From c61cb5c1c96a4a051956ac5ed72af4612f77cc33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=89=E5=A0=A1?= Date: Fri, 24 Jun 2022 23:42:09 +0800 Subject: [PATCH] =?UTF-8?q?update:=E6=99=BA=E8=83=BD=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/auth/domain/TerminalInfo.java | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) 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 2bce57c..77e46e7 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 @@ -105,6 +105,11 @@ public class TerminalInfo { */ @Deprecated public static final String STR_TERMINAL_SMP = "smp"; + /** + * 智能面板 ??? + */ + @Deprecated + public static final String STR_TERMINAL_SMART_PANEL = "smart_panel"; /** @@ -120,11 +125,7 @@ public class TerminalInfo { @Deprecated public static final String STR_TERMINAL_SCREEN = "screen"; - /** - * 智能面板 - */ - @Deprecated - public static final String STR_TERMINAL_SMART_PANEL = "smart_panel"; + /** * CMS - Web 还没选择任何具体的工作台。 @@ -234,15 +235,7 @@ public class TerminalInfo { aliasMap.put(NT_SM, NT_SM); aliasMap.put(STR_TERMINAL_SM, NT_SM); aliasMap.put(STR_TERMINAL_SMP, NT_SM); - } - - /** - * 智能面板 - */ - public static final String NT_SMART_PANEL = "NT_SMART_PANEL"; - static { - aliasMap.put(NT_SMART_PANEL, NT_SMART_PANEL); - aliasMap.put(STR_TERMINAL_SMART_PANEL, NT_SMART_PANEL); + aliasMap.put(STR_TERMINAL_SMART_PANEL, NT_SM); } @@ -442,8 +435,8 @@ public class TerminalInfo { * 智能面板 * @return */ - public boolean isSMART_PANEL() { - return NT_SMART_PANEL.equals(this.newTerminalString); + public boolean isSM() { + return NT_SM.equals(this.newTerminalString); } /**