From a8f68b31f04e0165a0817b12a55db0e1ac2057f0 Mon Sep 17 00:00:00 2001
From: suweicheng <2811574534@qq.com>
Date: Thu, 25 Oct 2018 18:47:20 +0800
Subject: [PATCH] 开发梳理；

---
 src/main/java/com/essa/framework/BrowserEngine.java |  5 ++++-
 src/main/java/com/essa/framework/BrowserEnum.java   | 22 ++++++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/essa/framework/BrowserEngine.java b/src/main/java/com/essa/framework/BrowserEngine.java
index 8c4c1a4..94801d8 100644
--- a/src/main/java/com/essa/framework/BrowserEngine.java
+++ b/src/main/java/com/essa/framework/BrowserEngine.java
@@ -19,7 +19,9 @@ public class BrowserEngine {
     private ConfigProperties configProperties;
 
     public void initConfigData() throws IOException{
+        env1 = null == env1 ? EnvEnum.SIT : env1;
         configProperties = ConfigProperties.getConfig(env1);
+        browserEnum = BrowserEnum.fromCode(configProperties.getBrowserName());
         Model.setEnv(env1.getCode());//我也不知道为什么执行完上面的代码后，env会变为sit
     }  
     /**
@@ -37,6 +39,7 @@ public class BrowserEngine {
      * @return
      */
     private WebDriver getBrowser(BrowserEnum browser,String url,int waitTime){
+        System.setProperty(browser.getExeName(), ".\\src\\main\\resources\\" + browser.getDriver());
         switch(browser) {
             case Firefox:{
                 driver = new FirefoxDriver();
@@ -50,7 +53,7 @@ public class BrowserEngine {
                 driver = new InternetExplorerDriver();
             }
         }
-        System.setProperty("webdriver.gecko.driver", ".\\src\\main\\resources\\" + browser.getDriver());
+
         Logger.Output(LogType.LogTypeName.INFO, "正在启动" + browser.getCode() +"浏览器");
     	driver.manage().window().maximize();
         Logger.Output(LogType.LogTypeName.INFO, "窗口最大化");
diff --git a/src/main/java/com/essa/framework/BrowserEnum.java b/src/main/java/com/essa/framework/BrowserEnum.java
index ba0c7e3..27caa40 100644
--- a/src/main/java/com/essa/framework/BrowserEnum.java
+++ b/src/main/java/com/essa/framework/BrowserEnum.java
@@ -8,9 +8,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
 
 public enum BrowserEnum {
-    Firefox("Firefox","geckodriver.exe"),
-    Chrome("Chrome","chromedriver.exe"),
-    IE("IE","IEDriverServer.exe");
+    Firefox("Firefox","webdriver.gecko.driver","geckodriver.exe"),
+    Chrome("Chrome","webdriver.chrome.driver","chromedriver.exe"),
+    IE("IE","webdriver.ie.driver","IEDriverServer.exe");
 
     /**
      * 原子引用(全部)
@@ -57,6 +57,11 @@ public enum BrowserEnum {
      */
     private String driver;
 
+    /**
+     * exe 名字
+     */
+    private String exeName;
+
     public String getCode() {
         return code;
     }
@@ -73,9 +78,18 @@ public enum BrowserEnum {
         this.driver = driver;
     }
 
-    BrowserEnum(String code, String driver) {
+    public String getExeName() {
+        return exeName;
+    }
+
+    public void setExeName(String exeName) {
+        this.exeName = exeName;
+    }
+
+    BrowserEnum(String code,String exeName, String driver) {
         this.code = code;
         this.driver = driver;
+        this.exeName = exeName;
     }
 
     public static List<BrowserEnum> getAllEnum() {
--
libgit2 0.21.2