From 57944609e7272aa1cd43beecae7ec1cf0d6ebbc7 Mon Sep 17 00:00:00 2001 From: Gao Wei Date: Thu, 23 Jun 2022 10:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=A5=E4=BC=98=E5=8C=96=E4=B8=80=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/auth/domain/ContextInfo.java | 44 +++++++++++++++++++ .../framework/auth/domain/TerminalInfo.java | 8 +--- .../axzo/framework/auth/domain/UserInfo.java | 25 ++++++----- 3 files changed, 59 insertions(+), 18 deletions(-) diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/ContextInfo.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/ContextInfo.java index 953c20c..7f8abb9 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/ContextInfo.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/ContextInfo.java @@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest; import cn.hutool.core.bean.BeanUtil; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -95,4 +96,47 @@ public class ContextInfo { //TODO: 这两天也看一下，是否直接从map转过去就够了，是不是还要再补一些其他的东西进去。 return BeanUtil.toBean(this.userInfoMap.getMap(), clazz); } + + @Builder + @Data + public static class LiteSaasContext { + private Long workspaceId; + private Integer workspaceType; + + private Long identityId; + private Integer identityType; + private Long acntId; + private Long personId; + + private Long ouId; + private Integer ouType; + + private Long saasTennantId; + + private String terminal; + private String ipAddress; //for log + } + + /** + * + * 这个小DTO是为了方便传参。 + * 主要是用在写方法上，这些方法需要记录完整操作日志。 + * + * @return + */ + public LiteSaasContext lite() { + return LiteSaasContext.builder() + .workspaceId(this.workspaceId) + .workspaceType(this.workspaceType) + .identityId(this.getUserInfo().getIdentityId()) + .identityType(this.getUserInfo().getIdentityType()) + .personId(this.getUserInfo().getPersonId()) + .acntId(this.getUserInfo().getAcntId()) + .ouId(this.ouId) + .ouType(this.ouType) + .saasTennantId(this.saasTenantId) + .terminal(this.terminalInfo.NT()) + .ipAddress(this.systemAndDeviceInfo.getIpAddress()) + .build(); + } } 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 e98401e..8fce838 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 @@ -95,13 +95,13 @@ public class TerminalInfo { public static final String STR_TERMINAL_PROJ = "proj"; /** - * 智能面板 + * 智能面板 ？？？ */ @Deprecated public static final String STR_TERMINAL_SM = "sm"; /** - * 智能面板 + * 智能面板 ？？？ */ @Deprecated public static final String STR_TERMINAL_SMP = "smp"; @@ -412,9 +412,7 @@ public class TerminalInfo { * * @return * - * @deprecated 只用来做历史代码兼容 */ - @Deprecated public boolean isCMS() { if (this.newTerminalString == null) return false; @@ -425,9 +423,7 @@ public class TerminalInfo { * * @return * - * @deprecated 只用来做历史代码兼容 */ - @Deprecated public boolean isCMP() { if (this.newTerminalString == null) return false; 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 b21d184..001d3f8 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 @@ -12,22 +12,28 @@ import lombok.extern.slf4j.Slf4j; public class UserInfo { /** - * 账号ID，从原axzoId迁移过来的 - */ - private Long acntId; - - /** - * 自然人ID，从原axzoId迁移过来的 + * 自然人ID，从原axzoId迁移过来的，每个自然人有一个ID，后续这里的ID会被治理，不会和原axzoId一一对应。 */ private Long personId; /** - * 身份ID，以后大家最常用的ID + * 身份ID，以后大家最常用的ID，用于各种具体的业务场景。 */ private Long identityId; private Integer identityType; + /** + * 账号ID，从原axzoId迁移过来的，是用来登录、发消息、发手机短信等使用的账号。 + */ + private Long acntId; + + /** + * 手机号，是从账号表里取到的，用户登录、短信验证、消息推送都是这个phone + */ + private String phoneNumber; + + /** * 性别：0：未知；1-女；2-男 */ @@ -59,11 +65,6 @@ public class UserInfo { */ private String avatarUrl; - /** - * 手机号 - */ - private String phoneNumber; - /////// /// 以下字段，不推荐使用，对历史进行兼容 /**