Jelajahi Sumber

修改定时任务日志输出

syh 5 tahun lalu
induk
melakukan
c876f19d29
36 mengubah file dengan 89 tambahan dan 159 penghapusan
  1. 9 39
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/utils/CornerCheck.java
  2. 0 14
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/SampleXxlJob.java
  3. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/ByteDanceCleanMaterialJob.java
  4. 4 5
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/ByteDanceHourlyAccountWarningLoadJob.java
  5. 0 2
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceAdvertiserDailyReportLoadJob.java
  6. 4 5
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceAdvertiserHourlyReportLoadJob.java
  7. 4 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceAdvertisingDataLoadJob.java
  8. 4 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceCreativeDailyReportLoadJob.java
  9. 4 5
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceCreativeHourlyReportLoadJob.java
  10. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedancePlanDailyReportLoadJob.java
  11. 2 2
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedancePlanHourlyReportLoadJob.java
  12. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedancePlanLoadJob.java
  13. 3 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedancePlanRealTimeLoadJob.java
  14. 0 2
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceSameDayCreativeLoadJob.java
  15. 0 2
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceVideoInfoLoadJob.java
  16. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouCampaignJob.java
  17. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouDailyAccountReportLoadJob.java
  18. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouDailyCampaignReportLoadJob.java
  19. 3 4
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouDailyCreativeReportLoadJob.java
  20. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouDailyGroupReportLoadJob.java
  21. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouDailyLoadFileJob.java
  22. 4 5
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouDailyReportTaskJob.java
  23. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouGroupJob.java
  24. 0 2
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouHistoryLoadFileJob.java
  25. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouHourlyAccountReportLoadJob.java
  26. 4 5
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouHourlyAccountWarningLoadJob.java
  27. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouHourlyCampaignReportLoadJob.java
  28. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouHourlyCreativeReportLoadJob.java
  29. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouHourlyGroupReportLoadJob.java
  30. 4 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouMaterialsLoadJob.java
  31. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouNowDateCampaignJob.java
  32. 4 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouNowDateCreativeJob.java
  33. 4 4
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouNowDateGroupJob.java
  34. 2 1
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouReportDailyGroupChannelCodeJob.java
  35. 2 3
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouSuZaoLoadJob.java
  36. 0 2
      xxl-job-executor/src/main/java/com/xxl/job/executor/handler/token/RefreshTokenJob.java

+ 9 - 39
jeecg-boot-module-system/src/main/java/org/jeecg/modules/opencv/utils/CornerCheck.java

