From 076a457c7c7d005075aa8247ee0b214e94418786 Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Wed, 16 Jul 2025 15:14:43 +0800
Subject: [PATCH] 反馈问题处理

---
 trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
index 3772924..ad5510d 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java
@@ -15,6 +15,7 @@
 import com.yami.trading.common.constants.Constants;
 import com.yami.trading.common.domain.Result;
 import com.yami.trading.common.util.IPHelper;
+import com.yami.trading.security.common.manager.PasswordManager;
 import com.yami.trading.security.common.util.SecurityUtils;
 import com.yami.trading.security.common.enums.SysTypeEnum;
 import com.yami.trading.security.common.manager.TokenStore;
@@ -60,6 +61,9 @@
 
     @Autowired
     PermissionFacade permissionFacade;
+
+    @Autowired
+    PasswordManager passwordManager;
 
     @PostMapping("list")
     @ApiOperation("列表")
@@ -115,7 +119,8 @@
     public Result restLoginPasswrod(@Valid @RequestBody RestLoginPasswrodModel model) {
         sysUserService.checkGooleAuthCode(Long.valueOf(model.getGoogleAuthCode()));
         sysUserService.checkSafeWord(model.getLoginSafeword());
-        userService.restLoginPasswrod(model.getUserId(),  model.getPassword());
+        String password = passwordManager.decryptPassword(model.getPassword());
+        userService.restLoginPasswrod(model.getUserId(),  password);
         return Result.ok(null);
     }
 
@@ -134,7 +139,8 @@
     public Result restSafePassword(@Valid @RequestBody RestSafePasswordModel model) {
         sysUserService.checkGooleAuthCode(Long.valueOf(model.getGoogleAuthCode()));
         sysUserService.checkSafeWord(model.getLoginSafeword());
-        userService.restSafePassword(model.getUserId(), model.getNewSafeword());
+        String password = passwordManager.decryptPassword(model.getNewSafeword());
+        userService.restSafePassword(model.getUserId(), password);
         return Result.ok(null);
     }
 

--
Gitblit v1.9.3