From f2535c7640ff727f73f0af33d75292ce7d778f17 Mon Sep 17 00:00:00 2001 From: xuwangcheng Date: Fri, 6 Dec 2019 14:11:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/db_druid.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/db_druid.properties b/src/main/resources/db_druid.properties index 1677753..be7f0dd 100644 --- a/src/main/resources/db_druid.properties +++ b/src/main/resources/db_druid.properties @@ -1,4 +1,4 @@ -jdbc.url=jdbc:mysql://localhost:3306/atp?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true +jdbc.url=jdbc:mysql://localhost:3306/atp?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&useSSL=false jdbc.driverClassName=com.mysql.jdbc.Driver jdbc.username=root jdbc.password=KeYpZrZx -- Gitee From 1182f16fbbcb608a3d8292e70a4af80762ee0772 Mon Sep 17 00:00:00 2001 From: xuwangcheng Date: Fri, 6 Dec 2019 16:24:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=9A=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E6=A0=BC=E5=BC=8F=E3=80=81=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=8A=A5=E6=96=87=E7=9A=84=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/parse/FixedMessageParse.java | 9 +++- .../message/parse/OPTMessageParse.java | 11 +++-- .../protocol/WebserviceTestClient.java | 15 +++--- .../java/yi/master/test/WebSocketTest.java | 49 ------------------- src/main/webapp/js/globalConstant.js | 14 +++--- .../webapp/resource/message/testData.html | 2 +- .../resource/template/customTemplate.htm | 2 +- update.md | 4 ++ 8 files changed, 35 insertions(+), 71 deletions(-) delete mode 100644 src/main/java/yi/master/test/WebSocketTest.java diff --git a/src/main/java/yi/master/coretest/message/parse/FixedMessageParse.java b/src/main/java/yi/master/coretest/message/parse/FixedMessageParse.java index e26fb52..976a3e2 100644 --- a/src/main/java/yi/master/coretest/message/parse/FixedMessageParse.java +++ b/src/main/java/yi/master/coretest/message/parse/FixedMessageParse.java @@ -45,7 +45,7 @@ public class FixedMessageParse extends MessageParse { return null; } Set params = new HashSet(); - Parameter param = new Parameter(message, "name", "defaultValue", "path", "String"); + Parameter param = new Parameter("defaultName", "", message, MessageKeys.MESSAGE_PARAMETER_DEFAULT_ROOT_PATH, "String"); if (validateRepeatabilityParameter(existParams, param)) { params.add(param); } @@ -66,7 +66,12 @@ public class FixedMessageParse extends MessageParse { return ""; } Parameter param = complexParameter.getSelfParameter(); - return messageFormatBeautify(param.getParameterIdentify()); + + if ("defaultValue".equals(param.getDefaultValue())) { + return messageFormatBeautify(param.getParameterIdentify()); + } else { + return messageFormatBeautify(param.getDefaultValue()); + } } @Override diff --git a/src/main/java/yi/master/coretest/message/parse/OPTMessageParse.java b/src/main/java/yi/master/coretest/message/parse/OPTMessageParse.java index a84e9b0..d055a8c 100644 --- a/src/main/java/yi/master/coretest/message/parse/OPTMessageParse.java +++ b/src/main/java/yi/master/coretest/message/parse/OPTMessageParse.java @@ -4,6 +4,7 @@ import org.apache.commons.lang.StringUtils; import yi.master.business.message.bean.ComplexParameter; import yi.master.business.message.bean.Parameter; import yi.master.business.message.service.ParameterService; +import yi.master.constant.MessageKeys; import yi.master.constant.SystemConsts; import yi.master.util.FrameworkUtil; import yi.master.util.PracticalUtils; @@ -44,7 +45,7 @@ public class OPTMessageParse extends FixedMessageParse { List params) { ParameterService ps = (ParameterService) FrameworkUtil.getSpringBean("parameterService"); - int pid = ps.save(new Parameter(message, "name", "defaultValue", "path", "String")); + int pid = ps.save(new Parameter("defaultName", "", message, MessageKeys.MESSAGE_PARAMETER_DEFAULT_ROOT_PATH, "String")); return new ComplexParameter(new Parameter(pid), null, null); } @@ -61,8 +62,12 @@ public class OPTMessageParse extends FixedMessageParse { return messageFormatBeautify(o.toString()); } } - - return messageFormatBeautify(complexParameter.getSelfParameter().getParameterIdentify()); + + if ("defaultValue".equals(complexParameter.getSelfParameter().getDefaultValue())) { + return messageFormatBeautify(complexParameter.getSelfParameter().getParameterIdentify()); + } else { + return messageFormatBeautify(complexParameter.getSelfParameter().getDefaultValue()); + } } } diff --git a/src/main/java/yi/master/coretest/message/protocol/WebserviceTestClient.java b/src/main/java/yi/master/coretest/message/protocol/WebserviceTestClient.java index 4ea0a0e..b4ea068 100644 --- a/src/main/java/yi/master/coretest/message/protocol/WebserviceTestClient.java +++ b/src/main/java/yi/master/coretest/message/protocol/WebserviceTestClient.java @@ -1,18 +1,16 @@ package yi.master.coretest.message.protocol; -import java.util.Map; - -import javax.xml.namespace.QName; - import org.apache.axis2.addressing.EndpointReference; import org.apache.axis2.client.Options; import org.apache.axis2.rpc.client.RPCServiceClient; - import yi.master.business.testconfig.bean.TestConfig; import yi.master.constant.MessageKeys; import yi.master.coretest.message.protocol.entity.ClientTestResponseObject; import yi.master.util.PracticalUtils; +import javax.xml.namespace.QName; +import java.util.Map; + public class WebserviceTestClient extends TestClient { private static WebserviceTestClient webserviceTestClient; @@ -41,7 +39,9 @@ public class WebserviceTestClient extends TestClient { password = (String) callParameter.get(MessageKeys.PUBLIC_PARAMETER_PASSWORD); namespace = (String) callParameter.get(MessageKeys.WEB_SERVICE_PARAMETER_NAMESPACE); method = (String) callParameter.get(MessageKeys.PUBLIC_PARAMETER_METHOD); - connectTimeOut = (int)callParameter.get(MessageKeys.PUBLIC_PARAMETER_CONNECT_TIMEOUT); + if (PracticalUtils.isNumeric(callParameter.get(MessageKeys.PUBLIC_PARAMETER_CONNECT_TIMEOUT))) { + connectTimeOut = Integer.parseInt((String) callParameter.get(MessageKeys.PUBLIC_PARAMETER_CONNECT_TIMEOUT)); + } } String responseMessage = ""; @@ -126,8 +126,7 @@ public class WebserviceTestClient extends TestClient { new Object[] { request }, new Class[] { String.class }); return result[0].toString(); } catch (Exception e) { - - LOGGER.debug("Fail to call web-service url=" + requestUrl + ",namespace=" + namespace + ",method=" + method + "!", e); + LOGGER.error("Fail to call web-service url=" + requestUrl + ",namespace=" + namespace + ",method=" + method + "!", e); throw e; } diff --git a/src/main/java/yi/master/test/WebSocketTest.java b/src/main/java/yi/master/test/WebSocketTest.java deleted file mode 100644 index b8a6184..0000000 --- a/src/main/java/yi/master/test/WebSocketTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package yi.master.test; - -import org.java_websocket.WebSocket; -import org.java_websocket.handshake.ClientHandshake; -import org.java_websocket.server.WebSocketServer; - -import java.net.InetSocketAddress; -import java.net.URISyntaxException; - -/** - * Created by Administrator on 2019/9/13. - */ -public class WebSocketTest { - public static void main(String[] args) throws URISyntaxException { - WebSocketServer server = new WebSocketServer(new InetSocketAddress(9787)) { - - @Override - public void onStart() { - System.out.println("start..."); - - } - - @Override - public void onOpen(WebSocket arg0, ClientHandshake arg1) { - System.out.println("open..."); - System.out.println(arg0.getRemoteSocketAddress().getPort()); - } - - @Override - public void onMessage(WebSocket arg0, String arg1) { - System.out.println("收到消息..." + arg1); - arg0.send("aasssss"); - } - - @Override - public void onError(WebSocket arg0, Exception arg1) { - arg1.printStackTrace(); - } - - @Override - public void onClose(WebSocket arg0, int arg1, String arg2, boolean arg3) { - System.out.println("close..."); - arg0.close(); - } - }; - - server.start(); - } -} \ No newline at end of file diff --git a/src/main/webapp/js/globalConstant.js b/src/main/webapp/js/globalConstant.js index 3a1f4a0..994349e 100644 --- a/src/main/webapp/js/globalConstant.js +++ b/src/main/webapp/js/globalConstant.js @@ -455,13 +455,13 @@ var MESSAGE_PROTOCOL = { "ConnectTimeOut":"", "ReadTimeOut":"" }, - "WebService":{ - "ConnectTimeOut":"", - "Namespace":"", - "Method":"", - "Username":"", - "Password":"" - }, + // "WebService":{ + // "ConnectTimeOut":"", + // "Namespace":"", + // "Method":"", + // "Username":"", + // "Password":"" + // }, "WebSocket":{ "ConnectTimeOut":"", "ReadTimeOut":"" diff --git a/src/main/webapp/resource/message/testData.html b/src/main/webapp/resource/message/testData.html index b0acc96..330b183 100644 --- a/src/main/webapp/resource/message/testData.html +++ b/src/main/webapp/resource/message/testData.html @@ -26,7 +26,7 @@
-
+
  点击 标记 栏快速修改数据
