From 0639aec58db3d6b1d59f4433c5bf211a03e15d17 Mon Sep 17 00:00:00 2001 From: Gao Wei Date: Mon, 20 Jun 2022 17:43:02 +0800 Subject: [PATCH] fix terminalInfo for perspective --- .../framework/auth/domain/TerminalInfo.java | 23 +++++++++++++++++++ .../axzo/framework/auth/domain/UserInfo.java | 6 ++++- 2 files changed, 28 insertions(+), 1 deletion(-) 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 1ab4de7..e98401e 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 @@ -501,6 +501,22 @@ public class TerminalInfo { return tm.allNames(); } + public static TerminalInfo buildByLegacyTerminalAndLegacyPerspective(String legacyTerminal, String legacyPerspective) { + TerminalInfo tm1 = new TerminalInfo(legacyTerminal); + if(tm1.isCMS()) { + if("proj".equals(legacyPerspective)) + return new TerminalInfo(TerminalInfo.NT_CMS_WEB_PROJ); + else if("ent".equals(legacyPerspective)) + return new TerminalInfo(TerminalInfo.NT_CMS_WEB_ENT_ZB); + } else if(tm1.isCMP()) { + if("proj".equals(legacyPerspective)) + return new TerminalInfo(TerminalInfo.NT_CMP_APP_PROJ); + else if("ent".equals(legacyPerspective)) + return new TerminalInfo(TerminalInfo.NT_CMP_APP_ENT_ZB); + } + return null; + } + public static void main(String[] args) { TerminalInfo tm = new TerminalInfo("proj"); System.out.println(tm.getRawTerminalString()); @@ -523,6 +539,13 @@ public class TerminalInfo { 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(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()); diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/UserInfo.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/UserInfo.java index 96b6e8b..b21d184 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/UserInfo.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/UserInfo.java @@ -160,7 +160,11 @@ public class UserInfo { // */ // private boolean credentialsNonExpired; - +// /** +// * 原来用来传projectId的字段，apollo用的最多 +// */ +// private Long tenantId; + // /** // * 分包机构名称 // */