增加日志语句

bi-core/src/main/java/com/usoftchina/bi/core/jdbc/DynamicDataSourceContextHolder.java

@@ -1,7 +1,7 @@
 package com.usoftchina.bi.core.jdbc;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * @Description 动态数据源上下文管理
@@ -12,7 +12,7 @@ public class DynamicDataSourceContextHolder {
     //存放当前线程使用的数据源类型信息
     private static final ThreadLocal<String> contextHolder = new ThreadLocal<String>();
     //存放数据源id
-    public static List<String> dataSourceIds = new ArrayList<String>();
+    public static Set<String> dataSourceIds = new HashSet<String>();
 
     //设置数据源
     public static void setDataSourceType(String dataSourceType) {

bi-server/src/main/java/com/usoftchina/bi/server/service/dataSource/DataBasesService.java

@@ -2,6 +2,7 @@ package com.usoftchina.bi.server.service.dataSource;
 
 import com.usoftchina.bi.core.exception.MyException;
 import com.usoftchina.bi.core.utils.ContextUtil;
+import com.usoftchina.bi.core.utils.JsonUtils;
 import com.usoftchina.bi.server.dao.dataSource.DataConnectorMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.CollectionType;
@@ -205,13 +206,17 @@ public class DataBasesService {
         if (target.size() == 0) {
             target.putAll(dataSourceRegister.getSlaveDataSources());
         }
-        if (!target.containsKey(databasesInfo.getId())) {
+        LOGGER.info("target={}, containsKey({}) is {}", target, databasesInfo.getId(), target.containsKey(String.valueOf(databasesInfo.getId())));
+        if (!target.containsKey(String.valueOf(databasesInfo.getId()))) {
             LOGGER.info("创建数据源");
             target.put(databasesInfo.getId(), dataSourceRegister.buildDataSource(dsMap));
             LOGGER.info("创建数据源结束");
             DynamicDataSource datasource = (DynamicDataSource) ContextUtil.getBean("dataSource");
+            LOGGER.info("datasource={}", JsonUtils.toJsonString(datasource));
             datasource.setTargetDataSources(target);
+            LOGGER.info("setTargetDataSources...ok");
             datasource.afterPropertiesSet();
+            LOGGER.info("afterPropertiesSet...ok");
 
             DynamicDataSourceContextHolder.dataSourceIds.add(String.valueOf(databasesInfo.getId()));
             LOGGER.info("注册数据源完成,id={}", databasesInfo.getId());