From d6c2eca9993c7cdf4e963a50c9b1d2c24d5eab29 Mon Sep 17 00:00:00 2001 From: suweicheng <2811574534@qq.com> Date: Fri, 26 Oct 2018 14:07:35 +0800 Subject: [PATCH] 开发梳理; --- src/main/java/com/essa/framework/BrowserEngine.java | 2 ++ src/main/java/com/essa/framework/BrowserEnum.java | 2 +- src/main/java/com/essa/framework/ConfigProperties.java | 4 ++++ src/main/java/com/essa/framework/DButil.java | 1 + src/main/java/com/essa/framework/SuitesEnum.java | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/essa/framework/BrowserEngine.java b/src/main/java/com/essa/framework/BrowserEngine.java index 7ab6d61..b617f00 100644 --- a/src/main/java/com/essa/framework/BrowserEngine.java +++ b/src/main/java/com/essa/framework/BrowserEngine.java @@ -18,6 +18,7 @@ public class BrowserEngine { private ConfigProperties configProperties; public void initConfigData() { + //有些地方是没有设置初始化环境直接调用这个方法的,所以默认是sit env1 = null == env1 ? EnvEnum.SIT : env1; configProperties = ConfigProperties.getConfig(env1); browserEnum = BrowserEnum.fromCode(configProperties.getBrowserName()); @@ -39,6 +40,7 @@ public class BrowserEngine { */ private WebDriver getBrowser(BrowserEnum browser,String url,int waitTime){ System.setProperty(browser.getExeName(), SystemConstant.RESOURCE_PATH + browser.getDriver()); + //根据浏览器类型,初始化对应的驱动 switch(browser) { case Firefox:{ driver = new FirefoxDriver(); diff --git a/src/main/java/com/essa/framework/BrowserEnum.java b/src/main/java/com/essa/framework/BrowserEnum.java index 27caa40..14376e7 100644 --- a/src/main/java/com/essa/framework/BrowserEnum.java +++ b/src/main/java/com/essa/framework/BrowserEnum.java @@ -53,7 +53,7 @@ public enum BrowserEnum { private String code; /** - * 枚举描述 + * 浏览器驱动名字 */ private String driver; diff --git a/src/main/java/com/essa/framework/ConfigProperties.java b/src/main/java/com/essa/framework/ConfigProperties.java index 77500c8..c332e62 100644 --- a/src/main/java/com/essa/framework/ConfigProperties.java +++ b/src/main/java/com/essa/framework/ConfigProperties.java @@ -11,8 +11,11 @@ import java.util.Properties; */ public class ConfigProperties { + //浏览器名称 private String browserName; + //bpms首页url private String serverURL; + //buyer首页url private String buyerURL; // 数据库驱动名字 @@ -31,6 +34,7 @@ public class ConfigProperties { private static Map configPropertiesMap = new HashMap(); static { + //读取各个环境的配置项 EnvEnum[] env = EnvEnum.values(); for (EnvEnum envEnum : env) { try { diff --git a/src/main/java/com/essa/framework/DButil.java b/src/main/java/com/essa/framework/DButil.java index 44c3713..6b1cd68 100644 --- a/src/main/java/com/essa/framework/DButil.java +++ b/src/main/java/com/essa/framework/DButil.java @@ -23,6 +23,7 @@ public class DButil { Connection conn = null; try { + //通过环境找寻相应的配置,然后初始化数据库连接 EnvEnum envEnum = EnvEnum.fromCode(Model.getEnv()); ConfigProperties dbConfig = ConfigProperties.getConfig(envEnum); Class.forName(dbConfig.getJdbcName()); diff --git a/src/main/java/com/essa/framework/SuitesEnum.java b/src/main/java/com/essa/framework/SuitesEnum.java index d429c3f..ca99c98 100644 --- a/src/main/java/com/essa/framework/SuitesEnum.java +++ b/src/main/java/com/essa/framework/SuitesEnum.java @@ -8,6 +8,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReference; public enum SuitesEnum { + //suite 第一个是唯一标志,第二个表示需要使用哪个xml(需要换的时候只要改这个即可),第三个描述这个干吗的 ADD_ORIGINAL_GOODS("ADD_ORIGIN_SKU","addOriginalGoods.xml","新增原厂商品"), ADD_MARKET_GOODS("ADD_MARKET_GOODS","addMarketGoods.xml","新增市场商品"), PUBLISH_GROUP_PURCHASE("PUBLISH_GROUP_PURCHASE","publishGroupPurchase.xml","发布团购"), -- libgit2 0.21.2