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

Merge branch 'new_3A' of axzsource.com:shanghai/axzo-framework into new_3A

Browse Source
This commit is contained in:
liang 2022-06-12 10:44:16 +08:00
commit 139f8c47d7
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,11 @@ public class TerminalInfo {
public static final String STR_TERMINAL_CMS = "cms";
@Deprecated
public static final String NUM_TERMINAL_CMS = "3";
//调试的时候，发现有一个15，是CMS
@Deprecated
public static final String NUM15_TERMINAL_CMS = "15";
/**
* 从业人员App，企业版App
*/
@ -100,6 +104,7 @@ public class TerminalInfo {
aliasMap.put(STR_TERMINAL_PROJ, NT_CMS_WEB_PROJ);
aliasMap.put(STR_TERMINAL_CMS, NT_CMS_WEB_PROJ);
aliasMap.put(NUM_TERMINAL_CMS, NT_CMS_WEB_PROJ);
aliasMap.put(NUM15_TERMINAL_CMS, NT_CMS_WEB_PROJ);
// 实际上不应该是直接对应于PROJ，默认先对应一个，需要再guess一下，
}
@ -168,8 +173,9 @@ public class TerminalInfo {
public TerminalInfo(String rawTerminalString) {
this.rawTerminalString = rawTerminalString;
this.newTerminalString = aliasMap.get(rawTerminalString);
if (this.newTerminalString == null)
throw new IllegalArgumentException("无效的Terminal：" + rawTerminalString);
//TODO: 为了调试方便，先注释掉这两句。@gaowei
//if (this.newTerminalString == null)
// throw new IllegalArgumentException("无效的Terminal：" + rawTerminalString);
}
public TerminalInfo(String rawTerminalString, String newTerminalString) {