add: 调整配置

pom.xml

@@ -63,7 +63,7 @@
         <commons.lang.version>2.4</commons.lang.version>
         <des.version>1.0.2-SNAPSHOT</des.version>
         <mapstruct.version>1.3.1.Final</mapstruct.version>
-        <!--<pandora.version>1.1.0-SNAPSHOT</pandora.version>-->
+        <pandora.version>1.1.0-SNAPSHOT</pandora.version>
     </properties>
 
     <!-- 子模块可选依赖 -->
@@ -191,12 +191,12 @@
                 <artifactId>druid</artifactId>
                 <version>${druid.version}</version>
             </dependency>
-            <!--&lt;!&ndash;引入潘多拉&ndash;&gt;-->
-            <!--<dependency>-->
-                <!--<groupId>com.netease.yanxuan</groupId>-->
-                <!--<artifactId>pandora</artifactId>-->
-                <!--<version>${pandora.version}</version>-->
-            <!--</dependency>-->
+            <!--引入潘多拉-->
+            <dependency>
+                <groupId>com.netease.yanxuan</groupId>
+                <artifactId>pandora</artifactId>
+                <version>${pandora.version}</version>
+            </dependency>
 
             <!-- store-redis -->
             <dependency>
@@ -228,6 +228,23 @@
                 <version>${user-info-client.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>tk.mybatis</groupId>
+                <artifactId>mapper-spring-boot-starter</artifactId>
+                <version>2.1.5</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>tk.mybatis</groupId>
+                        <artifactId>mapper-base</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>tk.mybatis</groupId>
+                <artifactId>mapper-base</artifactId>
+                <version>4.1.5</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -394,11 +411,6 @@
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
-        <dependency>
-            <groupId>tk.mybatis</groupId>
-            <artifactId>mapper-spring-boot-starter</artifactId>
-            <version>2.1.5</version>
-        </dependency>
         <!--mybatis 分页插件-->
         <dependency>
             <groupId>com.github.pagehelper</groupId>

yanxuan-qc-change-system-dal/pom.xml

@@ -30,10 +30,10 @@
             <groupId>com.alibaba</groupId>
             <artifactId>druid</artifactId>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>com.netease.yanxuan</groupId>-->
-            <!--<artifactId>pandora</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>com.netease.yanxuan</groupId>
+            <artifactId>pandora</artifactId>
+        </dependency>
 
          <!--store-redis-->
         <dependency>
@@ -48,6 +48,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-spring-boot-starter</artifactId>
+        </dependency>
 
     </dependencies>
 </project>
\ No newline at end of file

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/config/DataSourceConfiguration.java

@@ -3,7 +3,11 @@ package com.netease.mail.yanxuan.change.dal.config;
 
 import com.alibaba.druid.filter.stat.StatFilter;
 import com.alibaba.druid.pool.DruidDataSource;
+import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
+import com.netease.yanxuan.pandora.DataSourceRefresher;
+import com.netease.yanxuan.pandora.spring.annotation.EnableDataSourceRefresh;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
@@ -19,30 +23,31 @@ import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import javax.sql.DataSource;
+import java.util.Set;
 
 /**
  * @author hzfengyuexin@corp.netease.com
  */
 @Configuration
 @EnableTransactionManagement
-//@EnableApolloConfig("db-public")
-//@EnableDataSourceRefresh
+@EnableApolloConfig("db-public")
+@EnableDataSourceRefresh
 @MapperScan(basePackages = "com.netease.mail.yanxuan.change.dal.mapper", sqlSessionFactoryRef = "sqlSessionFactoryBean")
 public class DataSourceConfiguration {
 
     @Autowired
     private DrmDBConfig drmDBConfig;
 
-//    /**
-////     * pandora热切换数据源
-////     * */
-////    @Bean
-////    public DataSourceRefresher dataSourceRefresher() {
-////        DataSourceRefresher dataSourceRefresher = new DataSourceRefresher("db-public");
-////        Set<String> dataSource = ImmutableSet.of("db.url", "db.driverClassName", "db.username", "db.password");
-////        dataSourceRefresher.bindDataSourceWithPropertyKey("dataSource", dataSource);
-////        return dataSourceRefresher;
-////    }
+    /**
+     * pandora热切换数据源
+     * */
+    @Bean
+    public DataSourceRefresher dataSourceRefresher() {
+        DataSourceRefresher dataSourceRefresher = new DataSourceRefresher("db-public");
+        Set<String> dataSource = ImmutableSet.of("db.url", "db.driverClassName", "db.username", "db.password");
+        dataSourceRefresher.bindDataSourceWithPropertyKey("dataSource", dataSource);
+        return dataSourceRefresher;
+    }
 
     /**
      * 数据源
@@ -89,6 +94,7 @@ public class DataSourceConfiguration {
         org.apache.ibatis.session.Configuration configuration = new org.apache.ibatis.session.Configuration();
         configuration.setMapUnderscoreToCamelCase(true);
         configuration.setCacheEnabled(true);
+//        configuration.addInterceptor(new tk.mybatis.mapper.mapperhelper.());
         sqlSessionFactoryBean.setConfiguration(configuration);
         return sqlSessionFactoryBean;
     }