Merge branch 'develop' into 'release/v1.0.2'

Develop

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

pom.xml

@@ -8,7 +8,11 @@
     <name>approve-gateway</name>
     <description>approve-gateway</description>
     <properties>
-        <java.version>1.8</java.version>
+        <!--revisions需写死，用于标识打包的版本号，不可删除-->
+        <revision>1.0.2-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>
     </properties>
 
     <dependencyManagement>
@@ -38,6 +42,12 @@
         <dependency>
             <groupId>com.dragonsoft</groupId>
             <artifactId>duceap-cloud-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>HdrHistogram</artifactId>
+                    <groupId>org.hdrhistogram</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -112,7 +122,7 @@
                                     <!--取消依赖包的时间戳-->
                                     <useBaseVersion>true</useBaseVersion>
                                     <!--排除licenseignore包，用来禁用许可开关，防止生产环境通过关闭开关，绕过许可-->
-                                   <!-- <excludeArtifactIds>duceap-support-licenseignore</excludeArtifactIds>-->
+                                    <!-- <excludeArtifactIds>duceap-support-licenseignore</excludeArtifactIds>-->
                                 </configuration>
                             </execution>
                             <execution>

src/main/resources/application.yml

@@ -44,7 +44,7 @@ duceap:
       host: http://192.168.10.27:8070 #配置中心地址(portal端)
   security:
     ##配置登陆方式，dids、dssoac、dcuc
-    type: dids
+    type: dcuc
     ##dids登录配置#
     dids2:
       ##应用代码
@@ -65,7 +65,7 @@ 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
+      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
       appCode: YHZX0000000000000001