Commit 79f8cde5971379dacabd83beb1236388085e72cd
1 parent
407a932c
1.数据源配置修改，多数据源情况下存在异常
Showing
3 changed files
with
43 additions
and
40 deletions
src/main/java/com/bsth/Application.java
| @@ -12,12 +12,15 @@ import org.springframework.boot.builder.SpringApplicationBuilder; | @@ -12,12 +12,15 @@ import org.springframework.boot.builder.SpringApplicationBuilder; | ||
| 12 | import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; | 12 | import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; |
| 13 | import org.springframework.context.annotation.Bean; | 13 | import org.springframework.context.annotation.Bean; |
| 14 | import org.springframework.context.annotation.EnableAspectJAutoProxy; | 14 | import org.springframework.context.annotation.EnableAspectJAutoProxy; |
| 15 | +import org.springframework.context.annotation.EnableMBeanExport; | ||
| 15 | import org.springframework.context.annotation.Primary; | 16 | import org.springframework.context.annotation.Primary; |
| 17 | +import org.springframework.jmx.support.RegistrationPolicy; | ||
| 16 | import org.springframework.transaction.annotation.EnableTransactionManagement; | 18 | import org.springframework.transaction.annotation.EnableTransactionManagement; |
| 17 | 19 | ||
| 18 | import java.util.concurrent.Executors; | 20 | import java.util.concurrent.Executors; |
| 19 | import java.util.concurrent.ScheduledExecutorService; | 21 | import java.util.concurrent.ScheduledExecutorService; |
| 20 | 22 | ||
| 23 | +@EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING) | ||
| 21 | @EnableAspectJAutoProxy | 24 | @EnableAspectJAutoProxy |
| 22 | @EnableTransactionManagement | 25 | @EnableTransactionManagement |
| 23 | @SpringBootApplication | 26 | @SpringBootApplication |
src/main/resources/application-cloud.properties
| @@ -19,16 +19,16 @@ spring.datasource.control.username= root | @@ -19,16 +19,16 @@ spring.datasource.control.username= root | ||
| 19 | spring.datasource.control.password= root2jsp | 19 | spring.datasource.control.password= root2jsp |
| 20 | spring.datasource.control.type= com.zaxxer.hikari.HikariDataSource | 20 | spring.datasource.control.type= com.zaxxer.hikari.HikariDataSource |
| 21 | #DATASOURCE | 21 | #DATASOURCE |
| 22 | -spring.datasource.control.hikari.minimum-idle= 8 | ||
| 23 | -spring.datasource.control.hikari.maximum-pool-size= 100 | ||
| 24 | -#spring.datasource.control.hikari.auto-commit= true | ||
| 25 | -spring.datasource.control.hikari.idle-timeout= 60000 | ||
| 26 | -#spring.datasource.control.hikari.pool-name= HikariPool | ||
| 27 | -spring.datasource.control.hikari.max-lifetime= 1800000 | ||
| 28 | -spring.datasource.control.hikari.connection-timeout= 3000 | ||
| 29 | -spring.datasource.control.hikari.connection-test-query= SELECT 1 | ||
| 30 | -spring.datasource.control.hikari.validation-timeout= 3000 | ||
| 31 | -spring.datasource.control.hikari.register-mbeans=true | 22 | +spring.datasource.control.minimum-idle= 8 |
| 23 | +spring.datasource.control.maximum-pool-size= 100 | ||
| 24 | +#spring.datasource.control.auto-commit= true | ||
| 25 | +spring.datasource.control.idle-timeout= 60000 | ||
| 26 | +#spring.datasource.control.pool-name= HikariPool | ||
| 27 | +spring.datasource.control.max-lifetime= 1800000 | ||
| 28 | +spring.datasource.control.connection-timeout= 3000 | ||
| 29 | +spring.datasource.control.connection-test-query= SELECT 1 | ||
| 30 | +spring.datasource.control.validation-timeout= 3000 | ||
| 31 | +spring.datasource.control.register-mbeans=true | ||
| 32 | 32 | ||
| 33 | #DATABASE info-publish | 33 | #DATABASE info-publish |
| 34 | spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver | 34 | spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver |
| @@ -37,16 +37,16 @@ spring.datasource.info-publish.username= root | @@ -37,16 +37,16 @@ spring.datasource.info-publish.username= root | ||
| 37 | spring.datasource.info-publish.password= root2jsp | 37 | spring.datasource.info-publish.password= root2jsp |
| 38 | spring.datasource.info-publish.type= com.zaxxer.hikari.HikariDataSource | 38 | spring.datasource.info-publish.type= com.zaxxer.hikari.HikariDataSource |
| 39 | #DATASOURCE | 39 | #DATASOURCE |
| 40 | -spring.datasource.info-publish.hikari.minimum-idle= 8 | ||
| 41 | -spring.datasource.info-publish.hikari.maximum-pool-size= 100 | ||
| 42 | -#spring.datasource.info-publish.hikari.auto-commit= true | ||
| 43 | -spring.datasource.info-publish.hikari.idle-timeout= 60000 | ||
| 44 | -#spring.datasource.info-publish.hikari.pool-name= HikariPool | ||
| 45 | -spring.datasource.info-publish.hikari.max-lifetime= 1800000 | ||
| 46 | -spring.datasource.info-publish.hikari.connection-timeout= 3000 | ||
| 47 | -spring.datasource.info-publish.hikari.connection-test-query= SELECT 1 | ||
| 48 | -spring.datasource.info-publish.hikari.validation-timeout= 3000 | ||
| 49 | -spring.datasource.info-publish.hikari.register-mbeans=true | 40 | +spring.datasource.info-publish.minimum-idle= 8 |
| 41 | +spring.datasource.info-publish.maximum-pool-size= 100 | ||
| 42 | +#spring.datasource.info-publish.auto-commit= true | ||
| 43 | +spring.datasource.info-publish.idle-timeout= 60000 | ||
| 44 | +#spring.datasource.info-publish.pool-name= HikariPool | ||
| 45 | +spring.datasource.info-publish.max-lifetime= 1800000 | ||
| 46 | +spring.datasource.info-publish.connection-timeout= 3000 | ||
| 47 | +spring.datasource.info-publish.connection-test-query= SELECT 1 | ||
| 48 | +spring.datasource.info-publish.validation-timeout= 3000 | ||
| 49 | +spring.datasource.info-publish.register-mbeans=true | ||
| 50 | 50 | ||
| 51 | kafka.use= false | 51 | kafka.use= false |
| 52 | spring.kafka.consumer.bootstrap-servers= 127.0.0.1:9092 | 52 | spring.kafka.consumer.bootstrap-servers= 127.0.0.1:9092 |
src/main/resources/application-dev.properties
| @@ -19,16 +19,16 @@ spring.datasource.control.username= root | @@ -19,16 +19,16 @@ spring.datasource.control.username= root | ||
| 19 | spring.datasource.control.password= root2jsp | 19 | spring.datasource.control.password= root2jsp |
| 20 | spring.datasource.control.type= com.zaxxer.hikari.HikariDataSource | 20 | spring.datasource.control.type= com.zaxxer.hikari.HikariDataSource |
| 21 | #DATASOURCE | 21 | #DATASOURCE |
| 22 | -spring.datasource.control.hikari.minimum-idle= 8 | ||
| 23 | -spring.datasource.control.hikari.maximum-pool-size= 16 | ||
| 24 | -#spring.datasource.control.hikari.auto-commit= true | ||
| 25 | -spring.datasource.control.hikari.idle-timeout= 60000 | ||
| 26 | -#spring.datasource.control.hikari.pool-name= HikariPool | ||
| 27 | -spring.datasource.control.hikari.max-lifetime= 1800000 | ||
| 28 | -spring.datasource.control.hikari.connection-timeout= 3000 | ||
| 29 | -spring.datasource.control.hikari.connection-test-query= SELECT 1 | ||
| 30 | -spring.datasource.control.hikari.validation-timeout= 3000 | ||
| 31 | -spring.datasource.control.hikari.register-mbeans=true | 22 | +spring.datasource.control.minimum-idle= 8 |
| 23 | +spring.datasource.control.maximum-pool-size= 50 | ||
| 24 | +#spring.datasource.control.auto-commit= true | ||
| 25 | +spring.datasource.control.idle-timeout= 60000 | ||
| 26 | +#spring.datasource.control.pool-name= HikariPool | ||
| 27 | +spring.datasource.control.max-lifetime= 1800000 | ||
| 28 | +spring.datasource.control.connection-timeout= 3000 | ||
| 29 | +spring.datasource.control.connection-test-query= SELECT 1 | ||
| 30 | +spring.datasource.control.validation-timeout= 3000 | ||
| 31 | +spring.datasource.control.register-mbeans=true | ||
| 32 | 32 | ||
| 33 | #DATABASE info-publish | 33 | #DATABASE info-publish |
| 34 | spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver | 34 | spring.datasource.info-publish.driver-class-name= com.mysql.jdbc.Driver |
| @@ -37,16 +37,16 @@ spring.datasource.info-publish.username= root | @@ -37,16 +37,16 @@ spring.datasource.info-publish.username= root | ||
| 37 | spring.datasource.info-publish.password= root2jsp | 37 | spring.datasource.info-publish.password= root2jsp |
| 38 | spring.datasource.info-publish.type= com.zaxxer.hikari.HikariDataSource | 38 | spring.datasource.info-publish.type= com.zaxxer.hikari.HikariDataSource |
| 39 | #DATASOURCE | 39 | #DATASOURCE |
| 40 | -spring.datasource.info-publish.hikari.minimum-idle= 8 | ||
| 41 | -spring.datasource.info-publish.hikari.maximum-pool-size= 16 | ||
| 42 | -#spring.datasource.info-publish.hikari.auto-commit= true | ||
| 43 | -spring.datasource.info-publish.hikari.idle-timeout= 60000 | ||
| 44 | -#spring.datasource.info-publish.hikari.pool-name= HikariPool | ||
| 45 | -spring.datasource.info-publish.hikari.max-lifetime= 1800000 | ||
| 46 | -spring.datasource.info-publish.hikari.connection-timeout= 3000 | ||
| 47 | -spring.datasource.info-publish.hikari.connection-test-query= SELECT 1 | ||
| 48 | -spring.datasource.info-publish.hikari.validation-timeout= 3000 | ||
| 49 | -spring.datasource.info-publish.hikari.register-mbeans=true | 40 | +spring.datasource.info-publish.minimum-idle= 8 |
| 41 | +spring.datasource.info-publish.maximum-pool-size= 16 | ||
| 42 | +#spring.datasource.info-publish.auto-commit= true | ||
| 43 | +spring.datasource.info-publish.idle-timeout= 60000 | ||
| 44 | +#spring.datasource.info-publish.pool-name= HikariPool | ||
| 45 | +spring.datasource.info-publish.max-lifetime= 1800000 | ||
| 46 | +spring.datasource.info-publish.connection-timeout= 3000 | ||
| 47 | +spring.datasource.info-publish.connection-test-query= SELECT 1 | ||
| 48 | +spring.datasource.info-publish.validation-timeout= 3000 | ||
| 49 | +spring.datasource.info-publish.register-mbeans=true | ||
| 50 | 50 | ||
| 51 | kafka.use= false | 51 | kafka.use= false |
| 52 | spring.kafka.consumer.bootstrap-servers= localhost:9092 | 52 | spring.kafka.consumer.bootstrap-servers= localhost:9092 |