ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -7,8 +7,9 @@ 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.core.service.UserService; import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.spring.SpringUtils; import com.ruoyi.system.domain.vo.RouterVo; import com.ruoyi.system.service.ISysMenuService; import com.ruoyi.system.service.SysLoginService; @@ -78,7 +79,7 @@ @ApiOperation("获取用户信息") @GetMapping("getInfo") public AjaxResult<Map<String, Object>> getInfo() { SysUser user = SecurityUtils.getUser(); SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId()); // 角色集合 Set<String> roles = permissionService.getRolePermission(user); // 权限集合 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -5,9 +5,12 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.service.UserService; import com.ruoyi.common.enums.BusinessType; 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; import com.ruoyi.system.domain.SysOss; import com.ruoyi.system.service.ISysOssService; import com.ruoyi.system.service.ISysUserService; @@ -89,7 +92,7 @@ @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping("/updatePwd") public AjaxResult<Void> updatePwd(String oldPassword, String newPassword) { SysUser user = SecurityUtils.getUser(); SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId()); String userName = user.getUserName(); String password = user.getPassword(); if (!SecurityUtils.matchesPassword(oldPassword, password)) { ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
@@ -1,14 +1,7 @@ package com.ruoyi.common.utils; import cn.hutool.http.HttpStatus; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.service.UserService; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; /** @@ -18,17 +11,6 @@ */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class SecurityUtils { /** * 获取用户 **/ public static SysUser getUser() { try { return SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId()); } catch (Exception e) { throw new ServiceException("获取用户信息异常", HttpStatus.HTTP_UNAUTHORIZED); } } /** * 生成BCryptPasswordEncoder密码 ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
@@ -65,7 +65,7 @@ @ApiOperation("自定义分页查询") @SaCheckPermission("demo:demo:list") @GetMapping("/page") public TableDataInfo<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo) { public TableDataInfo<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { return iTestDemoService.customPageList(bo, pageQuery); }
@@ -4,9 +4,10 @@ import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.core.service.UserService; import com.ruoyi.common.utils.LoginUtils; 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; @@ -61,7 +62,7 @@ protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope) { // 获取当前的用户 SysUser currentUser = SecurityUtils.getUser(); SysUser currentUser = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId()); // 如果是超级管理员，则不过滤数据 if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin()) { dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
@@ -13,7 +13,7 @@ import com.ruoyi.common.enums.DataScopeType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.helper.DataPermissionHelper; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; @@ -76,7 +76,7 @@ } SysUser currentUser = DataPermissionHelper.getVariable("user"); if (ObjectUtil.isNull(currentUser)) { currentUser = SpringUtils.getBean(UserService.class).selectUserById(SecurityUtils.getUserId()); currentUser = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId()); DataPermissionHelper.setVariable("user", currentUser); } // 如果是超级管理员，则不过滤数据 ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
@@ -9,9 +9,14 @@ import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.dto.UserOnlineDTO; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.service.UserService; import com.ruoyi.common.enums.UserType; import com.ruoyi.common.utils.*; import com.ruoyi.common.utils.LoginUtils; import com.ruoyi.common.utils.RedisUtils; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.ip.AddressUtils; import com.ruoyi.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -37,7 +42,7 @@ if (userType == UserType.SYS_USER) { UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent")); String ip = ServletUtils.getClientIP(); SysUser user = SecurityUtils.getUser(); SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginUtils.getUserId()); String tokenValue = StpUtil.getTokenValue(); UserOnlineDTO userOnlineDTO = new UserOnlineDTO() .setIpaddr(ip)
