From 5ed84eaec030109b0e6b77ae2667ed56e959871b Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 12 八月 2022 16:58:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
index 1424c46..05ae1c5 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigEmergency.java
@@ -19,12 +19,14 @@
import org.springframework.stereotype.Repository;
import javax.sql.DataSource;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
@Configuration
@MapperScan(basePackages = {"com.gkhy.safePlatform.emergency"},
- sqlSessionTemplateRef = "sqlTemplateEmergency",annotationClass =
+ sqlSessionTemplateRef = "sqlSessionTemplateEmergency",annotationClass =
Repository.class)
public class MyBatisConfigEmergency {
@@ -35,41 +37,26 @@
@Autowired
private MybatisPlusInterceptor mybatisPlusInterceptor;
- @Bean(name = "datasourceEmergency")
+ @Bean(name = "dataSourceEmergency")
@ConfigurationProperties(prefix = "spring.datasource.emergency")
- public DruidDataSource druidDataSourceA(){
+ public DruidDataSource dataSourceDoublePrevent(){
return DruidDataSourceBuilder.create().build();
}
- @Bean(name = "sqlFactoryEmergency")
- public SqlSessionFactory sqlSessionFactory(@Qualifier("datasourceEmergency") DruidDataSource dataSource)
- throws Exception
- {
+ @Bean(name = "sqlSessionFactoryEmergency")
+ public SqlSessionFactory sqlSessionFactoryEmergency(@Qualifier("dataSourceEmergency") DruidDataSource dataSource) throws Exception {
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
- factoryBean.setDataSource(dataSource);
+ factoryBean.setDataSource(dsEmergency);
ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
-
- //-------------------
- Resource[] rs1 = resolver.getResources("classpath*:config/mapper/emergency/**/**Mapper.xml");
-// Resource[] rs2 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml");
- ArrayList<Resource> resourceArrayList = new ArrayList<>(Arrays.asList(rs1));
-// resourceArrayList.addAll(new ArrayList<>(Arrays.asList(rs2)));
- Resource[] resourceArray = new Resource[resourceArrayList.size()];
- resourceArrayList.toArray(resourceArray);
- factoryBean.setMapperLocations(resourceArray);
- //-------------------
-
-// factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/**/**Mapper.xml"));
+ factoryBean.setMapperLocations(resolver.getResources("classpath*:config/mapper/emergency/**Mapper.xml"));
//设置分页插件
Interceptor[] plugins = {mybatisPlusInterceptor};
factoryBean.setPlugins(plugins);
return factoryBean.getObject();
}
- @Bean(name = "sqlTemplateEmergency")
- public SqlSessionTemplate sqlSessionTemplate(@Qualifier("sqlFactoryEmergency") SqlSessionFactory sqlSessionFactory)
- {
+ @Bean
+ public SqlSessionTemplate sqlSessionTemplateEmergency(@Qualifier("sqlSessionFactoryEmergency") SqlSessionFactory sqlSessionFactory){
return new SqlSessionTemplate(sqlSessionFactory);
}
-
}
--
Gitblit v1.9.2