瀏覽代碼

修改core-security超时时间配置默认值;修改data-mybatis-plus数据库连接池最小空间数量,修改分页插件获取DbType逻辑

Signed-off-by: luoshi <luoshi@qmth.com.cn>
luoshi 11 月之前
父節點
當前提交
7d8883b0c7

+ 4 - 4
core-security/src/main/java/com/qmth/boot/core/security/config/SecurityProperties.java

@@ -18,18 +18,18 @@ import java.time.Duration;
 public class SecurityProperties {
 
     /**
-     * 允许服务器时间晚于请求时间戳最大时长,默认15
+     * 允许服务器时间晚于请求时间戳最大时长,默认180
      */
     @NotNull
     @DurationMin(seconds = 1)
-    private Duration timeMaxDelay = Duration.ofSeconds(15);
+    private Duration timeMaxDelay = Duration.ofSeconds(180);
 
     /**
-     * 允许服务器时间早于请求时间戳最大时长,默认5
+     * 允许服务器时间早于请求时间戳最大时长,默认30
      */
     @NotNull
     @DurationMin(seconds = 0)
-    private Duration timeMaxAhead = Duration.ofSeconds(5);
+    private Duration timeMaxAhead = Duration.ofSeconds(30);
 
     /**
      * 调试模式,默认不开启;开启后不验证密文直接验证通过

+ 2 - 2
data-mybatis-plus/src/main/java/com/qmth/boot/mybatis/config/DataSourceProperties.java

@@ -30,7 +30,7 @@ public class DataSourceProperties {
     private String password;
 
     @Min(0)
-    private int minIdle = 5;
+    private int minIdle = 0;
 
     @Min(1)
     private int maxPoolSize = 10;
@@ -40,7 +40,7 @@ public class DataSourceProperties {
     private Duration idleTimeout = Duration.ofMinutes(10);
 
     @NotNull
-    @DurationMin(seconds = 1)
+    @DurationMin(seconds = 5)
     private Duration connectionTimeout = Duration.ofSeconds(30);
 
     @NotNull

+ 12 - 2
data-mybatis-plus/src/main/java/com/qmth/boot/mybatis/config/MybatisPlusAutoConfiguration.java

@@ -23,9 +23,10 @@ import javax.validation.constraints.NotNull;
 public class MybatisPlusAutoConfiguration {
 
     @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor(@NotNull MybatisProperties mybatisProperties) {
+    public MybatisPlusInterceptor mybatisPlusInterceptor(@NotNull MybatisProperties mybatisProperties,
+            @NotNull DataSourceProperties dataSourceProperties) {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(getDbType(dataSourceProperties)));
         if (mybatisProperties.isBlockAttack()) {
             interceptor.addInnerInterceptor(new BlockAttackInnerInterceptor());
         }
@@ -45,4 +46,13 @@ public class MybatisPlusAutoConfiguration {
             configuration.setLogImpl(MybatisPlusLogger.class);
         };
     }
+
+    private DbType getDbType(DataSourceProperties dataSourceProperties) {
+        String driverClassName = dataSourceProperties.getDriverClassName();
+        if (driverClassName.contains("mysql")) {
+            return DbType.MYSQL;
+        } else {
+            return DbType.OTHER;
+        }
+    }
 }