Merge branch 'dev' of http://47.100.44.39:10001/tp-backend/tanpu-community into dev

community-service/src/main/java/com/tanpu/community/dao/UserDataSourceConfig.java

-package com.tanpu.community.dao;
-
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.tanpu.community.api.CommunityConstant;
-import lombok.extern.slf4j.Slf4j;
-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.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 org.springframework.jdbc.datasource.DataSourceTransactionManager;
-
-import javax.sql.DataSource;
-
-/**
- * created by xd on 2021/6/3
- */
-@Configuration
-@Slf4j
-@MapperScan(basePackages = CommunityConstant.PACKAGE_BASE + ".dao.mapper.user", sqlSessionTemplateRef = "userSqlSessionTemplate")
-public class UserDataSourceConfig {
-    @ConfigurationProperties(prefix = "spring.datasource.user")
-    @Bean(name = "userDataSource")
-    public DataSource dataSource() {
-        return DataSourceBuilder.create().build();
-    }
-
-    @Bean(name = "userSqlSessionFactory")
-    public SqlSessionFactory sqlSessionFactory(@Qualifier("userDataSource") DataSource dataSource) throws Exception {
-        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
-
-        bean.setDataSource(dataSource);
-        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(
-                "classpath*:mapper/user/*.xml"));
-
-        return bean.getObject();
-    }
-
-    @Bean(name = "userTransactionManager")
-    public DataSourceTransactionManager userTransactionManager(@Qualifier("userDataSource") DataSource dataSource) {
-        return new DataSourceTransactionManager(dataSource);
-    }
-
-    @Bean(name = "userSqlSessionTemplate")
-    public SqlSessionTemplate userSqlSessionTemplate(@Qualifier("userSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
-        return new SqlSessionTemplate(sqlSessionFactory);
-    }
-}

community-service/src/main/java/com/tanpu/community/dao/ZhiboDataSourceConfig.java

-package com.tanpu.community.dao;
-
-import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
-import com.tanpu.community.api.CommunityConstant;
-import lombok.extern.slf4j.Slf4j;
-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.boot.jdbc.DataSourceBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-
-import javax.sql.DataSource;
-
-/**
- * created by xd on 2021/6/3
- */
-@Configuration
-@Slf4j
-@MapperScan(basePackages = CommunityConstant.PACKAGE_BASE + ".dao.mapper.zhibo", sqlSessionTemplateRef = "zhiboSqlSessionTemplate")
-public class ZhiboDataSourceConfig {
-    @ConfigurationProperties(prefix = "spring.datasource.zhibo")
-    @Bean(name = "zhiboDataSource")
-    public DataSource dataSource() {
-        return DataSourceBuilder.create().build();
-    }
-
-    @Bean(name = "zhiboSqlSessionFactory")
-    public SqlSessionFactory sqlSessionFactory(@Qualifier("zhiboDataSource") DataSource dataSource) throws Exception {
-        MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
-
-        bean.setDataSource(dataSource);
-        bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(
-                "classpath*:mapper/zhibo/*.xml"));
-
-        return bean.getObject();
-    }
-
-    @Bean(name = "zhiboTransactionManager")
-    public DataSourceTransactionManager zhiboTransactionManager(@Qualifier("zhiboDataSource") DataSource dataSource) {
-        return new DataSourceTransactionManager(dataSource);
-    }
-
-    @Bean(name = "zhiboSqlSessionTemplate")
-    public SqlSessionTemplate zhiboSqlSessionTemplate(@Qualifier("zhiboSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
-        return new SqlSessionTemplate(sqlSessionFactory);
-    }
-}

community-service/src/main/java/com/tanpu/community/dao/mapper/zhibo/ZhiboThemeMapper.java

-package com.tanpu.community.dao.mapper.zhibo;
-
-import com.tanpu.community.dao.entity.zhibo.ZhiboThemeEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 直播间信息表 Mapper 接口
- * </p>
- *
- * @author xudong
- * @since 2021-06-23
- */
-public interface ZhiboThemeMapper extends BaseMapper<ZhiboThemeEntity> {
-
-}

community-service/src/main/resources/application-dev.yml

@@ -20,13 +20,13 @@ spring.datasource:
     maxActive: 2
     minIdle: 2
     initialSize: 2
-  user:
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    jdbc-url: jdbc:mysql://rm-uf6r22t3d798q4kmkao.mysql.rds.aliyuncs.com:3306/tamp_user?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
-    password: '@imeng123'
-    maxActive: 2
-    minIdle: 2
-    initialSize: 2
+#  user:
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    jdbc-url: jdbc:mysql://rm-uf6r22t3d798q4kmkao.mysql.rds.aliyuncs.com:3306/tamp_user?useUnicode=true&characterEncoding=utf-8&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull
+#    password: '@imeng123'
+#    maxActive: 2
+#    minIdle: 2
+#    initialSize: 2
 
 spring.redis:
   host: 118.190.63.109