From d40dcb2cb9032d646a11cb1c5b71657c99a78b14 Mon Sep 17 00:00:00 2001
From: mxd <838425805@qq.com>
Date: Wed, 8 Jun 2022 21:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=83=BD=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/service/impl/DefaultMagicAPIService.java        | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/core/service/impl/DefaultMagicAPIService.java b/magic-api/src/main/java/org/ssssssss/magicapi/core/service/impl/DefaultMagicAPIService.java
index 4b90384d..e76df5f8 100644
--- a/magic-api/src/main/java/org/ssssssss/magicapi/core/service/impl/DefaultMagicAPIService.java
+++ b/magic-api/src/main/java/org/ssssssss/magicapi/core/service/impl/DefaultMagicAPIService.java
@@ -36,6 +36,7 @@ import org.ssssssss.magicapi.utils.SignUtils;
 import org.ssssssss.script.MagicScriptContext;
 
 import java.io.*;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -80,7 +81,7 @@ public class DefaultMagicAPIService implements MagicAPIService, JsonCodeConstant
 		String scriptName = PathUtils.replaceSlash(String.format("/%s/%s(/%s/%s)", fullGroupName, info.getName(), fullGroupPath, info.getPath()));
 		scriptContext.setScriptName(scriptName);
 		scriptContext.putMapIntoContext(context);
-		if(requestEntity != null){
+		if (requestEntity != null) {
 			requestEntity.setMagicScriptContext(scriptContext);
 		}
 		return (T) ScriptManager.executeScript(info.getScript(), scriptContext);
@@ -91,12 +92,15 @@ public class DefaultMagicAPIService implements MagicAPIService, JsonCodeConstant
 		return execute(null, method, path, context);
 	}
 
-	private <T> T execute(RequestEntity requestEntity, String method, String path, Map<String, Object> context){
+	private <T> T execute(RequestEntity requestEntity, String method, String path, Map<String, Object> context) {
 		String mappingKey = Objects.toString(method, "GET").toUpperCase() + ":" + PathUtils.replaceSlash(this.prefix + "/" + Objects.toString(path, ""));
 		ApiInfo info = requestMagicDynamicRegistry.getMapping(mappingKey);
 		if (info == null) {
 			throw new MagicAPIException(String.format("找不到对应接口 [%s:%s]", method, path));
 		}
+		if (context == null) {
+			context = new HashMap<>();
+		}
 		context.put("apiInfo", info);
 		return execute(requestEntity, info, context);
 	}
@@ -201,6 +205,7 @@ public class DefaultMagicAPIService implements MagicAPIService, JsonCodeConstant
 		MagicWebSocketDispatcher.processMessageReceived(clientId, content);
 		return true;
 	}
+
 	private boolean processWebSocketEventMessage(String content) {
 		MagicWebSocketDispatcher.processWebSocketEventMessage(content);
 		return true;
-- 
GitLab