Index: build.gradle =================================================================== diff -u -r26673 -r26712 --- build.gradle (.../build.gradle) (revision 26673) +++ build.gradle (.../build.gradle) (revision 26712) @@ -119,6 +119,7 @@ parsedJson.seleniumHubURL = seleniumParameters[1] parsedJson.seleniumBrowserApplicationName = seleniumParameters[2] parsedJson.seleniumBrowserVersion = seleniumParameters[3] + parsedJson.configJSPath = seleniumParameters[4] jsonFile.write(StringEscapeUtils.unescapeJavaScript(new JsonBuilder(parsedJson).toPrettyString()),'UTF-8') } Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json =================================================================== diff -u -r26696 -r26712 --- ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json (.../settings.json) (revision 26696) +++ ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json (.../settings.json) (revision 26712) @@ -2,6 +2,7 @@ "seleniumBrowserApplicationName": "11", "seleniumBrowserVersion": "11.0", "seleniumHubURL": "http://192.168.2.20:4445/wd/hub", + "configJSPath" : "c:/xxx/config.js", "服务器地址": "http://192.168.2.111/gdsy", "触摸屏清洗服务地址": "/logon.jsp?logonType=washform", "一级供应室用户": { Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java =================================================================== diff -u -r26711 -r26712 --- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java (.../Utils.java) (revision 26711) +++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java (.../Utils.java) (revision 26712) @@ -379,7 +379,7 @@ mapper.configure(Feature.ALLOW_SINGLE_QUOTES, true); Scanner scan = null; try { - String rootPath = Path.getWebAppRoot() + "/disinfectsystem/config/"; + String rootPath = Utils.settings.get("configJSPath").toString() + "/disinfectsystem/config/"; String content = readFullFile(rootPath + configFilePath); int startIndex = content.indexOf("{"); //json变量定义的头(即左花括号之前的部分)