修bug
完成用户信息修改,以及用户信息审核
This commit is contained in:
@@ -28,7 +28,7 @@ public class PostController {
|
||||
@PostMapping(value = "/upload", consumes = "multipart/form-data")
|
||||
public Result<List<String>> uploadMedia(@RequestParam("files") MultipartFile[] files) {
|
||||
List<String> fileUrls = postService.uploadMedia(files);
|
||||
return Result.success(ResultCode.SUCCESS_REVIEW, "文件上传成功", fileUrls);
|
||||
return Result.success(ResultCode.SUCCESS, "文件上传成功", fileUrls);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -40,7 +40,7 @@ public class PostController {
|
||||
public Result<Post> createPostJson(@RequestBody PostRequestDTO postDTO) {
|
||||
// 调用 Service 层处理发布动态业务逻辑
|
||||
Post result = postService.createPost(postDTO);
|
||||
return Result.success(ResultCode.SUCCESS_REVIEW, "动态发布成功,等待审核。", result);
|
||||
return Result.success(ResultCode.SUCCESS, "动态发布成功,等待审核。", result);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -75,6 +75,6 @@ public class PostController {
|
||||
@PostMapping("/{postId}/updatePost")
|
||||
public Result<PostEditVO> updatePost(@PathVariable Long postId, @RequestBody PostRequestDTO postRequestDTO) {
|
||||
PostEditVO result = postService.updatePost(postId, postRequestDTO);
|
||||
return Result.success(ResultCode.SUCCESS_REVIEW, "动态更新成功", result);
|
||||
return Result.success(ResultCode.SUCCESS, "动态更新成功", result);
|
||||
}
|
||||
}
|
||||
@@ -51,7 +51,7 @@ public class UserController {
|
||||
@PostMapping(value = "/info/uploadAvatar", consumes = "multipart/form-data")
|
||||
public Result<String> uploadAvatar(@RequestParam("file") MultipartFile file) {
|
||||
String fileUrl = userService.uploadAvatar(file);
|
||||
return Result.success(ResultCode.SUCCESS_REVIEW, "头像上传成功", fileUrl);
|
||||
return Result.success(ResultCode.SUCCESS, "头像上传成功", fileUrl);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -62,7 +62,7 @@ public class UserController {
|
||||
@PostMapping(value = "/info/uploadBackground", consumes = "multipart/form-data")
|
||||
public Result<String> uploadBackground(@RequestParam("file") MultipartFile file) {
|
||||
String fileUrl = userService.uploadBackground(file);
|
||||
return Result.success(ResultCode.SUCCESS_REVIEW, "背景上传成功", fileUrl);
|
||||
return Result.success(ResultCode.SUCCESS, "背景上传成功", fileUrl);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -74,6 +74,7 @@ public class UserController {
|
||||
public Result userInfoUpdate(@RequestBody UserInfoUpdateDTO userInfoUpdateDTO) {
|
||||
Long userId = UserContext.getUserId();
|
||||
userInfoUpdateDTO.setUserId(userId);
|
||||
return Result.success(ResultCode.SUCCESS_REVIEW, "用户信息更新成功", null);
|
||||
userService.updateUserInfo(userInfoUpdateDTO);
|
||||
return Result.success(ResultCode.SUCCESS, "用户信息更新成功", null);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -248,16 +248,6 @@ public class UserServiceImpl implements UserService {
|
||||
}
|
||||
}
|
||||
|
||||
String nickname = userInfoUpdateDTO.getNickname();
|
||||
// 用户没传昵称 or 传空串
|
||||
if (!StringUtils.hasText(nickname)) {
|
||||
// 如果数据库里原本也没有昵称
|
||||
if (!StringUtils.hasText(user.getNickname())) {
|
||||
userInfoUpdateDTO.setNickname(user.getUserName());
|
||||
} else {
|
||||
userInfoUpdateDTO.setNickname(null);
|
||||
}
|
||||
}
|
||||
userInfoUpdateDTO.setUpdatedAt(LocalDateTime.now());
|
||||
|
||||
// 更新数据库
|
||||
|
||||
Reference in New Issue
Block a user