【修改】修改tenant

framework-boot/src/main/java/com/mrxu/framework/boot/entity/RpcRequestInfo.java

@@ -22,7 +22,7 @@ public class RpcRequestInfo {
 
     protected String trackId;
 
-    protected String merchantId;
+    protected String tenantId;
 
     protected String username;
 
@@ -32,8 +32,8 @@ public class RpcRequestInfo {
        return get().trackId;
     }
 
-    public static String getMerchantId() {
-        return get().merchantId;
+    public static String getTenantId() {
+        return get().tenantId;
     }
 
     public static String getUsername() {

framework-boot/src/main/java/com/mrxu/framework/boot/feign/FeignRequestInterceptor.java

@@ -22,8 +22,8 @@ public class FeignRequestInterceptor implements RequestInterceptor {
         if(StringUtils.isNotBlank(RpcRequestInfo.getIp())){
             requestTemplate.header(HeaderConstant.IP,RpcRequestInfo.getIp());
         }
-        if(StringUtils.isNotBlank(RpcRequestInfo.getMerchantId())){
-            requestTemplate.header(HeaderConstant.MERCHANT_ID,RpcRequestInfo.getMerchantId());
+        if(StringUtils.isNotBlank(RpcRequestInfo.getTenantId())){
+            requestTemplate.header(HeaderConstant.TENANT_ID,RpcRequestInfo.getTenantId());
         }
         if(StringUtils.isNotBlank(RpcRequestInfo.getUsername())){
             requestTemplate.header(HeaderConstant.USER_NAME,RpcRequestInfo.getUsername());

framework-boot/src/main/java/com/mrxu/framework/boot/feign/HeaderConstant.java

@@ -16,7 +16,7 @@ public interface HeaderConstant {
     /**
      * 租户id
      */
-    public static final String MERCHANT_ID = "merchant_id";
+    public static final String TENANT_ID = "tenant_id";
 
     /**
      * 当前登录名称

framework-boot/src/main/java/com/mrxu/framework/boot/handle/UserInfoHandler.java

@@ -21,11 +21,11 @@ public class UserInfoHandler extends HandlerInterceptorAdapter {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler){
         //获取设置头部信息
-        RpcRequestInfo requestInfo = RpcRequestInfo.get();
-        if(requestInfo.getMerchantId() != null){
+        if(RpcRequestInfo.getTenantId() != null){
             //已经设置过当前登录信息
             return true;
         }
+        RpcRequestInfo requestInfo = RpcRequestInfo.get();
         String trackId = request.getHeader(HeaderConstant.TRACK_ID);
         if (StringUtils.isNotBlank(trackId)) {
             requestInfo.setTrackId(trackId);
@@ -34,9 +34,9 @@ public class UserInfoHandler extends HandlerInterceptorAdapter {
         if (StringUtils.isNotBlank(ip)) {
             requestInfo.setIp(ip);
         }
-        String merchantId = request.getHeader(HeaderConstant.MERCHANT_ID);
-        if (StringUtils.isNotBlank(merchantId)) {
-            requestInfo.setMerchantId(merchantId);
+        String tenantId = request.getHeader(HeaderConstant.TENANT_ID);
+        if (StringUtils.isNotBlank(tenantId)) {
+            requestInfo.setTenantId(tenantId);
         }
         String userName = request.getHeader(HeaderConstant.USER_NAME);
         if (StringUtils.isNotBlank(userName)) {

framework-gateway/src/main/java/com/micro/cloud/GatewayServiceApplication.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @Slf4j
 public class GatewayServiceApplication {
 
-    //http://localhost:8080/rest/v1/服务名/merchant/merchant/getById?id=1
+    //http://localhost:8080/rest/v1/服务名/base/base/getById?id=1
     public static void main(String[] args) {
         long start = System.currentTimeMillis();
         SpringApplication.run(GatewayServiceApplication.class, args);