gxwebsoft/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
赵忠林
2024-12-26 20:36:09 +08:00
parent 436b12e818
commit 0d63620f58
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/gxwebsoft/common/core/web/BaseController.java
View File

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