@@ -27,15 +27,15 @@ public class CornerCheck {
         try {
             System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
 
-            final int maxCorners = 10000;
-            int blockSize = 3;
+            final int maxCorners = 8;
+            int blockSize = 5;
             final double qualityLevel = 0.01;
-            double minDistance = 5.0;
-            double k = 0.01;
+            double minDistance = 10;
+            double k = 0.06;
             final boolean useHarrisDetector = false;
             MatOfPoint corners = new MatOfPoint();
 
-            Mat src = Imgcodecs.imread("D:\\data\\model\\src\\0.jpg");
+            Mat src = Imgcodecs.imread("D:\\data\\model\\src\\1.jpg");
             if (src.empty()) {
                 throw new Exception("no file");
             }
@@ -44,25 +44,8 @@ public class CornerCheck {
             //灰度
             Imgproc.cvtColor(src, gray, Imgproc.COLOR_RGB2GRAY);
             Mat binary = new Mat();
-            Mat getSrc = gray;
-            Rect area = new Rect(324, 402, 218, 376);
+            Rect area = new Rect(324, 402, 218, 370);
             Mat mask = new Mat(gray, area);
-//            mask.setTo(new Scalar(0));
-            for (int i = 0; i < 8; i++) {
-                for (int j = 0; j < 8; j++) {
-                    System.out.print(mask.get(i, j)[0]);
-                }
-                System.out.println();
-            }
-//            System.out.println("+++++++++++++++++++");
-//            mask = mask.setTo(new Scalar(0),getSrc);
-//            for(int i=0;i<8;i++){
-//                for(int j=0;j<8;j++){
-////                    System.out.print(getSrc.get(i,j)[0]);
-//                    System.out.print(mask.get(i,j)[0]);
-//                }
-//                System.out.println();
-//            }
             //二值化mask
             Imgproc.threshold(mask, binary, 1, 255, Imgproc.THRESH_TOZERO);
             Imgcodecs.imwrite("D:\\data\\binary.jpg", binary);
@@ -70,26 +53,12 @@ public class CornerCheck {
                     , blockSize, useHarrisDetector, k);
             Point[] pCorners = corners.toArray();
             List<Point> pointList = new ArrayList<>();
-            double maxX = 0d;
-            double maxY = 0d;
-            double minX = 10000d;
-            double minY = 100000d;
             for (int i = 0; i < pCorners.length; i++) {
                 Point p = new Point(pCorners[i].x + 324, pCorners[i].y + 402);
                 Imgproc.circle(dst, p, 2, new Scalar(0, 0, 0), Imgproc.FILLED);
             }
             Imgcodecs.imwrite("D:\\data\\allConers.jpg", dst);
             List<Point> cornerPoints = new ArrayList<>();
-            for (Point point : pointList) {
-                double getX = point.x;
-                double getY = point.y;
-                if ((getY >= (minY + 20) && getY <= (maxY - 20))) {
-                    Imgproc.circle(dst, point, 4, new Scalar(255, 255, 255), Imgproc.FILLED);
-                } else {
-                    cornerPoints.add(point);
-                    Imgproc.circle(dst, point, 4, new Scalar(0, 0, 0), Imgproc.FILLED);
-                }
-            }
 //            {139.0, 240.0} 左上 {144.0, 837.0} 左下
 //            {482.0, 238.0} 右上 {532.0, 825.0} 右下
             Collections.sort(cornerPoints, new Comparator<Point>() {
@@ -99,8 +68,9 @@ public class CornerCheck {
                 }
             });
             Imgcodecs.imwrite("D:\\data\\coners.jpg", dst);
-//            for (Point p : cornerPoints) {
-//            }
+            for (Point p : cornerPoints) {
+
+            }
 //            result.put("leftTop", cornerPoints.get(0));
 //            result.put("rightBottom", cornerPoints.get(3));
 //            if (cornerPoints.get(2).y > cornerPoints.get(1).y) {

+ 0 - 14
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/SampleXxlJob.java

@@ -5,8 +5,6 @@ import com.xxl.job.core.handler.IJobHandler;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xxl.job.core.log.XxlJobLogger;
 import com.xxl.job.core.util.ShardingUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import java.io.BufferedInputStream;
@@ -28,8 +26,6 @@ import java.util.concurrent.TimeUnit;
  */
 @Component
 public class SampleXxlJob {
-    private static Logger logger = LoggerFactory.getLogger(SampleXxlJob.class);
-
     /**
      * 1、简单任务示例(Bean模式)
      */
@@ -195,14 +191,4 @@ public class SampleXxlJob {
         XxlJobLogger.log("XXL-JOB, Hello World.");
         return ReturnT.SUCCESS;
     }
-
-    public void init() {
-        logger.info("init");
-    }
-
-    public void destroy() {
-        logger.info("destory");
-    }
-
-
 }

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/ByteDanceCleanMaterialJob.java

@@ -4,7 +4,7 @@ import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.toutiao.modules.report.service.IByteDanceCleanMaterialReportService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -17,7 +17,6 @@ import java.util.concurrent.Executors;
  *
  * @author 宋英豪
  */
-@Slf4j
 @Component
 public class ByteDanceCleanMaterialJob {
     @Autowired
@@ -28,7 +27,7 @@ public class ByteDanceCleanMaterialJob {
     public ReturnT<String> execute(String param) throws Exception {
         List<String> signatureList = cleanMaterialService.getSignature();
         if (Check.isNull(signatureList)) {
-            log.error("头条素材数据获取为空");
+            XxlJobLogger.log("头条素材数据获取为空");
             return ReturnT.FAIL;
         }
         executorService = Executors.newFixedThreadPool(3);

+ 4 - 5
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/ByteDanceHourlyAccountWarningLoadJob.java

@@ -6,7 +6,7 @@ import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.toutiao.modules.report.service.IByteDanceHourlyAccountWarningService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -20,7 +20,6 @@ import java.util.concurrent.Executors;
  *
  * @author yumeng
  */
-@Slf4j
 @Component
 public class ByteDanceHourlyAccountWarningLoadJob {
     @Autowired
@@ -31,18 +30,18 @@ public class ByteDanceHourlyAccountWarningLoadJob {
 
     @XxlJob("byteDanceHourlyAccountWarning")
     public ReturnT<String> execute(String param) throws Exception {
-        log.info("开始时段消耗预警定时任务");
+        XxlJobLogger.log("开始时段消耗预警定时任务");
         long startTime = System.currentTimeMillis();
         List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取头条数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取头条数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
         executorService = Executors.newFixedThreadPool(3);
         String statDate = DateUtils.getDate("yyyy-MM-dd");
         String anotherDay = DateUtils.getAnotherDay("yyyy-MM-dd", statDate, 1);
         tokens.forEach(token -> executorService.submit(() -> byteDanceHourlyAccountWarningService.byteDanceAccountWarning(token.getAccountId(), statDate, anotherDay)));
-        log.info("时段消耗预警定时任务执行完毕,耗时:{} ms", System.currentTimeMillis() - startTime);
+        XxlJobLogger.log("时段消耗预警定时任务执行完毕,耗时:{} ms", System.currentTimeMillis() - startTime);
         return ReturnT.SUCCESS;
     }
 }

+ 0 - 2
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceAdvertiserDailyReportLoadJob.java

@@ -7,7 +7,6 @@ import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xxl.job.core.log.XxlJobLogger;
-import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -23,7 +22,6 @@ import java.util.concurrent.Executors;
  * 头条广告主日报数据获取任务
  * 第二天凌晨跑前一天的数据
  */
-@Slf4j
 @Component
 public class BytedanceAdvertiserDailyReportLoadJob {
     @Autowired

+ 4 - 5
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceAdvertiserHourlyReportLoadJob.java

@@ -6,7 +6,7 @@ import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -21,7 +21,6 @@ import java.util.concurrent.Executors;
  * @author 宋英豪
  * 头条广告主时报获取任务
  */
-@Slf4j
 @Component
 public class BytedanceAdvertiserHourlyReportLoadJob {
     @Autowired
@@ -32,14 +31,14 @@ public class BytedanceAdvertiserHourlyReportLoadJob {
 
     @XxlJob("bytedanceAdvertiserHourlyReport")
     public ReturnT<String> execute(String param) throws Exception {
-        log.info("头条时报数据获取开始");
+        XxlJobLogger.log("头条时报数据获取开始");
         Date getDate = new Date();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH");
         String hour = simpleDateFormat.format(getDate);
         //1:查询当日数据
         List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取头条小时数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取头条小时数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
         executorService = Executors.newFixedThreadPool(4);
@@ -53,7 +52,7 @@ public class BytedanceAdvertiserHourlyReportLoadJob {
                 reportService.getAdvertiserReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_HOURLY);
             });
         });
-        log.info("头条时报数据获取结束");
+        XxlJobLogger.log("头条时报数据获取结束");
         return ReturnT.SUCCESS;
     }
 }

+ 4 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceAdvertisingDataLoadJob.java

@@ -7,8 +7,9 @@ import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataServ
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceCreativeService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -20,7 +21,7 @@ import java.util.concurrent.Executors;
  * 头条广告物料数据获取任务
  * @author 宋英豪
  */
-@Slf4j
+@Component
 public class BytedanceAdvertisingDataLoadJob {
     @Autowired
     private ICtopOauthTokenService tokenService;
@@ -52,7 +53,7 @@ public class BytedanceAdvertisingDataLoadJob {
                 }
             });
         });
-        log.info("物料数据同步完成");
+        XxlJobLogger.log("物料数据同步完成");
         return ReturnT.SUCCESS;
     }
 }

