x

src/main/java/com/egolm/sentinel/web/SqlTestController.java

@@ -59,7 +59,6 @@ public class SqlTestController {
 			} else {
 				throw new XRException("URL无法识别, 没有对应的驱动程序");
 			}
-			dataSource.setQueryTimeout(60);
 			dataSource.setUsername(username);
 			dataSource.setPassword(password);
 			dataSource.setUrl(jdbcUrl);
@@ -74,10 +73,13 @@ public class SqlTestController {
 	        dataSource.setTestOnReturn(false);
 	        dataSource.setPoolPreparedStatements(true);
 	        dataSource.setMaxPoolPreparedStatementPerConnectionSize(20);
-			
+	        dataSource.setQueryTimeout(10);
+	        
 			dataSource.init();
 			JdbcTemplate jdbcTemplate = new JdbcTemplate();
 			jdbcTemplate.setDataSource(dataSource);
+			jdbcTemplate.setQueryTimeout(60);
+			
 			List<Object> argList = new ArrayList<Object>();
 			if(StringUtil.isNotBlank(parameters)) {
 				List<String> parametersSplitAry = Arrays.asList(parameters.split(",\\s+"));