diff --git a/pom.xml b/pom.xml index 1486244..3602964 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ UTF-8 3.4.0 3.8.1 - 1.40.0 + 1.55.0 17.0.2 0.0.8 diff --git a/src/main/java/com/fantaibao/service/FtbCrawlNetDy.java b/src/main/java/com/fantaibao/service/FtbCrawlNetDy.java index 3929dfc..7f1c481 100644 --- a/src/main/java/com/fantaibao/service/FtbCrawlNetDy.java +++ b/src/main/java/com/fantaibao/service/FtbCrawlNetDy.java @@ -37,21 +37,17 @@ public class FtbCrawlNetDy extends AbstractFtbCrawlNetBase implements FtbCrawlNe // 监听浏览器关闭事件释放资源 browser.onDisconnected((brow) -> { if (page != null && !page.isClosed()) { + log.info("抖音浏览器关闭事件"); page.close(); } }); // 导航到登录页面 page.navigate(GlobalConfig.dyLoginPage, new Page.NavigateOptions().setTimeout(6000000)); - while (!dyCookie.get()) { - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - log.warn("等待过程中被中断", e); - Thread.currentThread().interrupt(); - break; - } - } + // 设置30分钟登录超时时间 + Page.WaitForConditionOptions waitForConditionOptions = new Page.WaitForConditionOptions(); + waitForConditionOptions.setTimeout(30*60*1000); + page.waitForCondition(dyCookie::get,waitForConditionOptions); // 关闭页面 super.showSuccessAlertAndClose(page,"抖音"); } diff --git a/src/main/java/com/fantaibao/service/FtbCrawlNetMt.java b/src/main/java/com/fantaibao/service/FtbCrawlNetMt.java index 66dafa7..536a866 100644 --- a/src/main/java/com/fantaibao/service/FtbCrawlNetMt.java +++ b/src/main/java/com/fantaibao/service/FtbCrawlNetMt.java @@ -10,7 +10,6 @@ import org.springframework.stereotype.Component; import java.util.concurrent.atomic.AtomicBoolean; - @Component(value = "ftbCrawlNetMt") @Slf4j public class FtbCrawlNetMt extends AbstractFtbCrawlNetBase implements FtbCrawlNetBase { @@ -36,6 +35,7 @@ public class FtbCrawlNetMt extends AbstractFtbCrawlNetBase implements FtbCrawlNe // 监听浏览器关闭事件释放资源 browser.onDisconnected((brow) -> { if (page != null && !page.isClosed()) { + log.info("美团浏览器关闭事件"); page.close(); } }); @@ -43,22 +43,14 @@ public class FtbCrawlNetMt extends AbstractFtbCrawlNetBase implements FtbCrawlNe // 导航到登录页面 page.navigate(GlobalConfig.mtLoginPage, new Page.NavigateOptions().setTimeout(60000.0)); - - // 等待用户登录并获取所需cookie - while (!(mtCookie.get() && dzCookie.get())) { - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - log.warn("等待过程中被中断", e); - Thread.currentThread().interrupt(); - break; - } - } - log.info("已成功获取美团所有必需的cookie,关闭页面"); + // 设置30分钟登录超时时间 + Page.WaitForConditionOptions waitForConditionOptions = new Page.WaitForConditionOptions(); + waitForConditionOptions.setTimeout(30*60*1000); + page.waitForCondition(() -> mtCookie.get() && dzCookie.get(),waitForConditionOptions); // 关闭页面 super.showSuccessAlertAndClose(page,"美团"); } catch (Exception e) { - log.error("执行cookie拦截时发生错误", e); + log.error("执行打开浏览器时发生错误", e); } }