From 00e40ce8b1de4da44d427a80f46d69fb90a9c075 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 18 七月 2022 09:02:10 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DataSourceConfig.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 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..159f486 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;
@@ -14,8 +16,14 @@
public class DataSourceConfig {
@Bean
- @ConfigurationProperties("spring.datasource.one")
- DataSource dsOne(){
+ @ConfigurationProperties("spring.datasource.goalmanage")
+ DataSource dsGoalManage(){
+ return DruidDataSourceBuilder.create().build();
+ }
+
+ @Bean
+ @ConfigurationProperties("spring.datasource.emergency")
+ DataSource dsEmergency(){
return DruidDataSourceBuilder.create().build();
}
@@ -26,15 +34,23 @@
// }
+
/**
- * 新版分页插件
- * @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