From ca6e7a4528591c96eea2a611e60f42b98f668fe4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 11 Jun 2022 22:24:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=20RPC=20starter=202.=20?=
 =?UTF-8?q?security=20=E7=BB=84=E4=BB=B6=EF=BC=9Afeign=20=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E6=97=B6=EF=BC=8C=E9=80=9A=E8=BF=87=20header=20?=
 =?UTF-8?q?=E9=80=8F=E4=BC=A0=20LoginUser=20=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-dependencies/pom.xml                    |  7 +++
 yudao-framework/pom.xml                       |  1 +
 .../yudao-spring-boot-starter-rpc/pom.xml     | 42 ++++++++++++++++
 .../framework/rpc/config/package-info.java    |  4 ++
 .../framework/rpc/core/package-info.java      |  4 ++
 .../framework/rpc/core/util/FeignUtils.java   | 48 +++++++++++++++++++
 .../yudao/framework/rpc/package-info.java     |  7 +++
 .../《芋道 Spring Boot Dubbo 入门》.md        |  1 +
 ...芋道 Spring Boot 声明式调用 Feign 入门》.md |  1 +
 ...Spring Cloud Alibaba 服务调用 Dubbo 入门》.md |  1 +
 ...��道 Spring Cloud 声明式调用 Feign 入门》.md |  1 +
 .../pom.xml                                   | 14 ++----
 ...=> YudaoSecurityRpcAutoConfiguration.java} | 11 ++++-
 .../core/rpc/LoginUserRequestInterceptor.java | 19 ++++++++
 .../main/resources/META-INF/spring.factories  |  2 +-
 yudao-gateway/pom.xml                         |  9 +---
 .../src/main/resources/application.yaml       |  3 ++
 .../yudao-module-infra-biz/pom.xml            |  9 +---
 .../yudao-module-system-biz/pom.xml           |  9 +---
 19 files changed, 159 insertions(+), 34 deletions(-)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-rpc/pom.xml
 create mode 100644 yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/config/package-info.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/package-info.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/util/FeignUtils.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/package-info.java
 create mode 100644 yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot Dubbo 入门》.md
 create mode 100644 yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot 声明式调用 Feign 入门》.md
 create mode 100644 yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》.md
 create mode 100644 yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud 声明式调用 Feign 入门》.md
 rename yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/{YudaoSecurityFeignAutoConfiguration.java => YudaoSecurityRpcAutoConfiguration.java} (58%)
 create mode 100644 yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/rpc/LoginUserRequestInterceptor.java

diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml
index 9b4a4316d..8cb328656 100644
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -222,6 +222,13 @@
                 <version>${redisson.version}</version>
             </dependency>
 
+            <!-- RPC 远程调用相关 -->
+            <dependency>
+                <groupId>cn.iocoder.cloud</groupId>
+                <artifactId>yudao-spring-boot-starter-rpc</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
             <!-- Registry 注册中心相关 -->
 
             <!-- Config 配置中心相关 -->
diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml
index a5850bd42..e13419176 100644
--- a/yudao-framework/pom.xml
+++ b/yudao-framework/pom.xml
@@ -21,6 +21,7 @@
         <module>yudao-spring-boot-starter-protection</module>
         <module>yudao-spring-boot-starter-job</module>
         <module>yudao-spring-boot-starter-mq</module>
+        <module>yudao-spring-boot-starter-rpc</module>
 
         <module>yudao-spring-boot-starter-excel</module>
         <module>yudao-spring-boot-starter-test</module>
diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/pom.xml b/yudao-framework/yudao-spring-boot-starter-rpc/pom.xml
new file mode 100644
index 000000000..42389560c
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-rpc/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>yudao-framework</artifactId>
+        <groupId>cn.iocoder.cloud</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>yudao-spring-boot-starter-rpc</artifactId>
+    <packaging>jar</packaging>
+
+    <name>${project.artifactId}</name>
+    <description>
+        OpenFeign：提供 RESTful API 的调用
+        Dubbo：提供 Dubbo RPC 的调用
+    </description>
+    <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.iocoder.cloud</groupId>
+            <artifactId>yudao-common</artifactId>
+        </dependency>
+
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-dubbo</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/config/package-info.java b/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/config/package-info.java
new file mode 100644
index 000000000..516acc537
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/config/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 占坑 TODO
+ */
+package cn.iocoder.yudao.framework.rpc.config;
diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/package-info.java b/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/package-info.java
new file mode 100644
index 000000000..e8e494628
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 占坑 TODO
+ */
+package cn.iocoder.yudao.framework.rpc.core;
diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/util/FeignUtils.java b/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/util/FeignUtils.java
new file mode 100644
index 000000000..af81e0be6
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/core/util/FeignUtils.java
@@ -0,0 +1,48 @@
+package cn.iocoder.yudao.framework.rpc.core.util;
+
+import cn.hutool.core.util.ReflectUtil;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
+import feign.RequestTemplate;
+import feign.template.HeaderTemplate;
+import feign.template.Literal;
+import feign.template.Template;
+import feign.template.TemplateChunk;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@link feign.Feign} 工具类
+ *
+ * @author 芋道源码
+ */
+public class FeignUtils {
+
+    /**
+     * 添加 JSON 格式的 Header
+     *
+     * @param requestTemplate 请求
+     * @param name header 名
+     * @param value header 值
+     */
+    @SuppressWarnings("unchecked")
+    public static void createJsonHeader(RequestTemplate requestTemplate, String name, Object value) {
+        if (value == null) {
+            return;
+        }
+        // 添加 header
+        String valueStr = JsonUtils.toJsonString(value);
+        requestTemplate.header(name, valueStr);
+        // fix：由于 OpenFeign 针对 { 会进行分词，所以需要反射修改
+        // 具体分析，可见 https://zhuanlan.zhihu.com/p/360501330 文档
+        Map<String, HeaderTemplate> headers = (Map<String, HeaderTemplate>)
+                ReflectUtil.getFieldValue(requestTemplate, "headers");
+        HeaderTemplate template = headers.get(name);
+        List<Template> templateValues = (List<Template>)
+                ReflectUtil.getFieldValue(template, "values");
+        List<TemplateChunk> templateChunks = (List<TemplateChunk>)
+                ReflectUtil.getFieldValue(templateValues.get(0), "templateChunks");
+        templateChunks.set(0, Literal.create(valueStr));
+    }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/package-info.java b/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/package-info.java
new file mode 100644
index 000000000..004f14d37
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-rpc/src/main/java/cn/iocoder/yudao/framework/rpc/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * OpenFeign：提供 RESTful API 的调用
+ * Dubbo：提供 Dubbo RPC 的调用
+ *
+ * @author 芋道源码
+ */
+package cn.iocoder.yudao.framework.rpc;
diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot Dubbo 入门》.md b/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot Dubbo 入门》.md
new file mode 100644
index 000000000..b799667ba
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot Dubbo 入门》.md	
@@ -0,0 +1 @@
+<http://www.iocoder.cn/Spring-Boot/Dubbo/?yudao>
diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot 声明式调用 Feign 入门》.md b/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot 声明式调用 Feign 入门》.md
new file mode 100644
index 000000000..6df6a3801
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Boot 声明式调用 Feign 入门》.md	
@@ -0,0 +1 @@
+<http://www.iocoder.cn/Spring-Boot/Feign/?yudao>
diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》.md b/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》.md
new file mode 100644
index 000000000..8e4566c15
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud Alibaba 服务调用 Dubbo 入门》.md	
@@ -0,0 +1 @@
+<http://www.iocoder.cn/Spring-Cloud-Alibaba/Dubbo/?yudao>
diff --git a/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud 声明式调用 Feign 入门》.md b/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud 声明式调用 Feign 入门》.md
new file mode 100644
index 000000000..b419fd006
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-rpc/《芋道 Spring Cloud 声明式调用 Feign 入门》.md	
@@ -0,0 +1 @@
+<http://www.iocoder.cn/Spring-Cloud/Feign/?yudao>
diff --git a/yudao-framework/yudao-spring-boot-starter-security/pom.xml b/yudao-framework/yudao-spring-boot-starter-security/pom.xml
index 40d83d633..e28424430 100644
--- a/yudao-framework/yudao-spring-boot-starter-security/pom.xml
+++ b/yudao-framework/yudao-spring-boot-starter-security/pom.xml
@@ -53,17 +53,9 @@
 
         <!-- RPC 远程调用相关 -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-dubbo</artifactId>
+            <groupId>cn.iocoder.cloud</groupId>
+            <artifactId>yudao-spring-boot-starter-rpc</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 
diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityFeignAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityRpcAutoConfiguration.java
similarity index 58%
rename from yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityFeignAutoConfiguration.java
rename to yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityRpcAutoConfiguration.java
index a2b5c6ae7..a9a92e8cf 100644
--- a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityFeignAutoConfiguration.java
+++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoSecurityRpcAutoConfiguration.java
@@ -1,8 +1,11 @@
 package cn.iocoder.yudao.framework.security.config;
 
+import cn.iocoder.yudao.framework.security.core.rpc.LoginUserRequestInterceptor;
 import cn.iocoder.yudao.module.system.api.oauth2.OAuth2TokenApi;
 import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 /**
@@ -13,5 +16,11 @@ import org.springframework.context.annotation.Configuration;
 @Configuration(proxyBeanMethods = false)
 @EnableFeignClients(clients = {OAuth2TokenApi.class, // 主要是引入相关的 API 服务
         PermissionApi.class})
-public class YudaoSecurityFeignAutoConfiguration {
+public class YudaoSecurityRpcAutoConfiguration {
+
+    @Bean
+    public LoginUserRequestInterceptor loginUserRequestInterceptor() {
+        return new LoginUserRequestInterceptor();
+    }
+
 }
diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/rpc/LoginUserRequestInterceptor.java b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/rpc/LoginUserRequestInterceptor.java
new file mode 100644
index 000000000..f855a17ca
--- /dev/null
+++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/rpc/LoginUserRequestInterceptor.java
@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.framework.security.core.rpc;
+
+import cn.iocoder.yudao.framework.rpc.core.util.FeignUtils;
+import cn.iocoder.yudao.framework.security.core.LoginUser;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+public class LoginUserRequestInterceptor implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        LoginUser user = SecurityFrameworkUtils.getLoginUser();
+        if (user != null) {
+            FeignUtils.createJsonHeader(requestTemplate, SecurityFrameworkUtils.LOGIN_USER_HEADER, user);
+        }
+    }
+
+}
diff --git a/yudao-framework/yudao-spring-boot-starter-security/src/main/resources/META-INF/spring.factories b/yudao-framework/yudao-spring-boot-starter-security/src/main/resources/META-INF/spring.factories
index f7b6a72b4..3900197d5 100644
--- a/yudao-framework/yudao-spring-boot-starter-security/src/main/resources/META-INF/spring.factories
+++ b/yudao-framework/yudao-spring-boot-starter-security/src/main/resources/META-INF/spring.factories
@@ -1,4 +1,4 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  cn.iocoder.yudao.framework.security.config.YudaoSecurityFeignAutoConfiguration,\
+  cn.iocoder.yudao.framework.security.config.YudaoSecurityRpcAutoConfiguration,\
   cn.iocoder.yudao.framework.security.config.YudaoSecurityAutoConfiguration,\
   cn.iocoder.yudao.framework.security.config.YudaoWebSecurityConfigurerAdapter
diff --git a/yudao-gateway/pom.xml b/yudao-gateway/pom.xml
index 67db7b556..50f5155fe 100644
--- a/yudao-gateway/pom.xml
+++ b/yudao-gateway/pom.xml
@@ -37,15 +37,10 @@
 
         <!-- RPC 远程调用相关 -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+            <groupId>cn.iocoder.cloud</groupId>
+            <artifactId>yudao-spring-boot-starter-rpc</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-openfeign</artifactId>-->
-<!--        </dependency>-->
-
         <!-- Registry 注册中心相关 -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
diff --git a/yudao-gateway/src/main/resources/application.yaml b/yudao-gateway/src/main/resources/application.yaml
index bc772e6f4..59b5db671 100644
--- a/yudao-gateway/src/main/resources/application.yaml
+++ b/yudao-gateway/src/main/resources/application.yaml
@@ -1,4 +1,7 @@
 spring:
+  main:
+    allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
+
   cloud:
     # Spring Cloud Gateway 配置项，对应 GatewayProperties 类
     gateway:
diff --git a/yudao-module-infra/yudao-module-infra-biz/pom.xml b/yudao-module-infra/yudao-module-infra-biz/pom.xml
index 6b962b41a..023b13b2b 100644
--- a/yudao-module-infra/yudao-module-infra-biz/pom.xml
+++ b/yudao-module-infra/yudao-module-infra-biz/pom.xml
@@ -66,13 +66,8 @@
 
         <!-- RPC 远程调用相关 -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-dubbo</artifactId>
+            <groupId>cn.iocoder.cloud</groupId>
+            <artifactId>yudao-spring-boot-starter-rpc</artifactId>
         </dependency>
 
         <!-- Registry 注册中心相关 -->
diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml
index d2964b46b..de52bf4f9 100644
--- a/yudao-module-system/yudao-module-system-biz/pom.xml
+++ b/yudao-module-system/yudao-module-system-biz/pom.xml
@@ -81,13 +81,8 @@
 
         <!-- RPC 远程调用相关 -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-dubbo</artifactId>
+            <groupId>cn.iocoder.cloud</groupId>
+            <artifactId>yudao-spring-boot-starter-rpc</artifactId>
         </dependency>
 
         <!-- Registry 注册中心相关 -->