lilonglong/magic-api-gitee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复可能出现的空指针异常

Browse Source
This commit is contained in:
mxd 2022-06-08 21:09:31 +08:00
parent 4178f35377
commit d40dcb2cb9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
magic-api/src/main/java/org/ssssssss/magicapi/core/service/impl/DefaultMagicAPIService.java
View File

@ -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;