diff --git a/src/main/java/com/gxwebsoft/common/core/web/BaseController.java b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java index 9edba14..8c5f48d 100644 --- a/src/main/java/com/gxwebsoft/common/core/web/BaseController.java +++ b/src/main/java/com/gxwebsoft/common/core/web/BaseController.java @@ -78,21 +78,21 @@ public class BaseController { if (loginUser != null) { return loginUser.getTenantId(); } - // 2 从域名拿ID + // 2 从请求头拿ID + String tenantId = request.getHeader("tenantId"); + if(StrUtil.isNotBlank(tenantId)){ + return Integer.valueOf(tenantId); + } + // 3 从域名拿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); } } - // 3 从请求头拿ID - String tenantId = request.getHeader("tenantId"); - if(StrUtil.isNotBlank(tenantId)){ - return Integer.valueOf(tenantId); - } return null; }