Merge branch 'master' of http://git.picaiba.com/why/ym

 Conflicts:

	pom.xml

	ym-gateway/src/main/java/com/cnbm/config/SwaggerConfig.java

	ym-generator/src/main/java/com/cnbm/generator/build/CodeGenerator.java

ym-gateway/src/main/resources/application-test.yml

@@ -0,0 +1,40 @@
+spring:
+  datasource:
+    #MySQL
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://mysql.picaiba.com:30307/ym_pass?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+    username: root
+    password: 1qaz@WSX3edc$RFV
+    #      #Oracle
+    #      driver-class-name: oracle.jdbc.OracleDriver
+    #      url: jdbc:oracle:thin:@192.168.10.10:1521:xe
+    #      username: renren_security
+    #      password: 123456
+    #      #SQLServer
+    #      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+    #      url: jdbc:sqlserver://localhost:1433;DatabaseName=renren_security
+    #      username: sa
+    #      password: 123456
+    #      #postgresql
+    #      driver-class-name: org.postgresql.Driver
+    #      url: jdbc:postgresql://192.168.10.10:5432/postgres
+    #      username: postgres
+    #      password: 123456
+    hikari:
+      pool-name: GrowUpHikariCP
+      minimum-idle: 1
+      maximum-pool-size: 10
+
+##多数据源的配置，需要引用renren-dynamic-datasource
+#dynamic:
+#  datasource:
+#    slave1:
+#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#      url: jdbc:sqlserver://123456:1433;DatabaseName=renren_security
+#      username: sa
+#      password: 123456
+#    slave2:
+#      driver-class-name: org.postgresql.Driver
+#      url: jdbc:postgresql://123456:5432/renren_security
+#      username: postgres
+#      password: 123456

ym-gateway/src/main/resources/application.yml

@@ -24,13 +24,15 @@ spring:
   mvc:
     pathmatch:
       matching-strategy: ANT_PATH_MATCHER
+    format:
+      date-time: yyyy-MM-dd HH:mm:ss
   servlet:
     multipart:
       max-file-size: 100MB
       max-request-size: 100MB
       enabled: true
   redis:
-    database: 0
+    database: 2
     host: redis.picaiba.com
     port: 6380
     password: '@WSXcde3'   # 密码（默认为空）
@@ -41,11 +43,10 @@ spring:
         max-wait: -1ms      # 连接池最大阻塞等待时间（使用负值表示没有限制）
         max-idle: 10      # 连接池中的最大空闲连接
         min-idle: 5       # 连接池中的最小空闲连接
-
-# 是否开启redis缓存  true开启   false关闭
-renren:
-  redis:
-    open: false
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+    default-property-inclusion: non_null
 
 #mybatis
 mybatis-plus: