删除无用代码及打印语句,部分打印改为Logger方式

src/main/java/com/SpringbootStartApplication.java

@@ -1,4 +1,4 @@
-package com;
+/*package com;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -11,4 +11,4 @@ public class SpringbootStartApplication extends SpringBootServletInitializer {
         return applicationBuilder.sources(Application.class);
 
     }
-}
+}*/

src/main/java/com/Swagger2.java

@@ -25,8 +25,6 @@ public class Swagger2 {
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
                 .title("BI项目api文档")
-//                .description("简单优雅的restfun风格，http://blog.csdn.net/saytime")
-//                .termsOfServiceUrl("http://blog.csdn.net/saytime")
                 .version("1.0.2")
                 .build();
     }

src/main/java/com/config/BasesSource/DynamicDataSource.java

@@ -3,10 +3,8 @@ package com.config.BasesSource;
 import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 
 /**
- * @Author caiChaoqi
- * @Date 2018-06-23
  * @Description 动态数据源
- * AbstractRoutingDataSource(每执行一次数据库，动态获取DataSource)
+ * @Date 2018-06-23
  */
 public class DynamicDataSource extends AbstractRoutingDataSource {
     @Override

src/main/java/com/config/BasesSource/DynamicDataSourceContextHolder.java

@@ -4,9 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @Author caiChaoqi
- * @Date 2018-06-23
  * @Description 动态数据源上下文管理
+ * @Date 2018-06-23
  */
 public class DynamicDataSourceContextHolder {
 

src/main/java/com/config/BasesSource/DynamicDataSourceRegister.java

@@ -19,16 +19,12 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @Author caiChaoqi
+ * @Description 注册动态数据源,初始化数据源和提供了执行动态切换数据源的工具类,EnvironmentAware（获取配置文件配置的属性值）
  * @Date 2018-06-23
- * @Description 注册动态数据源
- * 初始化数据源和提供了执行动态切换数据源的工具类
- * EnvironmentAware（获取配置文件配置的属性值）
  */
 @Component
 public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar, EnvironmentAware {
 
-
     //指定默认数据源(springboot2.0默认数据源是hikari如何想使用其他数据源可以自己配置)
     private static final String DATASOURCE_TYPE_DEFAULT = "com.alibaba.druid.pool.DruidDataSource";
     //默认数据源
@@ -36,7 +32,7 @@ public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar,
     //用户自定义数据源
     private Map<String, DataSource> slaveDataSources = new HashMap<>();
 
-    private Logger LOGGER = LoggerFactory.getLogger(DynamicDataSourceRegister.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DynamicDataSourceRegister.class);
 
     Map<Object, Object> targetDataSources = new HashMap<Object, Object>();
 
@@ -84,14 +80,12 @@ public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar,
         defaultDataSource = buildDataSource(dsDeMap);
     }
 
-
     private void initslaveDataSources(){
         String driver = String.valueOf(dsDeMap.get("driver"));
         String url = String.valueOf(dsDeMap.get("url"));
         String userName = String.valueOf(dsDeMap.get("username"));
         String passWord = String.valueOf(dsDeMap.get("password"));
         String sql = "select id, bases_name, addrass, port, database_type, data_name, user_name, pass_word from bi_databases";
-
         Connection conn = null;
         PreparedStatement pstmt = null;
         ResultSet rs = null;//定义存放查询结果的结果集
@@ -102,7 +96,6 @@ public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar,
             rs = pstmt.executeQuery();//运行查询操作
             System.out.println();
             while(rs.next()){
-                System.out.println("id:" +rs.getString("id"));
                 // 多个数据源
                 Map<String, Object> dsMap = new HashMap<>();
                 String dei = rs.getString("database_type");
@@ -115,10 +108,8 @@ public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar,
                 slaveDataSources.put(rs.getString("id"), ds);
             }
         } catch (ClassNotFoundException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         } catch (SQLException e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }finally {
             try {
@@ -134,7 +125,6 @@ public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar,
 
     @Override
     public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry beanDefinitionRegistry) {
-
         //添加默认数据源
         targetDataSources.put("dataSource", this.defaultDataSource);
         DynamicDataSourceContextHolder.dataSourceIds.add("dataSource");
@@ -143,7 +133,6 @@ public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar,
         for (String key : slaveDataSources.keySet()) {
             DynamicDataSourceContextHolder.dataSourceIds.add(key);
         }
-
         //创建DynamicDataSource
         GenericBeanDefinition beanDefinition = new GenericBeanDefinition();
         beanDefinition.setBeanClass(DynamicDataSource.class);
@@ -157,15 +146,14 @@ public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar,
 
     public DataSource buildDataSource(Map<String, Object> dataSourceMap) {
         try {
-                dataSourceMap.put("testWhileIdle", "true");
-
+            dataSourceMap.put("testWhileIdle", "true");
             DruidDataSource factory = (DruidDataSource) DruidDataSourceFactory.createDataSource(dataSourceMap);
-                return factory;
-            } catch (ClassNotFoundException e) {
-                e.printStackTrace();
-            } catch (Exception e) {
+            return factory;
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return null;
-        }
+    }
 }

src/main/java/com/config/BasesSource/DynamicDattaSourceAspect.java

@@ -8,6 +8,8 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.After;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
@@ -15,7 +17,6 @@ import org.springframework.stereotype.Component;
 import java.io.IOException;
 
 /**
- * @Author caiChaoqi
  * @Description 动态数据源通知
  * @Date 2018-06-23
  */
@@ -29,14 +30,14 @@ public class DynamicDattaSourceAspect {
     @Autowired
     DataColumnMapper dataColumnMapper;
 
+    private static final Logger logger = LoggerFactory.getLogger(DynamicDattaSourceAspect.class);
+
     //改变数据源
     @Before("@annotation(com.model.pojo.annotation.TargetDataSource)")
     public void changeDataSource(JoinPoint joinPoint) {
         Object[] arr = joinPoint.getArgs();
         String joinStr = null;
         ToSql toSql = new ToSql();
-//        System.out.println("数据源用户名"+baseName);
-
         try {
             joinStr = objectMapper.writeValueAsString(arr[1]);
         } catch (JsonProcessingException e) {
@@ -51,17 +52,16 @@ public class DynamicDattaSourceAspect {
         int baseId = toSql.getId();
 
         if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-            //joinPoint.getSignature() ：获取连接点的方法签名对象
-            System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> " + joinPoint.getSignature());
+            logger.info("数据源 -> {} 不存在,使用默认的数据源 -> {}",String.valueOf(baseId), joinPoint.getSignature());
         } else {
-            System.out.println("使用数据源：" +  String.valueOf(baseId));
+            logger.info("使用数据源：{}", String.valueOf(baseId));
             DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
         }
     }
 
     @After("@annotation(com.model.pojo.annotation.TargetDataSource)")
     public void clearDataSource(JoinPoint joinPoint) {
-        System.out.println("清除数据源!");
+        logger.info("清除数据源!");
         DynamicDataSourceContextHolder.clearDataSourceType();
     }
 }

src/main/java/com/config/RoleInterceptor/ConfigAdapter.java

@@ -1,5 +1,7 @@
 package com.config.RoleInterceptor;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -8,6 +10,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 @Configuration
 public class ConfigAdapter implements WebMvcConfigurer {
 
+    private static final Logger logger = LoggerFactory.getLogger(ConfigAdapter.class);
+
     @Bean
     SecurityInterceptor securityInterceptor() {
         return new SecurityInterceptor();
@@ -20,6 +24,6 @@ public class ConfigAdapter implements WebMvcConfigurer {
         .addPathPatterns("/Connector/*").excludePathPatterns("/Connector/getListDataConnector")
         .excludePathPatterns("/Connector/getConnectorGroup")
         .excludePathPatterns("/Connector/getConnectorData");
-        System.out.println("进入拦截器");
+        logger.info("进入拦截器");
     }
 }

src/main/java/com/config/RoleInterceptor/SecurityInterceptor.java

@@ -2,6 +2,8 @@ package com.config.RoleInterceptor;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.util.GetTokenData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
@@ -19,28 +21,30 @@ public class SecurityInterceptor implements HandlerInterceptor {
     GetTokenData getTokenData;
     @Autowired
     ObjectMapper objectMapper;
+
+    private static final Logger logger = LoggerFactory.getLogger(SecurityInterceptor.class);
+
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        System.out.println("preHandle");
+        logger.info("preHandle");
         if (!handler.getClass().isAssignableFrom(HandlerMethod.class)) {
-            System.out.println("cat cast handler to HandlerMethod.class");
+            logger.error("cat cast handler to HandlerMethod.class");
             return true;
         }
         // 获取注解
         Auth auth = ((HandlerMethod) handler).getMethod().getAnnotation(Auth.class);
         if (auth == null) {
-            System.out.println("cant find @Auth in this uri:" + request.getRequestURI());
+            logger.error("cant find @Auth in this uri:{}", request.getRequestURI());
             return true;
         }
         // 从参数中取出用户身份并验证
         String admin = auth.user();
-        System.out.println("auth:"+admin);
+        logger.info("auth={}", admin);
         String token = request.getHeader("token");
         Map<String, String> resultMap = getTokenData.getTokenData(token);
-
-        System.out.println("user:" + resultMap.get("role"));
+        logger.info("user={}", resultMap.get("role"));
         if (!admin.equals(resultMap.get("role"))) {
-            System.out.println("permission denied");
+            logger.error("permission denied");
             throw new OperationsException("权限不足");
         }
         return true;
@@ -48,11 +52,11 @@ public class SecurityInterceptor implements HandlerInterceptor {
 
     @Override
     public void postHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, ModelAndView modelAndView) throws Exception {
-        System.out.println("2");
+        logger.info("postHandler");
     }
 
     @Override
     public void afterCompletion(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o, Exception e) throws Exception {
-        System.out.println("3");
+        logger.info("afterCompletion");
     }
 }

src/main/java/com/config/exception/MyException.java

@@ -3,92 +3,89 @@ package com.config.exception;
 public class MyException extends RuntimeException{
     /**
      * 错误编码
-     * */
+     */
     private int code;
 
-   /**
-    * * 消息是否为属性文件中的Key
-    * */
-   private boolean propertiesKey = true;
+    /**
+     * 消息是否为属性文件中的Key
+     */
+    private boolean propertiesKey = true;
 
     /**
-    * 构造一个基本异常.
-     *
+     * 构造一个基本异常.
      * @param msg
      *            信息描述
-      */
+     */
     public MyException(String msg)
     {
         super(msg);
     }
 
     /**
-  * 构造一个基本异常.
- *
-   * @param code
-   *            错误编码
-   * @param msg
-   *            信息描述
-   */
+    * 构造一个基本异常.
+    *
+    * @param code
+    *            错误编码
+    * @param msg
+    *            信息描述
+    */
     public MyException(int code, String msg)
     {
       this(code, msg, true);
     }
 
-  /**
-  * 构造一个基本异常.
-   *
+    /**
+    * 构造一个基本异常.
+    *
     * @param code
     *            错误编码
-   * @param msg
- *            信息描述
-   */
-  public MyException(int code, String msg, Throwable cause)
+    * @param msg
+    *            信息描述
+    */
+    public MyException(int code, String msg, Throwable cause)
  {
      this(code, msg, cause, true);
   }
 
     /**
-   * 构造一个基本异常.
- *
-  * @param code
-  *            错误编码
-   * @param msg
-  *            信息描述
-  * @param propertiesKey
-  *            消息是否为属性文件中的Key
-  */
- public MyException(int code, String msg, boolean propertiesKey)
-{
+     * 构造一个基本异常.
+     *
+     * @param code
+     *            错误编码
+     * @param msg
+     *            信息描述
+     * @param propertiesKey
+     *            消息是否为属性文件中的Key
+     */
+    public MyException(int code, String msg, boolean propertiesKey) {
       super(msg);
       this.setCode(code);
       this.setPropertiesKey(propertiesKey);
-}
+    }
 
    /**
-   * 构造一个基本异常.
+    * 构造一个基本异常.
     *
     * @param code
     *            错误编码
-   * @param msg
-   *            信息描述
-   */
-  public MyException(int code, String msg, Throwable cause, boolean propertiesKey)
-  {
-      super(msg, cause);
-     this.setCode(code);
-     this.setPropertiesKey(propertiesKey);
-   }
+    * @param msg
+    *            信息描述
+    */
+    public MyException(int code, String msg, Throwable cause, boolean propertiesKey) {
+        super(msg, cause);
+        this.setCode(code);
+        this.setPropertiesKey(propertiesKey);
+    }
 
   /**
-  * 构造一个基本异常.
+    * 构造一个基本异常.
     *
     * @param msg
-   *            信息描述
-     * @param cause
+    *            信息描述
+    * @param cause
     *            根异常类（可以存入任何异常）
-  */
-  public MyException(String msg, Throwable cause)
+    */
+    public MyException(String msg, Throwable cause)
   {
      super(msg, cause);
    }
@@ -106,7 +103,7 @@ public class MyException extends RuntimeException{
       return propertiesKey;
   }
 
-   public void setPropertiesKey(boolean propertiesKey)
+    public void setPropertiesKey(boolean propertiesKey)
   {
        this.propertiesKey = propertiesKey;
    }

src/main/java/com/controller/strategy/StrategysController.java

@@ -72,14 +72,6 @@ public class StrategysController {
         return strategysService.addObject(body);
     }
 
-    /*
-    删除对象
-     */
-//    @PostMapping("/delObject")
-//    public RepEntity delObject(@RequestBody ObjectInfo body){
-//        return strategysService.delObject(body);
-//    }
-
     /*
     查询图表策略
      */

src/main/java/com/controller/user/UserController.java

@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 @RestController
-//@PostMapping("/User")
 @Api(description = "用户相关接口")
 public class UserController {
     @Autowired

src/main/java/com/dao/chart/ChartsConfigMapper.java

@@ -189,23 +189,6 @@ public interface ChartsConfigMapper {
             "</script>")
     void updataChartsGroup(GroupInfo groupInfo);
 
-//    /*
-//    批量更新
-//     */
-//    @Update("<script>"+
-//            "<foreach item = \"value\" index=\"key\" collenction=\"groupInfoMap.entrySet()\" separator=\",\">"+
-//            "update bi_charts_group"+
-//            "set"+
-//            "bc_group_name = #{#{value}.groupName}" +
-//            "<if test=\"value.groupIndex != null\"> , bc_index = #{#{value}.groupIndex} </if>" +
-//            "<if test=\"value.fatherId != null\"> , bc_father_id ={#{value}.fatherId} </if>" +
-//            "<if test=\"value.createBy != null\"> , create_by = {#{value}.createBy} </if>" +
-//            ",updata_date = to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss') "+
-//            " where bc_id = #{value.id}" +
-//            "</foreach>"+
-//            "</script>")
-//    void updataListGroup(@Param("groupInfoMap") Map<Integer, GroupInfo> groupInfoMap);
-
     /*
     删除分组
      */

src/main/java/com/server/chart/ChartsUtilService.java

@@ -43,8 +43,6 @@ public class ChartsUtilService {
             throw new BindingException();
         }
         String tableName = chartsConfigMapper.getTableName(id);
-        System.out.println("table:"+tableName);
-        System.out.println("userId:" + userId + ", createID:" + createID + "");
         if (dashId == 0) {
             if (userId == createID) {
                 //如果数据源创建人ID跟用户ID一样，获得数据源全部权限

src/main/java/com/server/dataSource/ColumnScreenService.java

@@ -8,6 +8,8 @@ import com.model.vo.configVo.ColumnScreenInfo;
 import com.server.chart.GetChartsDataUtilService;
 import com.server.chart.ChartsUtilService;
 import com.config.BasesSource.DynamicDataSourceContextHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,6 +27,8 @@ public class ColumnScreenService {
     @Autowired
     ChartsUtilService chartsUtilService;
 
+    private static final Logger logger = LoggerFactory.getLogger(ColumnScreenService.class);
+
     public RepEntity getScreenData(ColumnScreenInfo columnScreenInfo, String token){
         //取表名
         int id = columnScreenInfo.getId();
@@ -36,21 +40,20 @@ public class ColumnScreenService {
         List<Object> data = new ArrayList<>();
 
         int baseId = getChartsDataUtilService.getBaseId(id);
-        System.out.println("切换数据库"+String.valueOf(baseId));
+        logger.info("切换数据库: {}", String.valueOf(baseId));
 
         try{
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                //joinPoint.getSignature() ：获取连接点的方法签名对象
-                System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
+                logger.info("数据源:{} 不存在,使用默认的数据源", String.valueOf(baseId));
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                System.out.println("使用数据源：" + String.valueOf(baseId));
+                logger.info("使用数据源：{}", String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
             }
             data =  showChartsMapper.getScreenData(columnScreenInfo.getColumnName(), tableName);
         }catch (Exception e){
             e.printStackTrace();
-            System.out.println("异常");
+            logger.error("异常");
             return new RepEntity(RepCode.erro);
         }finally {
             DynamicDataSourceContextHolder.clearDataSourceType();
@@ -74,21 +77,20 @@ public class ColumnScreenService {
         List<Object> data = new ArrayList<>();
 
         int baseId =  getChartsDataUtilService.getBaseIdByConnect(connectId);
-        System.out.println("切换数据库"+String.valueOf(baseId));
+        logger.info("切换数据库={}", String.valueOf(baseId));
 
         try{
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                //joinPoint.getSignature() ：获取连接点的方法签名对象
-                System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
+                logger.info("数据源: {}不存在,使用默认的数据源", String.valueOf(baseId));
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                System.out.println("使用数据源：" + String.valueOf(baseId));
+                logger.info("使用数据源：{}", String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
             }
             data =  showChartsMapper.getScreenData(columnScreenInfo.getColumnName(), tableName);
         }catch (Exception e){
             e.printStackTrace();
-            System.out.println("异常");
+            logger.error("异常");
             return new RepEntity(RepCode.erro);
         }finally {
             DynamicDataSourceContextHolder.clearDataSourceType();

src/main/java/com/server/dataSource/DataBasesService.java

@@ -21,6 +21,7 @@ import com.util.GetTokenData;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.io.IOException;
 import java.util.*;
@@ -115,7 +116,7 @@ public class DataBasesService {
         String columnData = dataConnector.getColumnConfig();
 
         List<ColumnRenameInfo> configList = new ArrayList<>();
-        if (columnData != null || (!"".equals(columnData))){
+        if (!StringUtils.isEmpty(columnData)){
             try {
                 CollectionType javaType = objectMapper.getTypeFactory().constructCollectionType(ArrayList.class, ColumnRenameInfo.class);
                 configList =  objectMapper.readValue(columnData, javaType);   //这里不需要强制转换

src/main/java/com/server/dataSource/DataConnectorService.java

@@ -27,6 +27,8 @@ import com.server.chart.ChartsUtilService;
 import com.config.BasesSource.DynamicDataSourceContextHolder;
 import com.util.GetTokenData;
 import com.util.ScreenUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -59,6 +61,9 @@ public class DataConnectorService {
     ChartsUtilService chartsUtilService;
     @Autowired
     GetChartsDataUtilService getChartsDataUtilService;
+
+    private static final Logger logger = LoggerFactory.getLogger(DataConnectorService.class);
+
     /*
     保存数据源
      */
@@ -80,7 +85,6 @@ public class DataConnectorService {
         String pw = dataConnectorMapper.getBasesById(dbConId);
         dbConfig.setPassWord(pw);
 
-//        String tableName = SqlMatch.matchSql(dataConnector.getLoadObject());
         dataConnector.setTableName(dataConnector.getLoadObject());
 
          String columnConfig = null;
@@ -116,8 +120,6 @@ public class DataConnectorService {
             dataConnector.setNote("");
         }
 
-        System.out.println(dataConnector);
-
         dataConnector.setCreateBy(userName);
         dataConnector.setCreateId(id);
         dataConnectorMapper.insertDataConnector(dataConnector);
@@ -129,13 +131,11 @@ public class DataConnectorService {
     public RepEntity getListConnector(String token, TestPage testPage){
         Map<String, String> resultMap = getTokenData.getTokenData(token);
         String id = resultMap.get("id");
-        System.out.println("id:" + id);
         List<DataConnectorList> listConnector = dataConnectorMapper.getDataConnectorList(Integer.parseInt(id), testPage.enablePaging());
         List<DataConnectorList> listConnectors = new ArrayList<>();
         Iterator isList = listConnector.iterator();
         while (isList.hasNext()){
             DataConnectorList dataConnectorList = (DataConnectorList) isList.next();
-            System.out.println("ddddd:"+dataConnectorList);
             BaseConfig baseConfig = new BaseConfig();
             String dbConfig = dataConnectorList.getDbConfig();
             try {
@@ -179,7 +179,6 @@ public class DataConnectorService {
             e.printStackTrace();
         }
         dataConnector.setDbConfig(dbConfig);
-        System.out.println(dataConnector);
         return new RepEntity(RepCode.success, dataConnector);
     }
 
@@ -194,11 +193,8 @@ public class DataConnectorService {
         DataConnector dataConnector = new DataConnector();
         BeanUtils.copyProperties(dataConnectorInfo,dataConnector);
         //获取表名
-//        String tableName = SqlMatch.matchSql(dataConnector.getLoadObject());
         dataConnector.setTableName(dataConnector.getLoadObject());
-
         List<ColumnRenameInfo> columnConfig = dataConnectorInfo.getColumnConfig();
-//        DatabaseConfig dbConfig = dataConnectorInfo.getDbConfig();
         List<String> dataTag = dataConnectorInfo.getDataTag();
 
 
@@ -229,8 +225,6 @@ public class DataConnectorService {
             dataConnector.setConnectorGroup(-1);
         }
 
-        System.out.println(dataConnector);
-
         dataConnectorMapper.updateData(dataConnector);
         return new RepEntity(RepCode.success);
     }
@@ -346,7 +340,7 @@ public class DataConnectorService {
 
         int dataId = baseToDataInfo.getId();
         int baseId = getChartsDataUtilService.getBaseIdByConnect(dataId);
-        System.out.println("切换数据库"+baseId);
+        logger.info("切换数据库:{}", baseId);
 
         Map<String, String> resultMap = getTokenData.getTokenData(token);
         int id = Integer.parseInt(resultMap.get("id"));
@@ -360,10 +354,9 @@ public class DataConnectorService {
 
             try {
                 if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                    //joinPoint.getSignature() ：获取连接点的方法签名对象
-                    System.out.println("数据源 " + baseId + " 不存在使用默认的数据源 -> ");
+                    logger.info("数据源:{} 不存在, 使用默认的数据源", baseId);
                 } else {
-                    System.out.println("使用数据源：" + baseId);
+                    logger.info("使用数据源：", baseId);
                     DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
                 }
                 List<Map<String, Object>> val = new ArrayList<>();
@@ -380,10 +373,10 @@ public class DataConnectorService {
                 columnValuesInfo.setValues(pageInfo);
             } catch (Exception e) {
                 e.printStackTrace();
-                System.out.println("异常");
+                logger.error("异常");
                 return new RepEntity(RepCode.erro);
             } finally {
-                System.out.println("关闭数据源");
+                logger.info("关闭数据源");
                 DynamicDataSourceContextHolder.clearDataSourceType();
             }
         return new RepEntity(RepCode.success, columnValuesInfo);

src/main/java/com/server/dataSource/ImplementSqlService.java

@@ -32,7 +32,6 @@ public class ImplementSqlService {
             return new RepEntity(RepCode.SqlWarn);
         }
         String sqlStr = "select * from (" + toSql.getStrSql() + ") where rownum <=1";
-        System.out.println(sqlStr);
         if ("".equals(sqlStr) || sqlStr == null) {
             return new RepEntity(RepCode.ChartsNameNull);
         }
@@ -55,53 +54,6 @@ public class ImplementSqlService {
         return new RepEntity(RepCode.success,isList);
     }
 
-     /*
-    执行数据源test
-     */
-//     public RepEntity getColumnTest(ToSql toSql){
-//         String sqlStr = toSql.getStrSql();
-//         Connection conn = null;
-//         try {
-//             String url = "jdbc:oracle:thin:@218.17.158.219:1521/orcl";
-//             String user = "UAS";
-//             String pass = "select!#%*(";
-//             conn = DriverManager.getConnection(url,user,pass);
-//             String sql="select as_id from accidinsur";
-//             PreparedStatement stmt;
-//             stmt = conn.prepareStatement(sql);
-//             System.out.println("...........");
-//             ResultSet rs = stmt.executeQuery(sql);
-//             System.out.println("1111111111");
-//
-//             ResultSetMetaData rsmd = rs.getMetaData();
-//             String name = rsmd.getCatalogName(1);
-//             int col = rsmd.getColumnCount();   //获得列的个数
-//             System.out.println("num"+col);
-//             System.out.println("name"+name);
-//
-//             ResultSetMetaData data = rs.getMetaData();
-//             while (rs.next()) {
-//                 for (int i = 1; i <= data.getColumnCount(); i++) {
-//                     //获得所有列的数目及实际列数
-//                     int columnCount = data.getColumnCount();
-//                     System.out.println("数:"+columnCount);
-//                     // 获得指定列的列名
-//                     String columnName = data.getColumnName(i);
-//                     System.out.println("ming:"+columnName);
-//                     //获得指定列的列值
-//                     String columnValue = rs.getString(i);
-//                     System.out.println("value"+columnValue);
-//                     //获得指定列的数据类型
-//                     int columnType = data.getColumnType(i);
-//                     System.out.println("type"+columnType);
-//                 }
-//             }
-//         }catch (SQLException e){
-//
-//         }
-//                     return new RepEntity(RepCode.success);
-//     }
-
     /*
     判断列类型
      */
@@ -175,15 +127,12 @@ public class ImplementSqlService {
         String url = "jdbc:oracle:thin:@" + databases.getAddrass() + ":" + databases.getPort() + ":" + databases
                 .getDataName();
         String username = databases.getUserName();
-//        String password = databases.getPassWord();
         Connection con = null;
         try {
             DriverManager.setLoginTimeout(8);
             con = DriverManager.getConnection(url, username, password);
-            System.out.println("数据库连接成功");
             con.close();
         } catch (SQLException se) {
-            System.out.println("数据库连接失败！");
             se.printStackTrace();
             return new RepEntity(RepCode.Null);
         }

src/main/java/com/server/strategy/StrategysService.java

@@ -126,17 +126,14 @@ public class StrategysService {
                 String type = (String) isTypeList.next();
                 if ("0".equals(type)) {
                     userGroupNameList = strategysBdMapper.getUserGroupIdAndName(id);
-                    System.out.println("userG:" + userGroupNameList);
                 } else {
                     userNameList = strategysBdMapper.getUserIdAndName(id);
-                    System.out.println("user" + userNameList);
                 }
             }
             strategysDatas.setStrategies(strategys);
             strategysDatas.setUserGroupName(userGroupNameList);
             strategysDatas.setUserName(userNameList);
             strategysDataList.add(strategysDatas);
-            System.out.println("strate:" + strategysDataList);
         }
         return new RepEntity(RepCode.success, strategysDataList);
     }
@@ -160,7 +157,6 @@ public class StrategysService {
             Obj obj = (Obj) isObj.next();
             String obType = obj.getObjectType();
             int obId = obj.getObId();
-            System.out.println("obId:" + obId);
             if ("base".equals(type)) {
                 strategysBdMapper.addObject(stId, obType, obId);
             } else if ("chart".equals(type)){
@@ -177,7 +173,6 @@ public class StrategysService {
     查询图表策略列表
      */
     public RepEntity getChartStrategys(int chartId){
-        System.out.println(",,,");
         List<StrategysData> strategysDataList = new ArrayList<>();
         /*
         获取id列表

src/main/java/com/server/user/UserService.java

@@ -57,7 +57,6 @@ public class UserService {
             return new RepEntity(RepCode.NoUser);
         }
 
-        System.out.println("user:" + user);
         user.setPassWord(pw);
         user.setUserName(userName);
         //判断uas系统的用户是否再bi中存在
@@ -92,13 +91,11 @@ public class UserService {
     public RepEntity login1(LoginInfo loginInfo){
         String userName = loginInfo.getUserName();
         User user = userMapper.getLogin(userName);
-        System.out.println("user:" + user);
         if ("".equals(user) || user == null || "".equals(userName) || !userName.equals(user.getUserName())){
             return new RepEntity(RepCode.NoUser);
         }
         String passWord = user.getPassWord();
         if (!passWord.equals(loginInfo.getPassWord())){
-            System.out.println("....passw:" + passWord + "ps:" + loginInfo.getPassWord());
             return new RepEntity(RepCode.NoUser);
         }
 
@@ -130,10 +127,8 @@ public class UserService {
         }
 
         value = "like '%" + v + "%'";
-        System.out.println("value:" + value);
 
         List<User> userName = userMapper.getNameList(value);
-        System.out.println("userName:" + userName);
         return new RepEntity(RepCode.success, userName);
     }
 

src/main/java/com/util/CalculationJudgeUtil.java

@@ -26,27 +26,4 @@ public class CalculationJudgeUtil {
             return "sum";
         }
     }
-
-    /*
-    X轴，或饼图图例
-     */
-//    public List<String> xData(String xColumnType, String xColumn, String tableName, String xAxisType){
-//        //X轴
-//        //判断是否为日期类型
-//        if ("time".equals(xColumnType)){
-//            xAxisData = timeConverterUtil.timeConverter(xColumn, tableName, xAxisType);
-//            xData = timeConverterUtil.toRespons(xAxisData,xAxisType );
-//            System.out.println("data:"+xAxisData);
-//        }else {
-//            xAxisData = showChartsMapper.getXAxis(xColumn, tableName);
-//
-//        }
-//
-//        if ("week".equals(xAxisType) || "month".equals(xAxisType) || "quarter".equals(xAxisType)){
-//            return xData;
-//        }else {
-//            return xAxisData;
-//        }
-//
-//    }
 }

src/main/java/com/util/ContextUtil.java

@@ -23,7 +23,6 @@ public class ContextUtil {
 			}
 			return applicationContext;
 		}
-		//return applicationContext;
 	}
 
 	/**

src/main/java/com/util/DesUtil.java

@@ -109,7 +109,6 @@ public class DesUtil {
 	                randGen = new Random();
 	                numbersAndLetters = ("0123456789abcdefghijklmnopqrstuvwxyz" +
 	                   "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ").toCharArray();
-	                  //numbersAndLetters = ("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ").toCharArray();
 	                 }
 	         char [] randBuffer = new char[length];
 	         for (int i=0; i<randBuffer.length; i++) {

src/main/java/com/util/GetTokenData.java

@@ -34,7 +34,6 @@ public class GetTokenData {
         Map<String, Claim> claimMap = jwt.getClaims();
         Map<String, String> resultMap = Maps.newHashMap();
         claimMap.forEach((k,v) -> resultMap.put(k, v.asString()));
-        System.out.println("re:"+resultMap);
         return resultMap;
     }
 }

src/main/java/com/util/JwtTokenUtil.java

@@ -32,11 +32,9 @@ public class JwtTokenUtil {
 
     }
 
-    public TokenData createToke(User user){
-
+    public TokenData createToke(User user) {
         //签发时间
         Date iaDate = new Date();
-
         //过期时间
         Calendar nowTime = Calendar.getInstance();
         nowTime.add(Calendar.MINUTE, 120);
@@ -46,7 +44,6 @@ public class JwtTokenUtil {
         String res;
         long ts = expiresDate.getTime();
         res = String.valueOf(ts);
-        System.out.println("time:"+ ts);
 
         //设置header信息
         Map<String, Object> map = new HashMap<String, Object>();
@@ -65,14 +62,13 @@ public class JwtTokenUtil {
                     .withExpiresAt(expiresDate)
                     .withIssuedAt(iaDate)
                     .sign(Algorithm.HMAC256(SECRET));
-            System.out.println("token:::::::::::" + token);
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
         TokenData tokenData = new TokenData();
         tokenData.setToken(token);
         tokenData.setTimes(res);
-        return tokenData ;
+        return tokenData;
     }
 
     //解密
@@ -83,7 +79,6 @@ public class JwtTokenUtil {
 
         Object[] arg = joinPoint.getArgs();
         String token = (String) arg[0];
-        System.out.println("token:::::" + token);
 
         JWTVerifier verifier = null;
         try {
@@ -91,14 +86,11 @@ public class JwtTokenUtil {
         } catch (UnsupportedEncodingException e) {
             e.printStackTrace();
         }
-        try{
+        try {
             jwt = verifier.verify(token);
-        }catch (MyException e){
+        } catch (MyException e) {
             throw new MyException(-505, "token过期");
         }
-
-
-
         return jwt.getClaims();
     }
 }

src/main/java/com/util/ScreenUtil.java

@@ -19,10 +19,11 @@ import java.util.List;
 public class ScreenUtil {
     @Autowired
     ObjectMapper objectMapper;
-    public ScreenStr screensUtil(List<Screen> screenList, String xColumn, String xColumnType){
+
+    public ScreenStr screensUtil(List<Screen> screenList, String xColumn, String xColumnType) {
         //返回值
         ScreenStr screenStr = new ScreenStr();
-        if (screenList.size() == 0){
+        if (screenList.size() == 0) {
             screenStr.setRet("");
             screenStr.setWithColumnRet("");
             return screenStr;
@@ -30,27 +31,28 @@ public class ScreenUtil {
         String ret = "";            //筛选条件
         String withColumnRet = "";   //与目标列相同的筛选条件
         Iterator isList = screenList.iterator();
-        while (isList.hasNext()){
+        while (isList.hasNext()) {
             Screen screen = (Screen) isList.next();
             String columnName = screen.getColumnName();
             String columnType = screen.getColumnType();
             String symbol = screen.getSymbol();
             String value = screen.getValue();
 
-            if (columnType != "time" && !("time".equals(columnType))){
+            if (columnType != "time" && !("time".equals(columnType))) {
                 String symbVal = getSymbAndVal(symbol, value, columnType);
-                if (xColumn.equals(columnName)){
+                if (xColumn.equals(columnName)) {
                     withColumnRet = ret + " and " + columnName + " " + symbVal;
-                }else {
+                } else {
                     ret = ret + " and " + columnName + " " + symbVal;
                 }
                 System.out.println("ret:" + ret);
-            }if(columnType == "time" || "time".equals(columnType)){
+            }
+            if (columnType == "time" || "time".equals(columnType)) {
                 String symbVal = getTimeSymbAndVal(symbol, value);
                 String column = getTimeColumn(columnName, xColumnType);
-                if (xColumn.equals(columnName)){
+                if (xColumn.equals(columnName)) {
                     withColumnRet = ret + " and " + column + " " + symbVal;
-                }else {
+                } else {
                     ret = ret + " and " + column + " " + symbVal;
                 }
             }
@@ -59,30 +61,31 @@ public class ScreenUtil {
         screenStr.setWithColumnRet(withColumnRet);
         return screenStr;
     }
-    public String getSymbAndVal(String symbol, String value, String columnType){
+
+    public String getSymbAndVal(String symbol, String value, String columnType) {
         String values = "" + value;
         String tar = "";
-        if ("contain".equals(symbol)){
+        if ("contain".equals(symbol)) {
             if ("categorical".equals(columnType)) {
                 tar = "in " + getContainsCate(value);
-            }else {
+            } else {
                 tar = "like '%" + values + "%'";
             }
-        }else if("notContain".equals(symbol)){
+        } else if ("notContain".equals(symbol)) {
             if ("categorical".equals(columnType)) {
                 tar = "not in " + getContainsCate(value);
-            }else {
+            } else {
                 tar = "not like '%" + values + "%'";
             }
-        }else if("startsWith".equals(symbol)){
+        } else if ("startsWith".equals(symbol)) {
             tar = "like '" + values + "%'";
-        }else if("endsWith".equals(symbol)){
-            tar = "like '%" + values +"'";
-        }else if("null".equals(symbol)){
+        } else if ("endsWith".equals(symbol)) {
+            tar = "like '%" + values + "'";
+        } else if ("null".equals(symbol)) {
             tar = "is null";
-        }else if ("notNull".equals(symbol)){
+        } else if ("notNull".equals(symbol)) {
             tar = "is not null";
-        }else if ("between".equals(symbol)){
+        } else if ("between".equals(symbol)) {
             tar = "";
             String[] str = value.split(",");
             String str1 = str[0];
@@ -95,57 +98,56 @@ public class ScreenUtil {
         return tar;
     }
 
-    public String getTimeColumn(String columnName, String xColumnType){
-        if ("year".equals(xColumnType)){
-            return "to_char(" + columnName +", 'yyyy')";
-        }else if("month".equals(xColumnType)){
-            return "to_char(" + columnName +", 'yyyy-mm')";
-        }else if ("day".equals(xColumnType)){
-            return "to_char(" + columnName +", 'yyyy-mm-dd')";
-        }else if ("quarter".equals(xColumnType)){
-            return "to_char(" + columnName +", 'yyyy-Q')";
-        }else if("week".equals(xColumnType)){
-            return "to_char(" + columnName +", 'yyyy-ww')";
-        }else {
-            return "to_char(" + columnName +", 'yyyy-mm-dd')";
+    public String getTimeColumn(String columnName, String xColumnType) {
+        if ("year".equals(xColumnType)) {
+            return "to_char(" + columnName + ", 'yyyy')";
+        } else if ("month".equals(xColumnType)) {
+            return "to_char(" + columnName + ", 'yyyy-mm')";
+        } else if ("day".equals(xColumnType)) {
+            return "to_char(" + columnName + ", 'yyyy-mm-dd')";
+        } else if ("quarter".equals(xColumnType)) {
+            return "to_char(" + columnName + ", 'yyyy-Q')";
+        } else if ("week".equals(xColumnType)) {
+            return "to_char(" + columnName + ", 'yyyy-ww')";
+        } else {
+            return "to_char(" + columnName + ", 'yyyy-mm-dd')";
         }
     }
 
-    private String getTimeSymbAndVal(String symbol, String value){
+    private String getTimeSymbAndVal(String symbol, String value) {
         String values = "" + value;
         String tar = "";
-        if("null".equals(symbol)){
+        if ("null".equals(symbol)) {
             tar = "is null";
-        }else if ("notNull".equals(symbol)){
+        } else if ("notNull".equals(symbol)) {
             tar = "is not null";
-        }else if ("between".equals(symbol)){
+        } else if ("between".equals(symbol)) {
             tar = "";
             String[] str = value.split(",");
             String str1 = str[0];
             String str2 = str[1];
             tar = "between '" + str1 + "' and '" + str2 + "'";
-        }
-        else {
+        } else {
             tar = symbol + " '" + values + "'";
         }
         return tar;
     }
 
-    public String getContainsCate(String value){
+    public String getContainsCate(String value) {
         System.out.println("走这里了吗");
         List<String> val = new ArrayList<>();
         CollectionType javaType = objectMapper.getTypeFactory().constructCollectionType(ArrayList.class, String.class);
         try {
-            val =  objectMapper.readValue(value, javaType);   //这里不需要强制转换
+            val = objectMapper.readValue(value, javaType);   //这里不需要强制转换
         } catch (IOException e) {
             e.printStackTrace();
         }
 
         String valueString = "";
         Iterator isList = val.iterator();
-        while (isList.hasNext()){
+        while (isList.hasNext()) {
             String v = String.valueOf(isList.next());
-            System.out.println("v"+v);
+            System.out.println("v" + v);
             valueString = valueString + ", '" + v + "'";
         }
         valueString = valueString.replaceFirst(",", "(") + ")";

src/main/test/com/test/TestDataSource.java → src/test/java/com/test/TestDataSource.java

@@ -1,74 +1,74 @@
-package com.test;
-import com.config.BasesSource.DynamicDataSource;
-import com.config.BasesSource.DynamicDataSourceContextHolder;
-import com.config.BasesSource.DynamicDataSourceRegister;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Import;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-//@SpringApplicationConfiguration(classes=Application.class)
-@Import({DynamicDataSourceRegister.class})
-public class TestDataSource{
-
-	@Autowired
-	private ApplicationContext app;
-	
-	@Autowired
-	private DynamicDataSourceRegister dataSourceRegister;
-	@Autowired
-	private JdbcTemplate JdbcTemplate;
-	
-	@Test
-	public void test(){
-		System.out.println("begin==========================");
-		addDataSource();
-		System.out.println("end==========================");
-	}
-	
-	private void testQuery(){
-		DynamicDataSourceContextHolder.setDataSourceType("UAS");
-		List<Map<String, Object>> list = JdbcTemplate.queryForList("SELECT EN_NAME FROM ENTERPRISE");
-		System.out.println("UAS:"+list);
-		DynamicDataSourceContextHolder.setDataSourceType("UAS_DEV");
-		List<Map<String, Object>> list2 = JdbcTemplate.queryForList("SELECT EN_NAME FROM ENTERPRISE");
-		System.out.println("UAS_DEV:"+list2);
-		DynamicDataSourceContextHolder.setDataSourceType("UAS_TEST");
-		List<Map<String, Object>> list3 = JdbcTemplate.queryForList("SELECT EN_NAME FROM ENTERPRISE");
-		System.out.println("UAS_TEST:"+list3);
-	}
-	
-	private void addDataSource(){
-		
-		//额外的数据源
-		Map<String, Object> dsMap = new HashMap<>();
-        dsMap.put("driver", "oracle.jdbc.driver.OracleDriver");
-        dsMap.put("url", "jdbc:oracle:thin:@192.168.253.6:1521:orcl");
-        dsMap.put("username", "UAS_TEST");
-        dsMap.put("password", "select!#%*(");
-        Map<Object, Object> target = dataSourceRegister.getTargetDataSources();
-        if(target.size() == 0){
-        	target.putAll(dataSourceRegister.getSlaveDataSources());
-        }
-        target.put("UAS_TEST", dataSourceRegister.buildDataSource(dsMap));
-        DynamicDataSource datasource=(DynamicDataSource)app.getBean("dataSource");
-        datasource.setTargetDataSources(target);
-        datasource.afterPropertiesSet();
-        
-        DynamicDataSourceContextHolder.dataSourceIds.add("UAS_TEST");
-        
-		testQuery();
-	}
-
-}
+package java.com.test;
+import com.config.BasesSource.DynamicDataSource;
+import com.config.BasesSource.DynamicDataSourceContextHolder;
+import com.config.BasesSource.DynamicDataSourceRegister;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Import;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+//@SpringApplicationConfiguration(classes=Application.class)
+@Import({DynamicDataSourceRegister.class})
+public class TestDataSource{
+
+	@Autowired
+	private ApplicationContext app;
+	
+	@Autowired
+	private DynamicDataSourceRegister dataSourceRegister;
+	@Autowired
+	private JdbcTemplate JdbcTemplate;
+	
+	@Test
+	public void test(){
+		System.out.println("begin==========================");
+		addDataSource();
+		System.out.println("end==========================");
+	}
+	
+	private void testQuery(){
+		DynamicDataSourceContextHolder.setDataSourceType("UAS");
+		List<Map<String, Object>> list = JdbcTemplate.queryForList("SELECT EN_NAME FROM ENTERPRISE");
+		System.out.println("UAS:"+list);
+		DynamicDataSourceContextHolder.setDataSourceType("UAS_DEV");
+		List<Map<String, Object>> list2 = JdbcTemplate.queryForList("SELECT EN_NAME FROM ENTERPRISE");
+		System.out.println("UAS_DEV:"+list2);
+		DynamicDataSourceContextHolder.setDataSourceType("UAS_TEST");
+		List<Map<String, Object>> list3 = JdbcTemplate.queryForList("SELECT EN_NAME FROM ENTERPRISE");
+		System.out.println("UAS_TEST:"+list3);
+	}
+	
+	private void addDataSource(){
+		
+		//额外的数据源
+		Map<String, Object> dsMap = new HashMap<>();
+        dsMap.put("driver", "oracle.jdbc.driver.OracleDriver");
+        dsMap.put("url", "jdbc:oracle:thin:@192.168.253.6:1521:orcl");
+        dsMap.put("username", "UAS_TEST");
+        dsMap.put("password", "select!#%*(");
+        Map<Object, Object> target = dataSourceRegister.getTargetDataSources();
+        if(target.size() == 0){
+        	target.putAll(dataSourceRegister.getSlaveDataSources());
+        }
+        target.put("UAS_TEST", dataSourceRegister.buildDataSource(dsMap));
+        DynamicDataSource datasource=(DynamicDataSource)app.getBean("dataSource");
+        datasource.setTargetDataSources(target);
+        datasource.afterPropertiesSet();
+        
+        DynamicDataSourceContextHolder.dataSourceIds.add("UAS_TEST");
+        
+		testQuery();
+	}
+
+}