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

修改获取tenantID的顺序

Browse Source
This commit is contained in:
赵忠林
2024-11-04 13:20:08 +08:00
parent e623f8106c
commit f49ec201f7
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
View File

@@ -40,22 +40,23 @@ public class MybatisPlusConfig {
@Override
public Expression getTenantId() {
String tenantId;
// 从请求头拿ID
tenantId = request.getHeader("tenantId");
if(tenantId != null){
System.out.println("从请求头拿ID = " + tenantId);
return new LongValue(tenantId);
}
// 从域名拿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("授权域名" + Domain + " => " + tenantId);
return new LongValue(tenantId);
}
}
// 从请求头拿ID
final String tenantId = request.getHeader("tenantId");
if(tenantId != null){
System.out.println("从请求头拿ID = " + tenantId);
return new LongValue(tenantId);
}
return getLoginUserTenantId();
}

1
src/main/java/com/gxwebsoft/oa/entity/OaAssets.java
View File

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;