From 71bcf38cf7bf687f6aaabdd9992b07333cf77875 Mon Sep 17 00:00:00 2001
From: mxd <838425805@qq.com>
Date: Mon, 3 Jan 2022 00:06:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B91.x=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/resource/ZipResource.java         |  7 ++--
 .../org/ssssssss/magicapi/model/ApiInfo.java  | 33 +++++++++++--------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/adapter/resource/ZipResource.java b/magic-api/src/main/java/org/ssssssss/magicapi/adapter/resource/ZipResource.java
index 5974b9a5..92eafcd5 100644
--- a/magic-api/src/main/java/org/ssssssss/magicapi/adapter/resource/ZipResource.java
+++ b/magic-api/src/main/java/org/ssssssss/magicapi/adapter/resource/ZipResource.java
@@ -7,10 +7,7 @@ import org.ssssssss.magicapi.adapter.Resource;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -27,7 +24,7 @@ public class ZipResource implements Resource {
 	private Resource parent;
 
 	public ZipResource(InputStream is) throws IOException {
-		cachedContent = new HashMap<>();
+		cachedContent = new TreeMap<>();
 		try (ZipArchiveInputStream zis = new ZipArchiveInputStream(is)) {
 			ArchiveEntry entry;
 			byte[] buf = new byte[4096];
diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/model/ApiInfo.java b/magic-api/src/main/java/org/ssssssss/magicapi/model/ApiInfo.java
index 1d86047c..20cdd217 100644
--- a/magic-api/src/main/java/org/ssssssss/magicapi/model/ApiInfo.java
+++ b/magic-api/src/main/java/org/ssssssss/magicapi/model/ApiInfo.java
@@ -99,7 +99,7 @@ public class ApiInfo extends PathMagicEntity {
 		this.paths = paths;
 	}
 
-	public Map<String, String> getOptionMap() {
+	public Map<String, String> options() {
 		Map<String, String> map = new HashMap<>();
 		if (this.jsonNode == null) {
 			return null;
@@ -110,17 +110,22 @@ public class ApiInfo extends PathMagicEntity {
 		} else {
 			this.jsonNode.fieldNames().forEachRemaining(it -> map.put(it, this.jsonNode.get(it).asText()));
 		}
-//		MagicRequestDynamicMappingRegistry.findGroups(this.groupId)
-//				.stream()
-//				.flatMap(it -> it.getOptions().stream())
-//				.forEach(option -> {
-//					if (!map.containsKey(option.getName())) {
-//						map.put(option.getName(), String.valueOf(option.getValue()));
-//					}
-//				});
+		MagicConfiguration.getMagicResourceService().getGroupsByFileId(this.groupId)
+				.stream()
+				.flatMap(it -> it.getOptions().stream())
+				.forEach(option -> {
+					if (!map.containsKey(option.getName())) {
+						map.put(option.getName(), String.valueOf(option.getValue()));
+					}
+				});
 		return map;
 	}
 
+	// 兼容1.x处理。
+	public void setOptionMap(Map<String, Object> optionMap) {
+
+	}
+
 	public String getDescription() {
 		return description;
 	}
@@ -137,6 +142,11 @@ public class ApiInfo extends PathMagicEntity {
 		this.options = options;
 	}
 
+	public void setOption(String json) {
+		this.options = JsonUtils.readValue(Objects.toString(json, "[]"), new TypeReference<List<Option>>() {
+		});
+	}
+
 	public List<Parameter> getParameters() {
 		return parameters;
 	}
@@ -145,11 +155,6 @@ public class ApiInfo extends PathMagicEntity {
 		this.parameters = parameters;
 	}
 
-	public void setRequestHeader(String requestHeader) {
-		this.headers = JsonUtils.readValue(Objects.toString(requestHeader, "[]"), new TypeReference<List<Header>>() {
-		});
-	}
-
 	public List<Header> getHeaders() {
 		return headers;
 	}