Преглед на файлове

清理无用的输出日志信息

songyh преди 3 години
родител
ревизия
7d8ae97d11
променени са 68 файла, в които са добавени 61 реда и са изтрити 938 реда
  1. 0 4
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java
  2. 0 1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java
  3. 0 5
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
  4. 2 8
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java
  5. 0 5
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java
  6. 0 3
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
  7. 0 2
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
  8. 0 5
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/controller/BytedanceRejectReasonController.java
  9. 0 1
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/service/impl/AiBytedanceAdvertiserStrategyServiceImpl.java
  10. 0 1
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/service/impl/ByteDanceAdvertiserDataServiceImpl.java
  11. 0 6
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/service/impl/BytedanceRejectReasonServiceImpl.java
  12. 0 1
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/service/impl/CtopOauthTokenServiceImpl.java
  13. 0 19
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/utils/ApkUtils.java
  14. 0 12
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/utils/Check.java
  15. 0 6
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/utils/GetCampaignNum.java
  16. 0 9
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/utils/StringUtils.java
  17. 0 10
      jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/report/utils/TimeStartAndEndUtil.java
  18. 0 12
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/utils/Check.java
  19. 0 18
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/DemoReportController.java
  20. 0 68
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/ReportSettlementServiceImpl.java
  21. 0 53
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/utils/SettlementUtil.java
  22. 0 27
      jeecg-boot-finance/src/test/java/org/jeecg/modules/finance/FinanceTest.java
  23. 1 21
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java
  24. 0 2
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
  25. 10 11
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java
  26. 0 5
      jeecg-boot-module-system/src/main/java/cn/com/ctop/alarm/modules/controller/RuleTemplateController.java
  27. 0 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/CtopOauthTokenServiceImpl.java
  28. 0 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/utils/HttpUtils.java
  29. 0 5
      jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/utils/ParseInstallPackageUtil.java
  30. 0 8
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/CrossAccountBatchController.java
  31. 0 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouGroupTemplateController.java
  32. 0 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouActionBarTextServiceImpl.java
  33. 0 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupServiceImpl.java
  34. 0 55
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouHistoryReportTaskServiceImpl.java
  35. 0 5
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouOverRunSendMessageServiceImpl.java
  36. 0 3
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouUpdateServiceImpl.java
  37. 0 98
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java
  38. 2 4
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl2.java
  39. 0 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouRealTimeDataServiceImpl.java
  40. 0 9
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/dimension/controller/KuaiShouDimensionUnitController.java
  41. 1 7
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/AccountReportServiceImpl.java
  42. 2 7
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouAudienceReportDailyGenderServiceImpl.java
  43. 0 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouAudienceReportDailyServiceImpl.java
  44. 0 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyAgentServiceImpl.java
  45. 1 3
      jeecg-boot-module-system/src/main/java/cn/com/ctop/oa/modules/service/impl/AppchatCreateServiceImpl.java
  46. 0 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/link/service/impl/ETLReportBytedanceVideoServiceImpl.java
  47. 0 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceAdvertiserDataServiceImpl.java
  48. 0 1
      jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/operation/util/GetChangeDateUtil.java
  49. 0 7
      jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/utils/LinkUtils.java
  50. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/common/utils/JsonResourceUtil.java
  51. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/util/CASServiceUtil.java
  52. 2 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/util/XmlUtils.java
  53. 0 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  54. 0 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java
  55. 0 3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/TestService.java
  56. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/order/OrderServiceImpl.java
  57. 0 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  58. 0 12
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/SecurityUtil.java
  59. 0 186
      jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java
  60. 0 2
      jeecg-boot-module-system/src/test/java/org/jeecg/SecurityToolsTest.java
  61. 16 31
      jeecg-boot-module-system/src/test/java/org/jeecg/modules/online/desform/test/DesformApiTest.java
  62. 14 33
      jeecg-boot-module-system/src/test/java/org/jeecg/modules/online/desform/test/OnlineApiTest.java
  63. 1 41
      jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java
  64. 8 7
      jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockService.java
  65. 0 1
      jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/client/RabbitMqClient.java
  66. 0 1
      jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/JeecgGatewayApplication.java
  67. 0 64
      jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/lock/DemoLockTest.java
  68. 1 1
      jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-prod.yml

+ 0 - 4
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/ProvinceCityArea.java

