fix: bug修复

liu-roy · Mar 1, 2025 · ea71cf0 · ea71cf0
1 parent 3dd2166
commit ea71cf0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git a/...uck-checkin-service/src/main/java/com/goodluck/checkin/manager/CheckinRetryScheduler.java b/...uck-checkin-service/src/main/java/com/goodluck/checkin/manager/CheckinRetryScheduler.java
@@ -80,6 +80,10 @@ public void stop() {
      */
     public void scheduleTask(Runnable task, long delay, TimeUnit unit) {
         if (isRunning.get()) {
+            if (delayQueue.size() > 20) {
+                log.warn("delay queue is more than 20, reject new task.");
+                return;
+            }
             delayQueue.put(new DelayedTask(task, delay, unit));
         } else {
             throw new IllegalStateException("任务调度器未启动，请调用 start() 方法！");

diff --git a/goodluck-checkin-service/src/main/java/com/goodluck/checkin/site/BuguTvCheckinService.java b/goodluck-checkin-service/src/main/java/com/goodluck/checkin/site/BuguTvCheckinService.java
@@ -27,8 +27,10 @@ public class BuguTvCheckinService extends AbstractCheckinService {
     @Value("${bugutv.password}")
     private String password;
 
-    private static final String LOGIN_URL = "https://www.bugutv.org";
-    private static final String USER_URL = "https://www.bugutv.org/user";
+    @Value("${bugutv.url}")
+    private String LOGIN_URL = "https://www.bugutv.vip";
+
+    private final String USER_URI = "/user";
 
 
     @Scheduled(fixedDelay = 11 * 60 * 60 * 1000+30000)
@@ -70,7 +72,7 @@ protected void login(WebDriver browser) {
 
     @Override
     protected boolean performCheckIn(WebDriver browser) {
-        browser.get(USER_URL);
+        browser.get(LOGIN_URL+USER_URI);
 
         // 检查是否已经签到
         WebElement alreadySignIn = safeWaitForElement(browser, By.xpath("//button[contains(text(), '今日已签到')]"), 10);
@@ -103,12 +105,5 @@ private void waitForAjaxLoad(WebDriver driver) {
     }
 
 
-    @Scheduled(cron = "0 0 6 * * ?") // 每天早上6点执行
-    public void scheduleCheckIn() {
-        if (!doCheckIn()) {
-            log.warn("签到失败，稍后尝试再次签到...");
-        }
-    }
-
 
 }
diff --git a/...uck-checkin-service/src/main/java/com/goodluck/checkin/site/ShaoshurenCheckinService.java b/...uck-checkin-service/src/main/java/com/goodluck/checkin/site/ShaoshurenCheckinService.java
@@ -27,8 +27,12 @@ public class ShaoshurenCheckinService extends AbstractCheckinService {
     @Value("${shaoshuren.password}")
     private String password;
 
-    private static final String LOGIN_URL = "https://xn--gmqz83awjh.net/auth/login";
-    private static final String USER_URL = "https://xn--gmqz83awjh.net/user";
+    @Value("${shaoshuren.url}")
+    private String LOGIN_URL = "https://xn--gmqz83awjh.net/auth/login";
+
+    private String USER_URI = "/user";
+
+
     @Scheduled(fixedDelay = 11 * 60 * 60 * 1000)
     public void loginAndCheckIn() {
         if (!doCheckIn()) {
@@ -55,7 +59,7 @@ protected void login(WebDriver browser) {
         WebElement loginButton = browser.findElement(By.id("login_submit"));
         loginButton.click();
         // 等待登录完成
-        wait.until(ExpectedConditions.urlContains("/user"));
+        wait.until(ExpectedConditions.urlContains(USER_URI));
     }
 
     @Override

diff --git a/goodluck-checkin-service/src/main/resources/application-docker.yml b/goodluck-checkin-service/src/main/resources/application-docker.yml
@@ -61,6 +61,8 @@ swagger:
 bugutv:
   username: xxxx
   password: xxxx
+  url: https://www.bugutv.vip
 shaoshuren:
   username: [email protected]
   password: xxxx
+  url: https://xn--gmqz83awjh.net/auth/login
diff --git a/goodluck-checkin-service/src/main/resources/application.yml b/goodluck-checkin-service/src/main/resources/application.yml
@@ -61,8 +61,9 @@ swagger:
 bugutv:
   username: xxxx
   password: xxxx
+  url: https://www.bugutv.vip
 shaoshuren:
   username: [email protected]
   password: xxxx
-
+  url: https://xn--gmqz83awjh.net/auth/login