+ 4 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceCreativeDailyReportLoadJob.java

@@ -6,9 +6,10 @@ import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
@@ -20,7 +21,7 @@ import java.util.concurrent.Executors;
  * 头条创意日报数据获取任务
  * 第二天凌晨跑前一天的数据
  */
-@Slf4j
+@Component
 public class BytedanceCreativeDailyReportLoadJob {
     @Autowired
     private ICtopOauthTokenService tokenService;
@@ -35,7 +36,7 @@ public class BytedanceCreativeDailyReportLoadJob {
         //1:查询当日数据
         List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取头条数据异常:为获取到可用的token");
+            XxlJobLogger.log("定时获取头条数据异常:为获取到可用的token");
             return ReturnT.FAIL;
         }
         executorService = Executors.newFixedThreadPool(5);

+ 4 - 5
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceCreativeHourlyReportLoadJob.java

@@ -6,7 +6,7 @@ import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -21,7 +21,6 @@ import java.util.concurrent.Executors;
  * @author syh
  * 头条创意时报获取任务
  */
-@Slf4j
 @Component
 public class BytedanceCreativeHourlyReportLoadJob {
     @Autowired
@@ -32,14 +31,14 @@ public class BytedanceCreativeHourlyReportLoadJob {
 
     @XxlJob("bytedanceCreativeHourlyReport")
     public ReturnT<String> execute(String param) throws Exception {
-        log.info("头条时报数据获取开始");
+        XxlJobLogger.log("头条时报数据获取开始");
         Date getDate = new Date();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH");
         String hour = simpleDateFormat.format(getDate);
         //1:查询当日数据
         List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取头条小时数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取头条小时数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
         executorService = Executors.newFixedThreadPool(4);
@@ -54,7 +53,7 @@ public class BytedanceCreativeHourlyReportLoadJob {
             });
 
         });
-        log.info("头条时报数据获取结束");
+        XxlJobLogger.log("头条时报数据获取结束");
         return ReturnT.SUCCESS;
     }
 }

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedancePlanDailyReportLoadJob.java

