wangli/axzo-framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature_REQ-847_app_merge' into 'master'

Browse Source 
Feature req 847 app merge

See merge request universal/framework/backend/axzo-framework!7
This commit is contained in:
谭杰 2023-08-16 10:16:02 +00:00
commit 7845eab22d
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,7 +154,6 @@ public class TerminalInfo {
aliasMap.put(NT_MP_WX_GENERAL, NT_MP_WX_GENERAL); aliasMap.put(NT_MP_WX_GENERAL, NT_MP_WX_GENERAL);
} }
/** /**
* 是否是小程序 * 是否是小程序
* *
@ -167,6 +166,31 @@ public class TerminalInfo {
return newTerminalString.startsWith("NT_MP_"); return newTerminalString.startsWith("NT_MP_");
} }
/**
* APP端。APP合并之后未确认身份的时候使用该端
*/
public static final String NT_APP_GENERAL = "NT_APP_GENERAL";
public static final String NT_APP_GENERAL_SMS_CODE_TYPE = "18";
static {
aliasMap.put(NT_APP_GENERAL, NT_APP_GENERAL);
aliasMap.put(NT_APP_GENERAL_SMS_CODE_TYPE, NT_APP_GENERAL);
}
/**
* 是否为合并之后的APP端(只有在未确认身份之前生效)
* @return
*/
public boolean isAppGeneral() {
if (!StringUtils.hasText(newTerminalString)) {
return false;
}
return newTerminalString.startsWith("NT_APP_GENERAL");
}
/** /**
* CMS - Web 还没选择任何具体的工作台。 * CMS - Web 还没选择任何具体的工作台。
* 也不会有产品板块、Feature配置在这个类型的Terminal。 * 也不会有产品板块、Feature配置在这个类型的Terminal。