From e763381186c3a1f74ed416ea79767ac73b984745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Fri, 3 Dec 2021 18:46:49 +0800 Subject: [PATCH] =?UTF-8?q?update=20[=E9=87=8D=E7=A3=85=E6=9B=B4=E6=96=B0]?= =?UTF-8?q?=20=E7=99=BB=E5=BD=95=E6=B5=81=E7=A8=8B=E5=8D=87=E7=BA=A7=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysLoginController.java | 3 +- .../system/SysProfileController.java | 3 +- .../core/controller/BaseController.java | 14 ++-- .../common/core/domain/model/LoginUser.java | 83 +++++++++++++++++++ .../common/exception/user/UserException.java | 2 +- .../com/ruoyi/common/utils/LoginUtils.java | 63 ++++++++++---- .../com/ruoyi/common/utils/SecurityUtils.java | 30 +------ .../framework/aspectj/DataScopeAspect.java | 1 - .../ruoyi/framework/aspectj/LogAspect.java | 10 +-- .../ruoyi/framework/config/SaTokenConfig.java | 4 +- .../CreateAndUpdateMetaObjectHandler.java | 10 +-- .../{ => satoken}/dao/PlusSaTokenDao.java | 2 +- .../satoken/service}/SaInterfaceImpl.java | 25 ++---- .../service/GenTableServiceImpl.java | 7 +- .../listener/SysUserImportListener.java | 3 +- .../ruoyi/system/service/SysLoginService.java | 13 ++- .../service/impl/SysDeptServiceImpl.java | 4 +- .../service/impl/SysRoleServiceImpl.java | 4 +- .../service/impl/SysUserServiceImpl.java | 3 +- 19 files changed, 179 insertions(+), 105 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java rename ruoyi-framework/src/main/java/com/ruoyi/framework/{ => satoken}/dao/PlusSaTokenDao.java (99%) rename {ruoyi-system/src/main/java/com/ruoyi/system/service/impl => ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service}/SaInterfaceImpl.java (52%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 5cf5170da..0a45d7393 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysMenu; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginBody; +import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.system.domain.vo.RouterVo; import com.ruoyi.system.service.ISysMenuService; @@ -99,7 +100,7 @@ public class SysLoginController { @ApiOperation("获取路由信息") @GetMapping("getRouters") public AjaxResult> getRouters() { - Long userId = SecurityUtils.getUserId(); + Long userId = LoginUtils.getUserId(); List menus = menuService.selectMenuTreeByUserId(userId); return AjaxResult.success(menuService.buildMenus(menus)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 50ba930bd..ee970489f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -113,10 +113,9 @@ public class SysProfileController extends BaseController { public AjaxResult> avatar(@RequestPart("avatarfile") MultipartFile file) { Map ajax = new HashMap<>(); if (!file.isEmpty()) { - SysUser user = SecurityUtils.getUser(); SysOss oss = iSysOssService.upload(file); String avatar = oss.getUrl(); - if (userService.updateUserAvatar(user.getUserName(), avatar)) { + if (userService.updateUserAvatar(getUsername(), avatar)) { ajax.put("imgUrl", avatar); return AjaxResult.success(ajax); } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java index 2f1c6ed3e..8aed41c7f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java @@ -1,8 +1,8 @@ package com.ruoyi.common.core.controller; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.core.domain.model.LoginUser; +import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.utils.StringUtils; /** @@ -70,28 +70,28 @@ public class BaseController { /** * 获取用户缓存信息 */ - public SysUser getUser() { - return SecurityUtils.getUser(); + public LoginUser getUser() { + return LoginUtils.getLoginUser(); } /** * 获取登录用户id */ public Long getUserId() { - return SecurityUtils.getUserId(); + return LoginUtils.getUserId(); } /** * 获取登录部门id */ public Long getDeptId() { - return SecurityUtils.getDeptId(); + return LoginUtils.getDeptId(); } /** * 获取登录用户名 */ public String getUsername() { - return SecurityUtils.getUsername(); + return LoginUtils.getUsername(); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java new file mode 100644 index 000000000..7554e3f4b --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java @@ -0,0 +1,83 @@ +package com.ruoyi.common.core.domain.model; + +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.util.Set; + +/** + * 登录用户身份权限 + * + * @author Lion Li + */ + +@Data +@NoArgsConstructor +@Accessors(chain = true) +public class LoginUser implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 用户ID + */ + private Long userId; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 用户唯一标识 + */ + private String token; + + /** + * 登录时间 + */ + 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; + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java index 94dbcdd52..99a888056 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java @@ -10,7 +10,7 @@ import com.ruoyi.common.exception.base.BaseException; public class UserException extends BaseException { private static final long serialVersionUID = 1L; - public UserException(String code, Object[] args) { + public UserException(String code, Object... args) { super("user", code, args, null); } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java index 9cd759f4a..2544fe859 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/LoginUtils.java @@ -1,6 +1,8 @@ package com.ruoyi.common.utils; import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.util.ObjectUtil; +import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.enums.DeviceType; import com.ruoyi.common.enums.UserType; import com.ruoyi.common.exception.UtilException; @@ -13,39 +15,68 @@ import com.ruoyi.common.exception.UtilException; */ public class LoginUtils { + private final static String LOGIN_USER_KEY = "loginUser"; + /** * 登录系统 * 针对两套用户体系 - * @param userId 用户id + * @param loginUser 登录用户信息 */ - public static void login(Long userId, UserType userType) { - StpUtil.login(userType.getUserType() + userId); + public static void login(LoginUser loginUser, UserType userType) { + StpUtil.login(userType.getUserType() + loginUser.getUserId()); + StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser); } /** * 登录系统 基于 设备类型 * 针对一套用户体系 - * @param userId 用户id + * @param loginUser 登录用户信息 */ - public static void loginByDevice(Long userId, UserType userType, DeviceType deviceType) { - StpUtil.login(userType.getUserType() + userId, deviceType.getDevice()); + public static void loginByDevice(LoginUser loginUser, UserType userType, DeviceType deviceType) { + StpUtil.login(userType.getUserType() + loginUser.getUserId(), deviceType.getDevice()); + StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser); + } + + /** + * 获取用户 + **/ + public static LoginUser getLoginUser() { + return (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY); } /** * 获取用户id */ public static Long getUserId() { - String loginId = StpUtil.getLoginIdAsString(); - String userId; - String replace = ""; - if (StringUtils.contains(loginId, UserType.SYS_USER.getUserType())) { - userId = StringUtils.replace(loginId, UserType.SYS_USER.getUserType(), replace); - } else if (StringUtils.contains(loginId, UserType.APP_USER.getUserType())){ - userId = StringUtils.replace(loginId, UserType.APP_USER.getUserType(), replace); - } else { - throw new UtilException("登录用户: LoginId异常 => " + loginId); + LoginUser loginUser = getLoginUser(); + if (ObjectUtil.isNull(loginUser)) { + String loginId = StpUtil.getLoginIdAsString(); + String userId; + String replace = ""; + if (StringUtils.contains(loginId, UserType.SYS_USER.getUserType())) { + userId = StringUtils.replace(loginId, UserType.SYS_USER.getUserType(), replace); + } else if (StringUtils.contains(loginId, UserType.APP_USER.getUserType())){ + userId = StringUtils.replace(loginId, UserType.APP_USER.getUserType(), replace); + } else { + throw new UtilException("登录用户: LoginId异常 => " + loginId); + } + return Long.parseLong(userId); } - return Long.parseLong(userId); + return loginUser.getUserId(); + } + + /** + * 获取部门ID + **/ + public static Long getDeptId() { + return getLoginUser().getDeptId(); + } + + /** + * 获取用户账户 + **/ + public static String getUsername() { + return getLoginUser().getUsername(); } /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java index ecf888d0b..4112748b4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java @@ -13,41 +13,13 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; * @author Long Li */ public class SecurityUtils { - /** - * 用户ID - **/ - public static Long getUserId() { - return LoginUtils.getUserId(); - } - - /** - * 获取部门ID - **/ - public static Long getDeptId() { - try { - return getUser().getDeptId(); - } catch (Exception e) { - throw new ServiceException("获取部门ID异常", HttpStatus.HTTP_UNAUTHORIZED); - } - } - - /** - * 获取用户账户 - **/ - public static String getUsername() { - try { - return getUser().getUserName(); - } catch (Exception e) { - throw new ServiceException("获取用户账户异常", HttpStatus.HTTP_UNAUTHORIZED); - } - } /** * 获取用户 **/ public static SysUser getUser() { try { - return SpringUtils.getBean(UserService.class).selectUserById(getUserId()); + return SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId()); } catch (Exception e) { throw new ServiceException("获取用户信息异常", HttpStatus.HTTP_UNAUTHORIZED); } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java index dcf805877..393b2e650 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java @@ -7,7 +7,6 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.reflect.ReflectUtils; -import com.ruoyi.common.utils.spring.SpringUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index 78a4b6268..e7aa90996 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -2,12 +2,11 @@ package com.ruoyi.framework.aspectj; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.dto.OperLogDTO; -import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.service.OperLogService; import com.ruoyi.common.enums.BusinessStatus; import com.ruoyi.common.enums.HttpMethod; import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; @@ -60,9 +59,6 @@ public class LogAspect { protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) { try { - // 获取当前的用户 - SysUser sysUser = SecurityUtils.getUser(); - // *========数据库日志=========*// OperLogDTO operLog = new OperLogDTO(); operLog.setStatus(BusinessStatus.SUCCESS.ordinal()); @@ -70,9 +66,7 @@ public class LogAspect { String ip = ServletUtils.getClientIP(); operLog.setOperIp(ip); operLog.setOperUrl(ServletUtils.getRequest().getRequestURI()); - if (sysUser != null) { - operLog.setOperName(sysUser.getUserName()); - } + operLog.setOperName(LoginUtils.getUsername()); if (e != null) { operLog.setStatus(BusinessStatus.FAIL.ordinal()); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java index 1d2f29570..260424545 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java @@ -6,7 +6,7 @@ import cn.dev33.satoken.jwt.StpLogicJwtForStyle; import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; -import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.framework.config.properties.SecurityProperties; import lombok.extern.slf4j.Slf4j; @@ -43,7 +43,7 @@ public class SaTokenConfig implements WebMvcConfigurer { .notMatch(securityProperties.getExcludes()) .check(() -> { if (log.isDebugEnabled()) { - Long userId = SecurityUtils.getUserId(); + Long userId = LoginUtils.getUserId(); if (StringUtils.isNotNull(userId)) { log.debug("剩余有效时间: {}", StpUtil.getTokenTimeout()); log.debug("临时有效时间: {}", StpUtil.getTokenActivityTimeout()); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java index 9dade4e13..dfda51327 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java @@ -4,9 +4,9 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; @@ -76,14 +76,14 @@ public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler { * 获取登录用户名 */ private String getLoginUsername() { - SysUser user; + LoginUser user; try { - user = SecurityUtils.getUser(); + user = LoginUtils.getLoginUser(); } catch (Exception e) { log.warn("自动注入警告 => 用户未登录"); return null; } - return user.getUserName(); + return user.getUsername(); } } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/dao/PlusSaTokenDao.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java similarity index 99% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/dao/PlusSaTokenDao.java rename to ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java index 8da7a1b96..556133c15 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/dao/PlusSaTokenDao.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.dao; +package com.ruoyi.framework.satoken.dao; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.util.SaFoxUtil; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaInterfaceImpl.java similarity index 52% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java rename to ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaInterfaceImpl.java index 5dc66f292..e5bacd342 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaInterfaceImpl.java @@ -1,34 +1,23 @@ -package com.ruoyi.system.service.impl; +package com.ruoyi.framework.satoken.service; import cn.dev33.satoken.stp.StpInterface; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.enums.UserType; import com.ruoyi.common.utils.LoginUtils; -import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.system.service.SysPermissionService; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.ArrayList; import java.util.List; -import java.util.Set; @Component public class SaInterfaceImpl implements StpInterface { - @Autowired - private SysPermissionService sysPermissionService; - @Autowired - private ISysUserService iSysUserService; - @Override public List getPermissionList(Object loginId, String loginType) { UserType userType = LoginUtils.getUserType(loginId); if (userType == UserType.SYS_USER) { - Long userId = LoginUtils.getUserId(); - SysUser user = iSysUserService.getById(userId); - Set menuPermission = sysPermissionService.getMenuPermission(user); - return new ArrayList<>(menuPermission); + LoginUser loginUser = LoginUtils.getLoginUser(); + return new ArrayList<>(loginUser.getMenuPermission()); } else if (userType == UserType.APP_USER) { // app端权限返回 自行根据业务编写 } @@ -39,10 +28,8 @@ public class SaInterfaceImpl implements StpInterface { public List getRoleList(Object loginId, String loginType) { UserType userType = LoginUtils.getUserType(loginId); if (userType == UserType.SYS_USER) { - Long userId = LoginUtils.getUserId(); - SysUser user = iSysUserService.getById(userId); - Set rolePermission = sysPermissionService.getRolePermission(user); - return new ArrayList<>(rolePermission); + LoginUser loginUser = LoginUtils.getLoginUser(); + return new ArrayList<>(loginUser.getRolePermission()); } else if (userType == UserType.APP_USER) { // app端权限返回 自行根据业务编写 } diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java index b53393f0c..35b1c9568 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java @@ -9,10 +9,7 @@ import com.ruoyi.common.constant.GenConstants; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.*; import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.generator.domain.GenTable; import com.ruoyi.generator.domain.GenTableColumn; @@ -159,7 +156,7 @@ public class GenTableServiceImpl extends ServicePlusImpl tableList) { - String operName = SecurityUtils.getUsername(); + String operName = LoginUtils.getUsername(); try { for (GenTable table : tableList) { String tableName = table.getTableName(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java b/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java index d0fd7d0e6..c65511073 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java @@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.excel.ExcelListener; import com.ruoyi.common.excel.ExcelResult; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; @@ -43,7 +44,7 @@ public class SysUserImportListener extends AnalysisEventListener depts = SpringUtils.getAopProxy(this).selectDeptList(dept); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java index 7bad29746..7d19191ab 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java @@ -8,8 +8,8 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.domain.SysRoleDept; @@ -187,7 +187,7 @@ public class SysRoleServiceImpl extends ServicePlusImpl roles = SpringUtils.getAopProxy(this).selectRoleList(role); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 86f4642ba..7837b52c2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -10,6 +10,7 @@ import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.service.UserService; import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.utils.PageUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; @@ -225,7 +226,7 @@ public class SysUserServiceImpl extends ServicePlusImpl users = SpringUtils.getAopProxy(this).selectUserList(user);