From e6ec3535c4c882cf173f91f08f6d81dd2ca3bb91 Mon Sep 17 00:00:00 2001 From: mxd <838425805@qq.com> Date: Fri, 14 May 2021 07:47:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../magicapi/controller/RequestHandler.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/ssssssss/magicapi/controller/RequestHandler.java b/src/main/java/org/ssssssss/magicapi/controller/RequestHandler.java index 84d4307f..5e438188 100644 --- a/src/main/java/org/ssssssss/magicapi/controller/RequestHandler.java +++ b/src/main/java/org/ssssssss/magicapi/controller/RequestHandler.java @@ -40,9 +40,6 @@ import org.ssssssss.script.parsing.Span; import org.ssssssss.script.parsing.ast.literal.BooleanLiteral; import org.ssssssss.script.reflection.JavaInvoker; -import static org.ssssssss.magicapi.model.Constants.RESPONSE_CODE_EXCEPTION; -import static org.ssssssss.magicapi.model.Constants.RESPONSE_CODE_INVALID; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -103,11 +100,8 @@ public class RequestHandler extends MagicController { MappingHandlerMapping.findGroups(requestEntity.getApiInfo().getGroupId()) .stream() .flatMap(it -> it.getPaths().stream()) - .forEach(it -> { - if (!paths.contains(it)) { - paths.add(it); - } - }); + .filter(it -> !paths.contains(it)) + .forEach(paths::add); // 验证 path value = doValidate(requestEntity, "path", paths, requestEntity.getPathVariables()); if (value != null) { @@ -146,15 +140,13 @@ public class RequestHandler extends MagicController { } try { Object value = convertValue(parameter.getDataType(), parameter.getName(), requestValue); - String validateType = parameter.getValidateType(); - if (VALIDATE_TYPE_PATTERN.equals(validateType)) { // 正则验证 + if (VALIDATE_TYPE_PATTERN.equals(parameter.getValidateType())) { // 正则验证 String expression = parameter.getExpression(); if (StringUtils.isNotBlank(expression) && !PatternUtils.match(Objects.toString(value, EMPTY), expression)) { return resultProvider.buildResult(requestEntity, RESPONSE_CODE_INVALID, StringUtils.defaultIfBlank(parameter.getError(), String.format("%s[%s]不满足正则表达式", comment, parameter.getName()))); } } parameters.put(parameter.getName(), value); - } catch (Exception e) { return resultProvider.buildResult(requestEntity, RESPONSE_CODE_INVALID, StringUtils.defaultIfBlank(parameter.getError(), String.format("%s[%s]不合法", comment, parameter.getName()))); }