Merge branch 'master' of http://git.picaiba.com/kszny/ym-pass

 Conflicts:

	ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java

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

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

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

@@ -20,10 +20,36 @@ spring:
       #      url: jdbc:postgresql://192.168.10.10:5432/postgres
       #      username: postgres
       #      password: 123456
-      hikari:
-        pool-name: GrowUpHikariCP
-        minimum-idle: 1
-        maximum-pool-size: 10
+      initial-size: 10
+      max-active: 100
+      min-idle: 10
+      max-wait: 60000
+      pool-prepared-statements: true
+      max-pool-prepared-statement-per-connection-size: 20
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      #Oracle需要打开注释
+      #validation-query: SELECT 1 FROM DUAL
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      stat-view-servlet:
+        enabled: true
+        url-pattern: /druid/*
+        #login-username: admin
+        #login-password: admin
+      filter:
+        stat:
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: false
+        wall:
+          config:
+            multi-statement-allow: true
+#      hikari:
+#        pool-name: GrowUpHikariCP
+#        minimum-idle: 1
+#        maximum-pool-size: 10
 
 ##多数据源的配置，需要引用renren-dynamic-datasource
 #dynamic:

ym-gateway/src/main/resources/logback-spring.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <include resource="org/springframework/boot/logging/logback/base.xml" />
+    <logger name="org.springframework.web" level="INFO"/>
+    <logger name="org.springboot.sample" level="TRACE" />
+
+    <!-- 开发、测试环境 -->
+    <springProfile name="dev,test">
+        <logger name="org.springframework.web" level="INFO"/>
+        <logger name="org.springboot.sample" level="INFO" />
+        <logger name="com.cnbm" level="DEBUG" />
+    </springProfile>
+
+    <!-- 生产环境 -->
+    <springProfile name="prod">
+        <logger name="org.springframework.web" level="ERROR"/>
+        <logger name="org.springboot.sample" level="ERROR" />
+        <logger name="com.cnbm" level="ERROR" />
+    </springProfile>
+
+</configuration>