@@ -11,7 +11,7 @@ import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -23,7 +23,6 @@ import java.util.List;
 /**
  * 头条计划日报数据任务
  */
-@Slf4j
 @Component
 public class BytedancePlanDailyReportLoadJob {
     @Autowired
@@ -39,7 +38,7 @@ public class BytedancePlanDailyReportLoadJob {
         //1:查询当日数据
         List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取头条数据异常:为获取到可用的token");
+            XxlJobLogger.log("定时获取头条数据异常:为获取到可用的token");
             return ReturnT.FAIL;
         }
         tokens.forEach(token -> reportService.getAdvertiserPlanReport(token, getDate, getDate, CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY));

+ 2 - 2
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedancePlanHourlyReportLoadJob.java

@@ -7,9 +7,9 @@ import cn.com.ctop.toutiao.modules.report.service.IBytedancePlanDailyReportServi
 import cn.com.ctop.toutiao.modules.report.service.IReportService;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xxl.job.core.log.XxlJobLogger;
-import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -22,7 +22,7 @@ import java.util.concurrent.Executors;
  * @author 宋英豪
  * 头条计划时报数据任务
  */
-@Slf4j
+@Component
 public class BytedancePlanHourlyReportLoadJob {
     @Autowired
     private ICtopOauthTokenService tokenService;

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedancePlanLoadJob.java

@@ -6,7 +6,7 @@ import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -14,7 +14,6 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-@Slf4j
 @Component
 public class BytedancePlanLoadJob {
     @Autowired
@@ -29,7 +28,7 @@ public class BytedancePlanLoadJob {
         List<CtopOauthToken> tokens = tokenService.getTokenListByType(CtopAdConstant.PLATFORM_TYPE_BYTEDANCE);
         executorService = Executors.newFixedThreadPool(4);
         tokens.forEach(token -> executorService.submit(() -> advertiserDataService.getAdvertiserPlan(token, "", null, null)));
-        log.info("头条全量计划数据获取完成");
+        XxlJobLogger.log("头条全量计划数据获取完成");
         return ReturnT.SUCCESS;
     }
 }

+ 3 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedancePlanRealTimeLoadJob.java

@@ -6,7 +6,7 @@ import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -18,7 +18,7 @@ import java.util.concurrent.Executors;
 /**
  * 头条当日计划素材获取任务
  */
-@Slf4j
+
 @Component
 public class BytedancePlanRealTimeLoadJob {
     @Autowired
@@ -34,7 +34,7 @@ public class BytedancePlanRealTimeLoadJob {
         executorService = Executors.newFixedThreadPool(4);
         String nowDate = DateUtils.date2Str();
         tokens.forEach(token -> executorService.submit(() -> advertiserDataService.getAdvertiserPlan(token, "", nowDate, nowDate)));
-        log.info("头条全量计划数据获取完成");
+        XxlJobLogger.log("头条全量计划数据获取完成");
         return ReturnT.SUCCESS;
     }
 

+ 0 - 2
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceSameDayCreativeLoadJob.java

@@ -6,7 +6,6 @@ import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -16,7 +15,6 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-@Slf4j
 @Component
 public class BytedanceSameDayCreativeLoadJob {
     @Autowired

+ 0 - 2
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/bytedance/BytedanceVideoInfoLoadJob.java

@@ -6,7 +6,6 @@ import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.toutiao.modules.material.service.IByteDanceAdvertiserDataService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -14,7 +13,6 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-@Slf4j
 @Component
 public class BytedanceVideoInfoLoadJob {
     @Autowired

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouCampaignJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -13,7 +13,6 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-@Slf4j
 @Component
 public class KuaishouCampaignJob {
     @Autowired
@@ -28,7 +27,7 @@ public class KuaishouCampaignJob {
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         executorService = Executors.newFixedThreadPool(5);
         tokens.forEach(token -> executorService.submit(() -> kuaishouInterfaceService.getCampaignList(token, null, null)));
-        log.info("快手物料数据同步完成");
+        XxlJobLogger.log("快手物料数据同步完成");
         return ReturnT.SUCCESS;
     }
 }

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouDailyAccountReportLoadJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -20,7 +20,6 @@ import java.util.concurrent.Executors;
  *
  * @author syh
  */
-@Slf4j
 @Component
 public class KuaishouDailyAccountReportLoadJob {
     @Autowired
@@ -35,7 +34,7 @@ public class KuaishouDailyAccountReportLoadJob {
         //1:查询当日数据
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取快手数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取快手数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
 

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouDailyCampaignReportLoadJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -20,7 +20,6 @@ import java.util.concurrent.Executors;
  *
  * @author syh
  */
-@Slf4j
 @Component
 public class KuaishouDailyCampaignReportLoadJob {
     @Autowired
@@ -35,7 +34,7 @@ public class KuaishouDailyCampaignReportLoadJob {
         //1:查询当日数据
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取快手数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取快手数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
         executorService = Executors.newFixedThreadPool(3);

+ 3 - 4
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouDailyCreativeReportLoadJob.java

@@ -8,7 +8,7 @@ import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.alibaba.fastjson.JSONArray;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -23,7 +23,6 @@ import java.util.concurrent.Executors;
  *
  * @author jeecg-boot
  */
-@Slf4j
 @Component
 public class KuaishouDailyCreativeReportLoadJob {
     @Autowired
@@ -42,11 +41,11 @@ public class KuaishouDailyCreativeReportLoadJob {
         executorService = Executors.newFixedThreadPool(4);
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取快手数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取快手数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
         tokens.forEach(token -> {
-            log.info("获取创意分天报表开始,accountId:{}", token.getAccountId());
+            XxlJobLogger.log("获取创意分天报表开始,accountId:{}", token.getAccountId());
             kuaishouInterfaceService.getCampaignList(token, null, null);
             try {
                 Thread.sleep(5 * 100);

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouDailyGroupReportLoadJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -20,7 +20,6 @@ import java.util.concurrent.Executors;
  *
  * @author syh
  */
-@Slf4j
 @Component
 public class KuaishouDailyGroupReportLoadJob {
     @Autowired
@@ -35,7 +34,7 @@ public class KuaishouDailyGroupReportLoadJob {
         //1:查询当日数据
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取快手数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取快手数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
         executorService = Executors.newFixedThreadPool(3);

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouDailyLoadFileJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDailyReportTaskService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -21,7 +21,6 @@ import static org.jeecg.common.util.DateUtils.getAnotherDay;
  *
  * @author yumeng
  */
-@Slf4j
 @Component
 public class KuaishouDailyLoadFileJob {
     @Autowired
@@ -37,7 +36,7 @@ public class KuaishouDailyLoadFileJob {
         //  查询快手token
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取快手数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取快手数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
         executorService = Executors.newFixedThreadPool(3);

+ 4 - 5
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouDailyReportTaskJob.java

@@ -6,7 +6,7 @@ import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -14,7 +14,6 @@ import org.springframework.stereotype.Component;
 import java.util.Date;
 import java.util.List;
 
-@Slf4j
 @Component
 public class KuaishouDailyReportTaskJob {
     @Autowired
@@ -24,18 +23,18 @@ public class KuaishouDailyReportTaskJob {
 
     @XxlJob("kuaishouDailyReportTask")
     public ReturnT<String> execute(String param) throws Exception {
-        log.info("快手获取日报数据任务执行开始");
+        XxlJobLogger.log("快手获取日报数据任务执行开始");
         Long start = System.currentTimeMillis();
         Date getDate = DateUtils.addDay(new Date(), -1);
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         if (null == tokens || tokens.isEmpty()) {
-            log.info("快手获取日报数据任务执行失败:未获取到可用的token");
+            XxlJobLogger.log("快手获取日报数据任务执行失败:未获取到可用的token");
             return ReturnT.FAIL;
         }
         String getDateStr = DateUtils.formatDate(getDate);
         tokens.forEach(token -> reportTaskService.createTask(token.getAccountId(), token.getAccessToken(), getDateStr, getDateStr, CtopAdConstant.KUAISHOU_LOAD_JOB_TYPE_DAILY));
         Long end = System.currentTimeMillis();
-        log.info("快手获取日报数据任务执行结束,执行耗时:{}秒", (end - start) / 1000);
+        XxlJobLogger.log("快手获取日报数据任务执行结束,执行耗时:{}秒", (end - start) / 1000);
         return ReturnT.SUCCESS;
     }
 }

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouGroupJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -13,7 +13,6 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-@Slf4j
 @Component
 public class KuaishouGroupJob {
     @Autowired
@@ -28,7 +27,7 @@ public class KuaishouGroupJob {
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         executorService = Executors.newFixedThreadPool(3);
         tokens.forEach(token -> executorService.submit(() -> kuaishouInterfaceService.getGroupList(token, null, null)));
-        log.info("快手物料数据同步完成");
+        XxlJobLogger.log("快手物料数据同步完成");
         return ReturnT.SUCCESS;
     }
 }

+ 0 - 2
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouHistoryLoadFileJob.java

@@ -3,7 +3,6 @@ package com.xxl.job.executor.handler.kuaishou;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -12,7 +11,6 @@ import org.springframework.stereotype.Component;
  *
  * @author yumeng
  */
-@Slf4j
 @Component
 public class KuaishouHistoryLoadFileJob {
     @Autowired

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouHourlyAccountReportLoadJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -21,7 +21,6 @@ import java.util.concurrent.Executors;
  *
  * @author syh
  */
-@Slf4j
 @Component
 public class KuaishouHourlyAccountReportLoadJob {
     @Autowired
@@ -41,7 +40,7 @@ public class KuaishouHourlyAccountReportLoadJob {
         //1:查询当日数据
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取快手数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取快手数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
         executorService = Executors.newFixedThreadPool(5);

+ 4 - 5
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouHourlyAccountWarningLoadJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IAccountWarningService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -20,7 +20,6 @@ import static org.jeecg.common.util.DateUtils.getAnotherDay;
  *
  * @author 于蒙
  */
-@Slf4j
 @Component
 public class KuaishouHourlyAccountWarningLoadJob {
     @Autowired
@@ -31,18 +30,18 @@ public class KuaishouHourlyAccountWarningLoadJob {
 
     @XxlJob("kuaishouHourlyAccountWarning")
     public ReturnT<String> execute(String param) throws Exception {
-        log.info("开始时段消耗预警定时任务");
+        XxlJobLogger.log("开始时段消耗预警定时任务");
         long l = System.currentTimeMillis();
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取快手数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取快手数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
         String statDate = DateUtils.getDate("yyyy-MM-dd");
         String anotherDay = getAnotherDay("yyyy-MM-dd", statDate, -1);
         executorService = Executors.newFixedThreadPool(3);
         tokens.forEach(token -> executorService.submit(() -> accountWarningService.kuaiShouAccountWarning(token.getAccountId(), statDate, anotherDay)));
-        log.info("异步时段消耗预警定时任务执行完毕,耗时:{} ms", System.currentTimeMillis() - l);
+        XxlJobLogger.log("异步时段消耗预警定时任务执行完毕,耗时:{} ms", System.currentTimeMillis() - l);
         return ReturnT.SUCCESS;
     }
 }

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouHourlyCampaignReportLoadJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -21,7 +21,6 @@ import java.util.concurrent.Executors;
  *
  * @author syh
  */
-@Slf4j
 @Component
 public class KuaishouHourlyCampaignReportLoadJob {
     @Autowired
@@ -42,7 +41,7 @@ public class KuaishouHourlyCampaignReportLoadJob {
         //1:查询当日数据
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取快手数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取快手数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
         executorService = Executors.newFixedThreadPool(5);

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouHourlyCreativeReportLoadJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -21,7 +21,6 @@ import java.util.concurrent.Executors;
  *
  * @author syh
  */
-@Slf4j
 @Component
 public class KuaishouHourlyCreativeReportLoadJob {
     @Autowired
@@ -42,7 +41,7 @@ public class KuaishouHourlyCreativeReportLoadJob {
         //1:查询当日数据
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取快手数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取快手数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
         executorService = Executors.newFixedThreadPool(3);

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouHourlyGroupReportLoadJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -21,7 +21,6 @@ import java.util.concurrent.Executors;
  *
  * @author syh
  */
-@Slf4j
 @Component
 public class KuaishouHourlyGroupReportLoadJob {
     @Autowired
@@ -41,7 +40,7 @@ public class KuaishouHourlyGroupReportLoadJob {
         //1:查询当日数据
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         if (null == tokens || tokens.size() <= 0) {
-            log.info("定时获取快手数据异常:未获取到可用的token");
+            XxlJobLogger.log("定时获取快手数据异常:未获取到可用的token");
             return ReturnT.FAIL;
         }
         executorService = Executors.newFixedThreadPool(5);

+ 4 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouMaterialsLoadJob.java

@@ -5,16 +5,17 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-@Slf4j
+@Component
 public class KuaishouMaterialsLoadJob {
     @Autowired
     private ICtopOauthTokenService tokenService;
@@ -37,7 +38,7 @@ public class KuaishouMaterialsLoadJob {
             // 获取图片信息数据
             kuaishouInterfaceService.getImageList(token, startDate, endDate);
         }));
-        log.info("快手物料数据同步完成");
+        XxlJobLogger.log("快手物料数据同步完成");
         return ReturnT.SUCCESS;
     }
 }

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouNowDateCampaignJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -16,7 +16,6 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-@Slf4j
 @Component
 public class KuaishouNowDateCampaignJob {
     @Autowired
@@ -36,7 +35,7 @@ public class KuaishouNowDateCampaignJob {
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         executorService = Executors.newFixedThreadPool(5);
         tokens.forEach(token -> executorService.submit(() -> kuaishouInterfaceService.getCampaignList(token, startDate, endDate)));
-        log.info("快手物料数据同步完成");
+        XxlJobLogger.log("快手物料数据同步完成");
         return ReturnT.SUCCESS;
     }
 }

+ 4 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouNowDateCreativeJob.java

@@ -5,9 +5,10 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -15,7 +16,7 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-@Slf4j
+@Component
 public class KuaishouNowDateCreativeJob {
     @Autowired
     private ICtopOauthTokenService tokenService;
@@ -33,7 +34,7 @@ public class KuaishouNowDateCreativeJob {
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         executorService = Executors.newFixedThreadPool(5);
         tokens.forEach(token -> executorService.submit(() -> kuaishouInterfaceService.getCreativeList(token, startDate, endDate)));
-        log.info("快手物料数据同步完成");
+        XxlJobLogger.log("快手物料数据同步完成");
         return ReturnT.SUCCESS;
     }
 

+ 4 - 4
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouNowDateGroupJob.java

@@ -5,17 +5,17 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-
-@Slf4j
+@Component
 public class KuaishouNowDateGroupJob {
     @Autowired
     private ICtopOauthTokenService tokenService;
@@ -34,7 +34,7 @@ public class KuaishouNowDateGroupJob {
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         executorService = Executors.newFixedThreadPool(5);
         tokens.forEach(token -> executorService.submit(() -> kuaishouInterfaceService.getGroupList(token, startDate, endDate)));
-        log.info("快手物料数据同步完成");
+        XxlJobLogger.log("快手物料数据同步完成");
         return ReturnT.SUCCESS;
     }
 

+ 2 - 1
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouReportDailyGroupChannelCodeJob.java

@@ -5,9 +5,10 @@ import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import java.util.Date;
-
+@Component
 public class KuaishouReportDailyGroupChannelCodeJob {
     @Autowired
     private IKuaishouReportDailyGroupService groupService;

+ 2 - 3
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/kuaishou/KuaishouSuZaoLoadJob.java

@@ -5,7 +5,7 @@ import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.extern.slf4j.Slf4j;
+import com.xxl.job.core.log.XxlJobLogger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -13,7 +13,6 @@ import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-@Slf4j
 @Component
 public class KuaishouSuZaoLoadJob {
     @Autowired
@@ -27,7 +26,7 @@ public class KuaishouSuZaoLoadJob {
         List<CtopOauthToken> tokens = tokenService.selectKuaiShouToken();
         executorService = Executors.newFixedThreadPool(8);
         tokens.forEach(token -> executorService.submit(() -> kuaishouInterfaceService.getSuZaoList(token.getAccessToken(), token.getAccountId(), 1)));
-        log.info("快手素造数据同步完成");
+        XxlJobLogger.log("快手素造数据同步完成");
         return ReturnT.SUCCESS;
     }
 }

+ 0 - 2
xxl-job-executor/src/main/java/com/xxl/job/executor/handler/token/RefreshTokenJob.java

@@ -4,7 +4,6 @@ import cn.com.ctop.common.module.service.IRefreshTokenService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import com.xxl.job.core.log.XxlJobLogger;
-import org.quartz.JobExecutionException;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class RefreshTokenJob {
@@ -15,7 +14,6 @@ public class RefreshTokenJob {
      * 刷新token
      *
      * @param param
-     * @throws JobExecutionException
      */
     @XxlJob("refreshToken")
     public ReturnT<String> execute(String param) {