From 5811d148da19e6d4b2a83f783039070ffee6393a Mon Sep 17 00:00:00 2001
From: TanJ <tanjie@axzo.cn>
Date: Tue, 18 Jul 2023 16:52:55 +0800
Subject: [PATCH] =?UTF-8?q?terminal=20=E6=B7=BB=E5=8A=A0=20=20NT=5FAPP=5FG?=
 =?UTF-8?q?ENERAL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/auth/domain/TerminalInfo.java   | 31 ++++++++++++++-----
 1 file changed, 23 insertions(+), 8 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 0d575f6..69d2a88 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
@@ -153,14 +153,6 @@ public class TerminalInfo {
 	static {
 		aliasMap.put(NT_MP_WX_GENERAL, NT_MP_WX_GENERAL);
 	}
-	/**
-	 * APP端。APP合并之后未确认身份的时候使用该端
-	 */
-	public static final String NT_APP_GENERAL = "NT_APP_GENERAL";
-
-	static {
-		aliasMap.put(NT_APP_GENERAL, NT_APP_GENERAL);
-	}
 
 	/**
 	 * 是否是小程序
@@ -174,6 +166,29 @@ public class TerminalInfo {
 		return newTerminalString.startsWith("NT_MP_");
 	}
 
+
+
+	/**
+	 * APP端。APP合并之后未确认身份的时候使用该端
+	 */
+	public static final String NT_APP_GENERAL = "NT_APP_GENERAL";
+
+	static {
+		aliasMap.put(NT_APP_GENERAL, NT_APP_GENERAL);
+	}
+
+	/**
+	 *  是否为合并之后的APP端(只有在未确认身份之前生效)
+	 * @return
+	 */
+	public boolean isAppGeneral() {
+		if (!StringUtils.hasText(newTerminalString)) {
+			return false;
+		}
+		return newTerminalString.startsWith("NT_APP_GENERAL");
+	}
+
+
 	/**
 	 * CMS - Web 还没选择任何具体的工作台。
 	 * 也不会有产品板块、Feature配置在这个类型的Terminal。