From 483a8683e903506d27fa744afa56f0e641a55d77 Mon Sep 17 00:00:00 2001 From: Gao Wei Date: Wed, 13 Jul 2022 18:33:10 +0800 Subject: [PATCH] : --- .../framework/auth/domain/ContextInfo.java | 120 ++++++++++++++++-- .../auth/domain/LegacyGuessMissedReq.java | 7 +- .../framework/auth/domain/TerminalInfo.java | 20 +-- 3 files changed, 127 insertions(+), 20 deletions(-) diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/ContextInfo.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/ContextInfo.java index be0c24c..2f69700 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/ContextInfo.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/ContextInfo.java @@ -21,8 +21,7 @@ import lombok.extern.slf4j.Slf4j; * @author gaowei * */ -@Getter -@Setter +//@Data 这个Annotation在继承的时候有问题，hashCode、equals的warning，所以手动生成了getter、setter @Slf4j @AllArgsConstructor @NoArgsConstructor @@ -71,13 +70,6 @@ public class ContextInfo { * saas租户id */ private Long saasTenantId; - - /** - * TODO: 去干掉visitTo的所有相关代码 - */ - @Deprecated - private String visitTo; - private UserInfoMap userInfoMap; @@ -89,7 +81,6 @@ public class ContextInfo { */ public void buildCustomInfo(HttpServletRequest httpRequest, UserInfoMap infoMap) { // TODO Auto-generated method stub - } @@ -152,4 +143,113 @@ public class ContextInfo { .build(); } + + public String getToken() { + return token; + } + + + public void setToken(String token) { + this.token = token; + } + + + public UserInfo getUserInfo() { + return userInfo; + } + + + public void setUserInfo(UserInfo userInfo) { + this.userInfo = userInfo; + } + + + public SystemAndDeviceInfo getSystemAndDeviceInfo() { + return systemAndDeviceInfo; + } + + + public void setSystemAndDeviceInfo(SystemAndDeviceInfo systemAndDeviceInfo) { + this.systemAndDeviceInfo = systemAndDeviceInfo; + } + + + public TerminalInfo getTerminalInfo() { + return terminalInfo; + } + + + public void setTerminalInfo(TerminalInfo terminalInfo) { + this.terminalInfo = terminalInfo; + } + + + public Long getWorkspaceId() { + return workspaceId; + } + + + public void setWorkspaceId(Long workspaceId) { + this.workspaceId = workspaceId; + } + + + public Integer getWorkspaceType() { + return workspaceType; + } + + + public void setWorkspaceType(Integer workspaceType) { + this.workspaceType = workspaceType; + } + + + public Long getOuId() { + return ouId; + } + + + public void setOuId(Long ouId) { + this.ouId = ouId; + } + + + public Integer getOuType() { + return ouType; + } + + + public void setOuType(Integer ouType) { + this.ouType = ouType; + } + + @Deprecated + public Long getTenantId() { + return tenantId; + } + + @Deprecated + public void setTenantId(Long tenantId) { + this.tenantId = tenantId; + } + + + public Long getSaasTenantId() { + return saasTenantId; + } + + + public void setSaasTenantId(Long saasTenantId) { + this.saasTenantId = saasTenantId; + } + + public UserInfoMap getUserInfoMap() { + return userInfoMap; + } + + + public void setUserInfoMap(UserInfoMap userInfoMap) { + this.userInfoMap = userInfoMap; + } + } diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/LegacyGuessMissedReq.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/LegacyGuessMissedReq.java index 4c517f1..c8b4930 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/LegacyGuessMissedReq.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/LegacyGuessMissedReq.java @@ -7,8 +7,13 @@ public class LegacyGuessMissedReq { public static final String HEADER_LEGACY_GUESS = "legacyGuess"; - private Long requestParamProjectId; + /** + * 这个字段是项目编号，不是主键ID + */ + private String headerProjectId; + private Long requestParamProjectId; + private String originalUrl; private Long headerTenantId; diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java index 7da973e..0c48cc3 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java @@ -87,6 +87,8 @@ public class TerminalInfo { /** * 平台身份，OMS + * + * SmartMIS也传plat */ @Deprecated public static final String STR_TERMINAL_PLAT = "plat"; @@ -104,13 +106,13 @@ public class TerminalInfo { public static final String STR_TERMINAL_PROJ = "proj"; /** - * 智能面板 ？？？ + * SmartMIS */ @Deprecated public static final String STR_TERMINAL_SM = "sm"; /** - * 智能面板 ？？？ + * 智能面板 */ @Deprecated public static final String STR_TERMINAL_SMP = "smp"; @@ -249,12 +251,12 @@ public class TerminalInfo { /** * SM，智能面板机 */ - public static final String NT_SM = "NT_SM"; + public static final String NT_PANEL = "NT_PANEL"; static { - aliasMap.put(NT_SM, NT_SM); - aliasMap.put(STR_TERMINAL_SM, NT_SM); - aliasMap.put(STR_TERMINAL_SMP, NT_SM); - aliasMap.put(STR_TERMINAL_SMART_PANEL, NT_SM); + aliasMap.put(NT_PANEL, NT_PANEL); + aliasMap.put(STR_TERMINAL_SM, NT_PANEL); + aliasMap.put(STR_TERMINAL_SMP, NT_PANEL); + aliasMap.put(STR_TERMINAL_SMART_PANEL, NT_PANEL); } /** @@ -453,8 +455,8 @@ public class TerminalInfo { * 智能面板 * @return */ - public boolean isSM() { - return NT_SM.equals(this.newTerminalString); + public boolean isPANEL() { + return NT_PANEL.equals(this.newTerminalString); } /**