Merge branch 'dev-user-isPublic' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/domain/User.java

@@ -185,4 +185,8 @@ public class User extends UserBaseEntity implements Serializable {
     @Column(columnDefinition = "int(11) default 0")
     @ApiModelProperty("销毁积分")
     private int destroyPoint = 0;
+
+    @Column(columnDefinition = "tinyint unsigned default 1")
+    @ApiModelProperty("主页是否展示")
+    private Boolean isPublicShow = Boolean.TRUE;
 }

src/main/java/com/izouma/nineth/service/UserService.java

@@ -145,7 +145,7 @@ public class UserService {
     }
 
     public User update(Long userId, String nickname, String avatar, String sex, String bg, String intro,
-                       Boolean useCollectionPic, Boolean riskWarning, Integer level) {
+                       Boolean useCollectionPic, Boolean riskWarning, Integer level, Boolean isPublicShow) {
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("用户不存在"));
         if (StringUtils.isNotBlank(nickname)) {
             if (!nickname.equals(user.getNickname())) {
@@ -181,6 +181,9 @@ public class UserService {
         if (level != null) {
             user.setLevel(level);
         }
+        if (isPublicShow != null) {
+            user.setIsPublicShow(isPublicShow);
+        }
         user = save(user);
         userRepo.updateAssetMinter(userId);
         userRepo.updateAssetOwner(userId);

src/main/java/com/izouma/nineth/web/UserController.java

@@ -73,9 +73,9 @@ public class UserController extends BaseController {
 
     @PostMapping("/update")
     public User update(String nickname, String avatar, String sex, String bg, String intro,
-                       Boolean useCollectionPic, Boolean riskWarning, Integer level) {
+                       Boolean useCollectionPic, Boolean riskWarning, Integer level, Boolean isPublicShow) {
         return userService.update(SecurityUtils.getAuthenticatedUser().getId(),
-                nickname, avatar, sex, bg, intro, useCollectionPic, riskWarning, level);
+                nickname, avatar, sex, bg, intro, useCollectionPic, riskWarning, level, isPublicShow);
     }
 
     @GetMapping("/my")