From f1f506172a3edff8d31e4db77b8940f115660919 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:25:43 +0800
Subject: [PATCH] fix

---
 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java
index 7fce4a5..396299d 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java
@@ -2,8 +2,10 @@
 
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
 import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.pagination.DialectFactory;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -13,28 +15,37 @@
 @Configuration
 public class DataSourceConfig {
 
-    @Bean
-    @ConfigurationProperties("spring.datasource.one")
-    DataSource dsOne(){
-        return DruidDataSourceBuilder.create().build();
-    }
-
 //    @Bean
-//    @ConfigurationProperties("spring.datasource.two")
-//    DataSource dsTwo(){
+//    @ConfigurationProperties("spring.datasource.goalmanage")
+//    DataSource dsGoalManage(){
+//        return DruidDataSourceBuilder.create().build();
+//    }
+//
+//    @Bean
+//    @ConfigurationProperties("spring.datasource.emergency")
+//    DataSource dsEmergency(){
 //        return DruidDataSourceBuilder.create().build();
 //    }
 
 
+
+
     /**
-     * 新版分页插件
-     * @return
+     * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除)
      */
     @Bean
-    public MybatisPlusInterceptor mybatisPlusInterceptor(){
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        PaginationInnerInterceptor innerInterceptor = new PaginationInnerInterceptor();
+        innerInterceptor.setDbType(DbType.MYSQL);
+        innerInterceptor.setMaxLimit(1000L);
+        innerInterceptor.setDialect(DialectFactory.getDialect(DbType.MYSQL));
+        interceptor.addInnerInterceptor(innerInterceptor);
         return interceptor;
     }
 
+    @Bean
+    public ConfigurationCustomizer configurationCustomizer() {
+        return configuration -> {};
+    }
 }

--
Gitblit v1.9.2