修改：优选从请求头拿租户ID

src/main/java/com/gxwebsoft/common/core/web/BaseController.java

@@ -73,21 +73,21 @@ public class BaseController {
    * @return tenantId
    */
   public Integer getTenantId() {
-    // 1 从域名拿ID
+    // 1 从请求头拿ID
+    String tenantId = request.getHeader("tenantId");
+    if(StrUtil.isNotBlank(tenantId)){
+      return Integer.valueOf(tenantId);
+    }
+    // 2 从域名拿ID
     String Domain = request.getHeader("Domain");
     if (StrUtil.isNotBlank(Domain)) {
       String key = "Domain:" + Domain;
-      String tenantId = redisUtil.get(key);
+      tenantId = redisUtil.get(key);
       if(tenantId != null){
         System.out.println("从域名拿ID = " + tenantId);
         return Integer.valueOf(tenantId);
       }
     }
-    // 2 从请求头拿ID
-    String tenantId = request.getHeader("tenantId");
-    if(StrUtil.isNotBlank(tenantId)){
-      return Integer.valueOf(tenantId);
-    }
     // 1 从登录用户拿tenantId
     User loginUser = getLoginUser();
     if (loginUser != null) {