修改超时时间为30秒

zhou-hao · zhou-hao · commit d9775bf1c2de · 2017-01-22T14:37:41.000+08:00
diff --git a/hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceAutoConfiguration.java b/hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceAutoConfiguration.java
@@ -86,8 +86,7 @@ public DynamicXaDataSourceImpl dynamicXaDataSource(@Qualifier("dataSource") Data
     }
 
     @Bean(initMethod = "init", destroyMethod = "close")
-    public UserTransactionManager userTransactionManager(
-            UserTransactionService userTransactionService) {
+    public UserTransactionManager userTransactionManager() {
         UserTransactionManager transactionManager = new UserTransactionManager();
         transactionManager.setForceShutdown(true);
         transactionManager.setStartupTransactionService(false);
diff --git a/hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceServiceImpl.java b/hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceServiceImpl.java
@@ -167,7 +167,7 @@ protected javax.sql.DataSource createDataSource(DataSource dataSource) {
         //初始化检测
         new Thread(() -> {
             try {
-                Thread.sleep(10000);
+                Thread.sleep(30 * 1000);
                 if (!success[0]) {
                     logger.error("初始化jdbc超时:{}", dataSourceBean);
                     closeDataSource(dataSourceBean);

Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,7 @@ public DynamicXaDataSourceImpl dynamicXaDataSource(@Qualifier("dataSource") Data`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`@Bean(initMethod = "init", destroyMethod = "close")`
`89`		`- public UserTransactionManager userTransactionManager(`
`90`		`- UserTransactionService userTransactionService) {`
	`89`	`+ public UserTransactionManager userTransactionManager() {`
`91`	`90`	`UserTransactionManager transactionManager = new UserTransactionManager();`
`92`	`91`	`transactionManager.setForceShutdown(true);`
`93`	`92`	`transactionManager.setStartupTransactionService(false);`