Merge branch 'master' into 'release/v1.0.2-flow-update'

# Conflicts:
#   src/main/resources/application.yml

.gitignore

@@ -0,0 +1,4 @@
+.idea
+target
+*.iml
+logs

pom.xml

@@ -112,7 +112,7 @@
                                     <!--取消依赖包的时间戳-->
                                     <useBaseVersion>true</useBaseVersion>
                                     <!--排除licenseignore包，用来禁用许可开关，防止生产环境通过关闭开关，绕过许可-->
-                                    <excludeArtifactIds>duceap-support-licenseignore</excludeArtifactIds>
+                                   <!-- <excludeArtifactIds>duceap-support-licenseignore</excludeArtifactIds>-->
                                 </configuration>
                             </execution>
                             <execution>

src/main/assembly/conf/application.yml

@@ -38,7 +38,7 @@ duceap:
     dataCacheMethod: apollo
     #配置用来指定license对接的后端项目地址(格式：ip:port/context，如http://10.10.10.10:8080/ctx)，默认使用HttpServletRequest.getLocalAddr()方法获取ip地址，应用在docker部署环境中无法获取机子的真实ip地址 考虑以配置参数的形式传入
     #address: http://10.10.10.10:8080/ctx
-    enabled: true
+    enabled: false
   apollo:
     client:
       host: http://192.168.10.27:8070 #配置中心地址(portal端)

src/main/resources/application.yml

@@ -62,7 +62,7 @@ duceap:
       jndi: JDBC/DIDS
       filterType: 1
       ##若匹配该地址，则无须过滤
-      noFilterUrl: /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/
+      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