From 2b6d80cd5a1ebfef4a9936c0d73ccc282732642e Mon Sep 17 00:00:00 2001 From: zhansihu Date: Thu, 25 Jan 2024 17:25:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(2046-terminal):=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AFAPP=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/framework/auth/domain/TerminalInfo.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 d31241c..d88921c 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 @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import cn.hutool.core.util.StrUtil; import org.springframework.util.StringUtils; @@ -147,6 +148,8 @@ public class TerminalInfo { */ public static final String NT_MP_WX_GENERAL = "NT_MP_WX_GENERAL"; + public static final String + static { aliasMap.put(NT_MP_WX_GENERAL, NT_MP_WX_GENERAL); } @@ -700,8 +703,11 @@ public class TerminalInfo { /** 是否管理端APP - 待细化 现在等同于isAppGeneral **/ public boolean isManageApp() { - //TODO:@Zhan 待细化具体逻辑 - return this.isAppGeneral(); + //APP管理端多terminal统一使用NT_CMP_APP_GENERAL 同时兼容老APP terminal + if (StrUtil.isBlank(newTerminalString)) { + return false; + } + return StrUtil.equalsAny(newTerminalString, NT_CM_APP_CM_LEADER, NT_CM_APP_GENERAL, NT_CMP_APP_PROJ, NT_CMP_APP_GENERAL); } public static void main(String[] args) {