From 2ed504b3895468c8fd6a98e39d836d2a033b590c Mon Sep 17 00:00:00 2001
From: sunyuehai <1486744867@qq.com>
Date: Wed, 18 Sep 2024 23:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=94=9F=E6=88=90=E9=9A=8F?=
 =?UTF-8?q?=E6=9C=BAnickname,=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81=E5=92=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E4=B8=80=E4=B8=AA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/web/controller/app/EqUserController.java |  7 ++++---
 .../dromara/web/domain/bo/EqSysUserPasswordBo.java   |  6 +++++-
 .../org/dromara/web/service/SysRegisterService.java  | 12 +++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqUserController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqUserController.java
index edcb97cc4..3e7718ea0 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqUserController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqUserController.java
@@ -173,9 +173,10 @@ public class EqUserController extends BaseController {
         validateEmailCode(bo.getTenantId(), bo.getUsername(), bo.getCode());
         SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
         String password = user.getPassword();
-//        if (!BCrypt.checkpw(bo.getOldPassword(), password)) {
-//            return R.fail("修改密码失败，旧密码错误");
-//        }
+        //bo.getOldPassword()不为空
+        if (StringUtils.isNotEmpty(bo.getOldPassword())&&!BCrypt.checkpw(bo.getOldPassword(), password)) {
+            return R.fail("修改密码失败，旧密码错误");
+        }
         if (BCrypt.checkpw(bo.getNewPassword(), password)) {
             return R.fail("新密码不能与旧密码相同");
         }
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqSysUserPasswordBo.java b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqSysUserPasswordBo.java
index 46297e838..232a6e854 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqSysUserPasswordBo.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/domain/bo/EqSysUserPasswordBo.java
@@ -9,7 +9,7 @@ import static org.dromara.common.core.constant.UserConstants.USERNAME_MAX_LENGTH
 import static org.dromara.common.core.constant.UserConstants.USERNAME_MIN_LENGTH;
 
 @Data
-public class EqSysUserPasswordBo {
+public class EqSysUserPasswordBo extends SysUserPasswordBo {
     /**
      * 用户名
      */
@@ -30,5 +30,9 @@ public class EqSysUserPasswordBo {
      */
     @NotBlank(message = "新密码不能为空")
     private String newPassword;
+    /**
+     * 旧密码
+     */
+    private String oldPassword;
 
 }
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
index ddab279bc..290932363 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
@@ -24,6 +24,8 @@ import org.dromara.system.mapper.SysUserMapper;
 import org.dromara.system.service.ISysUserService;
 import org.springframework.stereotype.Service;
 
+import java.util.Random;
+
 /**
  * 注册校验方法
  *
@@ -54,7 +56,7 @@ public class SysRegisterService {
         }
         SysUserBo sysUser = new SysUserBo();
         sysUser.setUserName(username);
-        sysUser.setNickName(username);
+        sysUser.setNickName("mock_"+createNonceStr());
         sysUser.setPassword(BCrypt.hashpw(password));
         sysUser.setUserType(userType);
 
@@ -71,6 +73,14 @@ public class SysRegisterService {
         }
         recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
     }
+    public static String createNonceStr(){
+        String sl = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+        StringBuilder sb = new StringBuilder();
+        for(int i = 0 ; i < 10 ; i ++){
+            sb.append(sl.charAt(new Random().nextInt(sl.length())));
+        }
+        return sb.toString();
+    }
 
     /**
      * 校验验证码