diff --git a/tester/src/main/java/com/ruoyi/tester/executor/http/UnirestUtil.java b/tester/src/main/java/com/ruoyi/tester/executor/http/UnirestUtil.java index 3a1e58ec268515024fc56134b7ed47554d6b1086..4323c36da4984d7e1fb19033a758eab516fb914e 100644 --- a/tester/src/main/java/com/ruoyi/tester/executor/http/UnirestUtil.java +++ b/tester/src/main/java/com/ruoyi/tester/executor/http/UnirestUtil.java @@ -72,6 +72,21 @@ public class UnirestUtil implements HttpUtils { @Override public XzfHttpResult post(String url, String contentType, Map headers, String queryParam, String bodyParam, String pathParam) { try { + if(StringUtils.hasLength(queryParam)) { + StringBuilder sb = new StringBuilder(url); + JSONObject paramJson = new JSONObject(queryParam); + int i = 0; + for (String key : paramJson.keySet()) { + if (i == 0) { + sb.append('?'); + } else { + sb.append('&'); + } + sb.append(key).append('=').append(paramJson.get(key)); + i++; + } + url = sb.toString(); + } HttpRequestWithBody requestWithBody = Unirest.post(url); if(headers != null){ requestWithBody.headers(headers); diff --git a/tester/src/main/java/com/ruoyi/tester/executor/thread/InvolutedThreadPool.java b/tester/src/main/java/com/ruoyi/tester/executor/thread/InvolutedThreadPool.java index 7a042d8e85fbd125038c78d09eba5a26694a0cfd..d81bad0ba01668a46385f1e4306ddc497fd1db2d 100644 --- a/tester/src/main/java/com/ruoyi/tester/executor/thread/InvolutedThreadPool.java +++ b/tester/src/main/java/com/ruoyi/tester/executor/thread/InvolutedThreadPool.java @@ -191,7 +191,7 @@ public class InvolutedThreadPool extends AbstractExecutorService { * The default rejected execution handler */ private static final InvolutedRejectedExecutionHandler defaultHandler = - new InvolutedThreadPool.AbortPolicy(); + new InvolutedThreadPool.CallerRunsPolicy(); /** * Permission required for callers of shutdown and shutdownNow. diff --git a/tester/src/main/java/com/ruoyi/tester/login/LoginHandlerContainer.java b/tester/src/main/java/com/ruoyi/tester/login/LoginHandlerContainer.java index c75e8738c87109182d12a128465448f3636f2cd3..5375c518937f630f6ea79a404849d009aedcac12 100644 --- a/tester/src/main/java/com/ruoyi/tester/login/LoginHandlerContainer.java +++ b/tester/src/main/java/com/ruoyi/tester/login/LoginHandlerContainer.java @@ -19,9 +19,11 @@ public class LoginHandlerContainer { } public static Login getLoginHandler(Long loginConfigId){ - TesterLoginConfig loginBaseInfo = LoginCache.getLoginBaseInfo(loginConfigId); - if(loginBaseInfo != null){ - return container.get(loginBaseInfo.getLoginType()); + if(loginConfigId != null) { + TesterLoginConfig loginBaseInfo = LoginCache.getLoginBaseInfo(loginConfigId); + if (loginBaseInfo != null) { + return container.get(loginBaseInfo.getLoginType()); + } } return null; } diff --git a/tester/src/main/resources/mapper/tester/TesterInterfaceMapper.xml b/tester/src/main/resources/mapper/tester/TesterInterfaceMapper.xml index 5ab47aaf5cd62959180265331054de8257c66a82..ea3dc482771a395ae524d246acae183fabeee6e7 100644 --- a/tester/src/main/resources/mapper/tester/TesterInterfaceMapper.xml +++ b/tester/src/main/resources/mapper/tester/TesterInterfaceMapper.xml @@ -38,6 +38,7 @@ and judge_expression = #{judgeExpression} and status = #{status} + order by interface_id desc -
+
-
+
-
- +
+
- +
-
+
@@ -57,4 +58,4 @@ } - \ No newline at end of file + diff --git a/tester/src/main/resources/templates/tester/task/edit.html b/tester/src/main/resources/templates/tester/task/edit.html index c51d2cd6fb1c2b7346a8596b2a07b7182d20e76c..75e10e5386cad6b30cf0f9828efaac3fe6b76a41 100644 --- a/tester/src/main/resources/templates/tester/task/edit.html +++ b/tester/src/main/resources/templates/tester/task/edit.html @@ -7,33 +7,34 @@
-
+
-
+
-
+
-
- +
+
- +
-
+
@@ -58,4 +59,4 @@ } - \ No newline at end of file +