JavaWeb/QQBot
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整WebClient代码

Browse Source
This commit is contained in:
Yutousama 2022-05-05 09:31:30 +08:00
parent 84c583ad38
commit af9be86762
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yutou/qqbot/QQBotApplication.java
View File

@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication @SpringBootApplication
public class QQBotApplication { public class QQBotApplication {
public static final String version="QQBot v.1.2.25"; public static final String version="QQBot v.1.2.26";
public static void main(String[] args) { public static void main(String[] args) {
System.out.println("version = " + version); System.out.println("version = " + version);
SpringApplication.run(QQBotApplication.class, args); SpringApplication.run(QQBotApplication.class, args);

32
src/main/java/com/yutou/qqbot/utlis/WebClient.java
View File

@ -13,14 +13,9 @@ import java.util.Date;
import java.util.List; import java.util.List;
public class WebClient { public class WebClient {
private static WebClient client;
public static WebClient getInstance() { public static WebClient getInstance() {
if (client == null) { return new WebClient();
client = new WebClient();
}
return client;
} }
public WebDriver getWebDriver() { public WebDriver getWebDriver() {
@ -30,7 +25,7 @@ public class WebClient {
private WebClient() { private WebClient() {
System.setProperty("webdriver.chrome.driver", System.setProperty("webdriver.chrome.driver",
ConfigTools.load(ConfigTools.CONFIG, "chrome", String.class)); ConfigTools.load(ConfigTools.CONFIG, "chrome", String.class));
// System.setProperty("webdriver.chrome.whitelistedIps", ""); // System.setProperty("webdriver.chrome.whitelistedIps", "");
// java.util.logging.Logger.getLogger("org.openqa.selenium").setLevel(Level.OFF); // java.util.logging.Logger.getLogger("org.openqa.selenium").setLevel(Level.OFF);
} }
@ -59,24 +54,27 @@ public class WebClient {
} }
return list; return list;
} }
static boolean headless=false;
public static void setHeadless(boolean headless){ static boolean headless = false;
WebClient.headless=headless;
public void setHeadless(boolean headless) {
WebClient.headless = headless;
} }
public static ChromeOptions getOptions() {
public ChromeOptions getOptions() {
ChromeOptions options = new ChromeOptions(); ChromeOptions options = new ChromeOptions();
// options.addArguments("--disable-gpu"); // options.addArguments("--disable-gpu");
// options.addArguments("blink-settings=imagesEnabled=false"); // options.addArguments("blink-settings=imagesEnabled=false");
String headless = RedisTools.get("chromedrive_headless"); String headless = RedisTools.get("chromedrive_headless");
String proxy=RedisTools.get("chromedrive_proxy"); String proxy = RedisTools.get("chromedrive_proxy");
if("true".equals(proxy)) { if ("true".equals(proxy)) {
options.addArguments("--proxy-server=http://127.0.0.1:7890"); options.addArguments("--proxy-server=http://127.0.0.1:7890");
} }
if("true".equals(headless)||WebClient.headless) { if ("true".equals(headless) || WebClient.headless) {
options.addArguments("--headless"); options.addArguments("--headless");
} }
options.addArguments("--no-sandbox"); options.addArguments("--no-sandbox");
// options.addArguments("--incognito"); // options.addArguments("--incognito");
options.addArguments("--disable-plugins"); options.addArguments("--disable-plugins");
options.addArguments("--lang=zh-CN"); options.addArguments("--lang=zh-CN");