com.mysql.cj.jdbc.Driver

javahongxi · Jan 12, 2019 · 3a15790 · 3a15790
1 parent ef27968
commit 3a15790
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 38 deletions.
diff --git a/...mars-spring-boot-samples/whatsmars-boot-sample-mybatis/src/main/resources/application.yml b/...mars-spring-boot-samples/whatsmars-boot-sample-mybatis/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 user:
   datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
     jdbc-url: jdbc:mysql://db.hongxi.org:3306/user?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
-    driver-class-name: com.mysql.jdbc.Driver
     username: root
     password: n36bxXMnHina
     connectionTimeout: 30000
@@ -13,8 +13,8 @@ user:
 
 trade:
   datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
     jdbc-url: jdbc:mysql://db.hongxi.org:3306/trade?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
-    driver-class-name: com.mysql.jdbc.Driver
     username: root
     password: n36bxXMnHina
     connectionTimeout: 30000

diff --git a/whatsmars-spring-boot/src/main/resources/application.yml b/whatsmars-spring-boot/src/main/resources/application.yml
@@ -41,21 +41,16 @@ pagehelper:
 spring:
   profiles: dev
   datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://db.hongxi.org:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
     username: root
     password: n36bxXMnHina
-    driver-class-name: com.mysql.jdbc.Driver
-    tomcat:
-      min-idle: 10
-      max-idle: 50
-      max-active: 100
-      max-wait: 100000
-      max-age: 10000
-      test-on-borrow: true
-      test-on-return: false
-      test-while-idle: true
-      time-between-eviction-runs-millis: 5000
-      validation-query: SELECT 1
+    connectionTimeout: 30000
+    idleTimeout: 60000
+    maxLifetime: 1800000
+    minimumIdle: 5
+    maximumPoolSize: 10
+    connection-test-query: SELECT 1
   redis:
     host: 127.0.0.1
     port: 6379
@@ -81,21 +76,16 @@ server:
 spring:
   profiles: test
   datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://db.hongxi.org:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
     username: root
     password: n36bxXMnHina
-    driver-class-name: com.mysql.jdbc.Driver
-    tomcat:
-      min-idle: 10
-      max-idle: 50
-      max-active: 100
-      max-wait: 100000
-      max-age: 10000
-      test-on-borrow: true
-      test-on-return: false
-      test-while-idle: true
-      time-between-eviction-runs-millis: 5000
-      validation-query: SELECT 1
+    connectionTimeout: 30000
+    idleTimeout: 60000
+    maxLifetime: 1800000
+    minimumIdle: 5
+    maximumPoolSize: 10
+    connection-test-query: SELECT 1
   redis:
     host: 127.0.0.1
     port: 6379
@@ -121,21 +111,16 @@ server:
 spring:
   profiles: prod
   datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://db.hongxi.org:3306/test?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
     username: root
     password: n36bxXMnHina
-    driver-class-name: com.mysql.jdbc.Driver
-    tomcat:
-      min-idle: 10
-      max-idle: 50
-      max-active: 100
-      max-wait: 100000
-      max-age: 10000
-      test-on-borrow: true
-      test-on-return: false
-      test-while-idle: true
-      time-between-eviction-runs-millis: 5000
-      validation-query: SELECT 1
+    connectionTimeout: 30000
+    idleTimeout: 60000
+    maxLifetime: 1800000
+    minimumIdle: 5
+    maximumPoolSize: 10
+    connection-test-query: SELECT 1
   redis:
     host: 127.0.0.1
     port: 6379