ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(全局): UUIDUtils.randomUUID替换oConvertUtils.randomGen

Browse Source
This commit is contained in:
yjz
2023-11-10 11:14:38 +08:00
parent db360447ad
commit 5c42548202
7 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+4 -4
View File
@@ -205,7 +205,7 @@ public class SysUserController {
// 密码加盐
String password = CommonUtils.decryptBtRsaPriKey(user.getPassword(), rsaPrivateKey);
user.setCreateTime(new Date());//设置创建时间
String salt = oConvertUtils.randomGen(8);
String salt = UUIDUtils.randomUUID(8);
user.setSalt(salt);
String passwordEncode = PasswordUtil.encrypt(user.getUsername(), password, salt);
user.setPassword(passwordEncode);
@@ -577,7 +577,7 @@ public class SysUserController {
sysUserExcel.setPassword(CommonConstant.DEFAULT_PASSWORD);
}
// 密码加密加盐
String salt = oConvertUtils.randomGen(8);
String salt = UUIDUtils.randomUUID(8);
sysUserExcel.setSalt(salt);
String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt);
sysUserExcel.setPassword(passwordEncode);
@@ -1027,7 +1027,7 @@ public class SysUserController {
try {
user.setCreateTime(new Date());// 设置创建时间
String salt = oConvertUtils.randomGen(8);
String salt = UUIDUtils.randomUUID(8);
String passwordEncode = PasswordUtil.encrypt(username, password, salt);
user.setSalt(salt);
user.setUsername(username);
@@ -1107,7 +1107,7 @@ public class SysUserController {
result.setSuccess(false);
return result;
} else {
String salt = oConvertUtils.randomGen(8);
String salt = UUIDUtils.randomUUID(8);
sysUser.setSalt(salt);
String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt);
sysUser.setPassword(passwordEncode);
laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysThirdAccountServiceImpl.java
+2 -2
View File
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.CommonConstant;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.UUIDGenerator;
import com.jero.common.util.oConvertUtils;
import com.jero.common.util.UUIDUtils;
import com.jero.modules.system.entity.SysRole;
import com.jero.modules.system.entity.SysThirdAccount;
import com.jero.modules.system.entity.SysUser;
@@ -71,7 +71,7 @@ public class SysThirdAccountServiceImpl extends ServiceImpl<SysThirdAccountMappe
user.setUsername(thirdUserUuid);
user.setPhone(phone);
//设置初始密码
String salt = oConvertUtils.randomGen(8);
String salt = UUIDUtils.randomUUID(8);
user.setSalt(salt);
String passwordEncode = PasswordUtil.encrypt(user.getUsername(), "123456", salt);
user.setPassword(passwordEncode);
laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+2 -10
View File
@@ -15,6 +15,7 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.system.vo.SysUserCacheInfo;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.UUIDGenerator;
import com.jero.common.util.UUIDUtils;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.base.service.BaseCommonService;
import com.jero.modules.system.entity.*;
@@ -96,7 +97,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
@CacheEvict(value = {CacheConstant.SYS_USERS_CACHE}, allEntries = true)
public Result<T> changePassword(SysUser sysUser) {
String salt = oConvertUtils.randomGen(8);
String salt = UUIDUtils.randomUUID(8);
sysUser.setSalt(salt);
String password = sysUser.getPassword();
String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), password, salt);
@@ -468,19 +469,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
//step.1 保存用户
// 对手机号、邮箱进行加密处理
this.proceedUserInfoEncrypt(user);
long a = System.currentTimeMillis();
this.save(user);
long b = System.currentTimeMillis();
log.info("保存用户耗时：" + (b - a));
//step.2 保存角色
if(oConvertUtils.isNotEmpty(selectedRoles)) {
String[] arr = selectedRoles.split(",");
for (String roleId : arr) {
SysUserRole userRole = new SysUserRole(user.getId(), roleId);
long c = System.currentTimeMillis();
sysUserRoleMapper.insert(userRole);
long d = System.currentTimeMillis();
log.info("保存角色耗时：" + (c - d));
}
}
//step.3 保存所属部门
@@ -488,10 +483,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
String[] arr = selectedDeparts.split(",");
for (String deaprtId : arr) {
SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId);
long e = System.currentTimeMillis();
sysUserDepartMapper.insert(userDeaprt);
long f = System.currentTimeMillis();
log.info("保存部门耗时：" + (e - f));
}
}
}