Merge branch 'master' of git.yfzx.zjtys.com.cn:hct/auto-test

src/main/java/com/zjty/autotest/AutotestApplication.java

 package com.zjty.autotest;
 
-import com.zjty.autotest.mq.PushBlockQueue;
 import com.zjty.autotest.util.IdWorker;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-import javax.annotation.PostConstruct;
-
 @SpringBootApplication
 @EnableScheduling
 public class AutotestApplication {

src/main/java/com/zjty/autotest/service/impl/SeleniumExecutor.java

@@ -201,6 +201,7 @@ public class SeleniumExecutor {
                 urlQueue.add(driver.getCurrentUrl());
                 //去重防止重复添加
                 urlQueue = queueDuplicateRemoval(urlQueue);
+                driver.get(currentUrl);
             }
             return true;
         } else {

src/main/resources/application.properties

@@ -18,8 +18,8 @@ spring.servlet.multipart.max-request-size=500MB
 
 
 # Selenium\u00FF\uFFFD\u03B5\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0135\u0234\uFFFD\u02B1\uFFFD\u48E8\uFFFD\uFFFD\uFFFD\uB8E9\uFFFD\uFFFD0\u03AA\uFFFD\uFFFD\uFFFD\u0234\uFFFD\uFFFD\uFFFD
-selenium.executor.wait-after-click=0
-# \uFFFD\u1E69\uFFFD\uFFFD\u037CURL\uFFFD\u0135\uFFFD\u05B7\u01F0\u05FA\uFFFD\uFFFDip\uFFFD\uFFFD
+selenium.executor.wait-after-click=1000
+# Selenium\uFFFD\u1E69\uFFFD\uFFFD\u037CURL\uFFFD\u0135\uFFFD\u05B7\u01F0\u05FA\uFFFD\uFFFDip\uFFFD\uFFFD
 selenium.executor.screenshot.url-host=localhost
-# \uFFFD\u1E69\uFFFD\uFFFD\u037CURL\uFFFD\u0135\uFFFD\u05B7\u01F0\u05FA\uFFFD\uFFFDip\uFFFD\uFFFD
+# Selenium\uFFFD\u1E69\uFFFD\uFFFD\u037CURL\uFFFD\u0135\uFFFD\u05B7\u01F0\u05FA\uFFFD\uFFFDip\uFFFD\uFFFD
 selenium.executor.screenshot.url-port=13500
\ No newline at end of file

src/test/java/com/zjty/autotest/AutotestApplicationTests.java

@@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.zjty.autotest.pojo.report.Measure;
 import com.zjty.autotest.pojo.report.Report;
+import com.zjty.autotest.pojo.test.Input;
 import com.zjty.autotest.pojo.test.Project;
 import com.zjty.autotest.service.impl.SeleniumExecutor;
 import com.zjty.autotest.util.WebDriverUtil;
@@ -30,16 +31,17 @@ class AutotestApplicationTests {
 
     @Test
     public void execute() {
-        Map<String, String> inputs = Maps.newHashMap();
-        inputs.put("name", "root");
-        inputs.put("password", "root");
-        String url = "https://www.cnblogs.com/invoker-/";
+        List<Input> inputs = Lists.newArrayList();
+        inputs.add(new Input(null,null,null,"caozuoyuan"));
+        inputs.add(new Input(null,null,null,"caozuoyuan123"));
+
+        String url = "http://192.168.1.244:8080/person/#/login";
         Project project = new Project(
                 null,
                 null,
                 "firefox",
                 url,
-                Lists.newArrayList()
+                inputs
         );
         Report report = seleniumExecutor.execute(project);
         for (Measure measure : report.getMeasures()) {