From dc3dc115eb28fc33ff19acd241cbcf2cd1c83d28 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sat, 17 Jun 2023 21:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90sys=E3=80=91?= =?UTF-8?q?=E3=80=90auth=E3=80=91=E6=9B=B4=E6=96=B0loginUser=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/auth/api/pojo/login/LoginUser.java | 142 +----------------- .../api/pojo/login/basic/SimpleRoleInfo.java | 53 ------- .../api/pojo/login/basic/SimpleUserInfo.java | 82 ---------- 3 files changed, 8 insertions(+), 269 deletions(-) delete mode 100644 kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/basic/SimpleRoleInfo.java delete mode 100644 kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/basic/SimpleUserInfo.java diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java index 36e4ea8ad..fda482cf9 100644 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java +++ b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/LoginUser.java @@ -24,19 +24,10 @@ */ package cn.stylefeng.roses.kernel.auth.api.pojo.login; -import cn.hutool.core.lang.Dict; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import cn.stylefeng.roses.kernel.auth.api.enums.DataScopeTypeEnum; -import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleRoleInfo; -import cn.stylefeng.roses.kernel.auth.api.pojo.login.basic.SimpleUserInfo; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; -import cn.stylefeng.roses.kernel.rule.constants.RuleConstants; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; -import java.util.*; /** * 登录用户信息 @@ -56,138 +47,21 @@ public class LoginUser implements Serializable { private Long userId; /** - * 账号 + * 当前用户正在访问的appId */ - @ChineseDescription("账号") - private String account; + @ChineseDescription("当前用户正在访问的appId") + private Long currentAppId; /** - * 超级管理员标识，true-是超级管理员 + * 当前用户激活的组织机构id（正在以哪个身份访问系统） */ - @ChineseDescription("超级管理员标识，true-是超级管理员") - private Boolean superAdmin; + @ChineseDescription("当前用户激活的组织机构id（正在以哪个身份访问系统）") + private Long currentOrgId; /** - * 用户基本信息 + * 用户的token */ - @ChineseDescription("用户基本信息") - private SimpleUserInfo simpleUserInfo; - - /** - * 用户角色信息 - */ - @ChineseDescription("用户角色信息") - private List simpleRoleInfoList; - - /** - * 公司/组织id - */ - @ChineseDescription("公司/组织id") - private Long organizationId; - - /** - * 职务信息 - */ - @ChineseDescription("职务信息") - private Long positionId; - - /** - * 用户数据范围枚举 - */ - @ChineseDescription("用户数据范围枚举") - private Set dataScopeTypeEnums; - - /** - * 用户数据范围用户信息 - */ - @ChineseDescription("用户数据范围用户信息") - private Set dataScopeUserIds; - - /** - * 用户数据范围组织信息 - */ - @ChineseDescription("用户数据范围组织信息") - private Set dataScopeOrganizationIds; - - /** - * 可用资源集合 - */ - @ChineseDescription("可用资源集合") - private Set resourceUrls; - - /** - * 用户拥有的按钮编码集合 - */ - @ChineseDescription("用户拥有的按钮编码集合") - private Set buttonCodes; - - /** - * 登录的时间 - */ - @ChineseDescription("登录的时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date loginTime; - - /** - * 用户的token，当返回用户会话信息时候回带token - */ - @ChineseDescription("用户的token，当返回用户会话信息时候回带token") + @ChineseDescription("用户的token") private String token; - /** - * 其他信息，Dict为Map的拓展 - */ - @ChineseDescription("其他信息，Dict为Map的拓展") - private Dict otherInfos; - - /** - * 用户的ws-url - */ - @ChineseDescription("用户的ws-url") - private String wsUrl; - - /** - * 头像url - */ - @ChineseDescription("用户头像url") - private String avatarUrl; - - /** - * 当前用户语种的标识，例如：chinese，english - *

- * 这个值是根据字典获取，字典类型编码 languages - *

- * 默认语种是中文 - */ - @ChineseDescription("当前用户语种的标识") - private String tranLanguageCode = RuleConstants.CHINESE_TRAN_LANGUAGE_CODE; - - /** - * 租户的编码 - */ - @ChineseDescription("租户的编码") - private String tenantCode; - - /** - * 当前登录用户是否是C端用户（默认不是C端用户） - */ - @ChineseDescription("是否是C端用户") - private Boolean customerFlag = false; - - /** - * 用户拥有的菜单类型：1-前台 ，2-后台，3-所有 - */ - @ChineseDescription("用户拥有的菜单类型：1-前台 ，2-后台，3-所有") - private Integer menuType; - - public String getWsUrl() { - if (ObjectUtil.isEmpty(this.wsUrl)) { - return ""; - } - - Map params = new HashMap<>(1); - params.put("token", this.token); - return StrUtil.format(this.wsUrl, params); - } - } diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/basic/SimpleRoleInfo.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/basic/SimpleRoleInfo.java deleted file mode 100644 index 2a4425cab..000000000 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/basic/SimpleRoleInfo.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.auth.api.pojo.login.basic; - -import lombok.Data; - -/** - * 用户基本信息 - * - * @author fengshuonan - * @since 2020/12/26 18:14 - */ -@Data -public class SimpleRoleInfo { - - /** - * 主键 - */ - private Long roleId; - - /** - * 名称 - */ - private String roleName; - - /** - * 编码 - */ - private String roleCode; - -} diff --git a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/basic/SimpleUserInfo.java b/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/basic/SimpleUserInfo.java deleted file mode 100644 index 146bf5a78..000000000 --- a/kernel-d-auth/auth-api/src/main/java/cn/stylefeng/roses/kernel/auth/api/pojo/login/basic/SimpleUserInfo.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点： - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处，作者声明等。 - * 4.分发源码时候，请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名，模块名称，项目代码等时，请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点，可申请商业授权 - */ -package cn.stylefeng.roses.kernel.auth.api.pojo.login.basic; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; - -import java.util.Date; - -/** - * 用户基本信息 - * - * @author fengshuonan - * @since 2020/12/26 18:14 - */ -@Data -public class SimpleUserInfo { - - /** - * 昵称 - */ - private String nickName; - - /** - * 姓名 - */ - private String realName; - - /** - * 头像 - */ - private Long avatar; - - /** - * 生日 - */ - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date birthday; - - /** - * 性别（M-男，F-女） - */ - private String sex; - - /** - * 邮箱 - */ - private String email; - - /** - * 手机 - */ - private String phone; - - /** - * 电话 - */ - private String tel; - -}