update:新增SM2解密工具类，优化登录注册密码找回功能

main/manager-api/src/main/java/xiaozhi/common/utils/Sm2DecryptUtil.java

@@ -0,0 +1,61 @@
+package xiaozhi.common.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.exception.ErrorCode;
+import xiaozhi.common.exception.RenException;
+import xiaozhi.modules.security.service.CaptchaService;
+import xiaozhi.modules.sys.service.SysParamsService;
+
+/**
+ * SM2解密和验证码验证工具类
+ * 封装了重复的SM2解密、验证码提取和验证逻辑
+ */
+public class Sm2DecryptUtil {
+    
+    /**
+     * 验证码长度
+     */
+    private static final int CAPTCHA_LENGTH = 5;
+    
+    /**
+     * 解密SM2加密内容，提取验证码并验证
+     * @param encryptedPassword SM2加密的密码字符串
+     * @param captchaId 验证码ID
+     * @param captchaService 验证码服务
+     * @param sysParamsService 系统参数服务
+     * @return 解密后的实际密码
+     */
+    public static String decryptAndValidateCaptcha(String encryptedPassword, String captchaId, 
+                                                 CaptchaService captchaService, SysParamsService sysParamsService) {
+        // 获取SM2私钥
+        String privateKeyStr = sysParamsService.getValue(Constant.SM2_PRIVATE_KEY, true);
+        if (StringUtils.isBlank(privateKeyStr)) {
+            throw new RenException(ErrorCode.SM2_KEY_NOT_CONFIGURED);
+        }
+        
+        // 使用SM2私钥解密密码
+        String decryptedContent;
+        try {
+            decryptedContent = SM2Utils.decrypt(privateKeyStr, encryptedPassword);
+        } catch (Exception e) {
+            throw new RenException(ErrorCode.SM2_DECRYPT_ERROR);
+        }
+        
+        // 分离验证码和密码：前5位是验证码，后面是密码
+        if (decryptedContent.length() > CAPTCHA_LENGTH) {
+            String embeddedCaptcha = decryptedContent.substring(0, CAPTCHA_LENGTH);
+            String actualPassword = decryptedContent.substring(CAPTCHA_LENGTH);
+            
+            // 验证嵌入的验证码是否正确
+            boolean embeddedCaptchaValid = captchaService.validate(captchaId, embeddedCaptcha, true);
+            if (!embeddedCaptchaValid) {
+                throw new RenException(ErrorCode.SMS_CAPTCHA_ERROR);
+            }
+            
+            return actualPassword;
+        } else {
+            throw new RenException(ErrorCode.SM2_DECRYPT_ERROR);
+        }
+    }
+}

main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java

@@ -32,7 +32,7 @@ import xiaozhi.modules.security.password.PasswordUtils;
 import xiaozhi.modules.security.service.CaptchaService;
 import xiaozhi.modules.security.service.SysUserTokenService;
 import xiaozhi.modules.security.user.SecurityUser;
-import xiaozhi.common.utils.SM2Utils;
+import xiaozhi.common.utils.Sm2DecryptUtil;
 import org.apache.commons.lang3.StringUtils;
 import xiaozhi.modules.sys.dto.PasswordDTO;
 import xiaozhi.modules.sys.dto.RetrievePasswordDTO;
