From 79cc02068f919bcfe55bdd01cabb06d3695eaed1 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Wed, 24 Sep 2025 14:03:15 +0800
Subject: [PATCH] TradePushJob修复
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/user/UserController.java | 9 +++++++--
1 files changed, 7 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..a50e22b 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,7 @@
public Result restLoginPasswrod(@Valid @RequestBody RestLoginPasswrodModel model) {
sysUserService.checkGooleAuthCode(Long.valueOf(model.getGoogleAuthCode()));
sysUserService.checkSafeWord(model.getLoginSafeword());
- userService.restLoginPasswrod(model.getUserId(), model.getPassword());
+ userService.restLoginPasswrod(model.getUserId(), passwordManager.decryptPassword(model.getPassword()));
return Result.ok(null);
}
@@ -134,7 +138,7 @@
public Result restSafePassword(@Valid @RequestBody RestSafePasswordModel model) {
sysUserService.checkGooleAuthCode(Long.valueOf(model.getGoogleAuthCode()));
sysUserService.checkSafeWord(model.getLoginSafeword());
- userService.restSafePassword(model.getUserId(), model.getNewSafeword());
+ userService.restSafePassword(model.getUserId(), passwordManager.decryptPassword(model.getNewSafeword()));
return Result.ok(null);
}
@@ -188,6 +192,7 @@
userBasicDto.setUid(user.getUserCode());
userBasicDto.setAccountType(Constants.ROLE_MAP.get(user.getRoleName()));
userBasicDto.setRealNameAuthority(user.isRealNameAuthority());
+ userBasicDto.setCreditScore(user.getCreditScore());
return userBasicDto;
}).collect(Collectors.toList());
--
Gitblit v1.9.3