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-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java
+12 -7
View File
@@ -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.setSrmsRealname("李兵");
iamUserAcceptDto.setSrmsUsername((1000 + i) +"");
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
+3 -10
View File
@@ -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;