From 06b826769bb61437eb632399309f0d7cff5c280e Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Tue, 21 Nov 2023 10:38:11 +0800
Subject: [PATCH] fix

---
 .../internal/logic/updateldapuserpwdlogic.go  | 20 ++++++++++---------
 server/ldap-admin/internal/types/types.go     |  2 +-
 server_api/ldap-admin.api                     |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/server/ldap-admin/internal/logic/updateldapuserpwdlogic.go b/server/ldap-admin/internal/logic/updateldapuserpwdlogic.go
index 4e2e81f9..891cb4f1 100644
--- a/server/ldap-admin/internal/logic/updateldapuserpwdlogic.go
+++ b/server/ldap-admin/internal/logic/updateldapuserpwdlogic.go
@@ -55,15 +55,17 @@ func (l *UpdateLdapUserPwdLogic) UpdateLdapUserPwd(req *types.UpdateLdapUserPwdR
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, err.Error())
 	}
-	//解密旧的密码
-	oldPwd, err := encryption_decryption.CBCDecrypt(user.Password[7:])
-	if err != nil {
-		logx.Error(err)
-		return resp.SetStatusWithMessage(basic.CodeServiceErr, "解密旧的密码出错")
-	}
-	//验证旧的密码
-	if oldPwd != req.OldPassword {
-		return resp.SetStatusWithMessage(basic.CodeServiceErr, "旧密码不对，请重新尝试")
+	if len(user.Password) > 7 && user.Password[:7] == "{crypt}" {
+		//解密旧的密码
+		oldPwd, err := encryption_decryption.CBCDecrypt(user.Password[7:])
+		if err != nil {
+			logx.Error(err)
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, "解密旧的密码出错")
+		}
+		//验证旧的密码
+		if oldPwd != req.OldPassword {
+			return resp.SetStatusWithMessage(basic.CodeServiceErr, "旧密码不对，请重新尝试")
+		}
 	}
 	//加密新的密码
 	newPwd, err := encryption_decryption.CBCEncrypt(req.NewPassword)
diff --git a/server/ldap-admin/internal/types/types.go b/server/ldap-admin/internal/types/types.go
index 5d74dba7..bd1cf72b 100644
--- a/server/ldap-admin/internal/types/types.go
+++ b/server/ldap-admin/internal/types/types.go
@@ -166,7 +166,7 @@ type GetLdapUserInfoReq struct {
 }
 
 type GetLdapUserInfoRsp struct {
-	UserId       int64  `json:"userId"`
+	UserId       int64  `json:"user_id"`
 	UserDN       string `json:"user_dn"`
 	UserName     string `json:"user_name"`          //用户名
 	Email        string `json:"email"`              //邮箱
diff --git a/server_api/ldap-admin.api b/server_api/ldap-admin.api
index c57b7b3f..ef2b9653 100644
--- a/server_api/ldap-admin.api
+++ b/server_api/ldap-admin.api
@@ -249,7 +249,7 @@ type GetLdapUserInfoReq {
 	UserDN string `form:"user_dn"` //用户dn
 }
 type GetLdapUserInfoRsp {
-	UserId       int64  `json:"userId"`
+	UserId       int64  `json:"user_id"`
 	UserDN       string `json:"user_dn"`
 	UserName     string `json:"user_name"`          //用户名
 	Email        string `json:"email"`              //邮箱