From 7509312cce4f2f0ad27059c892cb2d78d564e292 Mon Sep 17 00:00:00 2001
From: lixuetao <lixuetao@syxysoft.com>
Date: Fri, 10 Nov 2023 11:32:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DLinux=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E4=B8=8B=E9=9A=8F=E6=9C=BA=E6=95=B0=E6=96=B9=E6=B3=95=E9=80=A0?=
 =?UTF-8?q?=E6=88=90=E7=9A=84=E7=B3=BB=E7=BB=9F=E6=AD=BB=E9=94=81=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/common/util/oConvertUtils.java   | 26 ++-----------------
 .../system/controller/SysUserController.java  |  8 +++---
 .../impl/SysThirdAccountServiceImpl.java      |  3 ++-
 .../service/impl/SysUserServiceImpl.java      |  3 ++-
 4 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oConvertUtils.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oConvertUtils.java
index 2f87a1d3..25a283a7 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oConvertUtils.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/oConvertUtils.java
@@ -360,7 +360,7 @@ public class oConvertUtils {
 	/**
 	 * SET转换MAP
 	 *
-	 * @param str
+	 * @param setobj
 	 * @return
 	 */
 	public static Map<Object, Object> SetToMap(Set<Object> setobj) {
@@ -450,7 +450,7 @@ public class oConvertUtils {
 	 * 如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。</br>
 	 * 例如：hello_world,test_id->helloWorld,testId
 	 *
-	 * @param name
+	 * @param names
 	 *            转换前的下划线大写方式命名的字符串
 	 * @return 转换后的驼峰式命名的字符串
 	 */
@@ -524,28 +524,6 @@ public class oConvertUtils {
         return sb.toString().toLowerCase();
 	}
 
-	/**
-	 * 随机数
-	 * @param place 定义随机数的位数
-	 */
-	public static String randomGen(int place) {
-		String base = "qwertyuioplkjhgfdsazxcvbnmQAZWSXEDCRFVTGBYHNUJMIKLOP0123456789";
-		StringBuilder sb = new StringBuilder();
-		Random rd = null;
-		try {
-			rd = SecureRandom.getInstanceStrong();
-		} catch (NoSuchAlgorithmException e) {
-			e.printStackTrace();
-		}
-		if(Objects.isNull(rd)){
-			return null;
-		}
-		for(int i=0;i<place;i++) {
-			sb.append(base.charAt(rd.nextInt(base.length())));
-		}
-		return sb.toString();
-	}
-
 	/**
 	 * 获取类的所有属性，包括父类
 	 *
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index d39a25fa..ec1dd07f 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -210,7 +210,7 @@ public class SysUserController {
             // 密码加盐
             String password = CommonUtils.decryptBtRsaPriKey(user.getPassword(), rsaPrivateKey);
             user.setCreateTime(new Date());//设置创建时间
-            String salt = oConvertUtils.randomGen(8);
+            String salt = RandomUtil.randomString(8);
             user.setSalt(salt);
             String passwordEncode = PasswordUtil.encrypt(user.getUsername(), password, salt);
             user.setPassword(passwordEncode);
@@ -571,7 +571,7 @@ public class SysUserController {
                         sysUserExcel.setPassword("hzwlsoft.com");
                     }
                     // 密码加密加盐
-                    String salt = oConvertUtils.randomGen(8);
+                    String salt = RandomUtil.randomString(8);
                     sysUserExcel.setSalt(salt);
                     String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt);
                     sysUserExcel.setPassword(passwordEncode);
@@ -1025,7 +1025,7 @@ public class SysUserController {
 
 		try {
 			user.setCreateTime(new Date());// 设置创建时间
-			String salt = oConvertUtils.randomGen(8);
+            String salt = RandomUtil.randomString(8);
 			String passwordEncode = PasswordUtil.encrypt(username, password, salt);
 			user.setSalt(salt);
 			user.setUsername(username);
@@ -1105,7 +1105,7 @@ public class SysUserController {
             result.setSuccess(false);
             return result;
         } else {
-            String salt = oConvertUtils.randomGen(8);
+            String salt = RandomUtil.randomString(8);
             sysUser.setSalt(salt);
             String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt);
             sysUser.setPassword(passwordEncode);
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysThirdAccountServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysThirdAccountServiceImpl.java
index ab896ee3..b6115996 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysThirdAccountServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysThirdAccountServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.modules.system.service.impl;
 
+import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.constant.CommonConstant;
@@ -71,7 +72,7 @@ public class SysThirdAccountServiceImpl extends ServiceImpl<SysThirdAccountMappe
         user.setUsername(thirdUserUuid);
         user.setPhone(phone);
         //设置初始密码
-        String salt = oConvertUtils.randomGen(8);
+        String salt = RandomUtil.randomString(8);
         user.setSalt(salt);
         String passwordEncode = PasswordUtil.encrypt(user.getUsername(), "123456", salt);
         user.setPassword(passwordEncode);
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
index 1b676cff..1f5c777c 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.modules.system.service.impl;
 
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -95,7 +96,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     @CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
     public Results<T> changePassword(SysUser sysUser) {
-        String salt = oConvertUtils.randomGen(8);
+		String salt = RandomUtil.randomString(8);
         sysUser.setSalt(salt);
         String password = sysUser.getPassword();
         String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt);