diff --git a/src/main/java/neatlogic/module/tenant/api/apimanage/ApiManageSearchApi.java b/src/main/java/neatlogic/module/tenant/api/apimanage/ApiManageSearchApi.java index ee7306f5676429961db3dc5807719c65f522f5bc..e79a3d251c0d3a92482c73793cc7a4433e9d58d8 100644 --- a/src/main/java/neatlogic/module/tenant/api/apimanage/ApiManageSearchApi.java +++ b/src/main/java/neatlogic/module/tenant/api/apimanage/ApiManageSearchApi.java @@ -16,6 +16,9 @@ package neatlogic.module.tenant.api.apimanage; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.TypeReference; import neatlogic.framework.asynchronization.threadlocal.TenantContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.auth.label.INTERFACE_MODIFY; @@ -32,9 +35,7 @@ import neatlogic.framework.restful.dao.mapper.ApiMapper; import neatlogic.framework.restful.dto.ApiHandlerVo; import neatlogic.framework.restful.dto.ApiVo; import neatlogic.framework.restful.enums.ApiKind; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.TypeReference; +import neatlogic.framework.util.$; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -164,15 +165,23 @@ public class ApiManageSearchApi extends PrivateApiComponentBase { List dbTokenList = new ArrayList<>(); Map ramApiMap = PrivateApiComponentFactory.getApiMap(); for (ApiVo api : dbAllApiList) { - if (ramApiMap.get(api.getToken()) != null) { + ApiVo ramApi = ramApiMap.get(api.getToken()); + if (ramApi != null) { api.setIsPrivate(true); api.setApiType(ApiKind.SYSTEM.getValue()); + api.setHandler(ramApi.getHandler()); + api.setName($.t(ramApi.getName())); + api.setModuleId(ramApi.getModuleId()); + ApiHandlerVo apiHandlerVo = PrivateApiComponentFactory.getApiHandlerByHandler(api.getHandler()); + if (apiHandlerVo != null) { + api.setHandlerName($.t(apiHandlerVo.getName())); + } } else { ApiHandlerVo publicApiHandler = PublicApiComponentFactory.getApiHandlerByHandler(api.getHandler()); if (publicApiHandler == null) { api.setHandlerName("接口组件:" + api.getHandler() + "不存在"); } else { - api.setHandlerName(publicApiHandler.getName()); + api.setHandlerName($.t(publicApiHandler.getName())); } api.setIsPrivate(false); api.setApiType(ApiKind.CUSTOM.getValue());