wangli/axzo-framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix terminal header fill logic

Browse Source
This commit is contained in:
Gao Wei 2022-06-15 12:51:29 +08:00
parent bc889a2c9a
commit c4a42f3285
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/UserInfo.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import cn.axzo.basics.profiles.service.repairutil.ProfileIdRepair;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -17,6 +18,9 @@ public class UserInfo {
private Long acntId;
/**
* 原axzoId迁移过来的，自然人ID
*/
private Long personId;
private Long identityId;
@ -65,8 +69,11 @@ public class UserInfo {
private Long id;
/**
* axzoId=identityId，身份ID
* userId=identityId，身份ID
* 尽量使用上面的三个ID，identityId、personId、acntId
*
* 这个值是这样取到的：
* Long oldIdentityId = ProfileIdRepair.identityNew2OldId(userInfo.getIdentityId(), userInfo.getIdentityType());
*/
@Deprecated
private Long userId;

2
axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java
View File

@ -246,7 +246,7 @@ public class ContextInfoBuilderAspect {
log.warn("请求缺少terminal header，token={}。暂时使用session中的补齐terminal={}。", contextInfo.getToken(),
terminalSession);
terminal = terminalSession;
} else if (TerminalInfo.legacyEquals(terminalHeader, terminalSession)) {
} else if (!TerminalInfo.legacyEquals(terminalHeader, terminalSession)) {
log.warn("请求缺少terminal header与session中不一致，token={}。暂时使用request中的terminal={}，session terminal={}",
contextInfo.getToken(), terminalHeader, terminalSession);
terminal = terminalSession;