Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/compiler.xml
#	.idea/encodings.xml

.gitignore

@@ -0,0 +1,43 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml

.idea/compiler.xml

@@ -2,24 +2,24 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="sooka-auth" />
-        <module name="sooka-gateway" />
-        <module name="test-api" />
         <module name="sooka-common" />
+        <module name="sooka-gateway" />
         <module name="sooka-jersey" />
+        <module name="test-api" />
       </profile>
     </annotationProcessing>
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="sooka-auth" options="-parameters" />
-      <module name="sooka-gateway" options="-parameters" />
-      <module name="test-api" options="-parameters" />
-    </option>
+    <bytecodeTargetLevel>
+      <module name="cloud_show" target="1.5" />
+      <module name="sooka-auth" target="8" />
+      <module name="sooka-common" target="8" />
+      <module name="sooka-gateway" target="1.8" />
+      <module name="sooka-jersey" target="8" />
+      <module name="test-api" target="8" />
+    </bytecodeTargetLevel>
   </component>
 </project>

.idea/encodings.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/sooka-auth/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/sooka-common/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/sooka-common/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/sooka-gateway/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/test-api/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/test-api/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/sooka-auth" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/sooka-common" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/sooka-gateway" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/test-api" charset="UTF-8" />
   </component>
 </project>

sooka-common/sooka-common.iml

@@ -10,8 +10,6 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

sooka-jersey/sooka-jersey.iml

@@ -10,8 +10,6 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

test-api/5511xml/application-dev.yml

@@ -11,35 +11,12 @@ spring:
       primary: db1
       datasource:
         db1:
-          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
-          username: thsjzt
-          password: thsjzt
-            # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-        # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-              # 最小连接数
-            minimum-idle: 5
-        # 最大连接数
-            maximum-pool-size: 15
-        # 自动提交
-            auto-commit: true
-        # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-        # 连接池的名字
-            pool-name: DatebookHikariCP
-        # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db1gjj:
-          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.17.5.7:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
-          username: thsjzt
-          password: thsjzt
+          # 政务网 Vpn
+#          url: jdbc:mysql://172.17.5.6:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          # 政务网 dzzw
+          url: jdbc:mysql://172.18.128.7:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: root
+          password: thsjzt4e009fa5
             # Hikari will use the above plus the following to setup connection pooling
           type: com.zaxxer.hikari.HikariDataSource
           hikari:

test-api/5522xml/application-dev.yml

@@ -11,35 +11,12 @@ spring:
       primary: db1
       datasource:
         db1:
-          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
-          username: thsjzt
-          password: thsjzt
-            # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-        # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-              # 最小连接数
-            minimum-idle: 5
-        # 最大连接数
-            maximum-pool-size: 15
-        # 自动提交
-            auto-commit: true
-        # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-        # 连接池的名字
-            pool-name: DatebookHikariCP
-        # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db1gjj:
-          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.17.5.7:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
-          username: thsjzt
-          password: thsjzt
+          # 政务网 Vpn
+#          url: jdbc:mysql://172.17.5.6:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          # 政务网 dzzw
+          url: jdbc:mysql://172.18.128.7:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: root
+          password: thsjzt4e009fa5
             # Hikari will use the above plus the following to setup connection pooling
           type: com.zaxxer.hikari.HikariDataSource
           hikari:

test-api/src/main/java/com/sooka/api_pagefile/application-dev-172.17.5.4（政务外网）.yml

@@ -11,35 +11,10 @@ spring:
       primary: db1
       datasource:
         db1:
-          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
-          username: thsjzt
-          password: thsjzt
-            # Hikari will use the above plus the following to setup connection pooling
-          type: com.zaxxer.hikari.HikariDataSource
-          hikari:
-        # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-            connection-timeout: 30000
-              # 最小连接数
-            minimum-idle: 5
-        # 最大连接数
-            maximum-pool-size: 15
-        # 自动提交
-            auto-commit: true
-        # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-            idle-timeout: 600000
-        # 连接池的名字
-            pool-name: DatebookHikariCP
-        # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-            max-lifetime: 28740000
-            connection-test-query: SELECT 1
-        db1gjj:
-          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#          url: jdbc:mysql://172.17.5.7:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
-          username: thsjzt
-          password: thsjzt
+          url: jdbc:mysql://172.17.5.6:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+#          url: jdbc:mysql://172.18.128.7:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: root
+          password: thsjzt4e009fa5
             # Hikari will use the above plus the following to setup connection pooling
           type: com.zaxxer.hikari.HikariDataSource
           hikari:

test-api/src/main/resources/application-dev.yml

@@ -11,11 +11,12 @@ spring:
       primary: db1
       datasource:
         db1:
-#          url: jdbc:mysql://172.18.128.8:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-          url: jdbc:mysql://172.17.5.7:3306/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-
-          username: thsjzt
-          password: thsjzt
+          # 政务网 Vpn
+          url: jdbc:mysql://172.17.5.6:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          # 政务网 dzzw
+#          url: jdbc:mysql://172.18.128.7:5506/thsjzt?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
+          username: root
+          password: thsjzt4e009fa5
             # Hikari will use the above plus the following to setup connection pooling
           type: com.zaxxer.hikari.HikariDataSource
           hikari:
@@ -34,30 +35,6 @@ spring:
         # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
             max-lifetime: 28740000
             connection-test-query: SELECT 1
-#        db1gjj:
-#          url: jdbc:mysql://172.18.128.8:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-##          url: jdbc:mysql://172.17.5.7:3306/thgjj?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
-#
-#          username: thsjzt
-#          password: thsjzt
-#            # Hikari will use the above plus the following to setup connection pooling
-#          type: com.zaxxer.hikari.HikariDataSource
-#          hikari:
-#        # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没有的连接则发生SQLException，默认：30秒
-#            connection-timeout: 30000
-#              # 最小连接数
-#            minimum-idle: 5
-#        # 最大连接数
-#            maximum-pool-size: 15
-#        # 自动提交
-#            auto-commit: true
-#        # 一个连接idle状态的最大时长（毫秒），超时则被释放（retired），默认：10分钟
-#            idle-timeout: 600000
-#        # 连接池的名字
-#            pool-name: DatebookHikariCP
-#        # 一个连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认：30分钟1800000ms
-#            max-lifetime: 28740000
-#            connection-test-query: SELECT 1
 #        db_gjj_s:
 #          url: jdbc:mysql://59.198.246.77:32368/jl503001?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2B8
 #          username: jl503001