timi/TimiServerAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 57 Wiki Activity

fix gao store id

Browse Source
This commit is contained in:
Timi
2026-08-07 19:10:25 +08:00
parent ab79391cdc
commit 6e43ff349d
16 changed files with 138 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/imyeyu/api/modules/user/controller/UserController.java
+13 -24
View File
@@ -16,6 +16,7 @@ import com.imyeyu.api.modules.user.vo.LoginResponse;
import com.imyeyu.api.modules.user.vo.PhoneVerifyCodeSendRequest;
import com.imyeyu.api.modules.user.vo.PhoneVerifyRequest;
import com.imyeyu.api.modules.user.vo.UpdatePasswordRequest;
import com.imyeyu.java.TimiJava;
import com.imyeyu.spring.TimiSpring;
import com.imyeyu.spring.annotation.AOPLog;
import com.imyeyu.spring.annotation.CaptchaValid;
@@ -130,6 +131,7 @@ public class UserController {
}
@AOPLog
@JsonView(ResponseView.Public.class)
@RequiredToken
@RequestRateLimit
@RequestMapping("/login/token")
@@ -140,37 +142,24 @@ public class UserController {
/**
* 更新当前用户资料
*
* @param req 用户资料
* @param user 用户资料
* @return 最新登录用户
*/
@AOPLog
@RequiredToken
@RequestRateLimit
@RequireCorePermission(CorePermissionCode.USER_UPDATE)
@PostMapping("/current/update")
public LoginResponse updateCurrent(@RequestBody User req) {
public LoginResponse updateCurrent(@RequestBody User user) {
User loginUser = userLoginService.getRequireLoginUser();
User user = userService.get(loginUser.getId());
if (req.getName() != null) {
user.setName(req.getName());
}
if (req.getNick() != null) {
user.setNick(req.getNick());
}
if (req.getGender() != null) {
user.setGender(req.getGender());
}
if (req.getDescription() != null) {
user.setDescription(req.getDescription());
}
if (req.getAvatarType() != null) {
user.setAvatarType(req.getAvatarType());
}
if (req.getWrapperType() != null) {
user.setWrapperType(req.getWrapperType());
}
userService.update(user);
updateCurrentAvatar(loginUser.getId(), req.getTempFileIdList());
User dbUser = userService.get(loginUser.getId());
dbUser.setName(TimiJava.defaultIfEmpty(user.getName(), dbUser.getName()));
dbUser.setNick(TimiJava.defaultIfEmpty(user.getNick(), dbUser.getNick()));
dbUser.setGender(TimiJava.defaultIfNull(user.getGender(), dbUser.getGender()));
dbUser.setDescription(user.getDescription());
dbUser.setAvatarType(TimiJava.defaultIfNull(user.getAvatarType(), dbUser.getAvatarType()));
dbUser.setWrapperType(TimiJava.defaultIfNull(user.getAvatarType(), dbUser.getWrapperType()));
userService.update(dbUser);
updateCurrentAvatar(loginUser.getId(), user.getTempFileIdList());
return userLoginService.login(TimiSpring.getToken(), loginUser.getId());
}