@@ -90,35 +90,11 @@ public class LoginController {
     public Result<TokenDTO> login(@RequestBody LoginDTO login) {
         String password = login.getPassword();
         
-        // 获取SM2私钥
+        // 使用工具类解密并验证验证码
-        String privateKeyStr = sysParamsService.getValue(Constant.SM2_PRIVATE_KEY, true);
+        String actualPassword = Sm2DecryptUtil.decryptAndValidateCaptcha(
-        if (StringUtils.isBlank(privateKeyStr)) {
+                password, login.getCaptchaId(), captchaService, sysParamsService);
-            throw new RenException(ErrorCode.SM2_KEY_NOT_CONFIGURED);
-        }
         
-        // 使用SM2私钥解密密码
+        login.setPassword(actualPassword);
-        String decryptedContent;
-        try {
-            decryptedContent = SM2Utils.decrypt(privateKeyStr, password);
-        } catch (Exception e) {
-            throw new RenException(ErrorCode.SM2_DECRYPT_ERROR);
-        }
-        
-        // 分离验证码和密码：前5位是验证码，后面是密码
-        if (decryptedContent.length() > 5) {
-            String embeddedCaptcha = decryptedContent.substring(0, 5);
-            String actualPassword = decryptedContent.substring(5);
-            
-            // 验证嵌入的验证码是否正确
-            boolean embeddedCaptchaValid = captchaService.validate(login.getCaptchaId(), embeddedCaptcha, true);
-            if (!embeddedCaptchaValid) {
-                throw new RenException(ErrorCode.SMS_CAPTCHA_ERROR);
-            }
-            
-            login.setPassword(actualPassword);
-        } else {
-            throw new RenException(ErrorCode.SM2_DECRYPT_ERROR);
-        }
         
         // 按照用户名获取用户
         SysUserDTO userDTO = sysUserService.getByUsername(login.getUsername());
@@ -144,41 +120,11 @@ public class LoginController {
         
         String password = login.getPassword();
         
-        // SM2加密
+        // 使用工具类解密并验证验证码
-        String privateKeyStr;
+        String actualPassword = Sm2DecryptUtil.decryptAndValidateCaptcha(
-        try {
+                password, login.getCaptchaId(), captchaService, sysParamsService);
-            // 获取SM2私钥
-            privateKeyStr = sysParamsService.getValue(Constant.SM2_PRIVATE_KEY, true);
-            if (StringUtils.isBlank(privateKeyStr)) {
-                throw new RenException(ErrorCode.SM2_KEY_NOT_CONFIGURED);
-            }
-        } catch (Exception e) {
-            throw new RenException(ErrorCode.SM2_KEY_NOT_CONFIGURED);
-        }
         
-        String decryptedContent;
+        login.setPassword(actualPassword);
-        try {
-            // 使用SM2私钥解密密码
-            decryptedContent = SM2Utils.decrypt(privateKeyStr, password);
-        } catch (Exception e) {
-            throw new RenException(ErrorCode.SM2_DECRYPT_ERROR);
-        }
-        
-        // 分离验证码和密码：前5位是验证码，后面是密码
-        if (decryptedContent.length() > 5) {
-            String embeddedCaptcha = decryptedContent.substring(0, 5);
-            String actualPassword = decryptedContent.substring(5);
-            
-            // 验证嵌入的验证码是否正确
-            boolean embeddedCaptchaValid = captchaService.validate(login.getCaptchaId(), embeddedCaptcha, true);
-            if (!embeddedCaptchaValid) {
-                throw new RenException(ErrorCode.SMS_CAPTCHA_ERROR);
-            }
-            
-            login.setPassword(actualPassword);
-        } else {
-            throw new RenException(ErrorCode.SM2_DECRYPT_ERROR);
-        }
         
         // 是否开启手机注册
         Boolean isMobileRegister = sysParamsService
@@ -259,35 +205,11 @@ public class LoginController {
 
         String password = dto.getPassword();
         
-        // 获取SM2私钥
+        // 使用工具类解密并验证验证码
-        String privateKeyStr = sysParamsService.getValue(Constant.SM2_PRIVATE_KEY, true);
+        String actualPassword = Sm2DecryptUtil.decryptAndValidateCaptcha(
-        if (StringUtils.isBlank(privateKeyStr)) {
+                password, dto.getCaptchaId(), captchaService, sysParamsService);
-            throw new RenException(ErrorCode.SM2_KEY_NOT_CONFIGURED);
-        }
         
-        String decryptedContent;
+        dto.setPassword(actualPassword);
-        try {
-            // 使用SM2私钥解密密码
-            decryptedContent = SM2Utils.decrypt(privateKeyStr, password);
-        } catch (Exception e) {
-            throw new RenException(ErrorCode.SM2_DECRYPT_ERROR);
-        }
-        
-        // 分离验证码和密码：前5位是验证码，后面是密码
-        if (decryptedContent.length() > 5) {
-            String embeddedCaptcha = decryptedContent.substring(0, 5);
-            String actualPassword = decryptedContent.substring(5);
-            
-            // 验证嵌入的验证码是否正确
-            boolean embeddedCaptchaValid = captchaService.validate(dto.getCaptchaId(), embeddedCaptcha, true);
-            if (!embeddedCaptchaValid) {
-                throw new RenException(ErrorCode.SMS_CAPTCHA_ERROR);
-            }
-            
-            dto.setPassword(actualPassword);
-        } else {
-            throw new RenException(ErrorCode.SM2_DECRYPT_ERROR);
-        }
 
         sysUserService.changePasswordDirectly(userDTO.getId(), dto.getPassword());
         return new Result<>();