@@ -40,7 +40,6 @@ public class ProvinceCityArea {
     }
 
     private void initAreaList(){
-        //System.out.println("=====================");
         if(this.areaList==null || this.areaList.size()==0){
             this.areaList = new ArrayList<Area>();
             try {
@@ -49,20 +48,17 @@ public class ProvinceCityArea {
                 //第一层 省
                 JSONObject provinceJson = baseJson.getJSONObject("86");
                 for(String provinceKey: provinceJson.keySet()){
-                    //System.out.println("===="+provinceKey);
                     Area province = new Area(provinceKey,provinceJson.getString(provinceKey),"86");
                     this.areaList.add(province);
                     //第二层 市
                     JSONObject cityJson = baseJson.getJSONObject(provinceKey);
                     for(String cityKey:cityJson.keySet()){
-                        //System.out.println("-----"+cityKey);
                         Area city = new Area(cityKey,cityJson.getString(cityKey),provinceKey);
                         this.areaList.add(city);
                         //第三层 区
                         JSONObject areaJson =  baseJson.getJSONObject(cityKey);
                         if(areaJson!=null){
                             for(String areaKey:areaJson.keySet()){
-                                //System.out.println("········"+areaKey);
                                 Area area = new Area(areaKey,areaJson.getString(areaKey),cityKey);
                                 this.areaList.add(area);
                             }

+ 0 - 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/es/JeecgElasticsearchTemplate.java

@@ -125,7 +125,6 @@ public class JeecgElasticsearchTemplate {
             data.remove("id");
             bodySB.append(data.toJSONString()).append("\n");
         }
-        System.out.println("+-+-+-: bodySB.toString(): " + bodySB.toString());
         HttpHeaders headers = RestUtil.getHeaderApplicationJson();
         RestUtil.request(url, HttpMethod.PUT, headers, null, bodySB, JSONObject.class);
         return true;

+ 0 - 5
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java

@@ -209,9 +209,4 @@ public class JwtUtil {
 		if(returnValue!=null){returnValue = returnValue + moshi;}
 		return returnValue;
 	}
-	
-//	public static void main(String[] args) {
-//		 String token = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1NjUzMzY1MTMsInVzZXJuYW1lIjoiYWRtaW4ifQ.xjhud_tWCNYBOg_aRlMgOdlZoWFFKB_givNElHNw3X0";
-//		 System.out.println(JwtUtil.getUsername(token));
-//	}
 }

+ 2 - 8
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/FreemarkerParseFactory.java

@@ -98,10 +98,7 @@ public class FreemarkerParseFactory {
             paras.remove(MINI_DAO_FORMAT);
             return sql;
         } catch (Exception e) {
-            log.error(e.getMessage(), e.fillInStackTrace());
-            log.error("发送一次的模板key:{ " + tplName + " }");
-            //System.err.println(e.getMessage());
-            //System.err.println("模板名:{ "+ tplName +" }");
+            e.printStackTrace();
             throw new RuntimeException("解析SQL模板异常");
         }
     }
@@ -130,10 +127,7 @@ public class FreemarkerParseFactory {
             paras.remove(MINI_DAO_FORMAT);
             return sql;
         } catch (Exception e) {
-            log.error(e.getMessage(), e.fillInStackTrace());
-            log.error("发送一次的模板key:{ " + tplContent + " }");
-            //System.err.println(e.getMessage());
-            //System.err.println("模板内容:{ "+ tplContent +" }");
+            e.printStackTrace();
             throw new RuntimeException("解析SQL模板异常");
         }
     }

+ 0 - 5
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/StrAttackFilter.java

@@ -16,9 +16,4 @@ public class StrAttackFilter {
         Matcher m = p.matcher(str);
         return m.replaceAll("").trim();
     }
-
-//    public static void main(String[] args) {
-//        String filter = filter("@#jeecg/《》【bo】¥%……&*(o))))!@t<>,.,/?'\'~~`");
-//        System.out.println(filter);
-//    }
 }

+ 0 - 3
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java

@@ -71,9 +71,6 @@ public class oConvertUtils {
 		}
 		try {
 			byte[] b = strIn.getBytes(sourceCode);
-			for (int i = 0; i < b.length; i++) {
-				System.out.print(b[i] + "  ");
-			}
 			strOut = new String(b, targetCode);
 		} catch (Exception e) {
 			e.printStackTrace();

+ 0 - 2
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java

@@ -68,13 +68,11 @@ public class ShiroRealm extends AuthorizingRealm {
 
         // 设置用户拥有的角色集合,比如“admin,test”
         Set<String> roleSet = commonAPI.queryUserRoles(username);
-        System.out.println(roleSet.toString());
         info.setRoles(roleSet);
 
         // 设置用户拥有的权限集合,比如“sys:role:add,sys:user:add”
         Set<String> permissionSet = commonAPI.queryUserAuths(username);
         info.addStringPermissions(permissionSet);
-        System.out.println(permissionSet);
         log.info("===============Shiro权限认证成功==============");
         return info;
     }

+ 0 - 5
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/controller/BytedanceRejectReasonController.java

@@ -60,14 +60,10 @@ public class BytedanceRejectReasonController {
         Result result = new Result();
         List<CtopOauthToken> tokens = tokenService.selectToutiaoToken();
         if (null == tokens || tokens.isEmpty()) {
-            System.out.println("未获取到token");
             result.setCode(500);
             result.setMessage("未获取到token");
             return result;
         }
-
-        System.out.println("---------------------------------->>"+tokens.size()+"个token<<----------------------------------");
-
         tokens.forEach(token -> executorService.submit(()->getRejectReasonByToken(token, hour)));
 
 
@@ -93,7 +89,6 @@ public class BytedanceRejectReasonController {
 
             while(adids.size() > 10){
                 List<String> mulAdids = adids.subList(0,10);
-//                System.out.println("查询的计划是"+Arrays.toString(mulAdids.toArray()));
                 Result dataListResult = marketingService.getRejectReason(token, token.getAccountId().toString(), mulAdids);
                 if(dataListResult.getMessage().toString().contains("No permission to operate account")){
                     return;

+ 0 - 1
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/service/impl/AiBytedanceAdvertiserStrategyServiceImpl.java

@@ -599,7 +599,6 @@ public class AiBytedanceAdvertiserStrategyServiceImpl extends ServiceImpl<AiByte
 
     private Long createAdInfo(CtopOauthToken token, AiBytedanceAdvertiserStrategy strategy, JSONObject adParams) {
         Result result = marketingService.createAdvertiserPlan(token,adParams,strategy);
-        System.out.println(result);
         if(result.getCode()!=0){
             AiBytedanceAutocreateLog iBytedanceAutocreateLog = new AiBytedanceAutocreateLog(
                     strategy.getAccountId(),

+ 0 - 1
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -56,7 +56,6 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
             params.put("advertiser_id", accountId);
             String result = HttpUtils.httpGetRequest(url, headers, params);
             JSONObject jsonObject = JSONObject.parseObject(result);
-            System.err.println(jsonObject);
             if (Check.isNull(jsonObject)) {
                 throw new Exception("返回结果为空");
             }

+ 0 - 6
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/advertise/service/impl/BytedanceRejectReasonServiceImpl.java

@@ -72,9 +72,6 @@ public class BytedanceRejectReasonServiceImpl implements BytedanceRejectReasonSe
                     }
 
                     int res = bytedancePlanRejectReasonMapper.replaceIntoDb(bytedancePlanRejectReason);
-                    if(res == 0){
-                        System.out.println(bytedancePlanRejectReason.toString());
-                    }
                 }
             }
 
@@ -119,9 +116,6 @@ public class BytedanceRejectReasonServiceImpl implements BytedanceRejectReasonSe
                         bytedanceMaterialRejectReason.setAdId(ad_reject.getLong("ad_id"));
                     }
                     int res =  BytedanceMaterialRejectReasonMapper.replaceIntoDb(bytedanceMaterialRejectReason);
-                    if(res == 0){
-                        System.out.println(bytedanceMaterialRejectReason.toString());
-                    }
 //                    BytedanceMaterialRejectReasonMapper.insert(bytedanceMaterialRejectReason);
                 }
             }

+ 0 - 1
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/service/impl/CtopOauthTokenServiceImpl.java

@@ -73,7 +73,6 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
         param.put("grant_type", "refresh_token");
         param.put("refresh_token", token.getRefreshToken());
         String result = HttpUtils.httpPostRequest(url, param, new HashMap<>());
-        System.err.println(JSONObject.parseObject(result));
         log.info("头条刷新token;accountId:{},返回信息:{}", token.getAccountId(), result);
         if (null == result || "".equals(result.trim()) || "null".equalsIgnoreCase(result)) {
             log.info("头条刷新token失败;accountId:{},返回信息:{}", token.getAccountId(), result);

+ 0 - 19
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/utils/ApkUtils.java

@@ -229,23 +229,4 @@ public class ApkUtils {
         }
         return map;
     }
-
-
-    public static void main(String[] args) {
-       // Map map = ApkUtils.readAPK("https://apps.bytesfield.com/download/basic/cur/1c728178004c8d4d6c83444a05c414c1a1cfae48");
-
-        String filePath = LoadFileUtil.downLoadFromUrl("https://apps.bytesfield.com/download/basic/cur/1c728178004c8d4d6c83444a05c414c1a1cfae48-","E:\\appFiles");
-        //String filePath = LoadFileUtil.downLoadFromUrl("https://apps.bytesfield.com/download/basic/cur/96e5f2491826db22962149059da9e4eee7589764","E:\\appFiles");
-
-        System.out.println(filePath);
-
-        Map map = ApkUtils.readAPK(filePath);
-        Map map2 = ApkUtils.readIPA(filePath);
-
-        System.out.println(map);
-        System.out.println(map2);
-
-
-    }
-
 }

+ 0 - 12
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/utils/Check.java

@@ -138,16 +138,4 @@ public class Check {
         }
         return beanList;
     }
-
-
-    public static void main(String[] args) {
-        JSONObject params = new JSONObject();
-        params.put("advertiser_id", "123");
-        params.put("campaign_id", "123");
-        params.put("modify_time", null);
-        System.out.println(jsonRemoveEmpty(params));
-    }
-
-
-
 }

+ 0 - 6
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/utils/GetCampaignNum.java

@@ -22,16 +22,10 @@ public class GetCampaignNum {
 
         Long zu = countNum / campaignAdCnt;
         Long yu = countNum % campaignAdCnt;
-        //System.out.println("余---"+yu);
         // 不能整除 有余数 则 组 = 商 + 1
         // 整除 组 = 商
         Long count = yu != 0 ? zu.intValue()+1 : zu;
        // 账户配置中的组数量 < 当前 组序号
-        if (count.intValue() <= campaignCnt){
-            System.out.println("组序号----------"+count);
-        }else {
-            System.out.println("组序号-超过了规定的最大值-----"+count);
-        }
         return count;
     }
 

+ 0 - 9
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/common/utils/StringUtils.java

@@ -191,15 +191,6 @@ public class StringUtils {
         return list;
     }
 
-    public static void main(String[] args) {
-        String msg = "PerformanceManager{第1个中括号}Product{第2个中括号}<{第3个中括号}79~";
-        List<String> list = extractMessageByRegular(msg);
-        for (int i = 0; i < list.size(); i++) {
-            System.out.println(i+"-->"+list.get(i));
-        }
-    }
-
-
     /**
      *
      * 获取目标转化出价

+ 0 - 10
jeecg-boot-bytedance-ad/src/main/java/ctop/bytedance/ad/report/utils/TimeStartAndEndUtil.java

@@ -79,14 +79,4 @@ public class TimeStartAndEndUtil {
         }
         return dateList;
     }
-
-
-
-    public static void main(String[] args) throws Exception {
-//        Map<String,String> map = TimeStartAndEndUtil.getStartEndTime("2020-05-15","2020-05-18");
-        List<String> list = TimeStartAndEndUtil.getAllDatesOfTwoTimes("2021-05-19","2021-05-27");
-        System.out.println(list);
-    }
-
-
 }

+ 0 - 12
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/utils/Check.java

@@ -134,16 +134,4 @@ public class Check {
         }
         return beanList;
     }
-
-
-    public static void main(String[] args) {
-        JSONObject params = new JSONObject();
-        params.put("advertiser_id", "123");
-        params.put("campaign_id", "123");
-        params.put("modify_time", null);
-        System.out.println(jsonRemoveEmpty(params));
-    }
-
-
-
 }

+ 0 - 18
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/DemoReportController.java

@@ -221,22 +221,4 @@ public class DemoReportController {
         output.close();
        return "123";
     }
-
-
-    public static void main(String[] args) throws Exception {
-        File file1 = new File("C:\\Users\\Administrator\\Desktop\\汇创\\20210507161223.jpg");
-        File file2 = new File("https://media-1301855440.cos.ap-chongqing.myqcloud.com/image/2021-08-05/2-1628129040416.jpg");
-        System.out.println(file1.exists());
-        System.out.println(file2.exists());
-
-        //BufferedImage bufferImg = ImageIO.read(new File("media-1301855440\\u002Ecos\\u002Eap-chongqing\\u002Emyqcloud\\u002Ecom/image/2021-08-05/2-1628129040416.jpg"));
-       //String imagePath = "https:\\/\\/media-1301855440.cos.ap-chongqing.myqcloud.com"+File.separator+"image"+File.separator+"2021-08-05"+File.separator+"2-1628129040416.jpg";
-        String imagePath = "https://media-1301855440.cos.ap-chongqing.myqcloud.com/image/2021-08-05/2-1628129040416.jpg";
-        System.out.println(imagePath);
-        //InputStream is = new FileInputStream(imagePath);
-        InputStream is = createExcelByTemplate.getInputStreamByUrl(imagePath);
-        System.out.println(is);
-
-    }
-
 }

+ 0 - 68
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/ReportSettlementServiceImpl.java

@@ -814,8 +814,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
         return Result.successMsg("发送微信通知成功-test",null);
     }
 
-
-
     @Resource
     private CwjsPolicyProductMapper cwjsPolicyProductMapper;
 
@@ -845,72 +843,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                 cwjsProfitMapper.replaceCwjsSlettementProfit(reportList);
             }
         }
-
-
-
-
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-    public static void main(String[] args) throws Exception{
-       /* String a =  "woshiwoshi{1}woshi{2}111{3}===";
-        String b = MessageFormat.format(a,"测试","我","你","结束");
-        System.out.println(a);
-        System.out.println(b);*/
-
-
-        List list = new ArrayList();
-
-        list.add("2021-07-01");
-       // list.add("2021-07-02");
-        list.add("2021-07-10");
-        list.add("2021-07-05");
-        list.add("2021-07-15");
-
-
-/*
-
-
-        // 获取两个日期之间 所有的 时间 年-月-日
-        List<String> betweenDaysList = SettlementUtil.getAllDatesOfTwoTimes("2021-07-01","2021-07-20");
-
-        List<Object> times = SettlementUtil.sortlistTest(list);
-
-        //差集
-        List<String>  reduceList = betweenDaysList.stream().filter(item -> !times.contains(item)).collect(Collectors.toList());
-
-
-        System.out.println(betweenDaysList);
-        System.out.println(times);
-        System.out.println(reduceList);
-
-       List<Map<String,String>> stringList = SettlementUtil.getTime(reduceList);
-
-        System.out.println(stringList);
-
-
-*/
-
-        //String imagePath = "https://media-1301855440.cos.ap-chongqing.myqcloud.com/undefined/2021-08-25/9774099-1-1629874464883.jpg";
-        String imagePath = "https://media-1301855440.cos.ap-chongqing.myqcloud.com/undefined/2021-08-25/9677284-1629874460562.jpg";
-        //通过图片网络地址 获取输入流
-        InputStream is = createExcelByTemplate.getInputStreamByUrl(imagePath);
-        BufferedImage bufferImg = ImageIO.read(is);
-        System.out.println(bufferImg);
-
-
-
     }
 
 }

+ 0 - 53
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/utils/SettlementUtil.java

@@ -271,10 +271,7 @@ public class SettlementUtil {
             arrayList.add(map);
         }
 
-       // System.out.println(arrayList);
         return arrayList;
