Merge remote-tracking branch 'origin/develop' into develop

src/main/resources/application-common.yml

@@ -0,0 +1,45 @@
+logging:
+  level:
+    au:
+      com:
+        royalpay:
+          payment: debug
+    java:
+      sql:
+        Connection: debug
+        PreparedStatement: debug
+        Statement: debug
+  pattern:
+    console: '[%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){blue}] %clr(%-5level) %logger: %msg%n'
+mybatis:
+  configuration:
+    mapUnderscoreToCamelCase: true
+  dialects:
+    - com.yixsoft.support.mybatis.dialects.mysql.MySqlDialect
+  paginator:
+    enable: true
+    advanced-count: true
+    dialect: com.github.miemiedev.mybatis.paginator.dialect.MySQLDialect
+spring:
+  application:
+    name: @project.artifactId@
+    version: @project.version@
+  datasource:
+    filters: stat,wall,log4j
+    max-active: 1000
+    max-idle: 150
+    max-pool-prepared-statement-per-connection-size: 100
+    max-wait: 3000
+    test-while-idle: true
+    time-between-eviction-runs-millis: 500
+    validation-query: select 1
+  mail:
+    host: smtp.office365.com
+    port: 587
+  thymeleaf:
+    mode: HTML
+  http:
+    converters:
+      preferred-json-mapper: fastjson
+stockholder:
+  mails: leo.huang@royalpay.com.au

src/main/resources/application.yml

@@ -89,19 +89,6 @@ jetty:
   threadPool:
     maxThreads: 1000
 
-logging:
-  level:
-    au:
-      com:
-        royalpay:
-          payment: debug
-    java:
-      sql:
-        Connection: debug
-        PreparedStatement: debug
-        Statement: debug
-  pattern:
-    console: '[%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){blue}] %clr(%-5level) %logger: %msg%n'
 mail:
   mailgun:
     api_key: api:key-2e67b891a1a7974bf3a40ea440d5a77f
@@ -115,15 +102,6 @@ mail:
 multipart:
   max-file-size: 10Mb
 
-mybatis:
-  configuration:
-    mapUnderscoreToCamelCase: true
-  dialects:
-    - com.yixsoft.support.mybatis.dialects.mysql.MySqlDialect
-  paginator:
-    enable: true
-    advanced-count: true
-    dialect: com.github.miemiedev.mybatis.paginator.dialect.MySQLDialect
 
 qcloud:
   scf:
@@ -164,33 +142,17 @@ settle:
     default-bank: CBA
     remains-to: ANZ
 spring:
-  application:
-    name: @project.artifactId@
-    version: @project.version@
-  datasource:
-    filters: stat,wall,log4j
-    max-active: 1000
-    max-idle: 150
-    max-pool-prepared-statement-per-connection-size: 100
-    max-wait: 3000
-    test-while-idle: true
-    time-between-eviction-runs-millis: 500
-    validation-query: select 1
   mail:
     host: smtp.office365.com
     port: 587
   profiles:
-    active: dev,alipay,bestpay,jd,wechat,rpay,yeepay,rppaysvc
+    active: dev,alipay,bestpay,jd,wechat,rpay,yeepay,rppaysvc,common
   redis:
     database: 1
     host: 127.0.0.1
     port: 6379
   thymeleaf:
     mode: HTML
-  http:
-    converters:
-      preferred-json-mapper: fastjson
 
-stockholder:
-  mails: leo.huang@royalpay.com.au
+