20260512173244

code/container-ocr/ocr-springboot/src/main/java/cn/g3soft/config/datasource/DataSourceManager.java

@@ -81,6 +81,7 @@ public class DataSourceManager extends AbstractRoutingDataSource {
     }
 
     private static DataSource createDataSource(String orgCode) throws Exception {
+
         String file = CONFIG_PATH + orgCode + ".properties";
 
         try (InputStream in = DataSourceManager.class
@@ -93,6 +94,7 @@ public class DataSourceManager extends AbstractRoutingDataSource {
 
             Properties p = new Properties();
             p.load(in);
+
             requireProperty(p, "url", file);
             requireProperty(p, "username", file);
             requireProperty(p, "password", file);
@@ -101,44 +103,41 @@ public class DataSourceManager extends AbstractRoutingDataSource {
             DruidDataSource ds = new DruidDataSource();
 
             ds.setName(orgCode);
+
             ds.setUrl(p.getProperty("url"));
             ds.setUsername(p.getProperty("username"));
             ds.setPassword(p.getProperty("password"));
             ds.setDriverClassName(p.getProperty("driver"));
 
-            ds.setInitialSize(1);
-            ds.setMinIdle(1);
-            ds.setMaxActive(10);
-            ds.setMaxWait(3000);
+            // 连接池大小
+            ds.setInitialSize(2);
+            ds.setMinIdle(2);
+            ds.setMaxActive(50);
 
-            ds.setBreakAfterAcquireFailure(true);
-            ds.setConnectionErrorRetryAttempts(0);
-            ds.setFailFast(true);
+            // 获取连接超时时间
+            ds.setMaxWait(60000);
 
-            ds.setValidationQuery(VALIDATION_QUERY);
-
-            ds.setTestOnBorrow(false);
-            ds.setTestOnReturn(false);
+            // 连接检测
+            ds.setValidationQuery("SELECT 1");
+            ds.setTestOnBorrow(true);
             ds.setTestWhileIdle(true);
 
+            // 空闲检测
             ds.setTimeBetweenEvictionRunsMillis(60000);
             ds.setMinEvictableIdleTimeMillis(300000);
 
-            ds.setKeepAlive(false);
+            // 保活
+            ds.setKeepAlive(true);
 
-            ds.setPoolPreparedStatements(false);
+            // 防止连接失败卡死
+            ds.setBreakAfterAcquireFailure(true);
+            ds.setConnectionErrorRetryAttempts(1);
 
-            ds.setFilters("stat,slf4j");
-            ds.setUseGlobalDataSourceStat(true);
-            ds.setConnectionProperties(
-                    "druid.stat.mergeSql=true;" +
-                            "druid.stat.slowSqlMillis=3000;" +
-                            "druid.stat.logSlowSql=true"
-            );
-
-            ds.setRemoveAbandoned(false);
+            // 关闭慢SQL日志
+            ds.setFilters("stat");
 
             ds.init();
+
             return ds;
         }
     }

code/container-ocr/ocr-springboot/src/main/resources/dbconfigs/g3hd.properties

@@ -1,9 +1,9 @@
-#url=jdbc:sqlserver://118.89.70.199:1433;databaseName=G3BoxOCR;encrypt=false
+#url=jdbc:sqlserver://118.89.70.199:1433;databaseName=G3BoxOCR
 #username=sa
 #password=zhang520..
 #driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 
-url=jdbc:sqlserver://127.0.0.1:1433;databaseName=G3ContainerOCR;encrypt=false
+url=jdbc:sqlserver://127.0.0.1:1433;databaseName=G3ContainerOCR
 username=sa
 password=123456@aaa
 driver=com.microsoft.sqlserver.jdbc.SQLServerDriver