From c5cd32decb730acf966c051f5306a214fa537d91 Mon Sep 17 00:00:00 2001 From: TanJ Date: Tue, 21 Mar 2023 11:03:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?SystemAndDeviceInfo=20=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?loginDevice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/framework/auth/domain/SystemAndDeviceInfo.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/SystemAndDeviceInfo.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/SystemAndDeviceInfo.java index cfcb785..7756ba9 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/SystemAndDeviceInfo.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/SystemAndDeviceInfo.java @@ -14,8 +14,15 @@ public class SystemAndDeviceInfo { private String deviceKind; private String deviceNo; - + private String appVersion; private String ipAddress; + + /** + * 登录的设备，其实是端。模糊了具体的业务类型 + * {@link TerminalInfo#NT_CM_APP_CM_LEADER} 和 {@link TerminalInfo#NT_CM_APP_CM_WORKER} + * 会转换为 {@link TerminalInfo#NT_CM_APP_GENERAL} + */ + private String loginDevice; } From 859d6225fec0718d52e97956b4417737df68c6df Mon Sep 17 00:00:00 2001 From: TanJ Date: Tue, 21 Mar 2023 14:48:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?terminalInfo=E6=B7=BB=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=8E=B7=E5=8F=96=E6=A8=A1=E7=B3=8A=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E7=AB=AF=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/auth/domain/TerminalInfo.java | 40 +++++++++++++++++++ .../service/ContextInfoBuilderAspect.java | 1 + 2 files changed, 41 insertions(+) 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 6451962..0b7e037 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 @@ -8,6 +8,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; + +import jdk.nashorn.internal.ir.Terminal; import org.springframework.util.StringUtils; @@ -607,6 +609,44 @@ public class TerminalInfo { } return null; } + //只要端的标识，不需要分的更加的细 + public String getSimpleTerminal() { + String terminalKey = ""; + //产业工人app + if (this.isCM()) { + terminalKey = TerminalInfo.NT_CM_APP_GENERAL; + } + //从业人员app + else if (this.isCMP()) { + terminalKey = TerminalInfo.NT_CMP_APP_GENERAL; + } + //cms + else if (this.isCMS()) { + terminalKey = TerminalInfo.NT_CMS_WEB_GENERAL; + } + //oms + else if (this.isOMS_WEB()) { + terminalKey = TerminalInfo.NT_OMS_WEB; + } + //大屏 + else if (this.isSCREEN()) { + terminalKey = TerminalInfo.NT_SCREEN; + } + //智能面板 + else if (this.isPANEL()) { + terminalKey = TerminalInfo.NT_PANEL; + } //招标 + else if (this.isBID_WEB_ENT()) { + terminalKey = TerminalInfo.NT_BID_WEB_ENT; + } + //投标 + else if (this.isBID_WEB_LEADER()) { + terminalKey = TerminalInfo.NT_BID_WEB_LEADER; + } else { + terminalKey = this.NT(); + } + return terminalKey; + } public static void main(String[] args) { TerminalInfo tm = new TerminalInfo("proj"); diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java index 40de9b8..6f5cbf1 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java @@ -295,6 +295,7 @@ public class ContextInfoBuilderAspect { BeanUtil.fillBeanWithMap(userinfoMap, userInfo, false); contextInfo.setUserInfo(userInfo); + contextInfo.getSystemAndDeviceInfo().setLoginDevice(contextInfo.getTerminalInfo().getSimpleTerminal()); try { if(userinfoMap.containsKey("ouType")) contextInfo.setOuType(Integer.parseInt(userinfoMap.get("ouType").toString())); From 21ae1ab97f475c2e64798c00d8a650aaf69c691d Mon Sep 17 00:00:00 2001 From: TanJ Date: Tue, 21 Mar 2023 14:56:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?setLoginDevice=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/framework/auth/service/ContextInfoBuilderAspect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java index 6f5cbf1..060ca55 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java @@ -295,7 +295,6 @@ public class ContextInfoBuilderAspect { BeanUtil.fillBeanWithMap(userinfoMap, userInfo, false); contextInfo.setUserInfo(userInfo); - contextInfo.getSystemAndDeviceInfo().setLoginDevice(contextInfo.getTerminalInfo().getSimpleTerminal()); try { if(userinfoMap.containsKey("ouType")) contextInfo.setOuType(Integer.parseInt(userinfoMap.get("ouType").toString())); @@ -310,6 +309,7 @@ public class ContextInfoBuilderAspect { try { fillLegacyGuess(contextInfo, userinfoMap); + contextInfo.getSystemAndDeviceInfo().setLoginDevice(contextInfo.getTerminalInfo().getSimpleTerminal()); } catch (Exception e) { log.warn("fill legacy guess error for user identityId=" + userInfo.getIdentityId(), e); }