From e3c47cd1a3826d1cbfcc3c854739e75aa9989b5f Mon Sep 17 00:00:00 2001
From: 86191 <2160251938@qq.com>
Date: Thu, 8 Aug 2024 21:59:30 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E4=BF=AE=E5=A4=8Dforest=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82nacospi=E6=8E=A5=E5=8F=A3=E4=B8=BA=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/muyu/common/nacos/remote/NacosServiceRemote.java    | 6 +++---
 .../nacos/remote/interceptor/NacosNamespaceInterceptor.java | 4 ++--
 .../java/com/muyu/common/nacos/service/NacosService.java    | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/muyu/common/nacos/remote/NacosServiceRemote.java b/src/main/java/com/muyu/common/nacos/remote/NacosServiceRemote.java
index 3c2f037..6978695 100644
--- a/src/main/java/com/muyu/common/nacos/remote/NacosServiceRemote.java
+++ b/src/main/java/com/muyu/common/nacos/remote/NacosServiceRemote.java
@@ -13,12 +13,12 @@ import com.muyu.common.nacos.remote.resp.ServiceListResp;
  * nacos服务api
  */
 @BaseRequest(
-        baseURL = Constants.HTTP+"#{nacos.addr}/nacos/v1/ns/service",
-        interceptor = {NacosNamespaceInterceptor.class}
+        baseURL = Constants.HTTP+"#{nacos.addr}/nacos/v1/ns/service"
 )
 public interface NacosServiceRemote {
     @GetRequest(
-            url = "/list"
+            url = "/list",
+            interceptor = {NacosNamespaceInterceptor.class}
     )
     public ServiceListResp serviceList(@Query ServiceListReq serviceListReq);
 }
diff --git a/src/main/java/com/muyu/common/nacos/remote/interceptor/NacosNamespaceInterceptor.java b/src/main/java/com/muyu/common/nacos/remote/interceptor/NacosNamespaceInterceptor.java
index f209a9c..d748142 100644
--- a/src/main/java/com/muyu/common/nacos/remote/interceptor/NacosNamespaceInterceptor.java
+++ b/src/main/java/com/muyu/common/nacos/remote/interceptor/NacosNamespaceInterceptor.java
@@ -23,11 +23,11 @@ public class NacosNamespaceInterceptor<T> implements Interceptor<T> {
         if (StringUtils.isNotEmpty(namespaceId)) {
             String reqNamespaceId = Convert.utf8Str(req.getQuery("namespaceId"));
             if (reqNamespaceId == null){
-                log.warn("本次请求nacos的namespaceId未携带,已添加[{}]",namespaceId);
+                log.warn("本次请求nacos的namespaceId未携带,已添加[{}]",reqNamespaceId,namespaceId);
                 req.addQuery("namespaceId", namespaceId);
             }else {
                 if (StringUtils.equals(reqNamespaceId,namespaceId)){
-                    log.warn("本次请求nacos的namespaceId与和项目ID不相符,现已更改:[{}->{}]",namespaceId);
+                    log.warn("本次请求nacos的namespaceId与和项目ID不相符,现已更改:[{}->{}]",reqNamespaceId,namespaceId);
                     req.addQuery("namespaceId", namespaceId);
                 }
             }
diff --git a/src/main/java/com/muyu/common/nacos/service/NacosService.java b/src/main/java/com/muyu/common/nacos/service/NacosService.java
index d5c8753..74d36d1 100644
--- a/src/main/java/com/muyu/common/nacos/service/NacosService.java
+++ b/src/main/java/com/muyu/common/nacos/service/NacosService.java
@@ -5,7 +5,7 @@ import com.muyu.common.nacos.remote.req.ServiceListReq;
 import com.muyu.common.nacos.remote.resp.ServiceListResp;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.annotation.Resource;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,6 +28,7 @@ public class NacosService {
                             .pageSize(pageSize)
                             .build()
             );
+            serverList.addAll(serviceListResp.getDoms());
         }while (serviceListResp.getCount() > pageNo * pageSize);
 
         return serverList;