zw/pkAssistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修复 Bug

Browse Source
This commit is contained in:
Ziin
2025-08-21 21:42:17 +08:00
parent 458e49df22
commit 5404fd38c6
6 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/vvpkassistant/User/service/UserServiceImpl.java
View File

@@ -333,9 +333,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserModel> implements
throw new BusinessException(ErrorCode.USER_DOES_NOT_EXIST); throw new BusinessException(ErrorCode.USER_DOES_NOT_EXIST);
} }
if (userModelDTO.getPassword().equals(userModelDTO.getConfirmPassword())) { if (userModelDTO.getPassword().equals(userModelDTO.getConfirmPassword())) {
UserModel updateEntity = BeanUtil.copyProperties(userModelDTO, UserModel.class); userModel.setPassword(BcryptUtils.encryptPassword(userModelDTO.getPassword()));
updateEntity.setPassword(BcryptUtils.encryptPassword(updateEntity.getPassword())); return userDao.updateById(userModel) == 1;
return userDao.updateById(updateEntity) == 1;
} }
return false; return false;
} }

2
src/main/java/vvpkassistant/config/SaTokenConfigure.java
View File

@@ -55,7 +55,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
"/user/checkUserName", "/user/checkUserName",
"/user/verification", "/user/verification",
"/user/forgetMail", "/user/forgetMail",
"/user/resetPassword/" "/user/resetPassword"
}; };
} }

2
src/main/java/vvpkassistant/controller/UserController.java
View File

@@ -460,7 +460,7 @@ public class UserController {
} }
// 用户通过邮件验证链接重设密码接口 // 用户通过邮件验证链接重设密码接口
@PostMapping("/resetPassword/") @PostMapping("/resetPassword")
public ResponseData<Object>resetPassWord(@RequestBody UserModelDTO userModelDTO){ public ResponseData<Object>resetPassWord(@RequestBody UserModelDTO userModelDTO){
return ResponseData.success(userService.resetPassWord(userModelDTO)); return ResponseData.success(userService.resetPassWord(userModelDTO));
} }

1
src/main/resources/application-dev.yml
View File

@@ -8,7 +8,6 @@ spring:
url: jdbc:mysql://mysql.text.zhukeping.com:3326/vv_assistant?allowMultiQueries=true url: jdbc:mysql://mysql.text.zhukeping.com:3326/vv_assistant?allowMultiQueries=true
chat: chat:
appId: 1600092688 appId: 1600092688
appKey: 9bb6df04907a8cff9292eee8d6b32158d008350198acba11607068d91cb65f66 appKey: 9bb6df04907a8cff9292eee8d6b32158d008350198acba11607068d91cb65f66

6
src/main/resources/application.yml
View File

@@ -42,9 +42,9 @@ sa-token:
# 是否输出操作日志 # 是否输出操作日志
is-log: true is-log: true
activateUrl: http://192.168.1.174:8086/user/activate?token= activateUrl: http://pk.webapp.yolozs.com/activationSuccessful/
verificationMailUrl: http://192.168.1.174:8086/user/verificationMail?token= verificationMailUrl: http://pk.webapp.yolozs.com/verifyAccount/
forgetPassWordUrl: http://192.168.1.174:8086/user/resetPassword/?token= forgetPassWordUrl: http://pk.webapp.yolozs.com/resetPassword/
dromara: dromara:
x-file-storage: #文件存储配置 x-file-storage: #文件存储配置

6
target/classes/application.yml
View File

@@ -42,9 +42,9 @@ sa-token:
# 是否输出操作日志 # 是否输出操作日志
is-log: true is-log: true
activateUrl: http://192.168.1.174:8086/user/activate?token= activateUrl: http://192.168.1.112:8080/activationSuccessful/
verificationMailUrl: http://192.168.1.174:8086/user/verificationMail?token= verificationMailUrl: http://192.168.1.112:8080/verifyAccount/
forgetPassWordUrl: http://192.168.1.174:8086/user/resetPassword/?token= forgetPassWordUrl: http://192.168.1.112:8080/resetPassword/
dromara: dromara:
x-file-storage: #文件存储配置 x-file-storage: #文件存储配置