diff --git a/src/main/java/com/fantaibao/DesktopApplication.java b/src/main/java/com/fantaibao/DesktopApplication.java index 7ae8320..d4f222d 100644 --- a/src/main/java/com/fantaibao/DesktopApplication.java +++ b/src/main/java/com/fantaibao/DesktopApplication.java @@ -1,6 +1,7 @@ package com.fantaibao; import com.fantaibao.config.GlobalConfig; +import com.fantaibao.page.InitialiNetWork; import com.fantaibao.page.LoginView; import javafx.application.Application; import javafx.application.Platform; @@ -26,6 +27,8 @@ public class DesktopApplication extends Application { @Override public void init() throws Exception { super.init(); + // 初始化图标 + InitialiNetWork.initializeTheNetworkIcon(); } @Override diff --git a/src/main/java/com/fantaibao/config/GlobalConfig.java b/src/main/java/com/fantaibao/config/GlobalConfig.java index 511a8e6..715fcb0 100644 --- a/src/main/java/com/fantaibao/config/GlobalConfig.java +++ b/src/main/java/com/fantaibao/config/GlobalConfig.java @@ -2,10 +2,6 @@ package com.fantaibao.config; import javafx.scene.image.Image; import javafx.stage.Stage; -import org.springframework.util.ResourceUtils; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; public class GlobalConfig { /** @@ -23,6 +19,10 @@ public class GlobalConfig { * 更新cookie地址 */ public static final String updateCookieInterfaceAddress = BASE_NET_URL+"/crawler/appraisal/update-user-cookie"; + /** + * 网络图标接口地址 + */ + public static final String networkIconInterfaceAddress = BASE_NET_URL+"/user/network-ico"; /** * 租户Id标识 @@ -54,24 +54,12 @@ public class GlobalConfig { */ public static String dyLoginPage; + public static Image icon16 = null; + public static Image icon32 = null; + public static Image dyLogo = null; + public static Image mtLogo = null; - public static final Image icon16; - public static final Image icon32; - public static final Image dyLogo; - public static final Image mtLogo; - - static { - try { - icon16 = new Image(new FileInputStream(ResourceUtils.getFile("classpath:icon16.png"))); - icon32 = new Image(new FileInputStream(ResourceUtils.getFile("classpath:icon32.png"))); - dyLogo = new Image(new FileInputStream(ResourceUtils.getFile("classpath:dylogo.png"))); - mtLogo = new Image(new FileInputStream(ResourceUtils.getFile("classpath:mtlogo.png"))); - } catch (FileNotFoundException e) { - throw new RuntimeException(e); - } - } - public static void addIcon(Stage stage) { stage.getIcons().add(GlobalConfig.icon16); stage.getIcons().add(GlobalConfig.icon32); diff --git a/src/main/java/com/fantaibao/model/NetWorkIconVO.java b/src/main/java/com/fantaibao/model/NetWorkIconVO.java new file mode 100644 index 0000000..065af76 --- /dev/null +++ b/src/main/java/com/fantaibao/model/NetWorkIconVO.java @@ -0,0 +1,13 @@ +package com.fantaibao.model; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +public class NetWorkIconVO { + private String icon16; + private String icon32; + private String dyLogo; + private String mtLogo; +} diff --git a/src/main/java/com/fantaibao/page/InitialiNetWork.java b/src/main/java/com/fantaibao/page/InitialiNetWork.java new file mode 100644 index 0000000..b4c937d --- /dev/null +++ b/src/main/java/com/fantaibao/page/InitialiNetWork.java @@ -0,0 +1,30 @@ +package com.fantaibao.page; + +import cn.hutool.http.HttpUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.fantaibao.config.GlobalConfig; +import com.fantaibao.model.NetWorkIconVO; +import javafx.scene.image.Image; +import lombok.experimental.UtilityClass; + +@UtilityClass +public class InitialiNetWork { + + /** + * 初始化网络图标 + */ + public void initializeTheNetworkIcon() { + String result = HttpUtil.get(GlobalConfig.networkIconInterfaceAddress); + JSONObject parsed = JSON.parseObject(result); + if (parsed.getInteger("code") != 200) { + return; + } + NetWorkIconVO netWorkIconVO = parsed.getObject("data", NetWorkIconVO.class); + GlobalConfig.icon16 = new Image(netWorkIconVO.getIcon16()); + GlobalConfig.icon32 = new Image(netWorkIconVO.getIcon32()); + GlobalConfig.dyLogo = new Image(netWorkIconVO.getDyLogo()); + GlobalConfig.mtLogo = new Image(netWorkIconVO.getMtLogo()); + } + +} diff --git a/src/main/java/com/fantaibao/service/FtbCrawlNetDy.java b/src/main/java/com/fantaibao/service/FtbCrawlNetDy.java index b462e73..522aaa7 100644 --- a/src/main/java/com/fantaibao/service/FtbCrawlNetDy.java +++ b/src/main/java/com/fantaibao/service/FtbCrawlNetDy.java @@ -40,8 +40,7 @@ public class FtbCrawlNetDy extends AbstractFtbCrawlNetBase implements FtbCrawlNe new Page.NavigateOptions().setTimeout(6000000)); while (!dyCookie.get()) { try { - Thread.sleep(5000); - dyCookie.set(true); + Thread.sleep(1000); } catch (InterruptedException e) { log.warn("等待过程中被中断", e); Thread.currentThread().interrupt(); diff --git a/src/main/java/com/fantaibao/service/FtbCrawlNetMt.java b/src/main/java/com/fantaibao/service/FtbCrawlNetMt.java index 2c93c23..de0c706 100644 --- a/src/main/java/com/fantaibao/service/FtbCrawlNetMt.java +++ b/src/main/java/com/fantaibao/service/FtbCrawlNetMt.java @@ -41,9 +41,7 @@ public class FtbCrawlNetMt extends AbstractFtbCrawlNetBase implements FtbCrawlNe // 等待用户登录并获取所需cookie while (!(mtCookie.get() && dzCookie.get())) { try { - Thread.sleep(5000); - mtCookie.set(true); - dzCookie.set(true); + Thread.sleep(1000); } catch (InterruptedException e) { log.warn("等待过程中被中断", e); Thread.currentThread().interrupt();