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

laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -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

@@ -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

@@ -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));
 			}
 		}
 	}

laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java

@@ -28,10 +28,14 @@ public class TestClient {
     public static void main(String[] args) throws JsonProcessingException {
         TestClient testClient = new TestClient();
 //        testClient.sendSchemaService(); // 字段映射接口测试
-////        testClient.sendUserCreate(); // 创建用户接口测试
+        for (int i = 0; i < 100; i++) {
+            System.out.println(i);
+            testClient.sendUserCreate(i);
+        }
+        // 创建用户接口测试
 //        testClient.sendUserUpdate(); // 更新用户接口测试
 //        testClient.sendOrgCreate(); // 组织创建接口测试
-        testClient.sendQueryAllUserIdsService(); // 查询所有用户ID接口测试
+//        testClient.sendQueryAllUserIdsService(); // 查询所有用户ID接口测试
 //        testClient.sendQueryAllOrgIdsService(); // 查询所有组织ID接口测试
 //        testClient.sendQueryOrgByIdService(); // 查询指定id的组织数据测试
 //        testClient.sendQueryUserByIdService(); // 查询指定id的用户数据测试
@@ -102,14 +106,14 @@ public class TestClient {
     /**
      * 用户创建测试
      */
-    private void sendUserCreate() throws JsonProcessingException {
+    private void sendUserCreate(int i) throws JsonProcessingException {
         // 封装 IamUserAcceptDto 为用户数据层
         IamUserAcceptDto iamUserAcceptDto = new IamUserAcceptDto();
         iamUserAcceptDto.setSrmsCompanyCode("123");
         iamUserAcceptDto.setSrmsOrgCode("123/321");
         iamUserAcceptDto.setSrmsTypeId("001");
-        iamUserAcceptDto.setSrmsUsername("10001231");
+        iamUserAcceptDto.setSrmsUsername((1000 + i) +"");
-        iamUserAcceptDto.setSrmsRealname("李兵");
+        iamUserAcceptDto.setSrmsRealname("测试" + i);
         iamUserAcceptDto.setSrmsPassword("1qaz@WSX");
         iamUserAcceptDto.setSrmsSex("1"); // 男
         iamUserAcceptDto.setSrmsPost("主任");
@@ -118,7 +122,7 @@ public class TestClient {
         iamUserAcceptDto.setSrmsPostStatus("1"); // 在岗，srms不解析，直接存
         iamUserAcceptDto.setSrmsStatus("1"); // 1在册，0离职
         iamUserAcceptDto.setSrmsOfficePhone("022-87648762");
-        iamUserAcceptDto.setSrmsPhone("13811112222");
+//        iamUserAcceptDto.setSrmsPhone("13811112222");
         iamUserAcceptDto.setSrmsEmail("test@sinotruk.com");
         iamUserAcceptDto.setSrmsCreateTime("2023-10-15 10:35:20");
 
@@ -136,7 +140,8 @@ public class TestClient {
         String sendPoDataJson = objectMapper.writeValueAsString(sendPoDataEntity);
 
         // 发送数据
-        String url = "http://localhost:8184/laws-sinotruk/sync/iam/UserCreateService";
+//        String url = "http://localhost:8184/laws-sinotruk/sync/iam/UserCreateService";
+        String url = "laws-test.sinotruk.com/laws-sinotruk/sync/iam/UserCreateService";
         String response = HttpUtil.post(url, sendPoDataJson);
         System.out.println("用户创建接口响应：" + response);
     }

laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java

@@ -14,7 +14,7 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.DateUtils;
 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.docking.iam.annotation.IamProperty;
 import com.jero.modules.docking.iam.dto.IamCommonAcceptDto;
 import com.jero.modules.docking.iam.dto.IamOrgAcceptDto;
@@ -159,21 +159,17 @@ public class SyncIamService {
         iamUserCreateResponse.setBimRequestId(userAcceptDto.getBimRequestId());
         iamUserCreateResponse.setResultCode(DockingConstant.IAM_SUCCESS_RESULT_CODE);
         iamUserCreateResponse.setMessage(DockingConstant.IAM_SUCCESS_MESSAGE);
-        log.info("iamUserCreateResponse创建");
         // 将iam的数据转换成sysUser数据存入数据库
         SysUser sysUser = new SysUser();
         sysUser.setUsername(userAcceptDto.getSrmsUsername());
         sysUser.setRealname(userAcceptDto.getSrmsRealname());
 
         sysUser.setPassword(CommonConstant.DEFAULT_PASSWORD);
-        String salt = oConvertUtils.randomGen(8);
+        String salt = UUIDUtils.randomUUID(8);
+        System.out.println(salt);
         sysUser.setSalt(salt);
-        log.info("生成随机salt");
         String passwordEncode = PasswordUtil.encrypt(sysUser.getUsername(), sysUser.getPassword(), salt);
         sysUser.setPassword(passwordEncode);
-
-        log.info("密码加密");
-
         if (NumberUtil.isInteger(userAcceptDto.getSrmsSex())){
             sysUser.setSex(Integer.valueOf(userAcceptDto.getSrmsSex()));
         }
@@ -212,7 +208,6 @@ public class SyncIamService {
         sysUser.setDirectLeadership(userAcceptDto.getSrmsDirectLeadership());
         sysUser.setPostStatus(userAcceptDto.getSrmsPostStatus());
 
-        log.info("sysUser基本信息设置完毕");
         // 获取组织机构(多个逗号分隔)
         String orgCode = userAcceptDto.getSrmsOrgCode();
         String selectedDeparts = orgCode;
@@ -223,10 +218,8 @@ public class SyncIamService {
 
         // 存储到用户表中
         long a = System.currentTimeMillis();
-        log.info("--------" + a + "开始处理保存用户、角色、部门--------");
         this.sysUserService.saveUser(sysUser, selectedRoles, selectedDeparts);
         long b = System.currentTimeMillis();
-        log.info("--------处理结束耗时" + (b - a) + "--------");
         iamUserCreateResponse.setUid(sysUser.getId());
 
         return iamUserCreateResponse;

laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java

@@ -390,7 +390,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 			// 文件信息
 			List<OSSFile> ossFileList = ossFileService.list(
 					new LambdaQueryWrapper<OSSFile>()
-							.in(OSSFile::getConnectId, lawsStandardizationGroup.getId()));
+							.eq(OSSFile::getConnectId, lawsStandardizationGroup.getId()));
 
 			if (!ossFileList.isEmpty()){
 				String fileIds = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(","));
@@ -410,7 +410,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 			// 文件信息
 			List<OSSFile> ossFileList = ossFileService.list(
 					new LambdaQueryWrapper<OSSFile>()
-							.in(OSSFile::getConnectId, lawsStandardizationPayment.getId()));
+							.eq(OSSFile::getConnectId, lawsStandardizationPayment.getId()));
 
 			if (!ossFileList.isEmpty()){
 				String fileIds = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(","));
@@ -436,7 +436,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 			// 文件信息
 			List<OSSFile> ossFileList = ossFileService.list(
 					new LambdaQueryWrapper<OSSFile>()
-							.in(OSSFile::getConnectId, lawsStandardizationMeeting.getId()));
+							.eq(OSSFile::getConnectId, lawsStandardizationMeeting.getId()));
 
 			if (!ossFileList.isEmpty()){
 				String fileIds = ossFileList.stream().map(OSSFile::getId).collect(Collectors.joining(","));

laws-single-startup/src/main/resources/application-dev.yml

@@ -128,14 +128,14 @@ spring:
         min-idle: 5
         maxActive: 20
         # 配置获取连接等待超时的时间
-        maxWait: 60000
+        maxWait: 300000
         # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
         minEvictableIdleTimeMillis: 300000
         validationQuery: SELECT 1
         testWhileIdle: true
-        testOnBorrow: true
+        testOnBorrow: false
         testOnReturn: false
         # 打开PSCache，并且指定每个连接上PSCache的大小
         poolPreparedStatements: true