diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java index 53e2af9d..d76337e4 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java @@ -46,10 +46,10 @@ public class TestClient { // testClient.sendUserCreate(i); // } // 创建用户接口测试 - testClient.sendUserUpdate(); // 更新用户接口测试 +// testClient.sendUserUpdate(); // 更新用户接口测试 // testClient.sendUserDel(); // 更新用户接口测试 // testClient.sendOrgCreate(); // 组织创建接口测试 -// testClient.sendOrgUpdate(); // 组织修改接口测试 + testClient.sendOrgUpdate(); // 组织修改接口测试 // testClient.sendOrgDel(); // 组织删除接口测试 // testClient.sendQueryAllUserIdsService(); // 查询所有用户ID接口测试 // testClient.sendQueryAllOrgIdsService(); // 查询所有组织ID接口测试 @@ -322,10 +322,10 @@ public class TestClient { // 封装 IamUserAcceptDto 为用户数据层 IamOrgAcceptDto iamOrgAcceptDto = new IamOrgAcceptDto(); // iamOrgAcceptDto.set__ENABLE__(true); - iamOrgAcceptDto.setBimOrgId("D10000005"); - iamOrgAcceptDto.setSrmsOrgCode("IA00104"); - iamOrgAcceptDto.setSrmsDepartName("销售部1"); - iamOrgAcceptDto.setSrmsParentCode("D10000001"); + iamOrgAcceptDto.setBimOrgId("37b00dcc466f4849a634575857d6a33d"); + iamOrgAcceptDto.setSrmsOrgCode("A01"); + iamOrgAcceptDto.setSrmsDepartName("测试部门"); + iamOrgAcceptDto.setSrmsParentCode(""); iamOrgAcceptDto.setBimRequestId(UUIDUtils.randomUUID20()); iamOrgAcceptDto.setBimRemoteUser("cgrsmsIam"); @@ -344,7 +344,7 @@ public class TestClient { Sm4Cipher sm4Cipher = new Sm4Cipher(); String source = JSON.toJSONString(iamOrgAcceptDto); String target = sm4Cipher.encrypt(source, key); - + System.out.println("sm4加解密：" + target); // 发送数据 String url = "http://localhost:8188/laws-chery/sync/iam/chery/OrgUpdateService"; String response = HttpUtil.post(url, target); diff --git a/laws-single-startup/src/main/resources/application-dev-chery.yml b/laws-single-startup/src/main/resources/application-dev-chery.yml index acdf3b6e..cc2fbbc5 100644 --- a/laws-single-startup/src/main/resources/application-dev-chery.yml +++ b/laws-single-startup/src/main/resources/application-dev-chery.yml @@ -258,7 +258,7 @@ jero: # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置） upload-type: system # 在线预览文件服务器地址配置 - file-view-domain: 127.0.0.1:8012 + file-view-domain: 10.2.16.8:8012 # minio文件上传 minio: minio_url: @@ -305,7 +305,7 @@ jero: # 文件限制后缀黑名单 fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA # 跨站白名单 - whiteUrls: localhost:62345,localhost:8188,localhost:3344,localhost:3435,localhost:3408,10.2.16.8:8188,10.2.16.8:3344 + whiteUrls: localhost:62345,localhost:8188,localhost:3344,localhost:3435,localhost:3408,10.2.16.8:8188,10.2.16.8:3344,10.2.16.8:8188,10.2.16.8:8012 xssExcludedPages: /login,/updatePassword # cors白名单 notFilter: diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml index 4bfd6178..77a4dfde 100644 --- a/laws-single-startup/src/main/resources/application-test.yml +++ b/laws-single-startup/src/main/resources/application-test.yml @@ -258,7 +258,7 @@ jero: # 文件、图片上传方式，可选项：qiniu（七牛云）、system（跟随系统配置） upload-type: system # 在线预览文件服务器地址配置 - file-view-domain: 127.0.0.1:8012 + file-view-domain: 10.2.16.10:8012 # minio文件上传 minio: minio_url: @@ -305,12 +305,12 @@ jero: # 文件限制后缀黑名单 fileSuffixLimits : 0x00,%00,\\00,.jsp,.exe,.php,.asp,.aspx,.jspx,.xml,.html,.js,.sh,.bin,$DATA # 跨站白名单 - whiteUrls: localhost:62345,localhost:8188,localhost:3344,localhost:3435,localhost:3408,10.2.16.10:8188,10.2.16.10:3344 + whiteUrls: localhost:62345,localhost:8188,localhost:3344,localhost:3435,localhost:3408,10.2.16.10:8188,10.2.16.10:3344,10.2.16.10:8012 xssExcludedPages: /login,/updatePassword # cors白名单 notFilter: # origin地址 - originIp: http://localhost:62345,http://localhost:8188,http://localhost:3344,http://localhost:3435,http://localhost:3408,http://10.2.16.10:8188,http://10.2.16.10:3344 + originIp: http://localhost:62345,http://localhost:8188,http://localhost:3344,http://localhost:3435,http://localhost:3408,http://10.2.16.10:8188,http://10.2.16.10:3344,http://10.2.16.10:8012 # 加密默认值 password: pbe: @@ -500,13 +500,13 @@ watermark: # srms 接口对接 srms: # pdf预览 前端url http://ip:port 替换前端地址 - font_url_pdf: http://localhost:3344/pdfjs/web/viewer.html?file={back_url_pdf}&.pdf + font_url_pdf: http://10.2.16.10:3344/pdfjs/web/viewer.html?file={back_url_pdf}&.pdf # pdf预览 后端url back_url_pdf: /laws-chery/sys/common/view/{id}?type=view&at={token} # 其他文件预览 替换kkfileviewurl - font_url_other: http://127.0.0.1:8012/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5} + font_url_other: http://10.2.16.10:8012/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5} # 其他文件预览 后端url 替换后端地址 - back_url_other: http://localhost:8188/${srms.back_url_pdf}&fullfilename={file_name} + back_url_other: http://10.2.16.10:8188/${srms.back_url_pdf}&fullfilename={file_name} # 其他文件水印标识 other_md5_mark: cnhtc # E彩通标识