diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java index a0f3b020b480266ea4d52376d0c8961b0579d20d..7e80665429acbd3eb83fa544395dcdd49db9b5e2 100644 --- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java +++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/AnonymousApiDispatcher.java @@ -90,9 +90,11 @@ public class AnonymousApiDispatcher { if (interfaceVo == null || !interfaceVo.getIsActive().equals(1)) { throw new ApiNotFoundException(token); } - } else if (interfaceVo.getPathVariableObj() != null) { - // 融合路径参数 - paramObj.putAll(interfaceVo.getPathVariableObj()); + } else { + if (interfaceVo.getPathVariableObj() != null) { + // 融合路径参数 + paramObj.putAll(interfaceVo.getPathVariableObj()); + } if (dbApiVo != null) { interfaceVo.setQps(dbApiVo.getQps()); interfaceVo.setNeedAudit(dbApiVo.getNeedAudit()); diff --git a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java index 1a3bb576766d0b9679334ad658ae74f596236b70..1019733c284427aefbedeb9971f6f60fc79ba292 100644 --- a/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java +++ b/src/main/java/neatlogic/module/framework/restful/dispatch/handler/ApiDispatcher.java @@ -113,15 +113,18 @@ public class ApiDispatcher { if (interfaceVo == null || !interfaceVo.getIsActive().equals(1)) { throw new ApiNotFoundException(token); } - } else if (interfaceVo.getPathVariableObj() != null) { - // 融合路径参数 - paramObj.putAll(interfaceVo.getPathVariableObj()); + } else { + if (interfaceVo.getPathVariableObj() != null) { + // 融合路径参数 + paramObj.putAll(interfaceVo.getPathVariableObj()); + } if (dbApiVo != null) { interfaceVo.setQps(dbApiVo.getQps()); interfaceVo.setNeedAudit(dbApiVo.getNeedAudit()); } } + // 判断是否master模块接口,如果是不允许访问 ApiHandlerVo apiHandlerVo = PrivateApiComponentFactory.getApiHandlerByHandler(interfaceVo.getHandler()); if (apiHandlerVo != null) {