feats

README.md

@@ -8,6 +8,10 @@
 ```bash
 # yum install google-chrome-stable 方式二选一
 curl https://intoli.com/install-google-chrome.sh | sh
+
+# 查看 chrome 版本
+# 默认安装位置 /opt/google/chrome
+google-chrome-stable --version
 ```
 
 #### 下载 chrome 驱动

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.shigongli</groupId>
 	<artifactId>shigongli</artifactId>
-	<version>1.0.13</version>
+	<version>1.0.14</version>
 	<name>shigongli</name>
 	<description>ShiGongli Service</description>
 
@@ -137,12 +137,14 @@
 		<!--swagger end-->
 
 		<!-- selenium-java -->
+		<!-- https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java -->
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-java</artifactId>
-			<version>3.4.0</version>
+			<version>3.141.59</version>
 		</dependency>
 
+
 		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
 		<dependency>
 			<groupId>com.google.guava</groupId>

src/main/java/com/shigongli/common/ScreenShotUtil.java

@@ -1,17 +1,22 @@
 package com.shigongli.common;
 
 import com.shigongli.config.ScreenShotConfig;
+import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.openqa.selenium.*;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
+//import org.openqa.selenium.devtools.DevTools;
+//import org.openqa.selenium.devtools.network.Network;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 import org.openqa.selenium.support.ui.WebDriverWait;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
-import java.util.concurrent.TimeUnit;
+//import java.util.Optional;
 
+@Slf4j
 @Component
 public class ScreenShotUtil {
     @Autowired
@@ -20,11 +25,11 @@ public class ScreenShotUtil {
     @Autowired
     ScreenShotConfig config;
 
-    public String shot(String url, String cssSelector) throws Exception {
+    public String shot(String url) throws Exception {
         //驱动地址
         System.setProperty("webdriver.chrome.driver", config.getDriver());
 
-        WebDriver webDriver = null;
+        WebDriver driver = null;
         ChromeOptions options=new ChromeOptions();
         //设置 chrome 的无头模式
         options.addArguments("--headless");
@@ -32,35 +37,59 @@ public class ScreenShotUtil {
         options.addArguments("--no-sandbox");
         options.addArguments("--disable-dev-shm-usage");
         options.addArguments("--start-maximized");
+        options.addArguments("--disable-application-cache");
         options.addArguments("--lang=zh");
         options.addArguments(String.format("--window-size=%s,%s", config.getWidth(), config.getHeight()));
         //启动一个 chrome 实例
-        webDriver = new ChromeDriver(options);
+        driver = new ChromeDriver(options);
 
         //访问网址
-        webDriver.get(url);
+        log.info(String.format("访问网址: %s", url));
+//        webDriver.get(url);
+
+//        DevTools devTools = driver.getDevTools();
+//        devTools.createSession();
+//        devTools.send(Network.enable(Optional.empty(), Optional.empty(), Optional.of(100000000)));
+//        devTools.send(Network.setCacheDisabled(true));
+//        devTools.addListener(Network.responseReceived(), responseReceived -> Assert.assertEquals(false, responseReceived.getResponse().getFromDiskCache()));
+
+        driver.get(url);
+
+//        devTools.send(Network.clearBrowserCache());
 
         // 设置超时等待
-        WebDriverWait webDriverWait = new WebDriverWait(webDriver, config.getWait() / 1000);
-        String finalCssSelector = null == cssSelector ? "body" : cssSelector;
-        webDriverWait.until(new ExpectedCondition<WebElement>() {
-            @Override
-            public WebElement apply(WebDriver driver) {
-                // 通过定位页面元素来确定页面确实正常加载了
-                return driver.findElement(By.cssSelector(finalCssSelector));
-            }
-        });
+        try {
+            WebDriverWait webDriverWait = new WebDriverWait(driver, config.getWait() / 1000, 200);
+            webDriverWait.until(new ExpectedCondition<WebElement>() {
+                public @Nullable WebElement apply(@Nullable WebDriver driver) {
+                    WebElement el = null;
+                    try {
+                        WebDriver wf = driver.switchTo().frame(0);
+                        log.info("Got Web Iframe {}", wf);
+                        el = wf.findElement(By.cssSelector("body"));
+                        log.info("Got Web Element {}", el);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    return el;
+                }
+            });
+        } catch (Exception e) {
+            driver.quit();
+            throw e;
+        }
 
 //        webDriver.manage().timeouts().implicitlyWait(config.getWait(), TimeUnit.MILLISECONDS);
 
         //截取全屏
-        File f  = ((TakesScreenshot)webDriver).getScreenshotAs(OutputType.FILE);
+        File f  = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE);
 
         // 存入 oss
         String imageUrl = ossUtils.putObject(f);
+        log.info("Got image {}", imageUrl);
 
         //退出
-        webDriver.quit();
+        driver.quit();
 
         return imageUrl;
     }

src/main/java/com/shigongli/controller/TaHouseController.java

@@ -234,11 +234,11 @@ public class TaHouseController extends BaseController {
         }
 
         String shot = null;
-//        try {
-//            shot = screenShotUtil.shot(String.format(weatherURL, city), "#weather-v2-plugin-standard");
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
+        try {
+            shot = screenShotUtil.shot(String.format(weatherURL, city));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
         Map<String, Object> res = new HashMap<>();
         res.put("image", shot);

src/main/resources/application.yml

@@ -64,8 +64,10 @@ screen-shot:
   driver: /yunpan/shigongli/service/lib/chromedriver
   # milliseconds
   wait: 5000
-  width: '520'
-  height: '416'
+  #width: '520'
+  #height: '416'
+  width: '475'
+  height: '380'
 
 # weather-shot
 weather-shot: