Add:

1.添加小程序端:NT_MP_WX_GENERAL
2.添加认证状态:VerifyStatusEnum

axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java

@@ -1,15 +1,11 @@
 package cn.axzo.framework.auth.domain;
 
 import cn.hutool.core.collection.CollectionUtil;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 import org.springframework.util.StringUtils;
 
+import java.util.*;
+import java.util.Map.Entry;
+
 
 /**
  * 安心筑的所有终端的类型定义。
@@ -132,19 +128,43 @@ public class TerminalInfo {
 	@Deprecated
 	public static final String STR_TERMINAL_PL_PREFIX = "pl-";
 
-	private static Map<String, String> aliasMap = new HashMap<>();
+	private static final Map<String, String> aliasMap = new HashMap<>();
-	private static Map<String, List<String>> ntLegacyMap = new HashMap<>();
+	private static final Map<String, List<String>> ntLegacyMap = new HashMap<>();
 
 	@Deprecated
 	public static final String STR_TERMINAL_SCREEN = "screen";
 
-	
+	/**
+	 * MP_WX - 微信小程序。
+	 * 也不会有产品板块、Feature配置在这个类型的Terminal。
+	 * 这里只是登录、选择具体的工作台，这一类基础的功能。
+	 */
+	public static final String NT_MP_WX_GENERAL = "NT_MP_WX_GENERAL";
+
+	static {
+		aliasMap.put(NT_MP_WX_GENERAL, NT_MP_WX_GENERAL);
+	}
+
+
+	/**
+	 * 是否是小程序
+	 *
+	 * @return
+	 */
+	public boolean isMP() {
+		if (!StringUtils.hasText(newTerminalString)) {
+			return false;
+		}
+		return newTerminalString.startsWith("NT_MP_");
+	}
+
 	/**
 	 * CMS - Web 还没选择任何具体的工作台。
 	 * 也不会有产品板块、Feature配置在这个类型的Terminal。
 	 * 这里只是登录、选择具体的工作台，这一类基础的功能。
 	 */
 	public static final String NT_CMS_WEB_GENERAL = "NT_CMS_WEB_GENERAL";
+
 	static {
 		aliasMap.put(NT_CMS_WEB_GENERAL, NT_CMS_WEB_GENERAL);
 		aliasMap.put(STR_TERMINAL_CMS, NT_CMS_WEB_GENERAL);
@@ -327,19 +347,19 @@ public class TerminalInfo {
 		}
 	}
 
-	private String rawTerminalString;
+	private final String rawTerminalString;
 
-	private String newTerminalString;
+	private final String newTerminalString;
 
 	
 	/**
 	 * 代表CMS的几个字符串，无法确切的指明一个NewTerminal
 	 */
 	@Deprecated
-	private boolean ambiguous;
+	private final boolean ambiguous;
 
 	@Deprecated
-	private static Set<String> ambiguousNames = new HashSet<>();
+	private static final Set<String> ambiguousNames = new HashSet<>();
 	static {
 		ambiguousNames.add(STR_TERMINAL_CMS);
 		ambiguousNames.add(NUM_TERMINAL_CMS);
@@ -449,10 +469,7 @@ public class TerminalInfo {
 		String legacyNT = aliasMap.get(legacyTerminalString);
 		if (legacyNT == null)
 			return false;
-		if (legacyNT.equals(this.newTerminalString)) {
+		return legacyNT.equals(this.newTerminalString);
-			return true;
-		}
-		return false;
 	}
 
 	@Deprecated
@@ -611,35 +628,35 @@ public class TerminalInfo {
 	public static void main(String[] args) {
 		TerminalInfo tm = new TerminalInfo("proj");
 		System.out.println(tm.getRawTerminalString());
-		System.out.println(tm.toString());
+		System.out.println(tm);
 		System.out.println(TerminalInfo.parseLegacyTerminal(tm.getRawTerminalString()));
 		System.out.println(TerminalInfo.parseLegacyTerminalLegacyPerspective(tm.getRawTerminalString(), "proj", "ent"));
 		System.out.println("--------");
 		
 		tm = new TerminalInfo("cms");
 		System.out.println(tm.getRawTerminalString());
-		System.out.println(tm.toString());
+		System.out.println(tm);
 		System.out.println(TerminalInfo.parseLegacyTerminal(tm.getRawTerminalString()));
 		System.out.println(TerminalInfo.parseLegacyTerminalLegacyPerspective(tm.getRawTerminalString(), "proj", "ent"));
 		System.out.println("--------");
 		
 		tm = new TerminalInfo("ent");
 		System.out.println(tm.getRawTerminalString());
-		System.out.println(tm.toString());
+		System.out.println(tm);
 		System.out.println(TerminalInfo.parseLegacyTerminal(tm.getRawTerminalString()));
 		System.out.println(TerminalInfo.parseLegacyTerminalLegacyPerspective(tm.getRawTerminalString(), "proj", "ent"));
 		System.out.println("--------");
 		
 		tm = new TerminalInfo("cmp");
 		System.out.println(tm.getRawTerminalString());
-		System.out.println(tm.toString());
+		System.out.println(tm);
 		System.out.println(TerminalInfo.parseLegacyTerminal(tm.getRawTerminalString()));
 		System.out.println(TerminalInfo.parseLegacyTerminalLegacyPerspective(tm.getRawTerminalString(), "proj", "ent"));
 		System.out.println("--------");
 		
 		tm = new TerminalInfo(TerminalInfo.NT_CMS_WEB_PROJ);
 		System.out.println(tm.getRawTerminalString());
-		System.out.println(tm.toString());
+		System.out.println(tm);
 		System.out.println(TerminalInfo.parseLegacyTerminal(tm.getRawTerminalString()));
 		System.out.println(TerminalInfo.parseLegacyTerminalLegacyPerspective(tm.getRawTerminalString(), "proj", "ent"));
 		System.out.println("--------");

axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/UserInfo.java

@@ -1,5 +1,6 @@
 package cn.axzo.framework.auth.domain;
 
+import cn.axzo.framework.auth.enums.VerifyStatusEnum;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -13,25 +14,30 @@ public class UserInfo {
 
 	/**
 	 * 自然人ID，从原axzoId迁移过来的，每个自然人有一个ID，后续这里的ID会被治理，不会和原axzoId一一对应。
-	 */
+     */
-	private Long personId;
+    private Long personId;
 
-	/**
+    /**
-	 * 身份ID，以后大家最常用的ID，用于各种具体的业务场景。
+     * 身份ID，以后大家最常用的ID，用于各种具体的业务场景。
-	 */
+     */
-	private Long identityId;
+    private Long identityId;
 
-	private Integer identityType;
+    private Integer identityType;
 
-	/**
+    /**
-	 * 账号ID，从原axzoId迁移过来的，是用来登录、发消息、发手机短信等使用的账号。
+     * 认证状态
-	 */
+     */
-	private Long acntId;
+    private VerifyStatusEnum verifyStatus;
 
-	/**
+    /**
-	 * 手机号，是从账号表里取到的，用户登录、短信验证、消息推送都是这个phone
+     * 账号ID，从原axzoId迁移过来的，是用来登录、发消息、发手机短信等使用的账号。
-	 */
+     */
-	private String phoneNumber;
+    private Long acntId;
+
+    /**
+     * 手机号，是从账号表里取到的，用户登录、短信验证、消息推送都是这个phone
+     */
+    private String phoneNumber;
 
 
 	/**

axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/enums/VerifyStatusEnum.java

@@ -0,0 +1,43 @@
+package cn.axzo.framework.auth.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 项目名称：profiles
+ * 类 名 称：ProfileSourceType
+ * 类 描 述：TODO
+ * 创建时间：2022/5/9 21:59
+ * 创 建 人：xuyaozuo
+ */
+@Getter
+@RequiredArgsConstructor
+public enum VerifyStatusEnum {
+    //状态 0 - 未激活, 1 - 已激活，2 - 禁用,3- 认证失败
+    NOT_VERIFIED(0, "未认证"),
+    VERIFYING(1, "认证中"),
+    VERIFY_SUCCESS(2, "认证成功"),
+    VERIFY_FAILED(3, "认证失败"),
+    ;
+    private final Integer code;
+    private final String message;
+
+    private static Map<Integer, VerifyStatusEnum> map;
+
+    public static VerifyStatusEnum codeOf(Integer code) {
+        if (code == null) {
+            return null;
+        }
+        if (map == null) {
+            map = new HashMap<>(values().length);
+        }
+        map = Arrays.stream(values()).collect(Collectors.toMap(VerifyStatusEnum::getCode, Function.identity()));
+        return map.get(code);
+    }
+}

axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/enums/ViewEnum.java

@@ -0,0 +1,22 @@
+package cn.axzo.framework.auth.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 项目名称：profiles
+ * 类 名 称：ProfileSourceType
+ * 类 描 述：TODO
+ * 创建时间：2022/5/9 21:59
+ * 创 建 人：xuyaozuo
+ */
+@Getter
+@RequiredArgsConstructor
+public enum ViewEnum {
+    WORKER("工人"),
+    TEAM_LEADER("班组长"),
+    TEAM_MANAGER("班组管理员"),
+
+    ;
+    private final String message;
+}