From 5f7938e2420119392494d08276d6f95a59fbfd85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E4=B8=9C=E4=BD=B3?= <14614659+dongjia-li@user.noreply.gitee.com> Date: Sat, 10 Aug 2024 03:10:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 35 +++++++++++++++++ pom.xml | 31 +++++++++++++++ .../nacos/remote/NacosServiceRemote.java | 28 +++++++++++++ .../NacosNamespaceInterceptor.java | 39 +++++++++++++++++++ .../muyu/common/nacos/remote/req/BaseReq.java | 25 ++++++++++++ .../nacos/remote/req/ServiceListReq.java | 35 +++++++++++++++++ .../nacos/remote/resp/ServiceListResp.java | 32 +++++++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + 8 files changed, 226 insertions(+) create mode 100644 .gitignore create mode 100644 pom.xml create mode 100644 src/main/java/com/muyu/common/nacos/remote/NacosServiceRemote.java create mode 100644 src/main/java/com/muyu/common/nacos/remote/interceptor/NacosNamespaceInterceptor.java create mode 100644 src/main/java/com/muyu/common/nacos/remote/req/BaseReq.java create mode 100644 src/main/java/com/muyu/common/nacos/remote/req/ServiceListReq.java create mode 100644 src/main/java/com/muyu/common/nacos/remote/resp/ServiceListResp.java create mode 100644 src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3e403e3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,35 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..b84ea9d --- /dev/null +++ b/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + + + com.muyu + cloud-common + 3.6.3 + + + cloud-common-nacos-remote + 1.0.0 + + + 17 + 17 + UTF-8 + + + + + + com.muyu + cloud-common-core + + + + diff --git a/src/main/java/com/muyu/common/nacos/remote/NacosServiceRemote.java b/src/main/java/com/muyu/common/nacos/remote/NacosServiceRemote.java new file mode 100644 index 0000000..77419f9 --- /dev/null +++ b/src/main/java/com/muyu/common/nacos/remote/NacosServiceRemote.java @@ -0,0 +1,28 @@ +package com.muyu.common.nacos.remote; + +import com.dtflys.forest.annotation.BaseRequest; +import com.dtflys.forest.annotation.Body; +import com.dtflys.forest.annotation.GetRequest; +import com.muyu.common.core.constant.Constants; +import com.muyu.common.nacos.remote.interceptor.NacosNamespaceInterceptor; +import com.muyu.common.nacos.remote.req.ServiceListReq; +import com.muyu.common.nacos.remote.resp.ServiceListResp; + +/** + * @Author:LiDongJia + * @Package:com.muyu.common.nacos.remote + * @Project:cloud-common-nacos-remote + * @name:NacosServiceApi + * @Date:2024/8/10 2:07 + */ +@BaseRequest( + baseURL = Constants.HTTP+"#{nacos.addr}/nacos/v1/ns/service", + interceptor = {NacosNamespaceInterceptor.class} +) +public interface NacosServiceRemote { + + @GetRequest( + url = "/list" + ) + public ServiceListResp serviceList(@Body 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 new file mode 100644 index 0000000..bb7216a --- /dev/null +++ b/src/main/java/com/muyu/common/nacos/remote/interceptor/NacosNamespaceInterceptor.java @@ -0,0 +1,39 @@ +package com.muyu.common.nacos.remote.interceptor; + +import com.dtflys.forest.http.ForestRequest; +import com.dtflys.forest.interceptor.Interceptor; +import com.muyu.common.core.text.Convert; +import com.muyu.common.core.utils.StringUtils; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Value; + +@Log4j2 +public class NacosNamespaceInterceptor implements Interceptor { + + @Value("${nacos.namespace}") + private String namespaceId; + + /** + * 该方法在请求发送之前被调用, 若返回false则不会继续发送请求 + * @Param request Forest请求对象 + */ + @Override + public boolean beforeExecute(ForestRequest req) { + if (StringUtils.isNotEmpty(namespaceId)){ + String reqNamespaceId = Convert.str(req.getQuery("namespaceId"), ""); + req.addQuery("namespaceId", namespaceId); // 添加URL的Query参数 + if (reqNamespaceId == null){ + log.warn("本次请求nacos的namespaceId未携带, 已添加: [{}]", namespaceId); + req.addQuery("namespaceId", namespaceId); + }else { + if (StringUtils.equals(reqNamespaceId, namespaceId)){ + log.warn("本次请求nacos的namespaceId和项目ID不相符, 现已更改: [{} -> {}]", reqNamespaceId, namespaceId); + req.addQuery("namespaceId", namespaceId); + } + } + } + + return true; // 继续执行请求返回true + } +} + diff --git a/src/main/java/com/muyu/common/nacos/remote/req/BaseReq.java b/src/main/java/com/muyu/common/nacos/remote/req/BaseReq.java new file mode 100644 index 0000000..d3483cb --- /dev/null +++ b/src/main/java/com/muyu/common/nacos/remote/req/BaseReq.java @@ -0,0 +1,25 @@ +package com.muyu.common.nacos.remote.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author:LiDongJia + * @Package:com.muyu.common.nacos.api.req + * @Project:cloud-common-nacos-remote + * @name:BaseReq + * @Date:2024/8/10 2:23 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class BaseReq { + + /** + * 命名空间 + */ + private String namespaceId; +} diff --git a/src/main/java/com/muyu/common/nacos/remote/req/ServiceListReq.java b/src/main/java/com/muyu/common/nacos/remote/req/ServiceListReq.java new file mode 100644 index 0000000..b2a570e --- /dev/null +++ b/src/main/java/com/muyu/common/nacos/remote/req/ServiceListReq.java @@ -0,0 +1,35 @@ +package com.muyu.common.nacos.remote.req; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author:LiDongJia + * @Package:com.muyu.common.nacos.api.req + * @Project:cloud-common-nacos-remote + * @name:ServiceListReq + * @Date:2024/8/10 2:25 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class ServiceListReq extends BaseReq{ + + /** + * 当前页码 + */ + private int pageNo; + + /** + * 分页大小 + */ + private int pageSize = 10; + + /** + * 分组名 + */ + private String groupName; +} diff --git a/src/main/java/com/muyu/common/nacos/remote/resp/ServiceListResp.java b/src/main/java/com/muyu/common/nacos/remote/resp/ServiceListResp.java new file mode 100644 index 0000000..3baaa1e --- /dev/null +++ b/src/main/java/com/muyu/common/nacos/remote/resp/ServiceListResp.java @@ -0,0 +1,32 @@ +package com.muyu.common.nacos.remote.resp; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Author:LiDongJia + * @Package:com.muyu.common.nacos.api.resp + * @Project:cloud-common-nacos-remote + * @name:ServiceListResp + * @Date:2024/8/10 2:31 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ServiceListResp { + + /** + * 总条数 + */ + private int count; + + /** + * 服务列表 + */ + private List doms; +} diff --git a/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..dc8e9aa --- /dev/null +++ b/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.common.nacos.remote.interceptor.NacosNamespaceInterceptor.java