Merge branch 'hotfix-not-filter-20210705' into 'develop'

Hotfix not filter 20210705

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

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,9 +64,8 @@ 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: http://10.11.0.240:1645 http://10.254.11.185:1645 http://10.11.0.200:1645
+      ignorePattern: '/approve-core/api/*|/approve-core/v1/*|/approve-core/v2/*|/js/*|/img/*|/css/*|/api/*|/*.png|/rest/*|/webSocket/*|/oauthLogin/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/|/auditsvr/|/authsvr/|/codelist/|/swagger-ui.html'
       appCode: YHZX0000000000000001
   security-access:
     jwt:
@@ -77,4 +76,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/*|/approve-core/v2/*|/js/*|/img/*|/css/*|/api/*|/*.png|/rest/*|/webSocket/*|/oauthLogin/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/|/auditsvr/|/authsvr/|/codelist/|/swagger-ui.html'