潘钊 / bsth_control · Commits

Commit 48c9abe3f3b9450ab703986a00c4590386125770

Authored by ljq
1 parent 4c89dede
build: skipped

配置文件修改

Inline Side-by-side
Showing 3 changed files with 30 additions and 27 deletions
src/main/resources/application-dev.properties
  View file @48c9abe
@@ -20,17 +20,18 @@ spring.datasource.password= @@ -20,17 +20,18 @@ spring.datasource.password=
20 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false 20 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
21 #spring.datasource.username= root 21 #spring.datasource.username= root
22 #spring.datasource.password= root 22 #spring.datasource.password= root
  23 +spring.datasource.type= com.zaxxer.hikari.HikariDataSource
23 24
24 #DATASOURCE SETTING 25 #DATASOURCE SETTING
25 -spring.datasource.max-active=100  
26 -spring.datasource.max-idle=8  
27 -spring.datasource.min-idle=8  
28 -spring.datasource.initial-size=5  
29 -spring.datasource.test-on-borrow=true  
30 -spring.datasource.test-on-connect=true  
31 -spring.datasource.test-on-return=true  
32 -spring.datasource.test-while-idle=true  
33 -spring.datasource.validation-query=select 1 26 +spring.datasource.hikari.minimum-idle= 8
  27 +spring.datasource.hikari.maximum-pool-size= 100
  28 +#spring.datasource.hikari.auto-commit= true
  29 +spring.datasource.hikari.idle-timeout= 60000
  30 +#spring.datasource.hikari.pool-name= HikariPool
  31 +spring.datasource.hikari.max-lifetime= 1800000
  32 +spring.datasource.hikari.connection-timeout= 3000
  33 +spring.datasource.hikari.connection-test-query= SELECT 1
  34 +spring.datasource.hikari.validation-timeout= 3000
34 35
35 ## gps client data 36 ## gps client data
36 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all 37 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
src/main/resources/application-prod.properties
  View file @48c9abe
@@ -16,17 +16,18 @@ spring.datasource.driver-class-name= com.mysql.jdbc.Driver @@ -16,17 +16,18 @@ spring.datasource.driver-class-name= com.mysql.jdbc.Driver
16 spring.datasource.url= jdbc:mysql://10.10.200.121:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai 16 spring.datasource.url= jdbc:mysql://10.10.200.121:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
17 spring.datasource.username= root 17 spring.datasource.username= root
18 spring.datasource.password= root2jsp 18 spring.datasource.password= root2jsp
  19 +spring.datasource.type= com.zaxxer.hikari.HikariDataSource
19 20
20 #DATASOURCE SETTING 21 #DATASOURCE SETTING
21 -spring.datasource.max-active=100  
22 -spring.datasource.max-idle=8  
23 -spring.datasource.min-idle=8  
24 -spring.datasource.initial-size=5  
25 -spring.datasource.test-on-borrow=true  
26 -spring.datasource.test-on-connect=true  
27 -spring.datasource.test-on-return=true  
28 -spring.datasource.test-while-idle=true  
29 -spring.datasource.validation-query=select 1 22 +spring.datasource.hikari.minimum-idle= 8
  23 +spring.datasource.hikari.maximum-pool-size= 100
  24 +#spring.datasource.hikari.auto-commit= true
  25 +spring.datasource.hikari.idle-timeout= 60000
  26 +#spring.datasource.hikari.pool-name= HikariPool
  27 +spring.datasource.hikari.max-lifetime= 1800000
  28 +spring.datasource.hikari.connection-timeout= 3000
  29 +spring.datasource.hikari.connection-test-query= SELECT 1
  30 +spring.datasource.hikari.validation-timeout= 3000
30 31
31 ## gps client data 32 ## gps client data
32 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all 33 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
src/main/resources/application-test.properties
  View file @48c9abe
@@ -16,17 +16,18 @@ spring.datasource.driver-class-name= com.mysql.jdbc.Driver @@ -16,17 +16,18 @@ spring.datasource.driver-class-name= com.mysql.jdbc.Driver
16 spring.datasource.url= jdbc:mysql://10.10.200.148:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false 16 spring.datasource.url= jdbc:mysql://10.10.200.148:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
17 spring.datasource.username= root 17 spring.datasource.username= root
18 spring.datasource.password= root 18 spring.datasource.password= root
  19 +spring.datasource.type= com.zaxxer.hikari.HikariDataSource
19 20
20 #DATASOURCE SETTING 21 #DATASOURCE SETTING
21 -spring.datasource.max-active=100  
22 -spring.datasource.max-idle=8  
23 -spring.datasource.min-idle=8  
24 -spring.datasource.initial-size=5  
25 -spring.datasource.test-on-borrow=true  
26 -spring.datasource.test-on-connect=true  
27 -spring.datasource.test-on-return=true  
28 -spring.datasource.test-while-idle=true  
29 -spring.datasource.validation-query=select 1 22 +spring.datasource.hikari.minimum-idle= 8
  23 +spring.datasource.hikari.maximum-pool-size= 100
  24 +#spring.datasource.hikari.auto-commit= true
  25 +spring.datasource.hikari.idle-timeout= 60000
  26 +#spring.datasource.hikari.pool-name= HikariPool
  27 +spring.datasource.hikari.max-lifetime= 1800000
  28 +spring.datasource.hikari.connection-timeout= 3000
  29 +spring.datasource.hikari.connection-test-query= SELECT 1
  30 +spring.datasource.hikari.validation-timeout= 3000
30 31
31 ## gps client data 32 ## gps client data
32 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all 33 http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all