Merge branch 'huangzqa-add-sync-20231107' into 'develop'

Huangzqa add sync 20231107

See merge request dcuc-tjdsj/approve-gateway!47

Dockerfile

@@ -3,4 +3,4 @@ FROM bus.ga/base/dragon-java:jdk8-alpine-arm64
 # ${pomVersion}对应pom里的数字version，如：1.0.0
 ADD target/approve-gateway-${pomVersion}-SNAPSHOT.tar.gz /opt/docker/
 RUN mv /opt/docker/approve-gateway-${pomVersion}-SNAPSHOT /opt/docker/approve-gateway
-ENTRYPOINT ["/opt/docker/approve-gateway/bin/start.sh"];
+ENTRYPOINT ["/opt/docker/approve-gateway/bin/start.sh"]

pom.xml

@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dragonsoft.dcuc</groupId>
     <artifactId>approve-gateway</artifactId>
-    <version>1.0.3-tjdsj-SNAPSHOT</version>
+    <version>1.3.0-tjdsj-SNAPSHOT</version>
     <name>approve-gateway</name>
     <description>approve-gateway</description>
     <properties>
         <!--revisions需写死，用于标识打包的版本号，不可删除-->
-        <revision>1.0.3-tjdsj-SNAPSHOT</revision>
+        <revision>1.3.0-tjdsj-SNAPSHOT</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>

src/main/java/com/dragonsoft/dcuc/approvegateway/business/BimBusiness.java

@@ -104,21 +104,20 @@ public class BimBusiness {
 
         String reqJson = JsonUtils.toJSONString(bimUserInfoReqVO);
 
-        log.info("UserInfo req :{}", reqJson);
 
         String url = dcucApproveProperties.getBimIdentityUrl() + "/api/rest/customization/ExpApiCustomDragonitService/getUserInfoByUserToken";
 
-        log.info("UserInfo req url:{}", reqJson);
+        log.info("向认证服务获取用户信息请求url:{}：请求内容 {}", url, reqJson);
         String postResp = HttpRequest.post(url)
                 .body(reqJson)
                 .execute()
                 .body();
-        log.info("UserInfo resp :{}", postResp);
+        log.info("向认证服务获取用户信息请求返回内容 :{}", postResp);
 
         BimUserInfoRespVO bimRespVo = JsonUtils.parseObject(postResp, BimUserInfoRespVO.class);
 
         if (!bimRespVo.getSuccess()) {
-            log.error("UserInfo error:{}", postResp);
+            log.error("向认证服务获取用户信息请求 error:{}", postResp);
         }
 
         return bimRespVo.getData();

src/main/resources/application-base.yml

@@ -63,11 +63,11 @@ duceap:
       ##若匹配该地址，则无须过滤
       noFilterUrl: /api/v1/,/v1/,/v2/api-docs,services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/
     dcuc:
-      casServerUrlPrefix: http://192.168.10.2:8877/sso
-      serverName: 10.11.0.240:1645 10.254.11.185:1645 10.11.0.200:1645 10.11.1.25:1645
+      casServerUrlPrefix: http://10.201.1.50:8877/sso
+      serverName: 10.11.0.83:1645 10.11.0.240:1645 10.254.11.185:1645 10.11.0.200:1645 10.11.1.25:1645
       ignorePattern: '/approve-core/api/*|/approve-core/v1/api/*|/approve-core/v2/*|/js/*|/img/*|/css/*|/*.png|/rest/*|/webSocket/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/|/swagger-ui.html'
       appCode: YHZX0000000000000001
-      api-url: http://192.168.10.2:8870/dcuc
+      api-url: http://10.201.1.50:8870/dcuc
   security-access:
     jwt:
       enabled: false