Merge remote-tracking branch 'origin/master' into master

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

@@ -1,11 +1,11 @@
 package com.shigongli.common;
 
 import com.shigongli.config.ScreenShotConfig;
-import org.openqa.selenium.OutputType;
-import org.openqa.selenium.TakesScreenshot;
-import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.*;
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
+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;
 
@@ -20,7 +20,7 @@ public class ScreenShotUtil {
     @Autowired
     ScreenShotConfig config;
 
-    public String shot(String url) throws Exception {
+    public String shot(String url, String cssSelector) throws Exception {
         //驱动地址
         System.setProperty("webdriver.chrome.driver", config.getDriver());
 
@@ -39,8 +39,19 @@ public class ScreenShotUtil {
 
         //访问网址
         webDriver.get(url);
-//        Thread.sleep(config.getWait());
-        webDriver.manage().timeouts().implicitlyWait(config.getWait(), TimeUnit.MILLISECONDS);
+
+        // 设置超时等待
+        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));
+            }
+        });
+
+//        webDriver.manage().timeouts().implicitlyWait(config.getWait(), TimeUnit.MILLISECONDS);
 
         //截取全屏
         File f  = ((TakesScreenshot)webDriver).getScreenshotAs(OutputType.FILE);

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

@@ -211,7 +211,7 @@ public class TaHouseController extends BaseController {
 
         String shot = null;
         try {
-            shot = screenShotUtil.shot(String.format(weatherURL, city));
+            shot = screenShotUtil.shot(String.format(weatherURL, city), "#weather-v2-plugin-standard");
         } catch (Exception e) {
             e.printStackTrace();
         }