Explorar el Código

添加修改昵称协议

sunkean hace 2 años
padre
commit
ed6899fa0c

+ 14 - 7
src/main/java/com/izouma/nineth/service/UserService.java

@@ -141,21 +141,28 @@ public class UserService {
         return userRepo.save(user);
     }
 
-    public User metaUpdate(Long userId, String nickname) {
-        if (StringUtils.isBlank(nickname)) {
-            throw new BusinessException("用户昵称为空");
+    public MetaRestResult<User> metaUpdate(User record) {
+        if (Objects.isNull(record)) {
+            return MetaRestResult.returnError("Illegal parameter : params can not be null");
         }
-        User user = userRepo.findById(userId).orElse(null);
+        if (Objects.isNull(record.getId())) {
+            return MetaRestResult.returnError("Illegal parameter : userId can not be null");
+        }
+        if (StringUtils.isBlank(record.getNickname())) {
+            return MetaRestResult.returnError("Illegal parameter : nickname can not be null");
+        }
+        String nickname = record.getNickname();
+        User user = userRepo.findById(record.getId()).orElse(null);
         if (Objects.isNull(user)) {
-            throw new BusinessException("用户信息为空");
+            return MetaRestResult.returnError("用户信息为空");
         }
         if (!nickname.equals(user.getNickname())) {
             if (!contentAuditService.auditText(nickname)) {
-                throw new BusinessException("昵称包含非法内容");
+                return MetaRestResult.returnError("昵称包含非法内容");
             }
         }
         user.setNickname(nickname);
-        return save(user);
+        return MetaRestResult.returnSuccess(save(user));
     }
 
     public User update(Long userId, String nickname, String avatar, String sex, String bg, String intro,

+ 12 - 7
src/main/java/com/izouma/nineth/web/UserController.java

@@ -59,11 +59,11 @@ public class UserController extends BaseController {
     public User register(@RequestParam String username,
                          @RequestParam String password) {
         UserRegister user = UserRegister.builder()
-                .username(username)
-                .nickname(username)
-                .password(password)
-                .authorities(Collections.singleton(Authority.get(AuthorityName.ROLE_USER)))
-                .build();
+                                        .username(username)
+                                        .nickname(username)
+                                        .password(password)
+                                        .authorities(Collections.singleton(Authority.get(AuthorityName.ROLE_USER)))
+                                        .build();
         return userService.create(user);
     }
 
@@ -89,6 +89,11 @@ public class UserController extends BaseController {
                 nickname, avatar, sex, bg, intro, useCollectionPic, riskWarning, level, isPublicShow);
     }
 
+    @PostMapping("/metaUpdate")
+    public MetaRestResult<User> metaUpdate(@RequestBody User user) {
+        return userService.metaUpdate(user);
+    }
+
     @GetMapping("/my")
     public User my(@RequestParam(defaultValue = "false") boolean refresh) {
         if (refresh) {
@@ -108,7 +113,7 @@ public class UserController extends BaseController {
     @PreAuthorize("hasRole('ADMIN')")
     public User myAdmin() {
         return userRepo.findById(SecurityUtils.getAuthenticatedUser().getId())
-                .orElseThrow(new BusinessException("用户不存在"));
+                       .orElseThrow(new BusinessException("用户不存在"));
     }
 
     @GetMapping("/myTrading")
@@ -204,7 +209,7 @@ public class UserController extends BaseController {
     @GetMapping("/getToken/{userId}")
     public String getToken(@PathVariable Long userId) {
         return jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(userId)
-                .orElseThrow(new BusinessException("用户不存在"))));
+                                                                        .orElseThrow(new BusinessException("用户不存在"))));
     }
 
     @PostMapping("/bindPhone")