From 8aaf35314407e4326c8d8c636c541390f999b60a Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Tue, 28 Apr 2026 09:18:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../env/controller/SdHbrvDicController.java       |  2 +-
 .../controller/SmsVerifyCodeController.java       | 15 ++++++++-------
 .../system/domain/SmsVerifyCodeRequest.java       | 13 +++++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/env/controller/SdHbrvDicController.java b/backend/src/main/java/com/yfd/platform/env/controller/SdHbrvDicController.java
index 1b87633..5faa2c0 100644
--- a/backend/src/main/java/com/yfd/platform/env/controller/SdHbrvDicController.java
+++ b/backend/src/main/java/com/yfd/platform/env/controller/SdHbrvDicController.java
@@ -106,7 +106,7 @@ public class SdHbrvDicController {
     }
 
     @GetMapping("/regDropdown")
-    @Operation(summary = "下拉框列表查询")
+    @Operation(summary = "下拉框列表查询(注册)")
     public ResponseResult regDropdown(
             @RequestParam(required = false) String hbrvnm,
             @RequestParam(required = false) String baseid) {
diff --git a/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java b/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java
index 98b329a..5c9801d 100644
--- a/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java
+++ b/backend/src/main/java/com/yfd/platform/system/controller/SmsVerifyCodeController.java
@@ -9,6 +9,7 @@ import com.yfd.platform.system.service.ISmsVerifyCodeService;
 import com.yfd.platform.system.service.ISysLogService;
 import com.yfd.platform.system.service.IUserService;
 import com.yfd.platform.utils.RequestHolder;
+import com.yfd.platform.utils.RsaUtils;
 import com.yfd.platform.utils.StringUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -94,37 +95,37 @@ public class SmsVerifyCodeController {
     @PostMapping("/register")
     @Operation(summary = "注册用户")
     public ResponseResult register(@RequestBody SmsVerifyCodeRequest smsVerifyCodeRequest) {
-        SysUser user = smsVerifyCodeRequest.getUser();
         String code = smsVerifyCodeRequest.getCode();
-        if (user.getPhone() == null || user.getPhone().isEmpty()) {
+        if (smsVerifyCodeRequest.getPhone() == null || smsVerifyCodeRequest.getPhone().isEmpty()) {
             return ResponseResult.error("手机号不能为空");
         }
-        if (user.getUsername() == null || user.getUsername().isEmpty()) {
+        if (smsVerifyCodeRequest.getUsername() == null || smsVerifyCodeRequest.getUsername().isEmpty()) {
             return ResponseResult.error("用户名不能为空");
         }
-        if (user.getPassword() == null || user.getPassword().isEmpty()) {
+        if (smsVerifyCodeRequest.getPassword() == null || smsVerifyCodeRequest.getPassword().isEmpty()) {
             return ResponseResult.error("密码不能为空");
         }
         if (code == null || code.isEmpty()) {
             return ResponseResult.error("验证码不能为空");
         }
 
-        boolean verified = smsVerifyCodeService.verifyCode(user.getPhone(), code, SmsVerifyCode.TYPE_REGISTER);
+        boolean verified = smsVerifyCodeService.verifyCode(smsVerifyCodeRequest.getPhone(), code, SmsVerifyCode.TYPE_REGISTER);
         if (!verified) {
             return ResponseResult.error("验证码错误或已过期");
         }
 
-        SysUser existUser = userService.getUserByPhone(user.getPhone());
+        SysUser existUser = userService.getUserByPhone(smsVerifyCodeRequest.getPhone());
         if (existUser != null) {
             return ResponseResult.error("该手机号已注册");
         }
 
         try {
-            com.yfd.platform.utils.RsaUtils.decryptByPrivateKey(privateKey, user.getPassword());
+            RsaUtils.decryptByPrivateKey(privateKey, smsVerifyCodeRequest.getPassword());
         } catch (Exception e) {
             return ResponseResult.error("密码解密失败");
         }
 
+        SysUser user = new SysUser();
         BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
         user.setPassword(passwordEncoder.encode(user.getPassword()));
         user.setRegStatus(0);
diff --git a/backend/src/main/java/com/yfd/platform/system/domain/SmsVerifyCodeRequest.java b/backend/src/main/java/com/yfd/platform/system/domain/SmsVerifyCodeRequest.java
index b7f59eb..b754e5d 100644
--- a/backend/src/main/java/com/yfd/platform/system/domain/SmsVerifyCodeRequest.java
+++ b/backend/src/main/java/com/yfd/platform/system/domain/SmsVerifyCodeRequest.java
@@ -19,15 +19,20 @@ public class SmsVerifyCodeRequest {
      */
    private String code;
 
+    /**
+     * 用户名
+     */
+    private String username;
+
     /**
      * 密码
      */
    private String password;
 
-   /**
-     * 用户
-     */
-   private SysUser user;
+//   /**
+//     * 用户
+//     */
+//   private SysUser user;
 
    /**
      * 流域编号