diff --git a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java index 18f66330..5ae9e72c 100644 --- a/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java +++ b/zyplayer-doc-dubbo/src/main/java/com/zyplayer/doc/dubbo/controller/DubboController.java @@ -306,7 +306,7 @@ public class DubboController { private List getDubboInfoByNacos() { List providerList = new LinkedList<>(); // 获取所有的服务列表 - String serviceListStr = HttpUtil.get(nacosUrl + "/v1/ns/catalog/serviceList?startPg=1&pgSize=100000"); + String serviceListStr = HttpUtil.get(nacosUrl + "/v1/ns/catalog/services?withInstances=false&pageNo=1&pageSize=100000"); NacosServiceInfoVo nacosServiceInfoVo = JSON.parseObject(serviceListStr, NacosServiceInfoVo.class); if (nacosServiceInfoVo == null || nacosServiceInfoVo.getServiceList().isEmpty()) { return providerList; diff --git a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java index c49ce0b2..d15f4e76 100644 --- a/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java +++ b/zyplayer-doc-swagger/src/main/java/com/zyplayer/doc/swagger/controller/MgDocumentController.java @@ -301,6 +301,11 @@ public class MgDocumentController { */ @PostMapping(value = "/addSwaggerResources") public ResponseJson addSwaggerResources(String resourcesUrl, String rewriteDomainUrl, String oldUrl, Integer openVisit) { + // 总有些人喜欢填这个地址,那就替换来支持下吧 + int htmlIndex = resourcesUrl.indexOf("/swagger-ui.html"); + if (htmlIndex > 0) { + resourcesUrl = resourcesUrl.substring(0, htmlIndex) + "/swagger-resources"; + } String swaggerResourcesStr = storageService.get(StorageKeys.SWAGGER_RESOURCES_LIST); // 转成set,防止重复 List resourcesList = new LinkedList<>();