Merge branch 'release/v1.0.3' into 'master'

Release/v1.0.3

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

Jenkinsfile

@@ -5,9 +5,9 @@ def build = new org.devops.build()
 def color = new org.devops.color()
 def systemtime = new org.devops.systemtime()
 
-def String cpu = "${env.cpu}"
-def String imagePrefix = "${env.imagePrefix}"
-def String buildImage = "${env.buildImage}"
+String cpu = "${env.cpu}"
+String imagePrefix = "${env.imagePrefix}"
+String buildImage = "${env.buildImage}"
 
 pipeline {
     agent {
@@ -46,15 +46,11 @@ pipeline {
                     script {
                         version = build.GetMvnParentVersion()
                         systime = systemtime.GetSysTime('yyMMdd')
-                        //将打出来的tar包，按照命名规范命名。根据实际情况，修改对应的系统简称和区域标识（DCUC-AUTH-BACK-TJDSJ）
-                        //如果是单模块项目，则直接cd target；如果是多模块项目，则是cd 模块名称/target
+                        //将打出来的tar包，按照命名规范命名。根据实际情况，修改对应的系统简称和区域标识（APPROVE-GATEWAY-TJDSJ）
                         sh """cd target
                             cp approve-gateway-*.tar.gz APPROVE-GATEWAY-TJDSJ-${version}-${env.GIT_COMMIT.take(8)}-BETA-${systime}.tar.gz
                         """
-                        //将复制的按照命名规范的tar包提取到Jenkins的面板，方便下载。根据实际情况，修改对应的系统简称和区域标识（DCUC-AUTH-BACK-TJDSJ）
-                        //如果是单模块项目，则直接target/xxxxx；如果是多模块项目，则是模块名称/target/xxxx
-                        //多模块写法：archiveArtifacts artifacts: 'dcuc-auth-back/target/DCUC-AUTH-BACK-TJDSJ-*.tar.gz'
-                        //单模块写法：
+                        //将复制的按照命名规范的tar包提取到Jenkins的面板，方便下载。根据实际情况，修改对应的系统简称和区域标识（APPROVE-GATEWAY-TJDSJ）
                         archiveArtifacts artifacts: 'target/APPROVE-GATEWAY-TJDSJ-*.tar.gz'
                     }
                 }
@@ -64,7 +60,7 @@ pipeline {
         stage('DOCKER-BUILD') {
             when {
                 expression {
-                    return (buildImage  == 'true')
+                    return (buildImage == 'true')
                 }
             }
             steps {

README.md

@@ -1,8 +1,9 @@
 # 审批网关服务组件
 ## 简介
-1. 为审批服务提供转发
+1. 为审批服务提供转发请求
 2. 登陆用户处理
 ## 更新日志
 ### 1.0.2
   - 修复无法获取真实用户iP
+### 1.0.3
   - 新增对接华为认证

pom.xml

@@ -4,12 +4,12 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dragonsoft.dcuc</groupId>
     <artifactId>approve-gateway</artifactId>
-    <version>1.0.2-tjdsj-SNAPSHOT</version>
+    <version>1.0.3-tjdsj-SNAPSHOT</version>
     <name>approve-gateway</name>
     <description>approve-gateway</description>
     <properties>
         <!--revisions需写死，用于标识打包的版本号，不可删除-->
-        <revision>1.0.2-tjdsj-SNAPSHOT</revision>
+        <revision>1.0.3-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/filter/SecurityAccessTokenResolver.java

@@ -62,8 +62,7 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
 
         log.debug("Security filter not context uri:{}", requestUri);
         String huaweiLoginFilterUrl = dcucApproveProperties.getHuaweiLoginFilterUrl();
-        String[] splitUrls = huaweiLoginFilterUrl.split(StrUtil.COMMA);
-
+        String[] splitUrls = huaweiLoginFilterUrl.split("\\|");
         log.debug("splitUrls:{} .", JsonUtils.toJSONString(splitUrls));
 
         if (!requestUri.equalsIgnoreCase(Constants.API_USER_INFO)) {

src/main/resources/application-base.yml

@@ -64,10 +64,10 @@ 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: http://10.11.0.240:1645 http://10.254.11.185:1645
-      ignorePattern: /v2/api-docs,/api/v1/process-types,api/v1/process-type,api/v1/apply,services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/
-      ApiUrl: http://192.168.10.2:8860/dcuc
+      serverName: 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
   security-access:
     jwt:
       enabled: false
@@ -77,4 +77,4 @@ dcuc:
     bim-identity-url: https://127.0.0.1:8443/bim-server
     bim-login-id: app1
     bim-secret-key: app1@123
-    huawei-login-filter-url: /approve-core/v2/api-docs,/approve-core/api/*,services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/
+    huawei-login-filter-url: '/approve-core/api/*|/approve-core/v1/api/*|/approve-core/v2/api/*|/js/*|/img/*|/css/*|/*.png|/rest/*|/webSocket/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/|/swagger-ui.html'