支持静态多数据源

readme.md

@@ -14,6 +14,7 @@ springboot3+redis+mybatis的一个标的详情页通用服务
 - springboot3.x 高版本的springboot框架，体验最新的功能
 - jakarta api迁移，springboot3.0以上的版本要求所有的Java EE api都要迁移到Jakarta。比如javax.servlet.Filter需要替换为jakarta.servlet.Filter
 - spring.factories 文件废弃，自动配置包位置有变化
+- 支持多数据源，目前是springboot+mybatis支持的非动态数据源
 
 
 ### 项目分包说明
@@ -42,6 +43,7 @@ springboot3+redis+mybatis的一个标的详情页通用服务
     |   |       |-- py
     |   |-- event               -- 领域层事件
     |   |-- gateway             -- 防腐层，提供结构给infrastructure层实现，依赖倒置
+    |   |-- mapper              -- 数据库操作层，支持多数据源
     |   |-- manager             -- 领域层业务聚合，分模块
     |   |   |-- performance
     |   |   |   |-- handler

src/main/java/com/smppw/analysis/DataAnalysisApplication.java

@@ -1,13 +1,12 @@
 package com.smppw.analysis;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableScheduling
-@MapperScan("com.smppw.analysis.domain.mapper")
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class DataAnalysisApplication {
 
     public static void main(String[] args) {

src/main/java/com/smppw/analysis/application/service/position/StockPositionAnalysis.java

@@ -14,7 +14,7 @@ import com.smppw.analysis.domain.manager.position.BizHandler;
 import com.smppw.analysis.domain.manager.position.BizHandlerFactory;
 import com.smppw.analysis.domain.manager.position.stock.BarraSensitivityComponent;
 import com.smppw.analysis.domain.manager.position.stock.IndustryAllocationPreferenceComponent;
-import com.smppw.analysis.domain.mapper.BaseUnderlyingMapper;
+import com.smppw.analysis.domain.mapper.core.BaseUnderlyingMapper;
 import com.smppw.common.pojo.ValueLabelVO;
 import com.smppw.common.pojo.dto.NewDateValue;
 import org.springframework.stereotype.Component;

src/main/java/com/smppw/analysis/domain/dao/FundAnnounceDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao;
 
 import com.smppw.analysis.domain.dataobject.ManualFundNoticeInfoDO;
-import com.smppw.analysis.domain.mapper.MfFundAnnounceMapper;
+import com.smppw.analysis.domain.mapper.mf.MfFundAnnounceMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/smppw/analysis/domain/dao/FundArchivesDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao;
 
 import com.smppw.analysis.domain.dataobject.FundArchivesInfoDO;
-import com.smppw.analysis.domain.mapper.MfFundArchivesMapper;
+import com.smppw.analysis.domain.mapper.mf.MfFundArchivesMapper;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/smppw/analysis/domain/dao/FundInformationDao.java

@@ -5,9 +5,9 @@ import com.smppw.analysis.domain.dataobject.FundFrequencyDo;
 import com.smppw.analysis.domain.dataobject.FundInformationDo;
 import com.smppw.analysis.domain.dataobject.FundSimilarDo;
 import com.smppw.analysis.domain.dataobject.MonetaryFundProfitDO;
-import com.smppw.analysis.domain.mapper.FundFrequencyDoMapper;
-import com.smppw.analysis.domain.mapper.FundInformationDoMapper;
-import com.smppw.analysis.domain.mapper.MonetaryFundProfitMapper;
+import com.smppw.analysis.domain.mapper.core.FundFrequencyDoMapper;
+import com.smppw.analysis.domain.mapper.core.FundInformationDoMapper;
+import com.smppw.analysis.domain.mapper.core.MonetaryFundProfitMapper;
 import com.smppw.common.pojo.enums.Frequency;
 import com.smppw.common.pojo.enums.Indicator;
 import org.springframework.stereotype.Component;

src/main/java/com/smppw/analysis/domain/dao/FundStyleDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao;
 
 import com.smppw.analysis.domain.dataobject.FundStyleStatsDO;
-import com.smppw.analysis.domain.mapper.FundStyleStatsMapper;
+import com.smppw.analysis.domain.mapper.core.FundStyleStatsMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/smppw/analysis/domain/dao/IndexesProfileDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao;
 
 import com.smppw.analysis.domain.dataobject.IndexesProfileDo;
-import com.smppw.analysis.domain.mapper.IndexesProfileDoMapper;
+import com.smppw.analysis.domain.mapper.core.IndexesProfileDoMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/smppw/analysis/domain/dao/MarketIndexNavDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao;
 
 import com.smppw.analysis.domain.dataobject.MarketIndexesDo;
-import com.smppw.analysis.domain.mapper.MarketIndexesDoMapper;
+import com.smppw.analysis.domain.mapper.core.MarketIndexesDoMapper;
 import com.smppw.common.pojo.dto.NavDto;
 import com.smppw.constants.DateConst;
 import com.smppw.utils.DateUtil;

src/main/java/com/smppw/analysis/domain/dao/PositionAnalysisDao.java

@@ -2,8 +2,8 @@ package com.smppw.analysis.domain.dao;
 
 
 import com.smppw.analysis.domain.dataobject.*;
-import com.smppw.analysis.domain.mapper.BaseUnderlyingMapper;
-import com.smppw.analysis.domain.mapper.IndexesTradeDateDoMapper;
+import com.smppw.analysis.domain.mapper.core.BaseUnderlyingMapper;
+import com.smppw.analysis.domain.mapper.core.IndexesTradeDateDoMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

src/main/java/com/smppw/analysis/domain/dao/PrivatelyOfferedFundNavDao.java

@@ -2,7 +2,7 @@ package com.smppw.analysis.domain.dao;
 
 import com.smppw.analysis.domain.dataobject.NavDo;
 import com.smppw.analysis.infrastructure.consts.NavConst;
-import com.smppw.analysis.domain.mapper.NavDoMapper;
+import com.smppw.analysis.domain.mapper.core.NavDoMapper;
 import com.smppw.common.pojo.dto.NavDto;
 import com.smppw.common.pojo.enums.NavType;
 import com.smppw.constants.DateConst;

src/main/java/com/smppw/analysis/domain/dao/PubliclyFundPositionDao.java

@@ -7,7 +7,7 @@ import com.smppw.analysis.domain.dataobject.FundPositionBaseInfoDO;
 import com.smppw.analysis.domain.dataobject.FundPositionDetailDO;
 import com.smppw.analysis.domain.dataobject.PubliclyFundHolderInfoDO;
 import com.smppw.analysis.domain.dataobject.PubliclyFundStockChangeDO;
-import com.smppw.analysis.domain.mapper.PubliclyFundExtInfoMapper;
+import com.smppw.analysis.domain.mapper.core.PubliclyFundExtInfoMapper;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

src/main/java/com/smppw/analysis/domain/dao/PubliclyOfferedFundNavDao.java

@@ -2,7 +2,7 @@ package com.smppw.analysis.domain.dao;
 
 import com.smppw.analysis.domain.dataobject.PublicNavDo;
 import com.smppw.analysis.infrastructure.consts.NavConst;
-import com.smppw.analysis.domain.mapper.PublicNavDoMapper;
+import com.smppw.analysis.domain.mapper.core.PublicNavDoMapper;
 import com.smppw.common.pojo.dto.NavDto;
 import com.smppw.common.pojo.enums.NavType;
 import com.smppw.constants.DateConst;

src/main/java/com/smppw/analysis/domain/dao/RiskOfFreeNavDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao;
 
 import com.smppw.analysis.domain.dataobject.DepositNavDo;
-import com.smppw.analysis.domain.mapper.DepositNavDoMapper;
+import com.smppw.analysis.domain.mapper.core.DepositNavDoMapper;
 import com.smppw.common.pojo.dto.NavDto;
 import com.smppw.constants.DateConst;
 import com.smppw.utils.DateUtil;

src/main/java/com/smppw/analysis/domain/dao/RongzhiIndexNavDao.java

@@ -1,7 +1,7 @@
 package com.smppw.analysis.domain.dao;
 
 import com.smppw.analysis.domain.dataobject.IndexesRzIndexDo;
-import com.smppw.analysis.domain.mapper.IndexesRzIndexDoMapper;
+import com.smppw.analysis.domain.mapper.core.IndexesRzIndexDoMapper;
 import com.smppw.common.pojo.dto.NavDto;
 import com.smppw.constants.DateConst;
 import com.smppw.utils.DateUtil;

src/main/java/com/smppw/analysis/domain/dao/rank/RankToBDao.java

@@ -1,6 +1,6 @@
 package com.smppw.analysis.domain.dao.rank;
 
-import com.smppw.analysis.domain.mapper.RankToBMapper;
+import com.smppw.analysis.domain.mapper.core.RankToBMapper;
 import org.springframework.stereotype.Component;
 
 @Component("tob")

src/main/java/com/smppw/analysis/domain/dao/rank/RankToCDao.java

@@ -1,6 +1,6 @@
 package com.smppw.analysis.domain.dao.rank;
 
-import com.smppw.analysis.domain.mapper.RankToCMapper;
+import com.smppw.analysis.domain.mapper.core.RankToCMapper;
 import org.springframework.stereotype.Component;
 
 @Component("toc")

src/main/java/com/smppw/analysis/domain/manager/position/bond/BondPositionService.java

@@ -11,7 +11,7 @@ import com.smppw.analysis.domain.dto.position.bond.*;
 import com.smppw.analysis.domain.dto.position.stock.ConcentrationVO;
 import com.smppw.analysis.domain.dao.PubliclyFundPositionDao;
 import com.smppw.analysis.domain.dataobject.*;
-import com.smppw.analysis.domain.mapper.BondBasicInformationDOMapper;
+import com.smppw.analysis.domain.mapper.core.BondBasicInformationDOMapper;
 import com.smppw.analysis.infrastructure.utils.BinarySearchUtil;
 import com.smppw.common.pojo.ValueLabelVO;
 import com.smppw.utils.BigDecimalUtils;

src/main/java/com/smppw/analysis/domain/manager/position/future/FundFuturesOptionBaseService.java

@@ -4,8 +4,8 @@ package com.smppw.analysis.domain.manager.position.future;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapUtil;
 import com.smppw.analysis.domain.dataobject.FundPositionDetailDO;
-import com.smppw.analysis.domain.mapper.BaseUnderlyingMapper;
-import com.smppw.analysis.domain.mapper.PubliclyFundExtInfoMapper;
+import com.smppw.analysis.domain.mapper.core.BaseUnderlyingMapper;
+import com.smppw.analysis.domain.mapper.core.PubliclyFundExtInfoMapper;
 import com.smppw.common.pojo.FundFuturesOption;
 import com.smppw.common.pojo.ValueLabelVO;
 import org.slf4j.Logger;

src/main/java/com/smppw/analysis/domain/manager/position/future/MarginalRiskContributionBizHandler.java

@@ -21,8 +21,8 @@ import com.smppw.analysis.domain.dataobject.FutureDailyPriceDO;
 import com.smppw.analysis.domain.gateway.CacheFactory;
 import com.smppw.analysis.infrastructure.config.AnalysisProperty;
 import com.smppw.analysis.infrastructure.exception.APIException;
-import com.smppw.analysis.domain.mapper.BaseUnderlyingMapper;
-import com.smppw.analysis.domain.mapper.IndexesTradeDateDoMapper;
+import com.smppw.analysis.domain.mapper.core.BaseUnderlyingMapper;
+import com.smppw.analysis.domain.mapper.core.IndexesTradeDateDoMapper;
 import com.smppw.common.pojo.FundFuturesOption;
 import com.smppw.common.pojo.ValueLabelVO;
 import com.smppw.utils.BigDecimalUtils;

src/main/java/com/smppw/analysis/domain/mapper/BaseUnderlyingMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.analysis.domain.dataobject.*;
 import com.smppw.common.pojo.ValueLabelVO;

src/main/java/com/smppw/analysis/domain/mapper/BondBasicInformationDOMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.analysis.domain.dataobject.BondBasicInformationDO;
 import com.smppw.analysis.domain.dataobject.BondCreditGradingInfo;

src/main/java/com/smppw/analysis/domain/mapper/DepositNavDoMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.analysis.domain.dataobject.DepositNavDo;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/smppw/analysis/domain/mapper/FundFrequencyDoMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.analysis.domain.dataobject.FundFrequencyDo;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/smppw/analysis/domain/mapper/FundInformationDoMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.analysis.domain.dataobject.FundInformationDo;
 import com.smppw.analysis.domain.dataobject.FundSimilarDo;

src/main/java/com/smppw/analysis/domain/mapper/FundStyleStatsMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.analysis.domain.dataobject.FundStyleStatsDO;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/smppw/analysis/domain/mapper/IndexesProfileDoMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 
 import com.smppw.analysis.domain.dataobject.IndexesProfileDo;

src/main/java/com/smppw/analysis/domain/mapper/IndexesRzIndexDoMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.analysis.domain.dataobject.IndexesRzIndexDo;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/smppw/analysis/domain/mapper/IndexesTradeDateDoMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.common.pojo.IndexesTradeDateDo;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/smppw/analysis/domain/mapper/MarketIndexesDoMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.analysis.domain.dataobject.MarketIndexesDo;
 import com.smppw.common.pojo.dto.NavDto;

src/main/java/com/smppw/analysis/domain/mapper/MonetaryFundProfitMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.analysis.domain.dataobject.MonetaryFundProfitDO;
 import org.springframework.stereotype.Repository;

src/main/java/com/smppw/analysis/domain/mapper/NavDoMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.analysis.domain.dataobject.NavDo;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/smppw/analysis/domain/mapper/PublicNavDoMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.analysis.domain.dataobject.PublicNavDo;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/smppw/analysis/domain/mapper/PubliclyFundExtInfoMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import com.smppw.analysis.domain.dataobject.FundPositionBaseInfoDO;
 import com.smppw.analysis.domain.dataobject.FundPositionDetailDO;

src/main/java/com/smppw/analysis/domain/mapper/RankToBMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import org.springframework.stereotype.Repository;
 

src/main/java/com/smppw/analysis/domain/mapper/RankToCMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.core;
 
 import org.springframework.stereotype.Repository;
 

src/main/java/com/smppw/analysis/domain/mapper/MfFundAnnounceMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.mf;
 
 import com.smppw.analysis.domain.dataobject.ManualFundNoticeInfoDO;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/smppw/analysis/domain/mapper/MfFundArchivesMapper.java

@@ -1,4 +1,4 @@
-package com.smppw.analysis.domain.mapper;
+package com.smppw.analysis.domain.mapper.mf;
 
 import com.smppw.analysis.domain.dataobject.FundArchivesInfoDO;
 import org.springframework.stereotype.Repository;

src/main/java/com/smppw/analysis/domain/service/BaseInfoService.java

@@ -1,8 +1,8 @@
 package com.smppw.analysis.domain.service;
 
 import com.smppw.analysis.domain.dataobject.FundArchivesInfoDO;
-import com.smppw.analysis.domain.dataobject.ManualFundNoticeInfoDO;
 import com.smppw.analysis.domain.dataobject.FundSimilarDo;
+import com.smppw.analysis.domain.dataobject.ManualFundNoticeInfoDO;
 import com.smppw.analysis.domain.dataobject.MonetaryFundProfitDO;
 import com.smppw.analysis.domain.dto.info.FundSimilarParams;
 import com.smppw.common.pojo.enums.Frequency;
@@ -17,24 +17,86 @@ import java.util.Map;
  * @description 基础信息服务
  */
 public interface BaseInfoService {
+    /**
+     * 获取排名期
+     *
+     * @return /
+     */
     String getLatestRankRat();
 
+    /**
+     * 获取标的排名期，与指标排名比较，取最小的排名期
+     *
+     * @param refId /
+     * @return /
+     */
     String getLatestRankRat(String refId);
 
+    /**
+     * 获取标的类型
+     *
+     * @param secId /
+     * @return /
+     */
     String getSecType(String secId);
 
+    /**
+     * 获取类型与标的的对应关系
+     *
+     * @param secIdList 标的集合
+     * @return /
+     */
     Map<String, List<String>> getTypeSecMap(List<String> secIdList);
 
+    /**
+     * 获取标的id与类型对应关系
+     *
+     * @param secIdList 标的集合
+     * @return /
+     */
     Map<String, String> querySecsType(List<String> secIdList);
 
+    /**
+     * 获取标的id和名称映射关系
+     *
+     * @param allSecIdList 标的id集合
+     * @return /
+     */
     Map<String, String> querySecName(List<String> allSecIdList);
 
+    /**
+     * 湖区标的净值频率
+     *
+     * @param secId 标的id
+     * @return /
+     */
     Frequency getNavFrequency(String secId);
 
+    /**
+     * 获取货币基金业绩列表
+     *
+     * @param fundId 基金id
+     * @return /
+     */
     List<MonetaryFundProfitDO> queryMonetaryFund(String fundId);
 
+    /**
+     * 获取标的业绩排名
+     *
+     * @param rankDate  排名期
+     * @param fundId    基金id
+     * @param indexIds  指数
+     * @param indicator 指标
+     * @return /
+     */
     List<Map<String, Object>> getFundRank(String rankDate, String fundId, List<String> indexIds, Indicator indicator);
 
+    /**
+     * 获取相似产品，区分管理人同策略和市场同策略
+     *
+     * @param params /
+     * @return /
+     */
     List<FundSimilarDo> getFundSimilarList(FundSimilarParams params);
 
     /**

src/main/java/com/smppw/analysis/infrastructure/config/CoreDataSourceConfig.java

@@ -0,0 +1,43 @@
+package com.smppw.analysis.infrastructure.config;
+
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import javax.sql.DataSource;
+
+@Configuration
+@MapperScan(basePackages = {"com.smppw.analysis.domain.mapper.core"}, sqlSessionFactoryRef = "coreSqlSessionFactory")
+public class CoreDataSourceConfig {
+    @Bean("coreDataSource")
+    @Primary
+    @ConfigurationProperties(prefix = "spring.datasource.core")
+    public DataSource coreDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "coreSqlSessionFactory")
+    @Primary
+    public SqlSessionFactory coreSqlSessionFactory(@Qualifier("coreDataSource") DataSource datasource)
+            throws Exception {
+        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+        bean.setDataSource(datasource);
+        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:mapping/core/*.xml"));
+        return bean.getObject();// 设置mybatis的xml所在位置
+    }
+
+    @Bean("coreSqlSessionTemplate")
+    @Primary
+    public SqlSessionTemplate coreSqlSessionTemplate(
+            @Qualifier("coreSqlSessionFactory") SqlSessionFactory sessionFactory) {
+        return new SqlSessionTemplate(sessionFactory);
+    }
+}

src/main/java/com/smppw/analysis/infrastructure/config/MfDataSourceConfig.java

@@ -0,0 +1,39 @@
+package com.smppw.analysis.infrastructure.config;
+
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+
+import javax.sql.DataSource;
+
+@Configuration
+@MapperScan(basePackages = {"com.smppw.analysis.domain.mapper.mf"}, sqlSessionFactoryRef = "mfSqlSessionFactory")
+public class MfDataSourceConfig {
+    @Bean("mfDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.mf")
+    public DataSource mfDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+
+    @Bean(name = "mfSqlSessionFactory")
+    public SqlSessionFactory mfSqlSessionFactory(@Qualifier("mfDataSource") DataSource datasource)
+            throws Exception {
+        SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
+        bean.setDataSource(datasource);
+        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath*:mapping/mf/*.xml"));
+        return bean.getObject();// 设置mybatis的xml所在位置
+    }
+
+    @Bean("mfSqlSessionTemplate")
+    public SqlSessionTemplate mfSqlSessionTemplate(
+            @Qualifier("mfSqlSessionFactory") SqlSessionFactory sessionFactory) {
+        return new SqlSessionTemplate(sessionFactory);
+    }
+}

src/main/java/com/smppw/analysis/infrastructure/task/NonTradingDayTask.java

@@ -1,6 +1,6 @@
 package com.smppw.analysis.infrastructure.task;
 
-import com.smppw.analysis.domain.mapper.IndexesTradeDateDoMapper;
+import com.smppw.analysis.domain.mapper.core.IndexesTradeDateDoMapper;
 import com.smppw.common.cache.CaffeineLocalCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/smppw/analysis/infrastructure/task/RiskOfFreeIdTask.java

@@ -1,6 +1,6 @@
 package com.smppw.analysis.infrastructure.task;
 
-import com.smppw.analysis.domain.mapper.DepositNavDoMapper;
+import com.smppw.analysis.domain.mapper.core.DepositNavDoMapper;
 import com.smppw.common.cache.CaffeineLocalCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;

src/main/java/com/smppw/analysis/infrastructure/task/TrendDateTask.java

@@ -1,6 +1,6 @@
 package com.smppw.analysis.infrastructure.task;
 
-import com.smppw.analysis.domain.mapper.IndexesTradeDateDoMapper;
+import com.smppw.analysis.domain.mapper.core.IndexesTradeDateDoMapper;
 import com.smppw.common.cache.CaffeineLocalCache;
 import com.smppw.common.pojo.IndexesTradeDateDo;
 import org.slf4j.Logger;

src/main/resources/application.yaml

@@ -19,22 +19,40 @@ server:
 
 spring:
   datasource:
-    url: jdbc:mysql://120.79.121.165:3306/rz_hfdb_core?allowMultiQueries=true&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull
-    username: rz_new_data_channel_user
-    password: xVfuCKIP
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    hikari:
-      pool-name: hfdb_core
-      # 连接池最大连接数，默认是10
-      maximum-pool-size: 10
-      # 此属性控制从池返回的连接的默认自动提交行为,默认值：true
-      auto-commit: true
-      # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
-      max-lifetime: 900000
-      # 数据库连接超时时间,设置为300秒超时
-      connection-timeout: 300000
-      # keepalive time
-      keepalive-time: 60000
+    core:
+      jdbc-url: jdbc:mysql://120.79.121.165:3306/rz_hfdb_core?allowMultiQueries=true&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull
+      username: rz_new_data_channel_user
+      password: xVfuCKIP
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      hikari:
+        pool-name: hfdb_core
+        # 连接池最大连接数，默认是10
+        maximum-pool-size: 10
+        # 此属性控制从池返回的连接的默认自动提交行为,默认值：true
+        auto-commit: true
+        # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
+        max-lifetime: 900000
+        # 数据库连接超时时间,设置为300秒超时
+        connection-timeout: 300000
+        # keepalive time
+        keepalive-time: 60000
+    mf:
+      jdbc-url: jdbc:mysql://120.79.121.165:3306/rz_mf_info?allowMultiQueries=true&useSSL=false&rewriteBatchedStatements=true&zeroDateTimeBehavior=convertToNull
+      username: rz_new_data_channel_user
+      password: xVfuCKIP
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      hikari:
+        pool-name: mf_info
+        # 连接池最大连接数，默认是10
+        maximum-pool-size: 10
+        # 此属性控制从池返回的连接的默认自动提交行为,默认值：true
+        auto-commit: true
+        # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
+        max-lifetime: 900000
+        # 数据库连接超时时间,设置为300秒超时
+        connection-timeout: 300000
+        # keepalive time
+        keepalive-time: 60000
   data:
     redis:
       host: 192.168.1.28
@@ -54,13 +72,9 @@ smppw:
   data:
     analysis:
       py-url: https://pymaster-test.simuwang.com/  # python服务调用地址
-      cache-type: redis # 缓存类型，如果是redis必须配置redis
+      cache-type: redis # 缓存类型，支持redis和memory；如果是redis必须配置redis
       enable-sign: false # 参数签名校验功能是否可用
-      data-source: ${spring.profiles.active}
-
-# mybatis 配置
-mybatis:
-  mapper-locations: classpath:mapping/**/*.xml
+      data-source: toc # 数据源、toc和tob
 
 # 打印一下sql日志
 logging:

src/main/resources/mapping/BaseUnderlyingMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.BaseUnderlyingMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.BaseUnderlyingMapper">
     <select id="querySecIndustryInfo" resultType="com.smppw.analysis.domain.dataobject.SwSecIndustryInfoDO">
         SELECT distinct a.underlying_code as secCode,
                         i.industry_code   as industryCode,

src/main/resources/mapping/BondBasicInformationDOMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.BondBasicInformationDOMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.BondBasicInformationDOMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.BondBasicInformationDO">
     <!--@mbg.generated-->
     <!--@Table bond_basic_information-->

src/main/resources/mapping/DepositNavDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.DepositNavDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.DepositNavDoMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.DepositNavDo">
     <!--@mbg.generated-->
     <!--@Table deposit_nav-->

src/main/resources/mapping/FundFrequencyDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.FundFrequencyDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.FundFrequencyDoMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.FundFrequencyDo">
     <!--@mbg.generated-->
     <!--@Table fund_frequency-->

src/main/resources/mapping/FundInformationDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.FundInformationDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.FundInformationDoMapper">
     <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.FundInformationDo">
         <!--@mbg.generated-->
         <!--@Table fund_information-->

src/main/resources/mapping/FundStyleStatsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.FundStyleStatsMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.FundStyleStatsMapper">
 
     <select id="listFundStyleOverview" resultType="com.smppw.analysis.domain.dataobject.FundStyleStatsDO">
         SELECT fund_id                  AS fundId,

src/main/resources/mapping/IndexesProfileDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.IndexesProfileDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.IndexesProfileDoMapper">
     <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.IndexesProfileDo">
         <!--@mbg.generated-->
         <!--@Table indexes_profile-->

src/main/resources/mapping/IndexesRzIndexDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.IndexesRzIndexDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.IndexesRzIndexDoMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.IndexesRzIndexDo">
     <!--@mbg.generated-->
     <!--@Table indexes_rz_index-->

src/main/resources/mapping/IndexesTradeDateDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.IndexesTradeDateDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.IndexesTradeDateDoMapper">
     <resultMap id="BaseResultMap" type="com.smppw.common.pojo.IndexesTradeDateDo">
         <!--@mbg.generated-->
         <!--@Table indexes_trade_date-->

src/main/resources/mapping/MarketIndexesDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.MarketIndexesDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.MarketIndexesDoMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.MarketIndexesDo">
     <!--@mbg.generated-->
     <!--@Table market_indexes-->

src/main/resources/mapping/NavDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.NavDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.NavDoMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.NavDo">
     <!--@mbg.generated-->
     <!--@Table nav-->

src/main/resources/mapping/PublicNavDoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.PublicNavDoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.PublicNavDoMapper">
   <resultMap id="BaseResultMap" type="com.smppw.analysis.domain.dataobject.PublicNavDo">
     <!--@mbg.generated-->
     <!--@Table public_nav-->

src/main/resources/mapping/PubliclyFundExtInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.PubliclyFundExtInfoMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.PubliclyFundExtInfoMapper">
     <select id="queryPositionDetails" parameterType="string" resultType="com.smppw.analysis.domain.dataobject.FundPositionDetailDO">
         select a.sec_id as secId,
                a.fund_id as fundId,

src/main/resources/mapping/RankToBMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.RankToBMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.RankToBMapper">
     <select id="getRankDate" resultType="string">
         select max(end_date) from rank_rat_control where isvalid = 1
     </select>

src/main/resources/mapping/RankToCMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.RankToCMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.core.RankToCMapper">
     <select id="getRankDate" resultType="string">
         select max(end_date) from rank_rat_control where isvalid = 1
     </select>

src/main/resources/mapping/MFFundAnnounceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.MfFundAnnounceMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.mf.MfFundAnnounceMapper">
 
     <select id="queryFundAnnounce" resultType="com.smppw.analysis.domain.dataobject.ManualFundNoticeInfoDO">
         select info_publ_date as `date`,

src/main/resources/mapping/MfFundArchivesMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.smppw.analysis.domain.mapper.MfFundArchivesMapper">
+<mapper namespace="com.smppw.analysis.domain.mapper.mf.MfFundArchivesMapper">
 
     <select id="queryFundArchives" resultType="com.smppw.analysis.domain.dataobject.FundArchivesInfoDO">
         select invest_target          as investmentObjective,