From 565a60a8fc99b7cdd43ea4a733c46a88ba812d37 Mon Sep 17 00:00:00 2001
From: mxd <838425805@qq.com>
Date: Sat, 12 Mar 2022 22:53:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E`Any`=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ssssssss/magicapi/swagger/entity/SwaggerProvider.java    | 2 +-
 .../main/java/org/ssssssss/magicapi/core/model/DataType.java | 5 +++++
 .../java/org/ssssssss/magicapi/core/web/RequestHandler.java  | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/magic-api-plugins/magic-api-plugin-swagger/src/main/java/org/ssssssss/magicapi/swagger/entity/SwaggerProvider.java b/magic-api-plugins/magic-api-plugin-swagger/src/main/java/org/ssssssss/magicapi/swagger/entity/SwaggerProvider.java
index 5ba1ee35..014be1b9 100644
--- a/magic-api-plugins/magic-api-plugin-swagger/src/main/java/org/ssssssss/magicapi/swagger/entity/SwaggerProvider.java
+++ b/magic-api-plugins/magic-api-plugin-swagger/src/main/java/org/ssssssss/magicapi/swagger/entity/SwaggerProvider.java
@@ -193,7 +193,7 @@ public class SwaggerProvider {
 				result.put("items", Collections.emptyList());
 			}
 			result.put("type", target.getDataType().getJavascriptType());
-		} else if (DataType.Object == target.getDataType()) {
+		} else if (DataType.Object == target.getDataType() || DataType.Any == target.getDataType()) {
 			String voName = groupName + "«" + info.getPath().replaceFirst("/", "").replaceAll("/", "_") + (StringUtils.equals("response", definitionType) ? "«response«" : "«request«") + parentName + target.getName() + "»»»";
 
 			Map<String, Object> definition = new HashMap<>(4);
diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/model/DataType.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/model/DataType.java
index abbdde30..ec0b7581 100644
--- a/magic-api/src/main/java/org/ssssssss/magicapi/core/model/DataType.java
+++ b/magic-api/src/main/java/org/ssssssss/magicapi/core/model/DataType.java
@@ -27,6 +27,11 @@ public enum DataType {
 	 */
 	Array("array"),
 
+	/**
+	 * 任意类型
+	 */
+	Any("object"),
+
 	/**
 	 * Boolean类型
 	 */
diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/web/RequestHandler.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/web/RequestHandler.java
index de00e192..fb64a493 100644
--- a/magic-api/src/main/java/org/ssssssss/magicapi/core/web/RequestHandler.java
+++ b/magic-api/src/main/java/org/ssssssss/magicapi/core/web/RequestHandler.java
@@ -224,6 +224,9 @@ public class RequestHandler extends MagicController {
 			removeUnknownKey(parameters, validateParameters);
 		}
 		for (BaseDefinition parameter : validateParameters) {
+			if (parameter.getDataType() == DataType.Any) {
+				continue;
+			}
 			// 针对requestBody多层级的情况
 			if (DataType.Object == parameter.getDataType()) {
 				if (doValidateBody(comment, parameter, parameters, jsonCode, Map.class)) {