From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Fri, 02 Sep 2022 10:10:14 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java
index cb05d9e..eebd824 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java
@@ -23,7 +23,7 @@
import java.util.Arrays;
@Configuration
-@MapperScan(basePackages = {"com.gkhy.safePlatform.goalManage"},
+@MapperScan(basePackages = {"com.gkhy.safePlatform.targetDuty"},
sqlSessionTemplateRef = "sqlTemplateGoalManage",annotationClass =
Repository.class)
public class MyBatisConfigGoalManage {
@@ -46,11 +46,11 @@
throws Exception
{
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
- factoryBean.setDataSource(dataSource);
+ factoryBean.setDataSource(dsGoalManage);
ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
//-------------------
- Resource[] rs1 = resolver.getResources("classpath*:config/mapper/goalManage/**Mapper.xml");
+ Resource[] rs1 = resolver.getResources("classpath*:config/mapper/goalManage/**/**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)));
--
Gitblit v1.9.2