Browse Source

删除打印语句

chenw 6 năm trước cách đây
mục cha
commit
d97b9974ed

+ 0 - 14
src/main/java/com/SpringbootStartApplication.java

@@ -1,14 +0,0 @@
-/*package com;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-@SpringBootApplication
-public class SpringbootStartApplication extends SpringBootServletInitializer {
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder applicationBuilder){
-        return applicationBuilder.sources(Application.class);
-
-    }
-}*/

+ 0 - 1
src/main/java/com/config/BasesSource/DynamicDataSourceRegister.java

@@ -94,7 +94,6 @@ public class DynamicDataSourceRegister implements ImportBeanDefinitionRegistrar,
             conn = DriverManager.getConnection(url, userName, passWord);
             pstmt = conn.prepareStatement(sql);
             rs = pstmt.executeQuery();//运行查询操作
-            System.out.println();
             while(rs.next()){
                 // 多个数据源
                 Map<String, Object> dsMap = new HashMap<>();

+ 1 - 1
src/main/java/com/Swagger2.java → src/main/java/com/config/Swagger2.java

@@ -1,4 +1,4 @@
-package com;
+package com.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+ 0 - 2
src/main/java/com/controller/dataSource/DataConnectorController.java

@@ -38,8 +38,6 @@ public class DataConnectorController {
     @Auth(user = "admin")
     @PostMapping("/inputDataConnector")
     public RepEntity inputDataConnector(@RequestHeader String token, @RequestBody DataConnectorInfo body) {
-        System.out.println("-----------");
-        System.out.println(body);
         return dataConnectorService.setDataConnector(token,body);
     }
 

+ 0 - 1
src/main/java/com/server/chart/ChartsConfigService.java

@@ -148,7 +148,6 @@ public class ChartsConfigService {
         if (chartConfig.getStyle() == null){
             chartConfig.setStyle("");
         }
-        System.out.println("chartOption:"+chartConfig.getChartOption());
         chartsConfigMapper.updateChartConfig(chartConfig);
 
         return new RepEntity(RepCode.success);

+ 0 - 6
src/main/java/com/server/chart/ChartsUtilService.java

@@ -73,12 +73,9 @@ public class ChartsUtilService {
                 baseCreateId = createBId;
             }
             if (baseCreateId == userId ){
-                System.out.println("等于吗");
                 return "(" + tableName +")";
             }else {
-                System.out.println("周到这里。。。。。。。。。。。。。。。。。");
                 strList = strategysBdMapper.getSqlStr(userId, baseId);
-                System.out.println("strList:" + strList);
             }
         }else {
             strList = strategysChartMapper.getSqlStr(userId, id);
@@ -94,14 +91,11 @@ public class ChartsUtilService {
             if ("".equals(str) || str == null){
                 return  "(select * from " + "(" + tableName +"))";
             }
-            System.out.println("str111:" + str);
             StringBuilder sb = new StringBuilder(str);
             sqlStr = sqlStr + String.valueOf(sb .replace(1, 5, "( ")) + ") or";
         }
-        System.out.println("sqlStr:" + sqlStr);
         StringBuilder sb = new StringBuilder(sqlStr);
         sqlStr = "(select * from " + "(" + tableName +")" + " where " + sb.replace(sb.length()-2,sb.length(), "") + ")";
-        System.out.println("sql:" + sqlStr);
         return sqlStr;
     }
 

+ 0 - 6
src/main/java/com/server/chart/GetChartsDataUtilService.java

@@ -95,7 +95,6 @@ public class GetChartsDataUtilService {
         }
 
         int baseId = getChartsDataUtilService.getBaseId(chartsId);
-        System.out.println("切换数据库"+baseId);
 
         ColumnValuesInfo columnValuesInfo = new ColumnValuesInfo();
 
@@ -107,11 +106,8 @@ public class GetChartsDataUtilService {
         List<Map<String, Object>> values = new ArrayList<>();
         try {
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                //joinPoint.getSignature() :获取连接点的方法签名对象
-                System.out.println("数据源 " + baseId + " 不存在使用默认的数据源 -> ");
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                System.out.println("使用数据源:" + baseId);
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
             }
             values = chartsConfigMapper.getChartsData(sql, showDataChartInfo.getTestPage().enablePaging());
@@ -119,10 +115,8 @@ public class GetChartsDataUtilService {
             columnValuesInfo.setValues(pageInfo);
         }catch (Exception e){
             e.printStackTrace();
-            System.out.println("异常");
             return new RepEntity(RepCode.erro);
         }finally {
-            System.out.println("关闭数据源");
             DynamicDataSourceContextHolder.clearDataSourceType();
         }
         columnValuesInfo.setColumnConfig(columnConfig);

+ 0 - 15
src/main/java/com/server/chart/ShowHistogramService.java

@@ -62,15 +62,11 @@ public class ShowHistogramService {
         }
 
         int baseId = getChartsDataUtilService.getBaseId(id);
-        System.out.println("切换数据库"+baseId);
 
         try{
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                //joinPoint.getSignature() :获取连接点的方法签名对象
-                System.out.println("数据源 " + baseId + " 不存在使用默认的数据源 -> ");
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                System.out.println("使用数据源:" + baseId);
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
             }
 
@@ -108,12 +104,10 @@ public class ShowHistogramService {
                 screen = scr.getRet();
                 screenToColumn = scr.getWithColumnRet();
                 StringBuilder sb = new StringBuilder(screenToColumn);
-                System.out.println("sb:"+sb);
                 if (screenToColumn != null && !("".equals(screenToColumn))){
                     screenToColumnS = screenToColumn + " " + screen;               //and
                     screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
                     screen = screenToColumn + " " + screen;         //where
-                    System.out.println("screen:" + screen);
                 } else {
                     StringBuilder sb1 = new StringBuilder(screen);
                     screenToColumnS = screen;
@@ -127,9 +121,7 @@ public class ShowHistogramService {
                 timeReture = timeConverterUtil.timeConverter(xColumn, tableName, xAxisType, screen, 20);
                 xAxisData = timeReture.getValues();
                 chartsDataInfo.setTooMany(timeReture.isOverdose());
-                System.out.println("xA:" + xAxisData);
                 xData = timeConverterUtil.toRespons(xAxisData,xAxisType );
-                System.out.println("data:"+xAxisData);
             }else {
                 int count = showChartsMapper.getNumForX(xColumn, tableName);
                 if (count > 20){
@@ -170,11 +162,9 @@ public class ShowHistogramService {
                 value.add(valueOne);
             }
 
-            System.out.println(value);
             series.setName(xColumn);
             series.setValue(value);
             serieses.add(series);
-            System.out.println(serieses);
 
             //有分组
             if (groupBy.size() != 0){
@@ -189,7 +179,6 @@ public class ShowHistogramService {
                         chartsDataInfo.setTooMany(true);
                     }
                     List<String> groupsData = showChartsMapper.getGroups(groupByName,tableName, screenToColumnS, 20); //查询每个分组系列
-                    System.out.println("groupdata:"+ groupsData.toString());
                     Iterator itGroupsData = groupsData.iterator();
 
                     //每个分组得到得每个系列
@@ -236,20 +225,16 @@ public class ShowHistogramService {
                         }
 
                         ne.setValue(groupsValue);
-                        System.out.println("值:"+ series);
                         serieses.add(ne);
                     }
-                    System.out.println(serieses);
                 }
             }
 
             chartsDataInfo.setSerieses(serieses);
         }catch (Exception e){
         e.printStackTrace();
-        System.out.println("异常");
         return new RepEntity(RepCode.erro);
     }finally {
-            System.out.println("关闭数据源");
         DynamicDataSourceContextHolder.clearDataSourceType();
     }
 

+ 0 - 7
src/main/java/com/server/chart/ShowIndividualService.java

@@ -57,15 +57,11 @@ public class ShowIndividualService {
     }
 
         int baseId = getChartsDataUtilService.getBaseId(id);
-        System.out.println("切换数据库"+String.valueOf(baseId));
 
         try{
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                //joinPoint.getSignature() :获取连接点的方法签名对象
-                System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                System.out.println("使用数据源:" + String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
             }
 
@@ -85,7 +81,6 @@ public class ShowIndividualService {
             }
 
         String columnName = individualConfigInfo.getSortColumn();
-        System.out.println("columnName:"+columnName);
         //查询其他列
         String columnListName = individualConfigInfo.getColumnListName().toString();
         String sort = individualConfigInfo.getSort();
@@ -97,7 +92,6 @@ public class ShowIndividualService {
         popAndIndDataInfo.setValueList(pageInfo);
     }catch (Exception e){
         e.printStackTrace();
-        System.out.println("异常");
         return new RepEntity(RepCode.erro);
     }finally {
         DynamicDataSourceContextHolder.clearDataSourceType();
@@ -111,7 +105,6 @@ public class ShowIndividualService {
         String st2 = "]";
         String strA = str.replace(st1, "");
         String strB = strA.replace(st2, "");
-        System.out.println("str:"+ strB);
         return strB;
     }
 }

+ 2 - 9
src/main/java/com/server/chart/ShowLineService.java

@@ -60,15 +60,11 @@ public class ShowLineService {
         }
 
         int baseId = getChartsDataUtilService.getBaseId(id);
-        System.out.println("切换数据库"+String.valueOf(baseId));
 
         try{
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                //joinPoint.getSignature() :获取连接点的方法签名对象
-                System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                System.out.println("使用数据源:" + String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
             }
 
@@ -104,12 +100,10 @@ public class ShowLineService {
                 screen = scr.getRet();
                 screenToColumn = scr.getWithColumnRet();
                 StringBuilder sb = new StringBuilder(screenToColumn);
-                System.out.println("sb:"+sb);
                 if (screenToColumn != null && !("".equals(screenToColumn))){
                     screenToColumnS = screenToColumn + " " + screen;               //and
                     screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
                     screen = screenToColumn + " " + screen;         //where
-                    System.out.println("screen:" + screen);
                 } else {
                     StringBuilder sb1 = new StringBuilder(screen);
                     screenToColumnS = screen;
@@ -136,9 +130,9 @@ public class ShowLineService {
             }
             double valueOne = 0;
             String valueOnes = null;
-//                System.out.println("Y:"+ yColumn + "........x:" + xColumn + "........yAxistype:" + yAxisType + "...xtpye:+"+yAxisType+ "   xdata:"+xdata);
+//                ("Y:"+ yColumn + "........x:" + xColumn + "........yAxistype:" + yAxisType + "...xtpye:+"+yAxisType+ "   xdata:"+xdata);
                 valueOnes = timeConverterUtil.getTimeValueConverter(yColumn, xColumn, tableName, yAxisType, xAxisType, xdata, screenToColumnS);
-//                System.out.println("value:"+valueOnes);
+//                ("value:"+valueOnes);
             if (valueOnes == null || "".equals(valueOnes)){
                 valueOne = 0;
             }else {
@@ -212,7 +206,6 @@ public class ShowLineService {
 
         }catch (Exception e){
             e.printStackTrace();
-            System.out.println("异常");
             return new RepEntity(RepCode.erro);
         }finally {
             DynamicDataSourceContextHolder.clearDataSourceType();

+ 0 - 8
src/main/java/com/server/chart/ShowPieService.java

@@ -56,14 +56,10 @@ public class ShowPieService {
         }
 
         int baseId = getChartsDataUtilService.getBaseId(id);
-        System.out.println("切换数据库"+String.valueOf(baseId));
         try{
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                //joinPoint.getSignature() :获取连接点的方法签名对象
-                System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                System.out.println("使用数据源:" + String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
             }
 
@@ -100,12 +96,10 @@ public class ShowPieService {
                 screen = scr.getRet();
                 screenToColumn = scr.getWithColumnRet();
                 StringBuilder sb = new StringBuilder(screenToColumn);
-                System.out.println("sb:"+sb);
                 if (screenToColumn != null && !("".equals(screenToColumn))){
                     screenToColumnS = screenToColumn + " " + screen;               //and
                     screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
                     screen = screenToColumn + " " + screen;         //where
-                    System.out.println("screen:" + screen);
                 } else {
                     StringBuilder sb1 = new StringBuilder(screen);
                     screenToColumnS = screen;
@@ -120,7 +114,6 @@ public class ShowPieService {
             xAxisData = timeReture.getValues();
             chartsDataInfo.setTooMany(timeReture.isOverdose());
             xData = timeConverterUtil.toRespons(xAxisData,xAxisType );
-            System.out.println("data:"+xAxisData);
         }else {
             int count = showChartsMapper.getNumForX(xColumn, tableName);
             if (count > 20){
@@ -174,7 +167,6 @@ public class ShowPieService {
         chartsDataInfo.setSerieses(serieses);
         }catch (Exception e){
             e.printStackTrace();
-            System.out.println("异常");
             return new RepEntity(RepCode.erro);
         }finally {
             DynamicDataSourceContextHolder.clearDataSourceType();

+ 0 - 9
src/main/java/com/server/chart/ShowPopulationService.java

@@ -52,15 +52,11 @@ public class ShowPopulationService {
         }
 
         int baseId = getChartsDataUtilService.getBaseId(id);
-        System.out.println("切换数据库"+String.valueOf(baseId));
 
         try{
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                //joinPoint.getSignature() :获取连接点的方法签名对象
-                System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                System.out.println("使用数据源:" + String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
             }
             List<String> groupByList = populationInfo.getGroupByList();  //分组
@@ -126,10 +122,8 @@ public class ShowPopulationService {
             while (operatorsList.hasNext()){
                 next = String.valueOf(operatorsList.next()).toLowerCase();
 
-                System.out.println("next:"+next);
                 //计算25th,75th,和百分比
                 if (next.toUpperCase() == "PERCENT" || "PERCENT".equals(next.toUpperCase())){
-                    System.out.println("走这里了吗?"+ next);
                     String op = "count(" + columnName + ")/(select count(1) from " + tableName + ") "+ next;
                     operatorColumn.add(op);
                 }else if ("25th".equals(next) || "75th".equals(next)){
@@ -170,13 +164,11 @@ public class ShowPopulationService {
 
             valueList = showChartsMapper.getGroupByValue(groupBy, opr, tableName, listOne, screenStr);
             valueList.addAll(valueListTh);
-            System.out.println("valueList:"+ valueList);
             popAndIndDataInfo.setValueList(valueList);
             return new RepEntity(RepCode.success, popAndIndDataInfo);
         }
         }catch (Exception e){
             e.printStackTrace();
-            System.out.println("异常");
             return new RepEntity(RepCode.erro);
         }finally {
             DynamicDataSourceContextHolder.clearDataSourceType();
@@ -188,7 +180,6 @@ public class ShowPopulationService {
         String st2 = "]";
         String strA = str.replace(st1, "");
         String strB = strA.replace(st2, "");
-        System.out.println("str:"+ strB);
         return strB;
     }
 }

+ 0 - 11
src/main/java/com/server/chart/ShowScatterService.java

@@ -59,15 +59,11 @@ public class ShowScatterService {
         }
 
         int baseId = getChartsDataUtilService.getBaseId(id);
-        System.out.println("切换数据库"+String.valueOf(baseId));
 
         try{
             if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
-                //joinPoint.getSignature() :获取连接点的方法签名对象
-                System.out.println("数据源 " + String.valueOf(baseId) + " 不存在使用默认的数据源 -> ");
                 return new RepEntity(RepCode.DataSourceNull);
             } else {
-                System.out.println("使用数据源:" + String.valueOf(baseId));
                 DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
             }
 
@@ -105,12 +101,10 @@ public class ShowScatterService {
                 screen = scr.getRet();
                 screenToColumn = scr.getWithColumnRet();
                 StringBuilder sb = new StringBuilder(screenToColumn);
-                System.out.println("sb:"+sb);
                 if (screenToColumn != null && !("".equals(screenToColumn))){
                     screenToColumnS = screenToColumn + " " + screen;               //and
                     screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
                     screen = screenToColumn + " " + screen;         //where
-                    System.out.println("screen:" + screen);
                 } else {
                     StringBuilder sb1 = new StringBuilder(screen);
                     screenToColumnS = screen;
@@ -125,7 +119,6 @@ public class ShowScatterService {
             xAxisData = timeReture.getValues();
             chartsDataInfo.setTooMany(timeReture.isOverdose());
             xData = timeConverterUtil.toRespons(xAxisData,xAxisType );
-            System.out.println("data:"+xAxisData);
         }else {
                 int count = showChartsMapper.getNumForX(xColumn, tableName);
                 if (count > 50){
@@ -169,7 +162,6 @@ public class ShowScatterService {
         series.setMdata(value);
 
         serieses.add(series);
-        System.out.println(serieses);
 
         //有分组
         if (groupBy.size() != 0){
@@ -184,7 +176,6 @@ public class ShowScatterService {
                     chartsDataInfo.setTooMany(true);
                 }
                 List<String> groupsData = showChartsMapper.getGroups(groupByName,tableName, screenToColumnS, 50); //查询每个分组系列
-                System.out.println("groupdata:"+ groupsData.toString());
                 Iterator itGroupsData = groupsData.iterator();
 
                 //每个分组得到得每个系列
@@ -238,14 +229,12 @@ public class ShowScatterService {
                     lineSeries.setName(groupsName);
                     serieses.add(lineSeries);
                 }
-                System.out.println(serieses);
             }
         }
 
         chartsDataInfo.setSerieses(serieses);
         }catch (Exception e){
             e.printStackTrace();
-            System.out.println("异常");
             return new RepEntity(RepCode.erro);
         }finally {
             DynamicDataSourceContextHolder.clearDataSourceType();

+ 0 - 6
src/main/java/com/server/dashboard/DashboardsToChartsUtilService.java

@@ -41,7 +41,6 @@ public class DashboardsToChartsUtilService {
 
     public RepEntity getChartsInDash(ChartsToDashInfo chartsToDashInfo, String token) throws SQLException {
         chartId = chartsToDashInfo.getDashCreateId();
-        System.out.println("看板生成图表");
         //拿到图表配置
         ChartsConfigToDash chartsConfigToDash = chartsConfigMapper.getChartConfigToDash(chartId);
         if (chartsConfigToDash == null || "".equals(chartsConfigToDash)){
@@ -89,7 +88,6 @@ public class DashboardsToChartsUtilService {
     public RepEntity getScatter(String fetchConfig, String token, List<Screen> filters){
             ScatterConfigInfo scatterConfigInfo = new ScatterConfigInfo();
             try {
-                System.out.println(fetchConfig);
                 scatterConfigInfo = objectMapper.readValue(fetchConfig,ScatterConfigInfo.class);
                 scatterConfigInfo.setFilters(filters);
             } catch (Exception e) {
@@ -101,7 +99,6 @@ public class DashboardsToChartsUtilService {
     public RepEntity getLine(String fetchConfig, String token, List<Screen> filters){
         LineConfigInfo lineConfigInfo = new LineConfigInfo();
         try {
-            System.out.println(fetchConfig);
             lineConfigInfo = objectMapper.readValue(fetchConfig,LineConfigInfo.class);
             lineConfigInfo.setFilters(filters);
         } catch (Exception e) {
@@ -113,7 +110,6 @@ public class DashboardsToChartsUtilService {
     public RepEntity getPopulation(String fetchConfig, String token, List<Screen> filters) throws SQLException {
         PopulationInfo populationInfo = new PopulationInfo();
         try {
-            System.out.println(fetchConfig);
             populationInfo = objectMapper.readValue(fetchConfig,PopulationInfo.class);
             populationInfo.setFilters(filters);
         } catch (Exception e) {
@@ -125,7 +121,6 @@ public class DashboardsToChartsUtilService {
     public RepEntity getIndividual(String fetchConfig, String token, List<Screen> filters, TestPage testPage) throws SQLException {
         IndividualConfigInfo individualConfigInfo = new IndividualConfigInfo();
         try {
-            System.out.println(fetchConfig);
             individualConfigInfo = objectMapper.readValue(fetchConfig,IndividualConfigInfo.class);
             individualConfigInfo.setFilters(filters);
             individualConfigInfo.setTestPage(testPage);
@@ -138,7 +133,6 @@ public class DashboardsToChartsUtilService {
     public RepEntity getPie(String fetchConfig, String token, List<Screen> filters){
         PieConfigInfo pieConfigInfo = new PieConfigInfo();
         try {
-            System.out.println(fetchConfig);
             pieConfigInfo = objectMapper.readValue(fetchConfig,PieConfigInfo.class);
             pieConfigInfo.setFilters(filters);
         } catch (Exception e) {

+ 0 - 3
src/main/java/com/server/dataSource/DataBasesService.java

@@ -83,7 +83,6 @@ public class DataBasesService {
     删除数据库配置
      */
     public RepEntity delDatabases(List<Integer> idList){
-        System.out.println(idList);
         dataConnectorMapper.deleteDatabases(idList);
         return new RepEntity(RepCode.success);
     }
@@ -94,7 +93,6 @@ public class DataBasesService {
     public RepEntity updatabases(DatabasesInfo databasesInfo){
         Databases databases = new Databases();
         BeanUtils.copyProperties(databasesInfo, databases);
-        System.out.println(databases);
         if (databases.getPassWord() == null || "".equals(databases.getPassWord())){
             databases.setPassWord(null);
         }
@@ -149,7 +147,6 @@ public class DataBasesService {
     public RepEntity getColumnByChartId(int id){
         DataConnector dataConnector = new DataConnector();
         int ConnectId = getChartsDataUtilService.getConnectId(id);
-        System.out.println("baseId:"+ConnectId);
         dataConnector = dataConnectorMapper.getColumnData(ConnectId);
         if (dataConnector == null || "".equals(dataConnector)){
             return new RepEntity(RepCode.Null);

+ 0 - 1
src/main/java/com/util/ContextUtil.java

@@ -16,7 +16,6 @@ public class ContextUtil {
 		synchronized (ContextUtil.class) {
 			while (applicationContext == null) {
 				try {
-					System.out.println("1111111111");
 					ContextUtil.class.wait(6000);
 				} catch (InterruptedException ex) {
 				}

+ 0 - 1
src/main/java/com/util/EncryUtil.java

@@ -59,7 +59,6 @@ public class EncryUtil {
 	public  static String decryptPassword(String password){
 		try {
 			String pass = getDesUtil().decrypt(password);
-			System.out.println(pass);
 			return removePasswordSalt(pass);
 		} catch (Exception e) {
 			e.printStackTrace();

+ 0 - 4
src/main/java/com/util/ScreenUtil.java

@@ -45,7 +45,6 @@ public class ScreenUtil {
                 } else {
                     ret = ret + " and " + columnName + " " + symbVal;
                 }
-                System.out.println("ret:" + ret);
             }
             if (columnType == "time" || "time".equals(columnType)) {
                 String symbVal = getTimeSymbAndVal(symbol, value);
@@ -94,7 +93,6 @@ public class ScreenUtil {
         } else {
             tar = symbol + " '" + values + "'";
         }
-        System.out.println("tar:" + tar);
         return tar;
     }
 
@@ -134,7 +132,6 @@ public class ScreenUtil {
     }
 
     public String getContainsCate(String value) {
-        System.out.println("走这里了吗");
         List<String> val = new ArrayList<>();
         CollectionType javaType = objectMapper.getTypeFactory().constructCollectionType(ArrayList.class, String.class);
         try {
@@ -147,7 +144,6 @@ public class ScreenUtil {
         Iterator isList = val.iterator();
         while (isList.hasNext()) {
             String v = String.valueOf(isList.next());
-            System.out.println("v" + v);
             valueString = valueString + ", '" + v + "'";
         }
         valueString = valueString.replaceFirst(",", "(") + ")";

+ 12 - 8
src/test/java/com/test/TestDataSource.java

@@ -1,9 +1,12 @@
-package java.com.test;
+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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
@@ -18,7 +21,6 @@ import java.util.Map;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-//@SpringApplicationConfiguration(classes=Application.class)
 @Import({DynamicDataSourceRegister.class})
 public class TestDataSource{
 
@@ -29,24 +31,26 @@ public class TestDataSource{
 	private DynamicDataSourceRegister dataSourceRegister;
 	@Autowired
 	private JdbcTemplate JdbcTemplate;
-	
+
+	private static final Logger logger = LoggerFactory.getLogger(TestDataSource.class);
+
 	@Test
 	public void test(){
-		System.out.println("begin==========================");
+        logger.info("begin==========================");
 		addDataSource();
-		System.out.println("end==========================");
+        logger.info("end============================");
 	}
 	
 	private void testQuery(){
 		DynamicDataSourceContextHolder.setDataSourceType("UAS");
 		List<Map<String, Object>> list = JdbcTemplate.queryForList("SELECT EN_NAME FROM ENTERPRISE");
-		System.out.println("UAS:"+list);
+		logger.info("UAS:{}", list);
 		DynamicDataSourceContextHolder.setDataSourceType("UAS_DEV");
 		List<Map<String, Object>> list2 = JdbcTemplate.queryForList("SELECT EN_NAME FROM ENTERPRISE");
-		System.out.println("UAS_DEV:"+list2);
+		logger.info("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);
+		logger.info("UAS_TEST:{}", list3);
 	}
 	
 	private void addDataSource(){