From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: Mon, 25 Mar 2024 10:59:40 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/MyBatisConfigGoalManage.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 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 38148be..e2bef6c 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
@@ -1,7 +1,5 @@
package com.gkhy.safePlatform.config.database;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import org.apache.ibatis.plugin.Interceptor;
@@ -23,7 +21,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 {
@@ -35,18 +33,12 @@
@Autowired
private MybatisPlusInterceptor mybatisPlusInterceptor;
- @Bean(name = "dataSourceGoalManage")
- @ConfigurationProperties(prefix = "spring.datasource.goalmanage")
- public DruidDataSource dataSourceGoalManage(){
- return DruidDataSourceBuilder.create().build();
- }
-
@Bean(name = "sqlFactoryGoalManage")
- public SqlSessionFactory sqlSessionFactory(@Qualifier("dataSourceGoalManage") DruidDataSource dataSource)
+ public SqlSessionFactory sqlSessionFactory()
throws Exception
{
MybatisSqlSessionFactoryBean factoryBean = new MybatisSqlSessionFactoryBean();
- factoryBean.setDataSource(dataSource);
+ factoryBean.setDataSource(dsGoalManage);
ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
//-------------------
--
Gitblit v1.9.2