From 5404fd38c68e561efa7fa52ddabe0f80e02c4564 Mon Sep 17 00:00:00 2001 From: Ziin Date: Thu, 21 Aug 2025 21:42:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=20Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/vvpkassistant/User/service/UserServiceImpl.java | 5 ++--- src/main/java/vvpkassistant/config/SaTokenConfigure.java | 2 +- src/main/java/vvpkassistant/controller/UserController.java | 2 +- src/main/resources/application-dev.yml | 1 - src/main/resources/application.yml | 6 +++--- target/classes/application.yml | 6 +++--- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/vvpkassistant/User/service/UserServiceImpl.java b/src/main/java/vvpkassistant/User/service/UserServiceImpl.java index e95b0df..c83063f 100644 --- a/src/main/java/vvpkassistant/User/service/UserServiceImpl.java +++ b/src/main/java/vvpkassistant/User/service/UserServiceImpl.java @@ -333,9 +333,8 @@ public class UserServiceImpl extends ServiceImpl implements throw new BusinessException(ErrorCode.USER_DOES_NOT_EXIST); } if (userModelDTO.getPassword().equals(userModelDTO.getConfirmPassword())) { - UserModel updateEntity = BeanUtil.copyProperties(userModelDTO, UserModel.class); - updateEntity.setPassword(BcryptUtils.encryptPassword(updateEntity.getPassword())); - return userDao.updateById(updateEntity) == 1; + userModel.setPassword(BcryptUtils.encryptPassword(userModelDTO.getPassword())); + return userDao.updateById(userModel) == 1; } return false; } diff --git a/src/main/java/vvpkassistant/config/SaTokenConfigure.java b/src/main/java/vvpkassistant/config/SaTokenConfigure.java index ef27c0b..29750cf 100644 --- a/src/main/java/vvpkassistant/config/SaTokenConfigure.java +++ b/src/main/java/vvpkassistant/config/SaTokenConfigure.java @@ -55,7 +55,7 @@ public class SaTokenConfigure implements WebMvcConfigurer { "/user/checkUserName", "/user/verification", "/user/forgetMail", - "/user/resetPassword/" + "/user/resetPassword" }; } diff --git a/src/main/java/vvpkassistant/controller/UserController.java b/src/main/java/vvpkassistant/controller/UserController.java index 1effaf3..284c861 100644 --- a/src/main/java/vvpkassistant/controller/UserController.java +++ b/src/main/java/vvpkassistant/controller/UserController.java @@ -460,7 +460,7 @@ public class UserController { } // 用户通过邮件验证链接重设密码接口 - @PostMapping("/resetPassword/") + @PostMapping("/resetPassword") public ResponseDataresetPassWord(@RequestBody UserModelDTO userModelDTO){ return ResponseData.success(userService.resetPassWord(userModelDTO)); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 8822912..4b3c730 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -8,7 +8,6 @@ spring: url: jdbc:mysql://mysql.text.zhukeping.com:3326/vv_assistant?allowMultiQueries=true - chat: appId: 1600092688 appKey: 9bb6df04907a8cff9292eee8d6b32158d008350198acba11607068d91cb65f66 \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index bf19aed..6104b85 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -42,9 +42,9 @@ sa-token: # 是否输出操作日志 is-log: true -activateUrl: http://192.168.1.174:8086/user/activate?token= -verificationMailUrl: http://192.168.1.174:8086/user/verificationMail?token= -forgetPassWordUrl: http://192.168.1.174:8086/user/resetPassword/?token= +activateUrl: http://pk.webapp.yolozs.com/activationSuccessful/ +verificationMailUrl: http://pk.webapp.yolozs.com/verifyAccount/ +forgetPassWordUrl: http://pk.webapp.yolozs.com/resetPassword/ dromara: x-file-storage: #文件存储配置 diff --git a/target/classes/application.yml b/target/classes/application.yml index bf19aed..7bc690a 100644 --- a/target/classes/application.yml +++ b/target/classes/application.yml @@ -42,9 +42,9 @@ sa-token: # 是否输出操作日志 is-log: true -activateUrl: http://192.168.1.174:8086/user/activate?token= -verificationMailUrl: http://192.168.1.174:8086/user/verificationMail?token= -forgetPassWordUrl: http://192.168.1.174:8086/user/resetPassword/?token= +activateUrl: http://192.168.1.112:8080/activationSuccessful/ +verificationMailUrl: http://192.168.1.112:8080/verifyAccount/ +forgetPassWordUrl: http://192.168.1.112:8080/resetPassword/ dromara: x-file-storage: #文件存储配置