Merge remote-tracking branch 'origin/master'

src/main/java/com/cy/generate/common/builder/DataSourceOneConfig.java

@@ -1,30 +1,7 @@
 package com.cy.generate.common.builder;
 
-import com.baomidou.mybatisplus.core.MybatisConfiguration;
-import com.baomidou.mybatisplus.core.config.GlobalConfig;
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import org.apache.ibatis.logging.stdout.StdOutImpl;
-import org.apache.ibatis.session.SqlSessionFactory;
-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.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-
-import javax.sql.DataSource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-
 /**
- * @Description:
+ * @Description:自定义数据源
  * @Author: YongJingChuan
  * @Date: 2020/8/19 19:46
  */
@@ -78,6 +55,7 @@ public class DataSourceOneConfig {
 // PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
 // // 需要在这里指定xml文件的位置，不然自定义的sql会报Invalid bound statement异常
 // List<String> mapperLocations = new ArrayList<>();
+// // 不同路径下的Mapper文件
 // mapperLocations.add("classpath:/biz/mybatis/mapper/*Mapper.xml");
 // mapperLocations.add("classpath:/mybatis/mapper/*Mapper.xml");
 // List<Resource> resources = new ArrayList();