From 6264de042f2ae3d56fd1d89f05dc9c1aa8445d6e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 15 Dec 2021 16:07:23 +0800
Subject: [PATCH] 20211215
---
src/main/java/cc/mrbird/febs/video/dto/ApiUpdateNameDto.java | 17 ++++++++
src/main/java/cc/mrbird/febs/video/mapper/AppVersionMapper.java | 8 ++++
src/main/java/cc/mrbird/febs/video/service/IApiVideoMemberService.java | 12 ++++--
src/main/java/cc/mrbird/febs/video/dto/RegisterDto.java | 5 +-
src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java | 35 +++++++++++++++--
src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java | 3 +
src/main/java/cc/mrbird/febs/video/controller/ApiVideoMemberController.java | 13 ++++++
7 files changed, 81 insertions(+), 12 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
index 0fba505..0fc2ee5 100644
--- a/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
+++ b/src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java
@@ -13,6 +13,7 @@
InterceptorRegistration registration = registry.addInterceptor(new LoginInterceptor());
registration.addPathPatterns("/api/**");
registration.excludePathPatterns("/api/login/**");
-// registration.excludePathPatterns("/api/member/**");
+ registration.excludePathPatterns("/api/member/vipCostInfo");
+ registration.excludePathPatterns("/api/member/appVersion");
}
}
diff --git a/src/main/java/cc/mrbird/febs/video/controller/ApiVideoMemberController.java b/src/main/java/cc/mrbird/febs/video/controller/ApiVideoMemberController.java
index a6e4065..4998ea1 100644
--- a/src/main/java/cc/mrbird/febs/video/controller/ApiVideoMemberController.java
+++ b/src/main/java/cc/mrbird/febs/video/controller/ApiVideoMemberController.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.video.dto.ApiMyVideoCollectionDto;
import cc.mrbird.febs.video.dto.ApiMyVideoHistoryDto;
+import cc.mrbird.febs.video.dto.ApiUpdateNameDto;
import cc.mrbird.febs.video.service.IApiVideoMemberService;
import cc.mrbird.febs.video.vo.ApiMyVideoCollectionVo;
import cc.mrbird.febs.video.vo.ApiMyVideoHistoryVo;
@@ -68,6 +69,18 @@
return memberService.vipCostInfo();
}
+ @ApiOperation(value = "获取版本信息")
+ @GetMapping(value = "/appVersion")
+ public FebsResponse appVersion() {
+ return new FebsResponse().message("获取成功").success().data(memberService.findAppVersion());
+ }
+
+ @ApiOperation(value = "昵称头像修改")
+ @PostMapping(value = "/updateName")
+ public FebsResponse updateName(@RequestBody ApiUpdateNameDto apiUpdateNameDto) {
+ return memberService.updateName(apiUpdateNameDto);
+ }
+
}
diff --git a/src/main/java/cc/mrbird/febs/video/dto/ApiUpdateNameDto.java b/src/main/java/cc/mrbird/febs/video/dto/ApiUpdateNameDto.java
new file mode 100644
index 0000000..983c1f7
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/video/dto/ApiUpdateNameDto.java
@@ -0,0 +1,17 @@
+package cc.mrbird.febs.video.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "ApiUpdateNameDto", description = "接收参数类")
+public class ApiUpdateNameDto {
+
+ @ApiModelProperty(value = "头像", example = "10")
+ private String avatar;
+
+ @ApiModelProperty(value = "昵称", example = "1")
+ private String name;
+
+}
diff --git a/src/main/java/cc/mrbird/febs/video/dto/RegisterDto.java b/src/main/java/cc/mrbird/febs/video/dto/RegisterDto.java
index 0955ece..975bc11 100644
--- a/src/main/java/cc/mrbird/febs/video/dto/RegisterDto.java
+++ b/src/main/java/cc/mrbird/febs/video/dto/RegisterDto.java
@@ -25,8 +25,7 @@
// @ApiModelProperty(value = "验证码", example = "123456")
// private String code;
-// @NotBlank(message = "邀请码不能为空")
-// @ApiModelProperty(value = "邀请码")
-// private String inviteId;
+ @ApiModelProperty(value = "邀请码")
+ private String inviteId;
}
diff --git a/src/main/java/cc/mrbird/febs/video/mapper/AppVersionMapper.java b/src/main/java/cc/mrbird/febs/video/mapper/AppVersionMapper.java
new file mode 100644
index 0000000..2605570
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/video/mapper/AppVersionMapper.java
@@ -0,0 +1,8 @@
+package cc.mrbird.febs.video.mapper;
+
+import cc.mrbird.febs.video.entity.AppVersion;
+import cc.mrbird.febs.video.entity.DataDictionaryCustom;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+public interface AppVersionMapper extends BaseMapper<AppVersion> {
+}
diff --git a/src/main/java/cc/mrbird/febs/video/service/IApiVideoMemberService.java b/src/main/java/cc/mrbird/febs/video/service/IApiVideoMemberService.java
index 914db3e..f3813ed 100644
--- a/src/main/java/cc/mrbird/febs/video/service/IApiVideoMemberService.java
+++ b/src/main/java/cc/mrbird/febs/video/service/IApiVideoMemberService.java
@@ -1,12 +1,12 @@
package cc.mrbird.febs.video.service;
import cc.mrbird.febs.common.entity.FebsResponse;
-import cc.mrbird.febs.video.dto.ApiMyVideoCollectionDto;
-import cc.mrbird.febs.video.dto.ApiMyVideoHistoryDto;
-import cc.mrbird.febs.video.dto.LoginDto;
-import cc.mrbird.febs.video.dto.RegisterDto;
+import cc.mrbird.febs.video.dto.*;
+import cc.mrbird.febs.video.entity.AppVersion;
import cc.mrbird.febs.video.entity.VideoMemberEntity;
import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
public interface IApiVideoMemberService extends IService<VideoMemberEntity> {
@@ -23,4 +23,8 @@
FebsResponse myHistory(ApiMyVideoHistoryDto apiMyVideoHistoryDto);
FebsResponse vipCostInfo();
+
+ List<AppVersion> findAppVersion();
+
+ FebsResponse updateName(ApiUpdateNameDto apiUpdateNameDto);
}
diff --git a/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java
index 8379729..06e8684 100644
--- a/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/video/service/impl/ApiVideoMemberServiceImpl.java
@@ -7,12 +7,11 @@
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.ShareCodeUtil;
import cc.mrbird.febs.video.conversion.VideoMemberConversion;
-import cc.mrbird.febs.video.dto.ApiMyVideoCollectionDto;
-import cc.mrbird.febs.video.dto.ApiMyVideoHistoryDto;
-import cc.mrbird.febs.video.dto.LoginDto;
-import cc.mrbird.febs.video.dto.RegisterDto;
+import cc.mrbird.febs.video.dto.*;
+import cc.mrbird.febs.video.entity.AppVersion;
import cc.mrbird.febs.video.entity.DataDictionaryCustom;
import cc.mrbird.febs.video.entity.VideoMemberEntity;
+import cc.mrbird.febs.video.mapper.AppVersionMapper;
import cc.mrbird.febs.video.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.video.mapper.VideoCollectionMapper;
import cc.mrbird.febs.video.mapper.VideoMemberMapper;
@@ -47,6 +46,7 @@
private final RedisUtils redisUtils;
private final VideoCollectionMapper videoCollectionMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final AppVersionMapper appVersionMapper;
@Override
public FebsResponse register(RegisterDto registerDto) {
@@ -55,6 +55,13 @@
throw new FebsException("该账号已被占用");
}
videoMember = new VideoMemberEntity();
+ if(StrUtil.isNotEmpty(registerDto.getInviteId())){
+ VideoMemberEntity videoMemberEntity = this.baseMapper.selectInfoByInviteId(registerDto.getInviteId());
+ if (ObjectUtil.isEmpty(videoMemberEntity)) {
+ throw new FebsException("邀请码不存在");
+ }
+ videoMember.setRefererId(registerDto.getInviteId());
+ }
videoMember.setPassword(SecureUtil.md5(registerDto.getPassword()));
videoMember.setAccount(registerDto.getAccount());
videoMember.setName(registerDto.getAccount());
@@ -166,6 +173,26 @@
return new FebsResponse().success().data(dataDictionaryCustoms);
}
+ @Override
+ public List<AppVersion> findAppVersion() {
+ return appVersionMapper.selectList(null);
+ }
+
+ @Override
+ public FebsResponse updateName(ApiUpdateNameDto apiUpdateNameDto) {
+ Long id = LoginUserUtil.getLoginUser().getId();
+ VideoMemberEntity videoMemberEntity = this.baseMapper.selectById(id);
+ if(StrUtil.isNotEmpty(apiUpdateNameDto.getName())){
+ videoMemberEntity.setName(apiUpdateNameDto.getName());
+ }
+
+ if(StrUtil.isNotEmpty(apiUpdateNameDto.getAvatar())){
+ videoMemberEntity.setAvatar(apiUpdateNameDto.getAvatar());
+ }
+ this.baseMapper.updateById(videoMemberEntity);
+ return new FebsResponse().success().message("成功");
+ }
+
public String generateAsaToken(String token) {
RSA rsa = new RSA(null, AppContants.PUBLIC_KEY);
--
Gitblit v1.9.1