From 539dcd3fe1dbbcbc7de7620083bb66ee3eefb659 Mon Sep 17 00:00:00 2001 From: lizhengwei <171332584@qq.com> Date: Fri, 27 Mar 2026 22:38:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=9A=84=E7=B1=BB=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/model/LoginUser.java | 4 + ruoyi-common/ruoyi-common-satoken/pom.xml | 8 +- .../dromara/system/api/RemoteUserService.java | 4 +- .../dromara/system/api/model/LoginUser.java | 146 ------------------ .../org/dromara/system/api/model/RoleDTO.java | 42 ----- .../system/api/model/XcxLoginUser.java | 27 ---- .../saas/dubbo/RemoteUserServiceImpl.java | 6 +- 7 files changed, 13 insertions(+), 224 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/LoginUser.java delete mode 100644 ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/RoleDTO.java delete mode 100644 ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/XcxLoginUser.java diff --git a/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/LoginUser.java b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/LoginUser.java index c723e7668..fb1dfc956 100644 --- a/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/LoginUser.java +++ b/ruoyi-common/ruoyi-common-core-api/src/main/java/org/dromara/common/core/domain/model/LoginUser.java @@ -100,6 +100,10 @@ public class LoginUser implements Serializable { * 用户名 */ private String username; + /** + * pwd + */ + private String password; /** * 用户昵称 diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/ruoyi-common/ruoyi-common-satoken/pom.xml index c4754349b..e43863663 100644 --- a/ruoyi-common/ruoyi-common-satoken/pom.xml +++ b/ruoyi-common/ruoyi-common-satoken/pom.xml @@ -25,10 +25,10 @@ - - - - + + cn.dev33 + sa-token-spring-boot3-starter + diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteUserService.java b/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteUserService.java index b71eaa855..a6c86e302 100644 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteUserService.java +++ b/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/RemoteUserService.java @@ -1,11 +1,11 @@ package org.dromara.system.api; +import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.user.UserException; import org.dromara.system.api.domain.bo.RemoteUserBo; import org.dromara.system.api.domain.vo.RemoteUserVo; -import org.dromara.system.api.model.LoginUser; -import org.dromara.system.api.model.XcxLoginUser; +import org.dromara.common.core.domain.model.XcxLoginUser; import java.util.List; diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/LoginUser.java b/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/LoginUser.java deleted file mode 100644 index 405a87f04..000000000 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/LoginUser.java +++ /dev/null @@ -1,146 +0,0 @@ -package org.dromara.system.api.model; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; -import java.util.List; -import java.util.Set; - -/** - * 用户信息 - * - * @author ruoyi - */ -@Data -@NoArgsConstructor -public class LoginUser implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 租户ID - */ - private String tenantId; - - /** - * 用户ID - */ - private Long userId; - - /** - * 部门ID - */ - private Long deptId; - - /** - * 部门类别编码 - */ - private String deptCategory; - - /** - * 部门名 - */ - private String deptName; - - /** - * 用户唯一标识 - */ - private String token; - - /** - * 用户类型 - */ - private String userType; - - /** - * 登录时间 - */ - private Long loginTime; - - /** - * 过期时间 - */ - private Long expireTime; - - /** - * 登录IP地址 - */ - private String ipaddr; - - /** - * 登录地点 - */ - private String loginLocation; - - /** - * 浏览器类型 - */ - private String browser; - - /** - * 操作系统 - */ - private String os; - - /** - * 菜单权限 - */ - private Set menuPermission; - - /** - * 角色权限 - */ - private Set rolePermission; - - /** - * 用户名 - */ - private String username; - - /** - * 用户昵称 - */ - private String nickname; - - /** - * 密码 - */ - private String password; - - /** - * 角色对象 - */ - private List roles; - - /** - * 数据权限 当前角色ID - */ - private Long roleId; - - /** - * 客户端 - */ - private String clientKey; - - /** - * 设备类型 - */ - private String deviceType; - - /** - * 获取登录id - */ - public String getLoginId() { - if (userType == null) { - throw new IllegalArgumentException("用户类型不能为空"); - } - if (userId == null) { - throw new IllegalArgumentException("用户ID不能为空"); - } - return userType + ":" + userId; - } - -} diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/RoleDTO.java b/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/RoleDTO.java deleted file mode 100644 index 71b9af313..000000000 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/RoleDTO.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.dromara.system.api.model; - -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 角色 - * - * @author Lion Li - */ - -@Data -@NoArgsConstructor -public class RoleDTO implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 角色ID - */ - private Long roleId; - - /** - * 角色名称 - */ - private String roleName; - - /** - * 角色权限 - */ - private String roleKey; - - /** - * 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） - */ - private String dataScope; - -} diff --git a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/XcxLoginUser.java b/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/XcxLoginUser.java deleted file mode 100644 index 3982e2e16..000000000 --- a/ruoyi-modules/ruoyi-md-system/ruoyi-md-system-api/src/main/java/org/dromara/system/api/model/XcxLoginUser.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.dromara.system.api.model; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -import java.io.Serial; - -/** - * 小程序登录用户身份权限 - * - * @author Lion Li - */ -@Data -@EqualsAndHashCode(callSuper = true) -@NoArgsConstructor -public class XcxLoginUser extends LoginUser { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * openid - */ - private String openid; - -} diff --git a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java index 026333171..442da0534 100644 --- a/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; +import org.dromara.common.core.domain.dto.RoleDTO; import org.dromara.common.core.enums.UserStatus; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.user.UserException; @@ -18,9 +19,8 @@ import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.system.api.RemoteUserService; import org.dromara.system.api.domain.bo.RemoteUserBo; import org.dromara.system.api.domain.vo.RemoteUserVo; -import org.dromara.system.api.model.LoginUser; -import org.dromara.system.api.model.RoleDTO; -import org.dromara.system.api.model.XcxLoginUser; +import org.dromara.common.core.domain.model.LoginUser; +import org.dromara.common.core.domain.model.XcxLoginUser; import org.dromara.system.saas.domain.SysSaasUser; import org.dromara.system.saas.domain.bo.SysSaasUserBo; import org.dromara.system.saas.domain.vo.SysSaasDeptVo;