[ISSUE apache#4988] Fix swagger doc registered appName use contextPath

GOODBOY008 · Aug 10, 2023 · 0f83b53 · 0f83b53
1 parent 7711d77
commit 0f83b53
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/...src/main/java/org/apache/shenyu/admin/service/manager/impl/PullSwaggerDocServiceImpl.java b/...src/main/java/org/apache/shenyu/admin/service/manager/impl/PullSwaggerDocServiceImpl.java
@@ -24,6 +24,8 @@
 import java.util.Objects;
 import java.util.Set;
 import javax.annotation.Resource;
+
+import io.vertx.core.json.Json;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -123,7 +125,7 @@ private boolean canPull(final UpstreamInstance instance, final TagVO tagVO) {
     }
 
     private TagVO saveTagVOAndAcquireLock(final UpstreamInstance instance) {
-        List<TagVO> tagVOList = tagService.findByQuery(instance.getContextPath(), AdminConstants.TAG_ROOT_PARENT_ID);
+        List<TagVO> tagVOList = tagService.findByQuery(instance.getClusterName(), AdminConstants.TAG_ROOT_PARENT_ID);
         if (CollectionUtils.isNotEmpty(tagVOList)) {
             TagVO tagVO = tagVOList.get(0);
             TagDO.TagExt tagExt = convertTagExt(tagVO.getExt());
@@ -142,7 +144,7 @@ private TagVO saveTagVOAndAcquireLock(final UpstreamInstance instance) {
     private TagVO createRootTagAndAcquireLock(final UpstreamInstance instance) {
         TagDTO tagDTO = new TagDTO();
         tagDTO.setTagDesc(instance.getClusterName());
-        tagDTO.setName(instance.getContextPath());
+        tagDTO.setName(instance.getClusterName());
         tagDTO.setParentTagId(AdminConstants.TAG_ROOT_PARENT_ID);
         TagDO.TagExt tagExt = new TagDO.TagExt();
         tagExt.setDocLock(this.generateDocLock());

diff --git a/...src/main/java/org/apache/shenyu/admin/service/manager/impl/RegisterApiDocServiceImpl.java b/...src/main/java/org/apache/shenyu/admin/service/manager/impl/RegisterApiDocServiceImpl.java
@@ -60,6 +60,8 @@ public void registerApiDocument(final ApiDocRegisterDTO apiDocRegisterDTO) {
                 tags = apiDocRegisterDTO.getTags();
             }
             for (String tag : tags) {
+                // tag is contextPath,so remove first char '/'
+                tag = tag.substring(1);
                 List<TagVO> byQuery = tagService.findByQuery(tag);
                 if (CollectionUtils.isNotEmpty(byQuery)) {
                     tagsIds.addAll(byQuery.stream().map(TagVO::getId).collect(Collectors.toList()));
@@ -76,8 +78,7 @@ public void registerApiDocument(final ApiDocRegisterDTO apiDocRegisterDTO) {
             apiDTO.setTagIds(tagsIds);
             apiService.createOrUpdate(apiDTO);
         } else if (apiDocRegisterDTO.getEventType().equals(EventType.OFFLINE)) {
-            String contextPath = apiDocRegisterDTO.getContextPath();
-            apiService.offlineByContextPath(contextPath);
+            apiService.offlineByContextPath(apiDocRegisterDTO.getContextPath());
         }
     }