diff --git a/src/main/java/yi/master/constant/SystemConsts.java b/src/main/java/yi/master/constant/SystemConsts.java index d2464e5bf173d7070a4622144b8eb908f70300ef..5234f3624835feffca690e6794396a6fb2b14884 100644 --- a/src/main/java/yi/master/constant/SystemConsts.java +++ b/src/main/java/yi/master/constant/SystemConsts.java @@ -13,7 +13,7 @@ public interface SystemConsts { /** * 当前版本号 */ - String VERSION = "1.0.2"; + String VERSION = "1.0.3"; /** diff --git a/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java b/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java index 2fd180273b7588b941d405af206b5999d38a07f5..d8970cac3cb5f17d9805384100f553225f94e55f 100644 --- a/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java +++ b/src/main/java/yi/master/coretest/message/test/MessageAutoTest.java @@ -79,12 +79,12 @@ public class MessageAutoTest { * @throws Exception */ public String dynamicInterfaceGetValue(String sceneId, String systemId, String valueExpression) throws Exception { - //执行测试 TestConfig config = testConfigService.getConfigByUserId(FrameworkUtil.getLoginUser().getUserId()); if (config == null) { config = testConfigService.getConfigByUserId(0); } + MessageScene scene = messageSceneService.get(Integer.valueOf(sceneId)); if (scene == null) { throw new Exception("指定的测试场景不存在或者已被删除,请检查!"); @@ -642,8 +642,7 @@ public class MessageAutoTest { systems.add(singleSystem); } - for (BusinessSystem system:systems) { - + for (BusinessSystem system:systems) { if ((!allSystemsTestFlag && !enableTestSystems.contains(system)) || "1".equals(system.getStatus()) ) { continue; } @@ -706,7 +705,8 @@ public class MessageAutoTest { testScene.setParseUtil(parseUtil); testScene.setBusinessSystem(system); testScene.setConfig(config); - testScene.setCallParameter(PracticalUtils.jsonToMap(msg.getCallParameter())); + //提前在此处替换调用参数中的全局变量,防止在异步线程中调用时出现一些不可预期的错误 + testScene.setCallParameter(PracticalUtils.jsonToMap(PracticalUtils.replaceGlobalVariable(msg.getCallParameter(), null))); testObjects.add(testScene); } } diff --git a/src/main/java/yi/master/listener/VersionUpdateUtil.java b/src/main/java/yi/master/listener/VersionUpdateUtil.java index 6061a0e16e7b15e2b1bd3c6cac80c9d8fa9d88ec..c66b7e37e304ba29418fca1d4c1e3341b44c7704 100644 --- a/src/main/java/yi/master/listener/VersionUpdateUtil.java +++ b/src/main/java/yi/master/listener/VersionUpdateUtil.java @@ -48,6 +48,7 @@ public class VersionUpdateUtil { ALL_VERSION_LIST.add("1.0.0"); ALL_VERSION_LIST.add("1.0.1"); ALL_VERSION_LIST.add("1.0.2"); + ALL_VERSION_LIST.add("1.0.3"); } /** diff --git a/src/main/webapp/js/dcits.js b/src/main/webapp/js/dcits.js index c4652ed95c30a38f88642b4a26cb9323adc99a50..993faed9b51150c771692f6b0613b061335ae2d1 100644 --- a/src/main/webapp/js/dcits.js +++ b/src/main/webapp/js/dcits.js @@ -818,7 +818,7 @@ function ObjectEditPage(id, ajaxUrl, callback) { */ function iterObj(jsonObj, parentName) { $.each(jsonObj, function(k, v) { - if (parentName != null&&parentName != "") { + if (parentName != null && parentName != "") { k = parentName + "\\." + k; } if (!(v instanceof Object)) { diff --git a/src/main/webapp/resource/setting/variable.js b/src/main/webapp/resource/setting/variable.js index a61fefc8080c9ed1564fd5e2e9280bcd8eff31d3..f1a59b6ccf4cedc8fb3b31e3a5a738f7105dcd48 100644 --- a/src/main/webapp/resource/setting/variable.js +++ b/src/main/webapp/resource/setting/variable.js @@ -697,23 +697,23 @@ function changeFormByVariableType (variableType) { case "relatedKeyWord": case "setRuntimeSetting": case "dynamicInterface": - showOrHideInput('hidden', 'button', 'hidden', ''); + showOrHideInput('hidden', 'button', 'hidden', null); break; case "dbSql": case "datetime": case "randomNum": case "randomString": case "uuid": - showOrHideInput('hidden', 'button', 'hidden', ''); + showOrHideInput('hidden', 'button', 'hidden', null); break; case "currentTimestamp": showOrHideInput('hidden', 'hidden', 'hidden', ' '); break; case "constant": - showOrHideInput('text', 'hidden', 'hidden', ''); + showOrHideInput('text', 'hidden', 'hidden', null); break; case "fileParameter": - showOrHideInput('hidden', 'hidden', 'button', ''); + showOrHideInput('hidden', 'hidden', 'button', null); break; default: break; @@ -736,7 +736,10 @@ function showOrHideInput(value_type, settingButton_type, uploadButton_type, valu } else { $("#upload-file").prev('span').remove(); } - $("#value").val(value); + if (value != null) { + $("#value").val(value); + } + } /** diff --git a/update.md b/update.md index cda44c717a087c1c04eaece2fb37c552b2a5e0cd..51f07a4a6a59dca1ccdb4192304b52a02667363d 100644 --- a/update.md +++ b/update.md @@ -1,9 +1,11 @@ ### v1.0.3 -#### 2020.2.5 +#### 2020.2.20 - 更新:单个场景调试时可自定义报文内容; - 修复:HTTP请求时返回302状态时报错的问题;(未测试) - 新增:集成swagger4j,可查看api文档,使用方法:修改swagger.properties中disabled=false,启动项目打开http://localhost:8080/doc/index.html,api注解使用请参考https://github.com/cpjit/swagger - 更新:生成接口文档时指定名称修改为英文,防止某些Linux服务器上出现文件名中文乱码的文件; +- 修复:在测试集测试、性能测试中,如果接口中使用了动态接口全局变量时会出现无法获取到正确的值得错误; +- 修复:全局变量在编辑时无法显示正确的配置的问题。 ### v1.0.2