From 7bd53e325a83122cdfa5ba9a247b8d7955cb55b6 Mon Sep 17 00:00:00 2001
From: shimingxy <shimingxy@qq.com>
Date: Thu, 22 May 2025 14:36:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9=E5=85=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/maxkey/entity/idm/UserInfo.java   |  5 +++++
 .../persistence/service/impl/UserInfoServiceImpl.java  | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/maxkey-core/src/main/java/org/dromara/maxkey/entity/idm/UserInfo.java b/maxkey-core/src/main/java/org/dromara/maxkey/entity/idm/UserInfo.java
index b5385ee7..e5bf60d5 100644
--- a/maxkey-core/src/main/java/org/dromara/maxkey/entity/idm/UserInfo.java
+++ b/maxkey-core/src/main/java/org/dromara/maxkey/entity/idm/UserInfo.java
@@ -1426,6 +1426,11 @@ public class UserInfo extends JpaEntity  implements Serializable {
 		this.setDecipherable("");
 		this.transPictureBase64();
 	}
+	
+	public void clearPassword() {
+		this.setPassword(null);
+		this.setDecipherable(null);
+	}
 
 	@Override
 	public String toString() {
diff --git a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/UserInfoServiceImpl.java b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/UserInfoServiceImpl.java
index f74b7849..6df0cc6d 100644
--- a/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/UserInfoServiceImpl.java
+++ b/maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/UserInfoServiceImpl.java
@@ -44,6 +44,9 @@ import org.springframework.stereotype.Repository;
 
 
 /**
+ * 用户管理服务
+ * 
+ * 密码修改：1、插入用户，2、密码修改入口
  * @author Crystal.Sea
  *
  */
@@ -102,7 +105,8 @@ public class UserInfoServiceImpl extends JpaServiceImpl<UserInfoMapper,UserInfo>
 	
     @Override
     public boolean update(UserInfo userInfo) {
-    	ChangePassword changePassword = this.passwordEncoder(userInfo);
+    	//更新用户信息，不更新密码
+    	userInfo.clearPassword();
         if (super.update(userInfo)) {
         	if(provisionService.getApplicationConfig().isProvisionSupport()) {
                 UserInfo loadUserInfo = findUserRelated(userInfo.getId());
@@ -112,9 +116,6 @@ public class UserInfoServiceImpl extends JpaServiceImpl<UserInfoMapper,UserInfo>
                         loadUserInfo,
                         ProvisionAct.UPDATE);
             }
-            if(userInfo.getPassword() != null) {
-            	changePasswordProvisioning(changePassword);
-            }
             return true;
         }
         return false;
@@ -181,7 +182,6 @@ public class UserInfoServiceImpl extends JpaServiceImpl<UserInfoMapper,UserInfo>
 			insert(userInfo);
 		}else {
 			userInfo.setId(loadUserInfo.getId());
-			userInfo.setPassword(null);
 			update(userInfo);
 		}
 	}