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

Merge remote-tracking branch 'origin/new_3A' into new_3A

Browse Source
This commit is contained in:
cn 2022-06-15 19:59:13 +08:00
commit b809437e5b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,6 @@ import java.util.Objects;
@Slf4j
@Aspect
@Component
@Order(1)
public class ContextInfoBuilderAspect {
@ -316,10 +315,11 @@ public class ContextInfoBuilderAspect {
}
if (LegacyGuessMissedRsp.ST_GUESS_OK.equals(rsp.getGuessTerminal())) {
contextInfo.setTerminalInfo(
new TerminalInfo(contextInfo.getTerminalInfo().getRawTerminalString(), rsp.getGuessTerminal()));
new TerminalInfo(rsp.getNewTerminal()));
}
if (LegacyGuessMissedRsp.ST_GUESS_OK.equals(rsp.getGuessWorkspace())) {
contextInfo.setWorkspaceId(rsp.getWorkspaceId());
contextInfo.setWorkspaceType(rsp.getWorkspaceType());
}
if (LegacyGuessMissedRsp.ST_GUESS_OK.equals(rsp.getGuessOU())) {
contextInfo.setOuId(rsp.getOuId());