From 4f7362ec2854732c2ff2454331ec815c4c3147f0 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期五, 22 十一月 2024 11:08:59 +0800
Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/se-cloud

---
 se-modules/se-system/src/main/java/com/se/system/controller/SysProfileController.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysProfileController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysProfileController.java
index 6201f36..8b07d1e 100644
--- a/se-modules/se-system/src/main/java/com/se/system/controller/SysProfileController.java
+++ b/se-modules/se-system/src/main/java/com/se/system/controller/SysProfileController.java
@@ -27,7 +27,7 @@
 import com.se.system.api.domain.SysFile;
 import com.se.system.api.domain.SysUser;
 import com.se.system.api.model.LoginUser;
-import com.se.system.service.ISysUserService;
+import com.se.system.service.inte.ISysUserService;
 
 /**
  * 涓汉淇℃伅 涓氬姟澶勭悊
@@ -98,11 +98,13 @@
     @Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
     public AjaxResult updatePwd(String oldPassword, String newPassword) throws Exception {
+        if (enableEncrypt) {
+            oldPassword = AesUtils.decrypt(oldPassword);
+            newPassword = AesUtils.decrypt(newPassword);
+        }
+
         String username = SecurityUtils.getUsername();
         SysUser user = userService.selectUserByUserName(username);
-        if (enableEncrypt && !StringUtils.isEmpty(user.getPassword())) {
-            user.setPassword(AesUtils.decrypt(user.getPassword()));
-        }
         String password = user.getPassword();
         if (!SecurityUtils.matchesPassword(oldPassword, password)) {
             return error("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");

--
Gitblit v1.9.3