diff --git a/src/main/webapp/resource/template/customTemplate.htm b/src/main/webapp/resource/template/customTemplate.htm index 62dda71..8f37fab 100644 --- a/src/main/webapp/resource/template/customTemplate.htm +++ b/src/main/webapp/resource/template/customTemplate.htm @@ -668,7 +668,7 @@
- +
diff --git a/update.md b/update.md index aa3fd59..034b83f 100644 --- a/update.md +++ b/update.md @@ -17,6 +17,10 @@ 17、对文件上传类接口的支持。 +### v0.2.3beat +#### 2019.1206 +- 完善：固定格式、自定义格式报文的一些处理逻辑 + ### v0.2.2beta #### 2019.11.28 -- Gitee From 2e9b32e73d23f0c26abe71ed8ecb224302082d5d Mon Sep 17 00:00:00 2001 From: xuwangcheng Date: Fri, 6 Dec 2019 16:44:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.md b/update.md index 034b83f..18178d5 100644 --- a/update.md +++ b/update.md @@ -4,7 +4,7 @@ 4、增加历史数据报表功能。 5、优化数据验证、数据库验证等功能； 6、支持对数组的取值，设定值； -7、增加测试集全局配置：头信息、验证规则、测试集变量等功能； +~~7、增加测试集全局配置：头信息、验证规则、测试集变量等功能；~~ 8、完善操作说明手册, ~~10、一键安装包 for linux;~~ ~~11、更加方便安全的版本更新方案；~~ -- Gitee