Merge branch 'dev-1.10.0-webank' of https://github.com/WeDataSphere/l…

…inkis into dev-1.10.0-webank
WeDataSphere · Jan 17, 2025 · 1e78a3c · 1e78a3c
2 parents aa3ba68 + 162e962
commit 1e78a3c
Show file tree

Hide file tree

Showing 6 changed files with 676 additions and 2 deletions.
diff --git a/...ons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/conf/MybatisConfiguration.java b/...ons/linkis-mybatis/src/main/java/org/apache/linkis/mybatis/conf/MybatisConfiguration.java
@@ -45,7 +45,7 @@ public class MybatisConfiguration {
   public static final CommonVars<Integer> BDP_SERVER_MYBATIS_DATASOURCE_MAXACTIVE =
       CommonVars.apply("wds.linkis.server.mybatis.datasource.maxActive", 20);
   public static final CommonVars<Integer> BDP_SERVER_MYBATIS_DATASOURCE_MAXWAIT =
-      CommonVars.apply("wds.linkis.server.mybatis.datasource.maxWait", 6000);
+      CommonVars.apply("wds.linkis.server.mybatis.datasource.maxWait", 60000);
   public static final CommonVars<Integer> BDP_SERVER_MYBATIS_DATASOURCE_TBERM =
       CommonVars.apply("wds.linkis.server.mybatis.datasource.timeBetweenEvictionRunsMillis", 60000);
   public static final CommonVars<Integer> BDP_SERVER_MYBATIS_DATASOURCE_MEITM =