2. tenant 组件：feign 调用时，通过 header 透传 Tenant 信息

http-client.env.json

@@ -14,6 +14,7 @@
   "gateway": {
     "baseUrl": "http://127.0.0.1:48080/admin-api",
     "systemBaseUrl": "http://127.0.0.1:48080/admin-api",
+    "infaBaseUrl": "http://127.0.0.1:48080/admin-api",
     "token": "test1",
     "adminTenentId": "1",
 

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/RpcConstants.java

@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.framework.common.enums;
+
+/**
+ * RPC 相关的枚举
+ *
+ * 虽然放在 yudao-spring-boot-starter-rpc 会相对合适，但是每个 API 模块需要使用到，所以暂时只好放在此处
+ *
+ * @author 芋道源码
+ */
+public class RpcConstants {
+
+    /**
+     * RPC API 的前缀
+     */
+    public static final String RPC_API_PREFIX = "/rpc-api";
+
+}

yudao-framework/yudao-spring-boot-starter-biz-tenant/pom.xml

@@ -38,6 +38,13 @@
             <artifactId>yudao-spring-boot-starter-redis</artifactId>
         </dependency>
 
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>cn.iocoder.cloud</groupId>
+            <artifactId>yudao-spring-boot-starter-rpc</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <!-- Job 定时任务相关 -->
         <dependency>
             <groupId>cn.iocoder.cloud</groupId>

yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantRpcAutoConfiguration.java

@@ -0,0 +1,17 @@
+package cn.iocoder.yudao.framework.tenant.config;
+
+import cn.iocoder.yudao.framework.tenant.core.rpc.TenantRequestInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConditionalOnProperty(prefix = "yudao.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户
+public class YudaoTenantRpcAutoConfiguration {
+
+    @Bean
+    public TenantRequestInterceptor tenantRequestInterceptor() {
+        return new TenantRequestInterceptor();
+    }
+
+}

yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/rpc/TenantRequestInterceptor.java

@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.framework.tenant.core.rpc;
+
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
+import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+
+import static cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils.HEADER_TENANT_ID;
+
+/**
+ * Tenant 的 RequestInterceptor 实现类：Feign 请求时，将 {@link TenantContextHolder} 设置到 header 中，继续透传给被调用的服务
+ *
+ * @author 芋道源码
+ */
+public class TenantRequestInterceptor implements RequestInterceptor {
+
+    @Override
+    public void apply(RequestTemplate requestTemplate) {
+        Long tenantId = TenantContextHolder.getTenantId();
+        if (tenantId != null) {
+            requestTemplate.header(HEADER_TENANT_ID, String.valueOf(tenantId));
+        }
+    }
+
+}

yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/security/TenantSecurityWebFilter.java

@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.framework.tenant.core.security;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.enums.RpcConstants;
 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.servlet.ServletUtils;
@@ -53,6 +55,12 @@ public class TenantSecurityWebFilter extends ApiRequestFilter {
         this.tenantFrameworkService = tenantFrameworkService;
     }
 
+    @Override
+    protected boolean shouldNotFilter(HttpServletRequest request) {
+        return super.shouldNotFilter(request) &&
+                !StrUtil.startWithAny(request.getRequestURI(), RpcConstants.RPC_API_PREFIX); // 因为 RPC API 也会透传租户编号
+    }
+
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
             throws ServletException, IOException {

yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/web/TenantContextWebFilter.java

@@ -18,8 +18,6 @@ import java.io.IOException;
  */
 public class TenantContextWebFilter extends OncePerRequestFilter {
 
-    private static final String HEADER_TENANT_ID = "tenant-id";
-
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
             throws ServletException, IOException {

yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,3 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  cn.iocoder.yudao.framework.tenant.config.YudaoTenantRpcAutoConfiguration,\
   cn.iocoder.yudao.framework.tenant.config.YudaoTenantAutoConfiguration

yudao-framework/yudao-spring-boot-starter-security/pom.xml

@@ -44,18 +44,18 @@
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
 
-        <!-- 业务组件 -->
+        <!-- RPC 远程调用相关 -->
         <dependency>
             <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它，进行 Token 的校验 -->
+            <artifactId>yudao-spring-boot-starter-rpc</artifactId>
-            <version>${revision}</version>
+            <optional>true</optional>
         </dependency>
 
-        <!-- RPC 远程调用相关 -->
+        <!-- 业务组件 -->
         <dependency>
             <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-rpc</artifactId>
+            <artifactId>yudao-module-system-api</artifactId> <!-- 需要使用它，进行 Token 的校验 -->
-            <optional>true</optional>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 

yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/rpc/LoginUserRequestInterceptor.java

@@ -6,6 +6,11 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
 
+/**
+ * LoginUser 的 RequestInterceptor 实现类：Feign 请求时，将 {@link LoginUser} 设置到 header 中，继续透传给被调用的服务
+ *
+ * @author 芋道源码
+ */
 public class LoginUserRequestInterceptor implements RequestInterceptor {
 
     @Override

yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/util/WebFrameworkUtils.java

@@ -23,7 +23,7 @@ public class WebFrameworkUtils {
 
     private static final String REQUEST_ATTRIBUTE_COMMON_RESULT = "common_result";
 
-    private static final String HEADER_TENANT_ID = "tenant-id";
+    public static final String HEADER_TENANT_ID = "tenant-id";
 
     private static WebProperties properties;
 

yudao-gateway/pom.xml

@@ -37,8 +37,8 @@
 
         <!-- RPC 远程调用相关 -->
         <dependency>
-            <groupId>cn.iocoder.cloud</groupId>
+            <groupId>org.springframework.cloud</groupId>
-            <artifactId>yudao-spring-boot-starter-rpc</artifactId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
 
         <!-- Registry 注册中心相关 -->

yudao-gateway/src/main/resources/application.yaml

@@ -15,3 +15,11 @@ spring:
           uri: grayLb://system-server
           predicates: # 断言，作为路由的匹配条件，对应 RouteDefinition 数组
             - Path=/app-api/system/**
+        - id: infra-admin-api # 路由的编号
+          uri: grayLb://infra-server
+          predicates: # 断言，作为路由的匹配条件，对应 RouteDefinition 数组
+            - Path=/admin-api/infra/**
+        - id: infra-app-api # 路由的编号
+          uri: grayLb://infra-server
+          predicates: # 断言，作为路由的匹配条件，对应 RouteDefinition 数组
+            - Path=/app-api/infra/**

yudao-module-infra/yudao-module-infra-api/src/main/java/cn/iocoder/yudao/module/infra/enums/ApiConstants.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.infra.enums;
 
+import cn.iocoder.yudao.framework.common.enums.RpcConstants;
+
 /**
  * API 相关的枚举
  *
@@ -14,7 +16,7 @@ public class ApiConstants {
      */
     public static final String NAME = "infra-server";
 
-    public static final String PREFIX = "/rpc-api/system";
+    public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/system";
 
     public static final String VERSION = "1.0.0";
 

yudao-module-infra/yudao-module-infra-biz/pom.xml

@@ -42,6 +42,10 @@
             <groupId>cn.iocoder.cloud</groupId>
             <artifactId>yudao-spring-boot-starter-biz-operatelog</artifactId>
         </dependency>
+        <dependency>
+            <groupId>cn.iocoder.cloud</groupId>
+            <artifactId>yudao-spring-boot-starter-biz-tenant</artifactId>
+        </dependency>
 
         <!-- Web 相关 -->
         <dependency>

yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/TmpConfiguration.java

@@ -1,15 +1,12 @@
 package cn.iocoder.yudao.module.infra.framework;
 
-import cn.iocoder.yudao.framework.apilog.core.service.ApiAccessLogFrameworkService;
-import cn.iocoder.yudao.framework.apilog.core.service.ApiErrorLogFrameworkService;
-import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiAccessLogCreateReqDTO;
-import cn.iocoder.yudao.framework.apilog.core.service.dto.ApiErrorLogCreateReqDTO;
 import cn.iocoder.yudao.framework.operatelog.core.dto.OperateLogCreateReqDTO;
 import cn.iocoder.yudao.framework.operatelog.core.service.OperateLogFrameworkService;
-import cn.iocoder.yudao.module.infra.api.file.FileApi;
+import cn.iocoder.yudao.framework.tenant.core.service.TenantFrameworkService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.List;
 import java.util.concurrent.Future;
 
 @Configuration
@@ -25,4 +22,19 @@ public class TmpConfiguration {
         };
     }
 
+    @Bean
+    public TenantFrameworkService tenantFrameworkService() {
+        return new TenantFrameworkService() {
+            @Override
+            public List<Long> getTenantIds() {
+                return null;
+            }
+
+            @Override
+            public void validTenant(Long id) {
+
+            }
+        };
+    }
+
 }

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ApiConstants.java

@@ -1,5 +1,7 @@
 package cn.iocoder.yudao.module.system.enums;
 
+import cn.iocoder.yudao.framework.common.enums.RpcConstants;
+
 /**
  * API 相关的枚举
  *
@@ -14,7 +16,7 @@ public class ApiConstants {
      */
     public static final String NAME = "system-server";
 
-    public static final String PREFIX = "/rpc-api/system";
+    public static final String PREFIX = RpcConstants.RPC_API_PREFIX +  "/system";
 
     public static final String VERSION = "1.0.0";