优化数据源配置逻辑

zhou-hao · zhou-hao · commit 1f67517f173f · 2017-12-27T20:41:41.000+08:00
diff --git a/hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceProperties.java b/hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceProperties.java
@@ -57,7 +57,7 @@ public class DynamicDataSourceProperties
     private Properties            properties              = null;
     private ClassLoader           classLoader             = null;
     private DatasourceTypeSupport datasourceTypeSupport   = null;
-    private AtomikosProperties    icatch      = new AtomikosProperties();
+    private AtomikosProperties    icatch                  = new AtomikosProperties();
 
     public int getTransactionTimeout() {
         return transactionTimeout;
@@ -221,7 +221,7 @@ public void setProperties(Properties properties) {
     public void afterPropertiesSet() throws Exception {
         Assert.notNull(url);
         Assert.notNull(username);
-        if (datasourceName == null) {
+        if (datasourceName == null || datasourceTypeSupport == null) {
             datasourceName = lookupSupportDatasourceName();
         }
         if (type == null) {
@@ -241,6 +241,7 @@ public String lookupSupportDatasourceName() throws ClassNotFoundException {
                 datasourceTypeSupport = support;
                 return support.className;
             } catch (ClassNotFoundException e) {
+
             }
         }
         return getType().getXaDataSourceClassName();
@@ -290,7 +291,7 @@ public void putDefaultProperties(Properties properties) {
                 properties.putIfAbsent("testOnBorrow", false);
                 properties.putIfAbsent("testOnReturn", false);
                 properties.putIfAbsent("poolPreparedStatements", true);
-                properties.putIfAbsent("maxOpenPreparedStatements", 20);
+                properties.putIfAbsent("maxOpenPreparedStatements", 300);
             }
         };
 
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
@@ -28,6 +28,7 @@
 import org.hsweb.web.service.datasource.DynamicDataSourceService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -130,15 +131,23 @@ protected CacheInfo getCache(String id) {
         }
     }
 
+    @Autowired
+    private DynamicDataSourceProperties defaultProperties;
+
     protected javax.sql.DataSource createDataSource(DataSource dataSource) {
         DynamicDataSourceProperties properties = new DynamicDataSourceProperties();
+        try {
+            BeanUtils.copyProperties(defaultProperties, properties);
+        } catch (Exception e) {
+        }
         properties.setName("ds_" + dataSource.getId());
         properties.setBeanClassLoader(this.getClass().getClassLoader());
         properties.setUsername(dataSource.getUsername());
         properties.setPassword(dataSource.getPassword());
         properties.setUrl(dataSource.getUrl());
         properties.setType(DatabaseType.fromJdbcUrl(dataSource.getUrl()));
         properties.setTestQuery(dataSource.getTestSql());
+
         Map<String, Object> otherProperties = dataSource.getProperties();
         int initTimeout = StringUtils.toInt(otherProperties.getOrDefault("initTimeOut", 30 * 1000));
         otherProperties.remove("initTimeOut");
diff --git a/hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceSqlExecutorService.java b/hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceSqlExecutorService.java
@@ -37,6 +37,7 @@
 /**
  * 动态数据源sql执行器
  */
+@Transactional(rollbackFor = Exception.class)
 public class DynamicDataSourceSqlExecutorService extends AbstractJdbcSqlExecutor implements ExpressionScopeBean {
 
     @Resource
