feat(electron):优化跟卖精灵启动流程和UI细节
- 移除启动时的固定延时,改为即时反馈启动状态- 更新跟卖精灵描述文案,移除初始化时间说明 - 统一spinner样式类名,优化加载动画显示逻辑 - 调整菜单激活背景色,增强视觉层次感- 引入平台图标图片替代文字标识- 修改VIP状态栏背景及文字颜色,提升可读性 - 配置ChromeDriver国内镜像源并实现后台预加载 - 添加WebDriverManager依赖以自动管理浏览器驱动 -优化electron-builder资源打包配置
This commit is contained in:
@@ -1,9 +0,0 @@
|
||||
package com.tashow.erp.config;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.scheduling.annotation.EnableAsync;
|
||||
|
||||
@Configuration
|
||||
@EnableAsync
|
||||
public class AsyncConfig {
|
||||
}
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
package com.tashow.erp.config;
|
||||
|
||||
import io.github.bonigarcia.wdm.WebDriverManager;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.openqa.selenium.chrome.ChromeDriver;
|
||||
import org.openqa.selenium.chrome.ChromeOptions;
|
||||
import org.springframework.boot.ApplicationArguments;
|
||||
import org.springframework.boot.ApplicationRunner;
|
||||
import org.springframework.core.annotation.Order;
|
||||
import org.springframework.stereotype.Component;
|
||||
import java.net.URL;
|
||||
|
||||
/**
|
||||
* ChromeDriver预加载器
|
||||
* 在应用启动时后台下载ChromeDriver,避免用户首次使用时等待
|
||||
* 使用国内镜像源加速下载
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
@Order(2) // 在DatabaseConfig之后运行
|
||||
public class ChromeDriverPreloader implements ApplicationRunner {
|
||||
|
||||
@Override
|
||||
public void run(ApplicationArguments args) {
|
||||
// 使用后台线程执行,不阻塞应用启动
|
||||
Thread preloadThread = new Thread(() -> {
|
||||
try {
|
||||
log.info("开始预加载ChromeDriver驱动(使用国内镜像加速)...");
|
||||
|
||||
// 配置WebDriverManager使用国内镜像源
|
||||
WebDriverManager.chromedriver()
|
||||
.driverRepositoryUrl(new URL("https://registry.npmmirror.com/-/binary/chromedriver/"))
|
||||
.setup();
|
||||
|
||||
log.info("ChromeDriver驱动下载完成,开始验证...");
|
||||
|
||||
// 快速验证驱动可用性
|
||||
ChromeOptions options = new ChromeOptions();
|
||||
options.addArguments("--headless"); // 无头模式,不显示浏览器
|
||||
options.addArguments("--disable-gpu");
|
||||
options.addArguments("--no-sandbox");
|
||||
|
||||
ChromeDriver driver = new ChromeDriver(options);
|
||||
driver.quit(); // 立即关闭
|
||||
|
||||
log.info("ChromeDriver驱动预加载成功");
|
||||
|
||||
} catch (Exception e) {
|
||||
// 预加载失败不影响应用启动,第一次使用时会自动下载
|
||||
log.warn("ChromeDriver驱动预加载失败(不影响使用): {}", e.getMessage());
|
||||
}
|
||||
}, "ChromeDriver-Preloader");
|
||||
|
||||
preloadThread.setDaemon(true); // 设置为守护线程
|
||||
preloadThread.start();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -84,9 +84,14 @@ public class SystemController {
|
||||
|
||||
@PostMapping("/genmai/open")
|
||||
public JsonData openGenmaiWebsite(@RequestParam(required = false) Long accountId, HttpServletRequest request) {
|
||||
String username = com.tashow.erp.utils.JwtUtil.getUsernameFromRequest(request);
|
||||
genmaiService.openGenmaiWebsite(accountId, username);
|
||||
return JsonData.buildSuccess("跟卖精灵正在启动");
|
||||
try {
|
||||
String username = com.tashow.erp.utils.JwtUtil.getUsernameFromRequest(request);
|
||||
genmaiService.openGenmaiWebsite(accountId, username);
|
||||
return JsonData.buildSuccess("跟卖精灵已打开");
|
||||
} catch (Exception e) {
|
||||
logger.error("打开跟卖精灵失败", e);
|
||||
return JsonData.buildError(e.getMessage() != null ? e.getMessage() : "打开跟卖精灵失败");
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/proxy/image")
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
package com.tashow.erp.service.impl;
|
||||
import jakarta.annotation.PostConstruct;
|
||||
import org.openqa.selenium.chrome.ChromeDriver;
|
||||
import org.openqa.selenium.chrome.ChromeOptions;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
public class ChromeDriverPreloader {
|
||||
@PostConstruct
|
||||
public void preloadDriver() {
|
||||
new Thread(() -> {
|
||||
try {
|
||||
ChromeOptions options = new ChromeOptions();
|
||||
options.addArguments("--headless", "--disable-gpu");
|
||||
ChromeDriver driver = new ChromeDriver(options);
|
||||
driver.quit();
|
||||
} catch (Exception ignored) {}
|
||||
}).start();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,14 +2,15 @@ package com.tashow.erp.service.impl;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.qiniu.util.UrlUtils;
|
||||
import io.github.bonigarcia.wdm.WebDriverManager;
|
||||
import org.openqa.selenium.JavascriptExecutor;
|
||||
import org.openqa.selenium.chrome.ChromeDriver;
|
||||
import org.openqa.selenium.chrome.ChromeOptions;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.*;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
import java.net.URL;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -20,27 +21,29 @@ public class GenmaiServiceImpl {
|
||||
private final RestTemplate restTemplate = new RestTemplate();
|
||||
private final ObjectMapper objectMapper = new ObjectMapper();
|
||||
|
||||
@Async
|
||||
public void openGenmaiWebsite(Long accountId, String username) {
|
||||
try {
|
||||
String token = getAndValidateToken(accountId, username);
|
||||
Runtime.getRuntime().exec("taskkill /f /im chrome.exe");
|
||||
Thread.sleep(1000);
|
||||
|
||||
ChromeOptions options = new ChromeOptions();
|
||||
String systemUser = System.getProperty("user.name");
|
||||
char firstChar = systemUser.charAt(0);
|
||||
char flipped = Character.isUpperCase(firstChar) ? Character.toLowerCase(firstChar) : Character.toUpperCase(firstChar);
|
||||
String chromeUserData = System.getProperty("user.home")
|
||||
.replace(systemUser, UrlUtils.urlEncode(flipped + systemUser.substring(1)))
|
||||
+ "\\AppData\\Local\\Google\\Chrome\\User Data";
|
||||
options.addArguments("user-data-dir=" + chromeUserData.toLowerCase(), "profile-directory=Default");
|
||||
|
||||
ChromeDriver driver = new ChromeDriver(options);
|
||||
driver.get("https://www.genmaijl.com/#/profile");
|
||||
((JavascriptExecutor) driver).executeScript("localStorage.setItem('token','" + token + "')");
|
||||
driver.navigate().refresh();
|
||||
} catch (Exception ignored) {}
|
||||
public void openGenmaiWebsite(Long accountId, String username) throws Exception {
|
||||
WebDriverManager.chromedriver()
|
||||
.driverRepositoryUrl(new URL("https://registry.npmmirror.com/-/binary/chromedriver/"))
|
||||
.setup();
|
||||
|
||||
String token = getAndValidateToken(accountId, username);
|
||||
Runtime.getRuntime().exec("taskkill /f /im chrome.exe");
|
||||
Thread.sleep(1000);
|
||||
|
||||
|
||||
ChromeOptions options = new ChromeOptions();
|
||||
String systemUser = System.getProperty("user.name");
|
||||
char firstChar = systemUser.charAt(0);
|
||||
char flipped = Character.isUpperCase(firstChar) ? Character.toLowerCase(firstChar) : Character.toUpperCase(firstChar);
|
||||
String chromeUserData = System.getProperty("user.home")
|
||||
.replace(systemUser, UrlUtils.urlEncode(flipped + systemUser.substring(1)))
|
||||
+ "\\AppData\\Local\\Google\\Chrome\\User Data";
|
||||
options.addArguments("user-data-dir=" + chromeUserData.toLowerCase(), "profile-directory=Default");
|
||||
|
||||
ChromeDriver driver = new ChromeDriver(options);
|
||||
driver.get("https://www.genmaijl.com/#/profile");
|
||||
((JavascriptExecutor) driver).executeScript("localStorage.setItem('token','" + token + "')");
|
||||
driver.navigate().refresh();
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
|
||||
Reference in New Issue
Block a user