From ebe9abd88020e3671742129cb127d2e5e1064d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?=
 =?UTF-8?q?=EF=BC=89?= <leo@qi-cloud.com>
Date: Tue, 3 Jun 2025 11:33:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=95=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/van/business/util/JDScheduleJob.java   | 55 ++++++++++---------
 src/main/resources/log4j.properties           | 10 ----
 src/main/resources/logback-spring.xml         | 24 ++++++++
 3 files changed, 52 insertions(+), 37 deletions(-)
 delete mode 100644 src/main/resources/log4j.properties
 create mode 100644 src/main/resources/logback-spring.xml

diff --git a/src/main/java/cn/van/business/util/JDScheduleJob.java b/src/main/java/cn/van/business/util/JDScheduleJob.java
index fa3865c..bea7445 100644
--- a/src/main/java/cn/van/business/util/JDScheduleJob.java
+++ b/src/main/java/cn/van/business/util/JDScheduleJob.java
@@ -450,41 +450,42 @@ public class JDScheduleJob {
         return client.execute(request);
     }
 
-@Scheduled(cron = "0 0 8-20 * * ?") // 每天从 8:00 到 20:00，每小时执行一次
-public void fetchPL() {
-    // 设置每天最多执行 3 次
-    String cacheKey = "fetchPL:executedHours";
-    Set<String> executedHours = getExecutedHoursFromRedis(); // 从 Redis 获取已执行的小时数
+    @Scheduled(cron = "0 0 8-20 * * ?") // 每天从 8:00 到 20:00，每小时执行一次
+    public void fetchPL() {
+        logger.info("开始执行fetchPL任务");
+        // 设置每天最多执行 3 次
+        Set<String> executedHours = getExecutedHoursFromRedis(); // 从 Redis 获取已执行的小时数
 
-    LocalDateTime now = LocalDateTime.now();
-    String currentHour = String.valueOf(now.getHour());
+        LocalDateTime now = LocalDateTime.now();
+        String currentHour = String.valueOf(now.getHour());
 
-    // 如果今天已经执行了3次，则跳过
-    if (executedHours.size() >= 3) {
-        return;
+        // 如果今天已经执行了3次，则跳过
+        if (executedHours.size() >= 3) {
+            logger.info("今天已经执行了3次，跳过本次任务");
+            return;
+        }
+
+        // 随机决定是否执行本次任务（例如 50% 概率）
+        if (new Random().nextBoolean()) {
+            logger.info("执行fetchPL任务");
+            // 执行任务逻辑
+            executeFetchPL();
+            // 记录该小时已执行
+            executedHours.add(currentHour);
+            saveExecutedHoursToRedis(executedHours); // 存入 Redis
+        }
     }
 
-    // 随机决定是否执行本次任务（例如 50% 概率）
-    if (new Random().nextBoolean()) {
-        // 执行任务逻辑
-        executeFetchPL();
-        // 记录该小时已执行
-        executedHours.add(currentHour);
-        saveExecutedHoursToRedis(executedHours); // 存入 Redis
-    }
-}
-
 
     private void executeFetchPL() {
         HashMap<String, String> productTypeMap = jdUtil.getProductTypeMap();
-        int allCommentCount = 0;
-        int usedCommentCount = 0;
-        int canUseComentCount = 0;
-        int addCommentCount = 0;
+        int usedCommentCount;
+        int canUseComentCount;
+        int addCommentCount;
         for (Map.Entry<String, String> entry : productTypeMap.entrySet()) {
 
             // 随机睡眠1-5分钟
-            int sleepTime = new Random().nextInt(300) + 60;
+            int sleepTime = new Random().nextInt(3000) + 60;
             try {
                 Thread.sleep(sleepTime * 1000);
             } catch (InterruptedException e) {
@@ -497,8 +498,8 @@ public void fetchPL() {
 
             canUseComentCount = availableComments.size();
             usedCommentCount = usedComments.size();
-            if (canUseComentCount > 5){
-                 logger.info("商品{} 评论可用数量大于5：{}", product_id, canUseComentCount);
+            if (canUseComentCount > 5) {
+                logger.info("商品{} 评论可用数量大于5：{}", product_id, canUseComentCount);
                 return;
             }
 
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
deleted file mode 100644
index 402e7ad..0000000
--- a/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# ????????????
-log4j.rootLogger=DEBUG, file
-
-# ?????? Appender
-log4j.appender.file=org.apache.log4j.RollingFileAppender
-log4j.appender.file.File=logs/app.log
-log4j.appender.file.MaxFileSize=10MB
-log4j.appender.file.MaxBackupIndex=30
-log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%t] %-5p %c - %m%n
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..de0bf68
--- /dev/null
+++ b/src/main/resources/logback-spring.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT"/>
+    </root>
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>logs/app.log</file>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="DEBUG">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="FILE"/>
+    </root>
+
+</configuration>