-
-
 }
 
     /**
@@ -297,54 +294,4 @@ public class SettlementUtil {
         return dayAfter;
     }
 
-    public static void main(String[] args) {
-
-
-
-            List list = new ArrayList();
-
-
-            Map map1 = new HashMap();
-            map1.put("startTime","2021-07-01");
-            map1.put("endTime","2021-07-05");
-
-            Map map2 = new HashMap();
-            map2.put("startTime","2021-07-10");
-            map2.put("endTime","2021-07-15");
-
-
-            list.add("2021-07-01");
-            list.add("2021-07-02");
-            //list.add("2021-07-03");
-            list.add("2021-07-04");
-            list.add("2021-07-05");
-
-
-
-
-            // 获取两个日期之间 所有的 时间 年-月-日
-            List<String> betweenDaysList = SettlementUtil.getAllDatesOfTwoTimes("2021-07-01","2021-07-10");
-
-            List<Object> times = SettlementUtil.sortlistTest(list);
-
-            //差集
-            List<String>  reduceList = betweenDaysList.stream().filter(item -> !times.contains(item)).collect(Collectors.toList());
-
-
-            System.out.println(betweenDaysList);
-            System.out.println(times);
-            System.out.println(reduceList);
-
-            List<Map<String, String>> stringList = SettlementUtil.getTime(reduceList);
-
-            System.out.println(stringList);
-
-
-
-
-
-    }
-
-
-
 }

+ 0 - 27
jeecg-boot-finance/src/test/java/org/jeecg/modules/finance/FinanceTest.java

@@ -38,29 +38,6 @@ public class FinanceTest {
         corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
     }
 
-
-    @Test
-    public void getAccountId(){
-        String str1 = "123123123-1";
-        String str2 = "123123123-1";
-        String str = str1.substring(0, str1.indexOf("-"));
-        String str3 = str2.substring(0, str2.indexOf("-"));
-
-        System.out.println(str);
-        System.out.println(str3);
-
-    }
-
-
-    public static void main(String[] args) {
-        String str1 = "123123123-1";
-        String str2 = "123123123-1";
-        String str = str1.substring(0, str1.indexOf("-"));
-        String str3 = str2.substring(0, str2.indexOf("-"));
-
-        System.out.println(str);
-        System.out.println(str3);
-    }
     @Resource
     ICwjsPolicyInfoService policyInfoService;
     @Test
@@ -73,19 +50,15 @@ public class FinanceTest {
         cwjsPolicyInfo.setPolicyStartDate("2021-08-10");
         cwjsPolicyInfo.setPolicyEndDate("2021-08-15");
         boolean ok = policyInfoService.isExistCwjsPolicyInfo(cwjsPolicyInfo);
-        System.out.println(ok);
 
         cwjsPolicyInfo.setPolicyStartDate("2021-08-08");
         cwjsPolicyInfo.setPolicyEndDate("2021-08-09");
-        System.out.println(policyInfoService.isExistCwjsPolicyInfo(cwjsPolicyInfo));
 
         cwjsPolicyInfo.setPolicyStartDate("2021-08-08");
         cwjsPolicyInfo.setPolicyEndDate("2021-08-10");
-        System.out.println(policyInfoService.isExistCwjsPolicyInfo(cwjsPolicyInfo));
 
         cwjsPolicyInfo.setPolicyStartDate("2021-08-11");
         cwjsPolicyInfo.setPolicyEndDate("2021-08-12");
-        System.out.println(policyInfoService.isExistCwjsPolicyInfo(cwjsPolicyInfo));
 
     }
 

+ 1 - 21
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java

@@ -143,7 +143,6 @@ public class VxeMockController {
      */
     @PutMapping("/immediateSaveRow")
     public Result mockImmediateSaveRow(@RequestBody JSONObject rowData) throws Exception {
-        System.out.println("即时保存.rowData:" + rowData.toJSONString());
         // 延时1.5秒,模拟网慢堵塞真实感
         Thread.sleep(500);
         return Result.ok();
@@ -163,7 +162,7 @@ public class VxeMockController {
         //    只传新增的数据给后台insert即可,否者将会造成性能上的浪费。
         // 3、新增的行是没有id的,通过这一点,就可以判断是否是新增的数据
 
-        System.out.println("即时保存.tableData:" + tableData.toJSONString());
+        log.info("即时保存.tableData:" + tableData.toJSONString());
         // 延时1.5秒,模拟网慢堵塞真实感
         Thread.sleep(1000);
         return Result.ok();
@@ -221,30 +220,12 @@ public class VxeMockController {
         // 获取查询条件(前台传递的查询参数)
         Map<String, String[]> parameterMap = request.getParameterMap();
         // 遍历输出到控制台
-        System.out.println("\ngetDdjhData - 普通查询条件:");
-        for (String key : parameterMap.keySet()) {
-            System.out.println("-- " + key + ": " + JSON.toJSONString(parameterMap.get(key)));
-        }
         // 输出高级查询
         try {
-            System.out.println("\ngetDdjhData - 高级查询条件:");
             // 高级查询模式
             MatchTypeEnum matchType = MatchTypeEnum.getByValue(superQueryMatchType);
-            if (matchType == null) {
-                System.out.println("-- 高级查询模式:不识别(" + superQueryMatchType + ")");
-            } else {
-                System.out.println("-- 高级查询模式:" + matchType.getValue());
-            }
             superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8");
             List<QueryCondition> conditions = JSON.parseArray(superQueryParams, QueryCondition.class);
-            if (conditions != null) {
-                for (QueryCondition condition : conditions) {
-                    System.out.println("-- " + JSON.toJSONString(condition));
-                }
-            } else {
-                System.out.println("-- 没有传递任何高级查询条件");
-            }
-            System.out.println();
         } catch (Exception e) {
             log.error("-- 高级查询操作失败:" + superQueryParams, e);
             e.printStackTrace();
@@ -256,7 +237,6 @@ public class VxeMockController {
         // 封装成 MyBatisPlus 能识别的 QueryWrapper,可以直接使用这个对象进行SQL筛选条件拼接
         // 这个方法也会自动封装高级查询条件,但是高级查询参数名必须是superQueryParams和superQueryMatchType
         QueryWrapper<MockEntity> queryWrapper = QueryGenerator.initQueryWrapper(mockEntity, parameterMap);
-        System.out.println("queryWrapper: " + queryWrapper.getCustomSqlSegment());
 
         // 模拟JSON数据路径
         String path = "classpath:org/jeecg/modules/demo/mock/vxe/json/ddjh.json";

+ 0 - 2
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java

@@ -65,8 +65,6 @@ public class JeecgDemoServiceImpl extends ServiceImpl<JeecgDemoMapper, JeecgDemo
 	@Cacheable(cacheNames = CacheConstant.TEST_DEMO_CACHE, key = "#id")
 	public JeecgDemo getByIdCacheable(String id) {
 		JeecgDemo t = jeecgDemoMapper.selectById(id);
-		System.err.println("---未读缓存,读取数据库---");
-		System.err.println(t);
 		return t;
 	}
 

+ 10 - 11
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java

@@ -142,7 +142,7 @@ public class DlMockController {
      */
     @PutMapping("/immediateSaveRow")
     public Result mockImmediateSaveRow(@RequestBody JSONObject rowData) throws Exception {
-        System.out.println("即时保存.rowData:" + rowData.toJSONString());
+        log.info("即时保存.rowData:" + rowData.toJSONString());
         // 延时1.5秒,模拟网慢堵塞真实感
         Thread.sleep(500);
         return Result.ok();
@@ -162,7 +162,7 @@ public class DlMockController {
         //    只传新增的数据给后台insert即可,否者将会造成性能上的浪费。
         // 3、新增的行是没有id的,通过这一点,就可以判断是否是新增的数据
 
-        System.out.println("即时保存.tableData:" + tableData.toJSONString());
+        log.info("即时保存.tableData:" + tableData.toJSONString());
         // 延时1.5秒,模拟网慢堵塞真实感
         Thread.sleep(1000);
         return Result.ok();
@@ -220,30 +220,29 @@ public class DlMockController {
         // 获取查询条件(前台传递的查询参数)
         Map<String, String[]> parameterMap = request.getParameterMap();
         // 遍历输出到控制台
-        System.out.println("\ngetDdjhData - 普通查询条件:");
+        log.info("\ngetDdjhData - 普通查询条件:");
         for (String key : parameterMap.keySet()) {
-            System.out.println("-- " + key + ": " + JSON.toJSONString(parameterMap.get(key)));
+            log.info("-- " + key + ": " + JSON.toJSONString(parameterMap.get(key)));
         }
         // 输出高级查询
         try {
-            System.out.println("\ngetDdjhData - 高级查询条件:");
+            log.info("\ngetDdjhData - 高级查询条件:");
             // 高级查询模式
             MatchTypeEnum matchType = MatchTypeEnum.getByValue(superQueryMatchType);
             if (matchType == null) {
-                System.out.println("-- 高级查询模式:不识别(" + superQueryMatchType + ")");
+                log.info("-- 高级查询模式:不识别(" + superQueryMatchType + ")");
             } else {
-                System.out.println("-- 高级查询模式:" + matchType.getValue());
+                log.info("-- 高级查询模式:" + matchType.getValue());
             }
             superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8");
             List<QueryCondition> conditions = JSON.parseArray(superQueryParams, QueryCondition.class);
             if (conditions != null) {
                 for (QueryCondition condition : conditions) {
-                    System.out.println("-- " + JSON.toJSONString(condition));
+                    log.info("-- " + JSON.toJSONString(condition));
                 }
             } else {
-                System.out.println("-- 没有传递任何高级查询条件");
+                log.info("-- 没有传递任何高级查询条件");
             }
-            System.out.println();
         } catch (Exception e) {
             log.error("-- 高级查询操作失败:" + superQueryParams, e);
             e.printStackTrace();
@@ -255,7 +254,7 @@ public class DlMockController {
         // 封装成 MyBatisPlus 能识别的 QueryWrapper,可以直接使用这个对象进行SQL筛选条件拼接
         // 这个方法也会自动封装高级查询条件,但是高级查询参数名必须是superQueryParams和superQueryMatchType
         QueryWrapper<MockEntity> queryWrapper = QueryGenerator.initQueryWrapper(mockEntity, parameterMap);
-        System.out.println("queryWrapper: " + queryWrapper.getCustomSqlSegment());
+        log.info("queryWrapper: " + queryWrapper.getCustomSqlSegment());
 
         // 模拟JSON数据路径
         String path = "classpath:org/jeecg/modules/dlglong/json/ddjh.json";

+ 0 - 5
jeecg-boot-module-system/src/main/java/cn/com/ctop/alarm/modules/controller/RuleTemplateController.java

@@ -85,11 +85,6 @@ public class RuleTemplateController {
         return result;
     }
 
-    public static void main(String[] args) {
-        System.err.println(new JSONObject());
-    }
-
-
     /**
      * 通过id查询
      *

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/CtopOauthTokenServiceImpl.java

@@ -77,7 +77,6 @@ public class CtopOauthTokenServiceImpl extends ServiceImpl<CtopOauthTokenMapper,
         param.put("grant_type", "refresh_token");
         param.put("refresh_token", token.getRefreshToken());
         String result = HttpUtils.httpPostRequest(url, param, new HashMap<>());
-        System.err.println(JSONObject.parseObject(result));
         XxlJobHelper.log("头条刷新token;accountId:{},返回信息:{}", token.getAccountId(), result);
         if (null == result || "".equals(result.trim()) || "null".equalsIgnoreCase(result)) {
             XxlJobHelper.log("头条刷新token失败;accountId:{},返回信息:{}", token.getAccountId(), result);

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/utils/HttpUtils.java

@@ -669,7 +669,6 @@ public class HttpUtils {
         String strReturn = "";
         try {
             String uri = url + "?" + mapParamsSortToStringBySeperator(params, "&");
-            System.err.println(uri);
             HttpGet httpGet = new HttpGet(uri);
             if (headers != null) {
                 Iterator<String> keyIter = headers.keySet().iterator();

+ 0 - 5
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/utils/ParseInstallPackageUtil.java

@@ -123,11 +123,6 @@ public class ParseInstallPackageUtil {
 
             NSDictionary rootDict = (NSDictionary) PropertyListParser.parse(infoIs);
 
-            // 如果想要查看有哪些key ,可以把下面注释放开
-//            for (String keyName : rootDict.allKeys()) {
-//                System.out.println(keyName + ":" + rootDict.get(keyName).toString());
-//            }
-
             // 应用包名
             NSString parameters = (NSString) rootDict.get("CFBundleIdentifier");
             map.put("package", parameters.toString());

+ 0 - 8
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/CrossAccountBatchController.java

@@ -140,7 +140,6 @@ public class CrossAccountBatchController {
                 returnArr.add(returnJson);
             }
             result.setSuccess(true);
-            System.err.println(returnArr);
             result.setResult(returnArr);
         } catch (Exception e) {
             e.printStackTrace();
@@ -199,7 +198,6 @@ public class CrossAccountBatchController {
      */
     @PostMapping(value = "/crossAccountUnitCreate")
     public Result<JSONArray> batchUnitCreate(@RequestBody JSONObject requestJson) {
-        System.err.println(requestJson);
         Result<JSONArray> result = new Result<>();
         try {
 
@@ -243,9 +241,7 @@ public class CrossAccountBatchController {
                     createUnitArr = crossAccountBatchService.assembleUnitArray(oauthToken, createUnitArr, campaignList);
                 }
             }
-            System.err.println("组装数据:" + createUnitArr);
             JSONArray returnArray = crossAccountBatchService.createUnit(createUnitArr);
-            System.err.println(returnArray);
             result.setSuccess(true);
             result.setResult(returnArray);
         } catch (Exception e) {
@@ -262,8 +258,6 @@ public class CrossAccountBatchController {
     public Result<JSONArray> crossAccountCreativeCreate(@RequestBody JSONObject requestJson) {
         Result<JSONArray> result = new Result<>();
         try {
-            System.err.println(requestJson);
-
             if (Check.isNull(requestJson)) {
                 throw new Exception("参数不能为空");
             }
@@ -276,9 +270,7 @@ public class CrossAccountBatchController {
                 JSONObject accountJson = accountArr.getJSONObject(i);
                 creativeArray = crossAccountBatchService.assembleCreativeJson(creativeArray, accountJson);
             }
-            System.err.println("组装数据:" + creativeArray);
             JSONArray returnArray = crossAccountBatchService.createCreative(creativeArray);
-            System.err.println(returnArray);
             result.setSuccess(true);
             result.setResult(returnArray);
 

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouGroupTemplateController.java

@@ -62,7 +62,6 @@ public class KuaiShouGroupTemplateController {
      */
     @PostMapping(value = "/submitUnitTask")
     public Result<JSONObject> submitUnitTask(@RequestBody JSONObject requestJson) {
-        System.err.println(requestJson);
         Result<JSONObject> result = new Result<>();
         try {
             if (Check.isNull(requestJson)) {

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouActionBarTextServiceImpl.java

@@ -61,7 +61,6 @@ public class KuaiShouActionBarTextServiceImpl extends ServiceImpl<KuaiShouAction
             requestJson.put("campaign_type", list.get(i));
             String result = HttpUtils.kuaiShouhttpPostRequest(url, requestJson.toJSONString(), headers);
             JSONObject resultJson = JSONObject.parseObject(result);
-            System.err.println(resultJson);
             Integer code = resultJson.getInteger("code");
             if (code == 0) {
                 JSONObject data = resultJson.getJSONObject("data");

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupServiceImpl.java

@@ -193,7 +193,6 @@ public class KuaiShouGroupServiceImpl extends ServiceImpl<KuaiShouGroupMapper, K
             return;
         }
         addGroupV2(accountId, details);
-        log.info("组数据入库成功=》id:{}",unitId);
     }
 
 

+ 0 - 55
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouHistoryReportTaskServiceImpl.java

@@ -368,60 +368,6 @@ public class KuaiShouHistoryReportTaskServiceImpl extends ServiceImpl<KuaiShouHi
                 }
 
             }
-
-
-            //   System.err.println(reportList);
-          /*  if (!Check.isNull(localPath)) {
-                Map<String, Object> deleteMap = new HashMap<>();
-                deleteMap.put("account_id", task.getAccountId());
-
-                if (task.getViewType() == 1) {
-                    reportDailyAccountMapper.deleteByMap(deleteMap);
-                    reportDailyAccountMapper.loadAccountDailyReport(task.getAccountId(), localPath);
-                } else if (task.getViewType() == 2) {
-                    reportDailyCampaignMapper.deleteByMap(deleteMap);
-                    reportDailyCampaignMapper.loadCampaignDailyReport(task.getAccountId(), localPath);
-
-                } else if (task.getViewType() == 3) {
-                    reportDailyGroupMapper.deleteByMap(deleteMap);
-                    reportDailyGroupMapper.loadGroupDailyReport(task.getAccountId(), localPath);
-
-                } else if (task.getViewType() == 4) {
-                    reportDailyCreativeMapper.deleteByMap(deleteMap);
-                    reportDailyCreativeMapper.loadCreativeDailyReport(task.getAccountId(), localPath);
-
-                } else if (task.getViewType() == 10) {
-                    reportDailyCreativeMapper.deleteByAccountId(task.getAccountId());
-                    reportDailyCreativeMapper.loadProgramCreativeDailyReport(task.getAccountId(), localPath);
-
-                } else if (task.getViewType() == 5) {
-                    kuaishouReportDailyMaterialMapper.deleteByMap(deleteMap);
-                    kuaishouReportDailyMaterialMapper.loadMaterialDailyReport(task.getAccountId(), localPath);
-                    Thread thread = new Thread() {
-                        @Override
-                        public void run() {
-                            try {
-                                Thread.sleep(1 * 500L);
-                                getMd5(null, task.getAccountId());
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                        }
-
-                    };
-                    thread.start();
-                } else if (task.getViewType() == 7) {
-                    kuaishouReportDailyImageMapper.deleteByMap(deleteMap);
-                    //封面报表
-                    kuaishouReportDailyImageMapper.loadImageDailyReport(task.getAccountId(), localPath);
-                    //清洗数据
-                    kuaishouReportDailyImageMapper.updateImageReportCode();
-                    kuaishouReportDailyImageMapper.updateImageReportUserId();
-                    kuaishouReportDailyImageMapper.updateImageReportRealname();
-                }
-
-
-            }*/
             task.setTaskStatus(4);
 
         } catch (Exception e) {
@@ -442,7 +388,6 @@ public class KuaiShouHistoryReportTaskServiceImpl extends ServiceImpl<KuaiShouHi
         reader.readHeaders();
         // 逐行读入除表头的数据
         while (reader.readRecord()) {
-            //  System.out.println(reader.getRawRecord());
             csvFileList.add(reader.getValues());
         }
         reader.close();

+ 0 - 5
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouOverRunSendMessageServiceImpl.java

@@ -86,9 +86,4 @@ public class KuaiShouOverRunSendMessageServiceImpl extends ServiceImpl<KuaishouO
         }
 
     }
-
-    public static void main(String[] args) {
-        String startTime = DateUtils.getStartTime(new Date());
-        System.err.println(startTime);
-    }
 }

+ 0 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouUpdateServiceImpl.java

@@ -608,11 +608,8 @@ public class KuaiShouUpdateServiceImpl implements IKuaiShouUpdateService {
             Map<String, String> headers = new HashMap<>();
             headers.put("Access-Token", accessToken);
             headers.put("Content-Type", "application/json");
-            System.err.println("修改广告组入参:" + unitJson);
-            System.err.println("修改广告组head:" + headers);
             String result = HttpUtils.kuaiShouhttpPostRequest(url, unitJson.toJSONString(), headers);
             JSONObject resultJson = JSONObject.parseObject(result);
-            log.info("修改广告组返回信息:{}", resultJson);
             if (!Check.isNull(resultJson)) {
                 Integer code = resultJson.getInteger("code");
                 if (code == 0) {

+ 0 - 98
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -2856,97 +2856,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     private IKuaiShouVideoGetService videoGetService;
     static ExecutorService suZhaoService = Executors.newFixedThreadPool(15);
 
-   /* @Override
-    public void getSuZaoList(String token, Long accountId, int page, String startDate, String endDate) {
-        String url = "https://ad.e.kuaishou.com/rest/openapi/v1/ad_creator/video/list";
-        Map<String, String> headers = new HashMap<String, String>();
-        headers.put("Content-Type", "application/json");
-        headers.put("Access-Token", token);
-        Map<String, Object> param = new HashMap<String, Object>();
-        param.put("advertiser_id", accountId);
-        param.put("page", page);
-        param.put("page_size", 200);
-        if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
-            param.put("start_date", startDate);
-            param.put("end_date", endDate);
-        }
-        String result = HttpUtils.httpPostRequest(url, param, headers);
-        JSONObject resultJson = JSONObject.parseObject(result);
-        System.err.println(resultJson);
-        if (Check.isNull(resultJson)) {
-            return;
-        }
-        Integer code = resultJson.getInteger("code");
-        String message = resultJson.getString("message");
-        if (null == code || code != 0) {
-            log.error("获取快手素造列表数据异常:{},accountId:{}", message, accountId);
-            return;
-        }
-        JSONObject dataJson = resultJson.getJSONObject("data");
-        if (Check.isNull(dataJson)) {
-            return;
-        }
-
-
-        JSONArray details = dataJson.getJSONArray("details");
-        if (Check.isNull(details)) {
-            return;
-        }
-
-        List<KuaiShouVideoGet> videoGetList = new ArrayList<>();
-        for (int i = 0; i < details.size(); i++) {
-            JSONObject detailJson = details.getJSONObject(i);
-            if (Check.isNull(detailJson)) {
-                continue;
-            }
-            KuaiShouVideoGet videoGet = new KuaiShouVideoGet();
-            String photo_id = detailJson.getString("photo_id");
-            videoGet.setId(accountId + photo_id);
-            videoGet.setAccountId(accountId);
-            videoGet.setCoverUrl(detailJson.getString("cover_url"));
-            videoGet.setPhotoId(photo_id);
-            videoGet.setPhotoName(detailJson.getString("photo_name"));
-            videoGet.setStatDate(detailJson.getDate("upload_time"));
-            String signature = detailJson.getString("signature");
-            videoGet.setSignature(signature);
-            Integer source = detailJson.getInteger("source");
-            if (source == 2) {
-                videoGet.setChannelType(1);
-            } else {
-                videoGet.setChannelType(0);
-            }
-            Integer new_status = detailJson.getInteger("new_status");
-            if (new_status == 1) {
-                videoGet.setStatus(0);
-            } else {
-                videoGet.setStatus(1);
-            }
-            videoGet.setUrl(detailJson.getString("url"));
-            Integer width = detailJson.getInteger("width");
-            videoGet.setWidth(width);
-            Integer height = detailJson.getInteger("height");
-            videoGet.setHeight(height);
-            Integer type = MaterialEnum.getTypeBySize(width, height);
-            if (!Check.isNull(type)) {
-                videoGet.setMaterialType(type);
-            }
-            videoGetList.add(videoGet);
-            Thread thread = new Thread() {
-                @Override
-                public void run() {
-                    videoGetService.getKeyFrame(token, accountId, signature, photo_id);
-                }
-            };
-            thread.start();
-        }
-        if (!Check.isNull(videoGetList)) {
-            videoGetService.replaceBatch(videoGetList);
-        }
-
-        getSuZaoList(token, accountId, page + 1, startDate, endDate);
-
-    }*/
-
     @Autowired
     private IMaterialCutFrameService cutFrameService;
     private static ExecutorService executorService = Executors.newFixedThreadPool(10);
@@ -2963,11 +2872,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             JSONObject param = new JSONObject();
             param.put("advertiser_id", accountId);
             param.put("page_size", 200);
-
-           /* Map<String, Object> deleteMap = new HashMap<>();
-            deleteMap.put("account_id", accountId);
-            deleteMap.put("campaign_id", campaignId);
-            creativeService.removeByMap(deleteMap);*/
             QueryWrapper<KuaiShouGroup> groupQueryWrapper = new QueryWrapper<>();
             groupQueryWrapper.eq("account_id", accountId);
             groupQueryWrapper.eq("campaign_id", campaignId);
@@ -3082,8 +2986,6 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
             e.printStackTrace();
 
         }
-
-
     }
 
     /**

+ 2 - 4
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl2.java

@@ -124,7 +124,6 @@ public class KuaishouInterfaceServiceImpl2 implements IKuaishouInterfaceService2
                 }
             }else{
                 if(code == 500000){
-                    System.out.println("5秒后重试,accountId:"+advertiserId+",日期:"+startDate);
                     try{Thread.sleep(5000);} catch (InterruptedException e){};
                     getOperationRecordByPage(advertiserId, accessToken,page, pageSize, operationTarget, startDate, endDate);
                 }else {
@@ -216,7 +215,6 @@ public class KuaishouInterfaceServiceImpl2 implements IKuaishouInterfaceService2
                 }
             }else{
                 if(code == 500000){
-                    System.out.print("》》5秒后重试,accountId:"+advertiserId+",日期:"+startDate+"《《 ");
                     try{Thread.sleep(5000);} catch (InterruptedException e){};
                     getOperationRecordByPage2(advertiserId, accessToken,page, pageSize, operationTarget, startDate, endDate);
                 }else {
@@ -295,7 +293,7 @@ public class KuaishouInterfaceServiceImpl2 implements IKuaishouInterfaceService2
                 } else if (operationTarget == 7) {
                     kuaishouOperationRecordMapper.insertOperationRecordInfoPackageNew(batchList);
                 } else {
-                    System.out.println("未知的目标类型!");
+                    log.info("未知的目标类型!");
                 }
                 batchList.clear();
             }
@@ -317,7 +315,7 @@ public class KuaishouInterfaceServiceImpl2 implements IKuaishouInterfaceService2
             } else if (operationTarget == 7) {
                 kuaishouOperationRecordMapper.insertOperationRecordInfoPackageNew(batchList);
             } else {
-                System.out.println("未知的目标类型!");
+                log.info("未知的目标类型!");
             }
             batchList.clear();
         }

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouRealTimeDataServiceImpl.java

@@ -43,7 +43,6 @@ public class KuaishouRealTimeDataServiceImpl implements IKuaishouRealTimeDataSer
         param.put("campaign_ids", array);
         try {
             String result = HttpUtils.httpPostRequest(url, param, headers);
-            System.err.println(result);
             JSONObject jsonObject = JSONObject.parseObject(result);
             if (!Check.isNull(jsonObject)) {
                 Integer code = jsonObject.getInteger("code");

+ 0 - 9
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/dimension/controller/KuaiShouDimensionUnitController.java

@@ -257,15 +257,6 @@ public class KuaiShouDimensionUnitController {
         return result;
     }
 
-
-    public static void main(String[] args) {
-        String a = "1";
-        List<String> strings = Arrays.asList(a.split(","));
-        System.err.println(strings);
-        JSONArray array = JSONArray.parseArray(strings.toString());
-        System.err.println(array);
-    }
-
     /**
      * 通过id查询
      *

+ 1 - 7
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/AccountReportServiceImpl.java

@@ -673,7 +673,7 @@ public class AccountReportServiceImpl implements IAccountReportService {
                 queryMap.put("accountIds", accountIds);
             }
 
-            if ((type != 1 && type != 2) && type != null) {
+            if (type != 1 && type != 2) {
                 JSONObject ratioJson = accountReportMapper.selectSummaryByMap(queryMap);
                 returnJson.put("ratioJson", ratioJson);
             }
@@ -685,10 +685,4 @@ public class AccountReportServiceImpl implements IAccountReportService {
         }
         return returnJson;
     }
-
-    public static void main(String[] args) {
-        Calendar calendar = Calendar.getInstance();
-        int maxHour = calendar.get(Calendar.HOUR_OF_DAY);
-        System.out.println(maxHour);
-    }
 }

+ 2 - 7
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouAudienceReportDailyGenderServiceImpl.java

@@ -43,15 +43,10 @@ public class KuaishouAudienceReportDailyGenderServiceImpl extends ServiceImpl<Ku
             });
         }
 
-        if(!Check.isNull(genderResultMap)){
-            Set<String> keys = genderResultMap.keySet();
-            keys.forEach(key -> result.add(genderResultMap.get(key)));
-        }
+        Set<String> keys = genderResultMap.keySet();
+        keys.forEach(key -> result.add(genderResultMap.get(key)));
 
         if(!Check.isNull(result)){
-            result.forEach(a -> {
-                System.out.println(a.toString());
-            });
             saveAudienceReportDailyGenderToDb(result);
         }
     }

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouAudienceReportDailyServiceImpl.java

@@ -335,7 +335,6 @@ public class KuaishouAudienceReportDailyServiceImpl extends ServiceImpl<Kuaishou
                     }
                 } else {
                     if(code == 500000 || code == 400001){
-                        System.out.print("》》5秒后重试,accountId:"+unit+",日期:"+date+"《《 "+resultJson);
                         try{Thread.sleep(5000);} catch (InterruptedException e){}
                         crowdAnalysisReport2(token,date, type, plan, unit, page, pageSize);
                     }else{

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyAgentServiceImpl.java

@@ -204,7 +204,6 @@ public class KuaishouReportDailyAgentServiceImpl extends ServiceImpl<KuaishouRep
             String postData = "{\"pageInfo\":{\"currentPage\":" + currentPage + ",\"pageSize\":200,\"total\":1000},\"reviewStatus\":\"-1\",\"selectType\":1,\"selectValue\":\"\",\"createBeginTime\":0,\"createEndTime\":0}";
             String listUrl = "https://agent.e.kuaishou.com/rest/dsp/agent/account/list";
             String result = HttpUtils2.httpPostRequestTest(listUrl, postData, headerMap);
-            System.out.println(result);
             ObjectMapper mapper = new ObjectMapper();
             mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
             JsonNode resultNode = mapper.readTree(result);

+ 1 - 3
jeecg-boot-module-system/src/main/java/cn/com/ctop/oa/modules/service/impl/AppchatCreateServiceImpl.java

@@ -36,7 +36,6 @@ public class AppchatCreateServiceImpl implements IAppchatCreateService {
             if ((Integer) qywxAccessToken.get(GeneralConstant.CODE) != 0) {
                 throw new Exception("获取token失败");
             }
-            System.err.println(qywxAccessToken);
             JSONObject params = new JSONObject();
             params.put("name", "易车时报发送");
             params.put("owner", "qy01338f036d3ce902287758b529");
@@ -45,8 +44,7 @@ public class AppchatCreateServiceImpl implements IAppchatCreateService {
             userList.add("qy01ae8f626d56e90128175730d2");
             userList.add("YuMeng");
             params.put("userlist", userList);
-            String resultStr = HttpUtils.httpPostRequestTest(QYWxConstant.APPCHAT_CREATE + "?access_token=" + qywxAccessToken.get(GeneralConstant.ACCESS_TOKEN), params.toJSONString(), null);
-            System.err.println(resultStr);
+            HttpUtils.httpPostRequestTest(QYWxConstant.APPCHAT_CREATE + "?access_token=" + qywxAccessToken.get(GeneralConstant.ACCESS_TOKEN), params.toJSONString(), null);
         } catch (Exception e) {
             log.error("员工考勤入库异常,", e);
         }

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/link/service/impl/ETLReportBytedanceVideoServiceImpl.java

@@ -37,7 +37,6 @@ public class ETLReportBytedanceVideoServiceImpl extends ServiceImpl<ETLReportByt
     @Override
     public void cleanETL(String statDate) {
         List<ETLReportBytedanceVideo> etlReportBytedanceVideos = etlReportBytedanceVideoMapper.queryETLData(statDate);
-        System.out.println(statDate+":"+etlReportBytedanceVideos.size());
         if(etlReportBytedanceVideos.isEmpty()){
             log.warn("{},头条etl报表清洗异常,base数据源为空",statDate);
             return;

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/material/service/impl/ByteDanceAdvertiserDataServiceImpl.java

@@ -56,7 +56,6 @@ public class ByteDanceAdvertiserDataServiceImpl implements IByteDanceAdvertiserD
             params.put("advertiser_id", accountId);
             String result = HttpUtils.httpGetRequest(url, headers, params);
             JSONObject jsonObject = JSONObject.parseObject(result);
-            System.err.println(jsonObject);
             if (Check.isNull(jsonObject)) {
                 throw new Exception("返回结果为空");
             }

+ 0 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/operation/util/GetChangeDateUtil.java

@@ -78,7 +78,6 @@ public class GetChangeDateUtil {
         ) {
             sb.append(name + "由【"+bject.get(name).get(0) +"】改为了【"+ bject.get(name).get(1)+"】");
             sb.append(",");
-//            System.out.println(name + "由【"+bject.get(name).get(0) +"】改为了【"+ bject.get(name).get(1)+"】");
         }
         return sb.substring(0,sb.length() - 1 >= 0 ? sb.length() - 1 : 0);
     }

+ 0 - 7
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/utils/LinkUtils.java

@@ -60,11 +60,4 @@ public class LinkUtils {
         }
         return link;
     }
-
-    public static void main(String[] args) {
-        BigDecimal a = BigDecimal.valueOf(5.2);
-        BigDecimal b = BigDecimal.valueOf(4.2);
-        System.out.println(countLink(a, b));
-    }
-
 }

+ 0 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/common/utils/JsonResourceUtil.java

@@ -83,8 +83,6 @@ public class JsonResourceUtil {
      * 拼接字段
      */
     public static String joinFiled(Map<String, Map<String,Object>> mapMap,JSONArray array) {
-        System.out.println(mapMap);
-        System.out.println(array);
         StringBuilder sb = new StringBuilder();
         array.forEach(it -> {
             String filedName = it.toString();

+ 0 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/util/CASServiceUtil.java

@@ -23,8 +23,6 @@ public class CASServiceUtil {
 		String service = "http://localhost:3003/user/login";
 		String ticket = "ST-5-1g-9cNES6KXNRwq-GuRET103sm0-DESKTOP-VKLS8B3";
 		String res = getSTValidate(serviceUrl,ticket, service);
-		
-		System.out.println("---------res-----"+res);
 	}
 	
 	

+ 2 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/cas/util/XmlUtils.java

@@ -286,13 +286,10 @@ public final class XmlUtils {
 				"</cas:serviceResponse>";
 		
 		String error = XmlUtils.getTextForElement(errorRes, "authenticationFailure");
-		System.out.println("------"+error);
+
 		
 		String error2 = XmlUtils.getTextForElement(result, "authenticationFailure");
-		System.out.println("------"+error2);
 		String principal = XmlUtils.getTextForElement(result, "user");
-		System.out.println("---principal---"+principal);
 		Map<String, Object> attributes = XmlUtils.extractCustomAttributes(result);
-		System.out.println("---attributes---"+attributes);
-	}
+    }
 }

+ 0 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java

@@ -75,8 +75,6 @@ public class CallbackController {
                         HttpServletResponse response,
                         @RequestParam("code") String code,
                         @RequestParam("state") String state) throws IOException {
-        System.err.println("code:" + code);
-        System.err.println("state:" + state);
         response.sendRedirect(state + "?code=" + code);
     }
 

+ 0 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TestController.java

@@ -484,19 +484,13 @@ public class TestController {
 
     @GetMapping("/uploadVideo")
     public String uploadVideo(Long projectId) {
-
-        System.err.println(jobUrl + "/jeecg-boot/ai/create/customCreativeLimit");
-
         //  832
         JSONArray idList = materialInfoService.getIdListByProject(832L);
         JSONArray accountArray = new JSONArray();
-
         accountArray.add(9549277L);
         accountArray.add(9635234L);
         accountArray.add(9767697L);
         accountArray.add(9825207L);
-
-
         materialUploadService.uploadAccount("2", idList, accountArray, "2e3b982046a44b5faadaa77a7c0da114", true);
         return "success";
     }

+ 0 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/TestService.java

@@ -97,8 +97,5 @@ public class TestService {
                 }
             }
         } while (isContinue);
-        System.err.println(array);
     }
-
-
 }

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/order/OrderServiceImpl.java

@@ -9,7 +9,6 @@ import org.springframework.stereotype.Component;
 public class OrderServiceImpl implements OrderService {
     @Override
     public String getOrderById(Long id) {
-        System.out.println("输出testOrder");
         return "test Order";
     }
 }

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -272,7 +272,6 @@ public class SysUserController {
     @RequestMapping(value = "/generateUserId", method = RequestMethod.GET)
     public Result<String> generateUserId() {
         Result<String> result = new Result<>();
-        System.out.println("我执行了,生成用户ID==============================");
         String userId = UUID.randomUUID().toString().replace("-", "");
         result.setSuccess(true);
         result.setResult(userId);

+ 0 - 12
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/util/SecurityUtil.java

@@ -36,16 +36,4 @@ public class SecurityUtil {
         return  decryptResult;
     }
     //---AES加密---------end---------
-    /**
-     * 主函数
-     */
-    public static void main(String[] args) {
-        String content="test1111";
-        String encrypt = jiami(content);
-        System.out.println(encrypt);
-        //构建
-        String decrypt = jiemi(encrypt);
-        //解密为字符串
-        System.out.println(decrypt);
-    }
 }

+ 0 - 186
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -33,190 +33,4 @@ public class SampleTest {
     public void IKuaishouAudienceReportDailyGenderServiceTest(){
         audienceReportDailyGenderService.mergeAudienceReportDailyDate("2021-07-20");
     }
-
-
-
-//    @Resource
-//    CorpWexinUtils corpWexinUtils;
-//    @Resource
-//    MailLogMapper mailLogMapper;
-//    @Test
-//    public void weixin(){
-//        JSONObject wChatIdByUserId = mailLogMapper.getWChatIdByUserId("26bbe90edc5b475ca41ec3f76aa65067");
-//        StringBuilder text = new StringBuilder();
-//        text.append("您有一条销售政策需要审核,该客户为:");
-//        text.append("测试");
-//        text.append(",请及时登录助手平台-销售政策页面进行审核,谢谢!");
-//        corpWexinUtils.sendMessageByWeChatId(wChatIdByUserId,text.toString());
-//    }
-//
-//    @Autowired
-//    IKuaishouAudienceReportDailyService kuaishouAudienceReportDailyService;
-//    @Resource
-//    AiKuaishouUnitLevelOperationRecordMapper kuaishouUnitLevelOperationRecordMapper;
-//    @Test
-//    public void getAudienceReport() throws InterruptedException {
-//        int page = 1;
-//        int pageSize = 2000;
-//        Date beginDate = DateUtils.parseDate("2021-05-01", "yyyy-MM-dd");
-//        Date endDate = DateUtils.parseDate("2021-06-01", "yyyy-MM-dd");
-//
-//        while (beginDate.before(endDate)){
-//            Date mulDate = beginDate;
-//            List<AiKuaishouUnitLevelOperationRecord> planIdsAndUnitIds = kuaishouUnitLevelOperationRecordMapper.selectAllByAccountId(mulDate, DateUtils.addDay(mulDate,1));
-//            countDownLatch = new CountDownLatch(planIdsAndUnitIds.size());
-//            planIdsAndUnitIds.forEach(planIdAndUnitId -> executorService.submit(() -> {
-//                try{
-//                    CtopOauthToken token = tokenService.getTokenByAccountId(planIdAndUnitId.getAccountId());
-//                    if(!Check.isNull(token)){
-//                        Date startDate = mulDate;
-//                        Date enDate = DateUtils.addDay(startDate, 30);
-//                        // province: 省级地域分布, city: 地级地域分布,gender: 性别分布,ageSegment: 年龄分布clientId: 系统分布 businessInterestTags: 商业兴趣分布
-//                        while (startDate.before(enDate)){
-//                            kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, DateUtils.formatDate(startDate,"yyyy-MM-dd"), "ageSegment", planIdAndUnitId.getCampaignId(), planIdAndUnitId.getUnitId(), page, pageSize);
-//                            System.out.println("获取完毕 -> unit:" + planIdAndUnitId.getUnitId() +",日期:" + DateUtils.formatDate(startDate,"yyyy-MM-dd"));
-//                            startDate = DateUtils.addDay(startDate, 1);
-//                        }
-//
-//                    }else {
-//                        System.out.println("token异常 -》 accountId:"+planIdAndUnitId.getAccountId());
-//                    }
-//                }catch (Exception e){
-//                }finally {
-//                    countDownLatch.countDown();
-//                }
-//            }));
-//            beginDate = DateUtils.addDay(beginDate, 1);
-//            countDownLatch.await();
-//        }
-//
-//        System.out.println("走完了~");
-//
-//    }
-//    @Autowired
-//    cn.com.ctop.kuaishou.modules.report.service.IKuaishouPullTaskInfoService kuaishouPullTaskInfoService;
-//    /**
-//     * 发布任务到表里,大家消耗任务。  458  淘特项目所有账户从6月1日开始到现在所有的最新的数据
-//     */
-//    @Test
-//    public void initKusishouTaskInfo() {
-//        Date beginDate = DateUtils.parseDate("2021-06-01", "yyyy-MM-dd");
-//        Date endDate = DateUtils.parseDate("2021-08-04", "yyyy-MM-dd");
-//        while (beginDate.before(endDate)) {
-//            Date mulDate = beginDate;
-//            List<KuaishouPullTaskInfo> result = new ArrayList<>();
-//            List<Long> accountIds = kuaishouUnitLevelOperationRecordMapper.selectAllAccountIds(mulDate, DateUtils.addDay(mulDate, 1));
-//            accountIds.forEach(accountId -> {
-//                KuaishouPullTaskInfo taskInfo = new KuaishouPullTaskInfo();
-//                taskInfo.setAccountId(accountId);
-//                taskInfo.setTargetDate(DateUtils.formatDate(mulDate,"yyyy-MM-dd"));
-//                result.add(taskInfo);
-//            });
-//            kuaishouPullTaskInfoService.saveBatch(result);
-//            beginDate = DateUtils.addDay(beginDate, 1);
-//        }
-//
-//    }
-
-//    public void getAudienceReport() throws InterruptedException{
-//        int page = 1;
-//        int pageSize = 2000;
-//
-//        System.out.println("");
-//        System.out.println("");
-//        System.out.println("");
-//        System.out.println("");
-//        System.out.println("拉取人群报表数据服务已开始执行!");
-//        Scanner scan = new Scanner(System.in);
-//        System.out.println("请输入要运行几个任务:");
-//        int num = scan.nextInt();
-//        System.out.println("即将执行"+num+"个任务,执行完毕会自动退出此程序。");
-//        System.out.println("");
-//        System.out.println("");
-//        System.out.println("");
-//        System.out.println("");
-//        List<KuaishouPullTaskInfo> taskInfos = kuaishouPullTaskInfoMapper.getTaskInfos(num);
-//        System.exit(0);
-//        if(!Check.isNull(taskInfos)){
-//            taskInfos.forEach(taskInfo -> taskInfo.setStatus(1));
-//            kuaishouPullTaskInfoService.updateBatchById(taskInfos);
-//
-//            for (KuaishouPullTaskInfo taskInfo : taskInfos) {
-//                Date mulDate = DateUtils.parseDate(taskInfo.getTargetDate(), "yyyy-MM-dd");
-//                List<AiKuaishouUnitLevelOperationRecord> planIdsAndUnitIds = kuaishouUnitLevelOperationRecordMapper.selectAllByAccountIdAndDate(taskInfo.getAccountId(), mulDate, DateUtils.addDay(mulDate, 1));
-//                countDownLatch = new CountDownLatch(planIdsAndUnitIds.size());
-//                planIdsAndUnitIds.forEach(planIdAndUnitId -> executorService.submit(() -> {
-//                    try {
-//                        CtopOauthToken token = tokenService.getTokenByAccountId(planIdAndUnitId.getAccountId());
-//                        if (!Check.isNull(token)) {
-//                            Date startDate = mulDate;
-//                            Date enDate = DateUtils.addDay(startDate, 30);
-//                            // province: 省级地域分布, city: 地级地域分布,gender: 性别分布,ageSegment: 年龄分布clientId: 系统分布 businessInterestTags: 商业兴趣分布
-//                            while (startDate.before(enDate)) {
-//                                kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, DateUtils.formatDate(startDate, "yyyy-MM-dd"), "province", planIdAndUnitId.getCampaignId(), planIdAndUnitId.getUnitId(), page, pageSize);
-//                                kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, DateUtils.formatDate(startDate, "yyyy-MM-dd"), "city", planIdAndUnitId.getCampaignId(), planIdAndUnitId.getUnitId(), page, pageSize);
-//                                kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, DateUtils.formatDate(startDate, "yyyy-MM-dd"), "gender", planIdAndUnitId.getCampaignId(), planIdAndUnitId.getUnitId(), page, pageSize);
-//                                kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, DateUtils.formatDate(startDate, "yyyy-MM-dd"), "clientId", planIdAndUnitId.getCampaignId(), planIdAndUnitId.getUnitId(), page, pageSize);
-//                                kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, DateUtils.formatDate(startDate, "yyyy-MM-dd"), "ageSegment", planIdAndUnitId.getCampaignId(), planIdAndUnitId.getUnitId(), page, pageSize);
-//                                kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, DateUtils.formatDate(startDate, "yyyy-MM-dd"), "businessInterestTags", planIdAndUnitId.getCampaignId(), planIdAndUnitId.getUnitId(), page, pageSize);
-//                                System.out.println("获取完毕 -> unit:" + planIdAndUnitId.getUnitId() + ",日期:" + DateUtils.formatDate(startDate, "yyyy-MM-dd"));
-//                                startDate = DateUtils.addDay(startDate, 1);
-//                            }
-//
-//                        } else {
-//                            System.out.println("token异常 -》 accountId:" + planIdAndUnitId.getAccountId());
-//                        }
-//                    } catch (Exception e) {
-//                    } finally {
-//                        countDownLatch.countDown();
-//                    }
-//                }));
-//                countDownLatch.await();
-//            }
-//            System.out.println("11111111111111111111111111111111111111111111111111111111");
-//            System.out.println("11111111111111111111111111执行完毕111111111111111111111111");
-//            System.out.println("11111111111111111111111111111111111111111111111111111111");
-//            System.exit(0);
-//        }else{
-//            List<KuaishouPullTaskLog> taskLogs = kuaishouPullTaskLogMapper.getTaskInfos(num * 1000);
-//            if(Check.isNull(taskLogs)){
-//                System.out.println("所有的表里的任务走完啦,请联系发布任务!!!");
-//                return;
-//            }
-//
-//            taskLogs.forEach(taskLog -> taskLog.setStatus(1));
-//            kuaishouPullTaskLogService.updateBatchById(taskLogs);
-//
-//            countDownLatch = new CountDownLatch(taskLogs.size());
-//            taskLogs.forEach(taskLog -> executorService.submit(() -> {
-//                try {
-//                    CtopOauthToken token = tokenService.getTokenByAccountId(taskLog.getAccountId());
-//                    if (!Check.isNull(token)) {
-//                        Date startDate = DateUtils.parseDate(taskLog.getTargetDate(),"yyyy-MM-dd");
-//                        // province: 省级地域分布, city: 地级地域分布,gender: 性别分布,ageSegment: 年龄分布clientId: 系统分布 businessInterestTags: 商业兴趣分布
-//                        kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, taskLog.getTargetDate(), "province", taskLog.getPlanId(), taskLog.getUnitId(), page, pageSize);
-//                        kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, taskLog.getTargetDate(), "city", taskLog.getPlanId(), taskLog.getUnitId(), page, pageSize);
-//                        kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, taskLog.getTargetDate(), "gender", taskLog.getPlanId(), taskLog.getUnitId(), page, pageSize);
-//                        kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, taskLog.getTargetDate(), "clientId", taskLog.getPlanId(), taskLog.getUnitId(), page, pageSize);
-//                        kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, taskLog.getTargetDate(), "ageSegment", taskLog.getPlanId(), taskLog.getUnitId(), page, pageSize);
-//                        kuaishouAudienceReportDailyService.crowdAnalysisReport2(token, taskLog.getTargetDate(), "businessInterestTags", taskLog.getPlanId(), taskLog.getUnitId(), page, pageSize);
-//                        System.out.println("获取完毕 -> unit:" + taskLog.getUnitId() + ",日期:" + taskLog.getTargetDate());
-//                    } else {
-//                        System.out.println("token异常 -》 accountId:" + taskLog.getAccountId());
-//                    }
-//                } catch (Exception e) {
-//                } finally {
-//                    countDownLatch.countDown();
-//                }
-//            }));
-//            countDownLatch.await();
-//
-//            System.out.println("11111111111111111111111111111111111111111111111111111111");
-//            System.out.println("11111111111111111111111111执行完毕111111111111111111111111");
-//            System.out.println("11111111111111111111111111111111111111111111111111111111");
-//            System.exit(0);
-//        }
-//
-//
-//    }
 }

+ 0 - 2
jeecg-boot-module-system/src/test/java/org/jeecg/SecurityToolsTest.java

@@ -30,7 +30,6 @@ public class SecurityToolsTest {
         // signData为签名数据
         // data为aes加密数据
         // asekey为ras加密过的aeskey
-        System.out.println(new JSONObject(sign).toStringPretty());
 
         // 验签解密部分
         SecurityReq req = new SecurityReq();
@@ -44,6 +43,5 @@ public class SecurityToolsTest {
         SecurityResp securityResp = SecurityTools.valid(req);
         //解密报文data为解密报文
         //sucess 为验签成功失败标志 true代码验签成功,false代表失败
-        System.out.println(new JSONObject(securityResp).toStringPretty());
     }
 }

+ 16 - 31
jeecg-boot-module-system/src/test/java/org/jeecg/modules/online/desform/test/DesformApiTest.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.online.desform.test;
 
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.JeecgSystemApplication;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
@@ -22,6 +23,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
 @SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"})
+@Slf4j
 public class DesformApiTest {
 
     @Autowired
@@ -55,24 +57,20 @@ public class DesformApiTest {
         // 请求方式是 POST 代表提交新增数据
         HttpMethod method = HttpMethod.POST;
 
-        System.out.println("请求地址:" + url);
-        System.out.println("请求方式:" + method);
-        System.out.println("请求Token:" + token);
-
         JSONObject params = new JSONObject();
         params.put("name", "张三");
         params.put("sex", "1");
         params.put("begin_time", "2019-12-27");
         params.put("remarks", "生病了");
 
-        System.out.println("请求参数:" + params.toJSONString());
+        log.info("请求参数:" + params.toJSONString());
 
         // 利用 RestUtil 请求该url
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果:" + result.getBody().toJSONString());
+        if (result.getBody() != null) {
+            log.info("返回结果:" + result.getBody().toJSONString());
         } else {
-            System.out.println("查询失败");
+            log.info("查询失败");
         }
     }
 
@@ -93,24 +91,20 @@ public class DesformApiTest {
         // 请求方式是 PUT 代表提交修改数据
         HttpMethod method = HttpMethod.PUT;
 
-        System.out.println("请求地址:" + url);
-        System.out.println("请求方式:" + method);
-        System.out.println("请求Token:" + token);
-
         JSONObject params = new JSONObject();
         params.put("name", "李四");
         params.put("sex", "0");
         params.put("begin_time", "2019-12-27");
         params.put("remarks", "感冒了");
 
-        System.out.println("请求参数:" + params.toJSONString());
+        log.info("请求参数:" + params.toJSONString());
 
         // 利用 RestUtil 请求该url
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果:" + result.getBody().toJSONString());
+        if (result.getBody() != null) {
+            log.info("返回结果:" + result.getBody().toJSONString());
         } else {
-            System.out.println("查询失败");
+            log.info("查询失败");
         }
     }
 
@@ -130,17 +124,12 @@ public class DesformApiTest {
         HttpHeaders headers = this.getHeaders(token);
         // 请求方式是 DELETE 代表删除数据
         HttpMethod method = HttpMethod.DELETE;
-
-        System.out.println("请求地址:" + url);
-        System.out.println("请求方式:" + method);
-        System.out.println("请求Token:" + token);
-
         // 利用 RestUtil 请求该url
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果:" + result.getBody().toJSONString());
+        if (result.getBody() != null) {
+            log.info("返回结果:" + result.getBody().toJSONString());
         } else {
-            System.out.println("查询失败");
+            log.info("查询失败");
         }
     }
 
@@ -160,16 +149,12 @@ public class DesformApiTest {
         // 请求方式是 GET 代表获取数据
         HttpMethod method = HttpMethod.GET;
 
-        System.out.println("请求地址:" + url);
-        System.out.println("请求方式:" + method);
-        System.out.println("请求Token:" + token);
-
         // 利用 RestUtil 请求该url
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果:" + result.getBody().toJSONString());
+        if (result.getBody() != null) {
+            log.info("返回结果:" + result.getBody().toJSONString());
         } else {
-            System.out.println("查询失败");
+            log.info("查询失败");
         }
     }
 

+ 14 - 33
jeecg-boot-module-system/src/test/java/org/jeecg/modules/online/desform/test/OnlineApiTest.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.online.desform.test;
 
 import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.JeecgSystemApplication;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.system.util.JwtUtil;
@@ -22,6 +23,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,classes = JeecgSystemApplication.class)
 @SuppressWarnings({"FieldCanBeLocal", "SpringJavaAutowiredMembersInspection"})
+@Slf4j
 public class OnlineApiTest {
     @Autowired
     private RedisUtil redisUtil;
@@ -55,24 +57,18 @@ public class OnlineApiTest {
         // 请求方式是 POST 代表提交新增数据
         HttpMethod method = HttpMethod.POST;
 
-        System.out.println("请求地址:" + url);
-        System.out.println("请求方式:" + method);
-        System.out.println("请求Token:" + token);
-
         JSONObject params = new JSONObject();
         params.put("name", "张三");
         params.put("sex", "1");
         params.put("age",15);
         params.put("descc", "<p>富文本编辑</p>");
 
-        System.out.println("请求参数:" + params.toJSONString());
-
         // 利用 RestUtil 请求该url
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果:" + result.getBody().toJSONString());
+        if (result.getBody() != null) {
+            log.info("返回结果:" + result.getBody().toJSONString());
         } else {
-            System.out.println("查询失败");
+            log.info("查询失败");
         }
     }
 
@@ -93,10 +89,6 @@ public class OnlineApiTest {
         // 请求方式是 PUT 代表提交修改数据
         HttpMethod method = HttpMethod.PUT;
 
-        System.out.println("请求地址:" + url);
-        System.out.println("请求方式:" + method);
-        System.out.println("请求Token:" + token);
-
         JSONObject params = new JSONObject();
         params.put("id", dataId);
         params.put("name", "张三");
@@ -104,14 +96,12 @@ public class OnlineApiTest {
         params.put("age",30);
         params.put("descc", "<p>富文本编辑,重新编辑</p>");
 
-        System.out.println("请求参数:" + params.toJSONString());
-
         // 利用 RestUtil 请求该url
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果:" + result.getBody().toJSONString());
+        if (result.getBody() != null) {
+            log.info("返回结果:" + result.getBody().toJSONString());
         } else {
-            System.out.println("查询失败");
+            log.info("查询失败");
         }
     }
 
@@ -131,17 +121,12 @@ public class OnlineApiTest {
         HttpHeaders headers = this.getHeaders(token);
         // 请求方式是 DELETE 代表删除数据
         HttpMethod method = HttpMethod.DELETE;
-
-        System.out.println("请求地址:" + url);
-        System.out.println("请求方式:" + method);
-        System.out.println("请求Token:" + token);
-
         // 利用 RestUtil 请求该url
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果:" + result.getBody().toJSONString());
+        if (result.getBody() != null) {
+            log.info("返回结果:" + result.getBody().toJSONString());
         } else {
-            System.out.println("查询失败");
+            log.info("查询失败");
         }
     }
 
@@ -159,16 +144,12 @@ public class OnlineApiTest {
         // 请求方式是 GET 代表获取数据
         HttpMethod method = HttpMethod.GET;
 
-        System.out.println("请求地址:" + url);
-        System.out.println("请求方式:" + method);
-        System.out.println("请求Token:" + token);
-
         // 利用 RestUtil 请求该url
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果:" + result.getBody().toJSONString());
+        if (result.getBody() != null) {
+            log.info("返回结果:" + result.getBody().toJSONString());
         } else {
-            System.out.println("查询失败");
+            log.info("查询失败");
         }
     }
 

+ 1 - 41
jeecg-boot-module-system/src/test/java/org/jeecg/modules/system/test/SysUserTest.java

@@ -49,10 +49,6 @@ public class SysUserTest {
         // 请求方式是 POST 代表提交新增数据
         HttpMethod method = HttpMethod.POST;
 
-        System.out.println("请求地址:" + url);
-        System.out.println("请求方式:" + method);
-        System.out.println("请求Token:" + token);
-
         JSONObject params = new JSONObject();
         params.put("username", "wangwuTest");
         params.put("password", "123456");
@@ -62,15 +58,8 @@ public class SysUserTest {
         params.put("userIdentity","1");
         params.put("workNo","0025");
 
-        System.out.println("请求参数:" + params.toJSONString());
-
         // 利用 RestUtil 请求该url
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果:" + result.getBody().toJSONString());
-        } else {
-            System.out.println("查询失败");
-        }
     }
 
 
@@ -90,10 +79,6 @@ public class SysUserTest {
         // 请求方式是 PUT 代表提交修改数据
         HttpMethod method = HttpMethod.PUT;
 
-        System.out.println("请求地址:" + url);
-        System.out.println("请求方式:" + method);
-        System.out.println("请求Token:" + token);
-
         JSONObject params = new JSONObject();
         params.put("username", "wangwuTest");
         params.put("realname", "单元测试1111");
@@ -102,15 +87,9 @@ public class SysUserTest {
         params.put("workNo","0025");
         params.put("id",dataId);
 
-        System.out.println("请求参数:" + params.toJSONString());
-
         // 利用 RestUtil 请求该url
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, params, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果:" + result.getBody().toJSONString());
-        } else {
-            System.out.println("查询失败");
-        }
+
     }
 
 
@@ -130,17 +109,8 @@ public class SysUserTest {
         // 请求方式是 DELETE 代表删除数据
         HttpMethod method = HttpMethod.DELETE;
 
-        System.out.println("请求地址:" + url);
-        System.out.println("请求方式:" + method);
-        System.out.println("请求Token:" + token);
-
         // 利用 RestUtil 请求该url
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果:" + result.getBody().toJSONString());
-        } else {
-            System.out.println("查询失败");
-        }
     }
 
     /**
@@ -156,18 +126,8 @@ public class SysUserTest {
         HttpHeaders headers = this.getHeaders(token);
         // 请求方式是 GET 代表获取数据
         HttpMethod method = HttpMethod.GET;
-
-        System.out.println("请求地址:" + url);
-        System.out.println("请求方式:" + method);
-        System.out.println("请求Token:" + token);
-
         // 利用 RestUtil 请求该url
         ResponseEntity<JSONObject> result = RestUtil.request(url, method, headers, null, null, JSONObject.class);
-        if (result != null && result.getBody() != null) {
-            System.out.println("返回结果:" + result.getBody().toJSONString());
-        } else {
-            System.out.println("查询失败");
-        }
     }
 
     private String getToken() {

+ 8 - 7
jeecg-boot-starter/jeecg-boot-starter-lock/src/test/java/org/jeecg/boot/starter/lock/test/LockService.java

@@ -1,5 +1,6 @@
 package org.jeecg.boot.starter.lock.test;
 
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.boot.starter.lock.annotation.JLock;
 import org.jeecg.boot.starter.lock.annotation.JRepeat;
 import org.jeecg.boot.starter.lock.annotation.LockConstant;
@@ -9,6 +10,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 
 @Service
+@Slf4j
 public class LockService {
 
     @Resource
@@ -22,11 +24,10 @@ public class LockService {
     @JLock(lockKey = "#productId", expireSeconds = 5000)
     public void seckill(String productId) {
         if (n <= 0) {
-            System.out.println("活动已结束,请下次再来");
             return;
         }
-        System.out.println(Thread.currentThread().getName() + ":秒杀到了商品");
-        System.out.println(--n);
+        log.info(Thread.currentThread().getName() + ":秒杀到了商品");
+        log.info(--n+"");
     }
 
     /**
@@ -35,11 +36,11 @@ public class LockService {
     public void seckill2(String productId) {
         redissonLockClient.tryLock(productId, 5000);
         if (n <= 0) {
-            System.out.println("活动已结束,请下次再来");
+            log.info("活动已结束,请下次再来");
             return;
         }
-        System.out.println(Thread.currentThread().getName() + ":秒杀到了商品");
-        System.out.println(--n);
+        log.info(Thread.currentThread().getName() + ":秒杀到了商品");
+        log.info(--n+"");
         redissonLockClient.unlock(productId);
     }
 
@@ -54,6 +55,6 @@ public class LockService {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        System.out.println("提交成功" + name);
+        log.info("提交成功" + name);
     }
 }

+ 0 - 1
jeecg-boot-starter/jeecg-boot-starter-rabbitmq/src/main/java/org/jeecg/boot/starter/rabbitmq/client/RabbitMqClient.java

@@ -255,7 +255,6 @@ public class RabbitMqClient {
         Binding binding = BindingBuilder.bind(queue).to(directExchange).withQueueName();
         rabbitAdmin.declareBinding(binding);
         String messages = (String) rabbitTemplate.receiveAndConvert(queueName);
-        System.out.println("Receive:" + messages);
         return messages;
     }
 

+ 0 - 1
jeecg-cloud-module/jeecg-cloud-gateway/src/main/java/org/jeecg/JeecgGatewayApplication.java

@@ -25,7 +25,6 @@ public class JeecgGatewayApplication  implements CommandLineRunner {
     public static void main(String[] args) {
         ConfigurableApplicationContext applicationContext = SpringApplication.run(JeecgGatewayApplication.class, args);
         String userName = applicationContext.getEnvironment().getProperty("jeecg.test");
-        System.err.println("user name :" +userName);
     }
 
     /**

+ 0 - 64
jeecg-cloud-module/jeecg-cloud-system-start/src/main/java/org/jeecg/modules/cloud/lock/DemoLockTest.java

@@ -1,64 +0,0 @@
-//package org.jeecg.modules.cloud.lock;
-//
-//import lombok.extern.slf4j.Slf4j;
-//import org.jeecg.boot.starter.lock.annotation.JLock;
-//import org.jeecg.boot.starter.lock.client.RedissonLockClient;
-//import org.jeecg.boot.starter.rabbitmq.client.RabbitMqClient;
-//import org.jeecg.common.base.BaseMap;
-//import org.jeecg.modules.cloud.constant.CloudConstant;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.scheduling.annotation.Scheduled;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.Map;
-//
-///**
-// * 分布式锁测试demo
-// */
-//@Slf4j
-//@Component
-//public class DemoLockTest {
-//    @Autowired
-//    RedissonLockClient redissonLock;
-//    @Autowired
-//    RabbitMqClient rabbitMqClient;
-//
-//    /**
-//     * 测试分布式锁【注解方式】
-//     */
-//    @Scheduled(cron = "0/5 * * * * ?")
-//    @JLock(lockKey = CloudConstant.REDISSON_DEMO_LOCK_KEY1)
-//    public void execute() throws InterruptedException {
-//        log.info("执行execute任务开始,休眠三秒");
-//        Thread.sleep(3000);
-//        System.out.println("=======================业务逻辑1=============================");
-//        Map map = new BaseMap();
-//        map.put("orderId", "BJ0001");
-//        rabbitMqClient.sendMessage(CloudConstant.MQ_JEECG_PLACE_ORDER, map);
-//        //延迟10秒发送
-//        map.put("orderId", "NJ0002");
-//        rabbitMqClient.sendMessage(CloudConstant.MQ_JEECG_PLACE_ORDER, map, 10000);
-//        log.info("execute任务结束,休眠三秒");
-//    }
-//
-//    public DemoLockTest() {
-//    }
-//
-//    /**
-//     * 测试分布式锁【编码方式】
-//     */
-//    //@Scheduled(cron = "0/5 * * * * ?")
-//    public void execute2() throws InterruptedException {
-//        if (redissonLock.tryLock(CloudConstant.REDISSON_DEMO_LOCK_KEY2, -1, 6000)) {
-//            log.info("执行任务execute2开始,休眠十秒");
-//            Thread.sleep(10000);
-//            System.out.println("=======================业务逻辑2=============================");
-//            log.info("定时execute2结束,休眠十秒");
-//
-//            redissonLock.unlock(CloudConstant.REDISSON_DEMO_LOCK_KEY2);
-//        } else {
-//            log.info("execute2获取锁失败");
-//        }
-//    }
-//
-//}

+ 1 - 1
jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-prod.yml

@@ -116,7 +116,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://139.186.27.96:3390/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://172.30.0.4:3390/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: data
           password: hcst@2021
           driver-class-name: com.mysql.jdbc.Driver