From f05138df62ad68ff0b4da1593f345ed75f56142a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 28 九月 2021 17:55:01 +0800
Subject: [PATCH] update 适配单体系与多体系用户权限
---
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java | 4 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java | 30 +++++++++++---
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java | 52 ++++++++-----------------
3 files changed, 43 insertions(+), 43 deletions(-)
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 1500975..a8bfb3f 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
@@ -1,6 +1,5 @@
package com.ruoyi.common.utils;
-import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.http.HttpStatus;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.service.IUserService;
@@ -11,29 +10,23 @@
/**
* 瀹夊叏鏈嶅姟宸ュ叿绫�
*
- * @author ruoyi
+ * @author Long Li
*/
-public class SecurityUtils
-{
+public class SecurityUtils {
/**
* 鐢ㄦ埛ID
**/
- public static Long getUserId()
- {
- return StpUtil.getLoginIdAsLong();
+ public static Long getUserId() {
+ return LoginUtils.getUserId();
}
/**
* 鑾峰彇閮ㄩ棬ID
**/
- public static Long getDeptId()
- {
- try
- {
+ public static Long getDeptId() {
+ try {
return getUser().getDeptId();
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw new ServiceException("鑾峰彇閮ㄩ棬ID寮傚父", HttpStatus.HTTP_UNAUTHORIZED);
}
}
@@ -41,14 +34,10 @@
/**
* 鑾峰彇鐢ㄦ埛璐︽埛
**/
- public static String getUsername()
- {
- try
- {
+ public static String getUsername() {
+ try {
return getUser().getUserName();
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw new ServiceException("鑾峰彇鐢ㄦ埛璐︽埛寮傚父", HttpStatus.HTTP_UNAUTHORIZED);
}
}
@@ -56,14 +45,10 @@
/**
* 鑾峰彇鐢ㄦ埛
**/
- public static SysUser getUser()
- {
- try
- {
+ public static SysUser getUser() {
+ try {
return SpringUtils.getBean(IUserService.class).selectUserById(getUserId());
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw new ServiceException("鑾峰彇鐢ㄦ埛淇℃伅寮傚父", HttpStatus.HTTP_UNAUTHORIZED);
}
}
@@ -74,8 +59,7 @@
* @param password 瀵嗙爜
* @return 鍔犲瘑瀛楃涓�
*/
- public static String encryptPassword(String password)
- {
+ public static String encryptPassword(String password) {
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
return passwordEncoder.encode(password);
}
@@ -83,12 +67,11 @@
/**
* 鍒ゆ柇瀵嗙爜鏄惁鐩稿悓
*
- * @param rawPassword 鐪熷疄瀵嗙爜
+ * @param rawPassword 鐪熷疄瀵嗙爜
* @param encodedPassword 鍔犲瘑鍚庡瓧绗�
* @return 缁撴灉
*/
- public static boolean matchesPassword(String rawPassword, String encodedPassword)
- {
+ public static boolean matchesPassword(String rawPassword, String encodedPassword) {
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
return passwordEncoder.matches(rawPassword, encodedPassword);
}
@@ -99,8 +82,7 @@
* @param userId 鐢ㄦ埛ID
* @return 缁撴灉
*/
- public static boolean isAdmin(Long userId)
- {
+ public static boolean isAdmin(Long userId) {
return userId != null && 1L == userId;
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
index fb8273a..4300a54 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
@@ -4,7 +4,9 @@
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.service.LogininforService;
+import com.ruoyi.common.enums.DeviceType;
import com.ruoyi.common.enums.UserStatus;
+import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.user.CaptchaException;
import com.ruoyi.common.exception.user.CaptchaExpireException;
@@ -72,7 +74,7 @@
asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
recordLoginInfo(user.getUserId());
// 鐢熸垚token
- StpUtil.login(user.getUserId(), "PC");
+ LoginUtils.loginByDevice(user.getUserId(), UserType.SYS_USER, DeviceType.PC);
return StpUtil.getTokenValue();
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java
index ccbd3b3..11a1974 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java
@@ -2,6 +2,8 @@
import cn.dev33.satoken.stp.StpInterface;
import com.ruoyi.common.core.domain.entity.SysUser;
+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;
@@ -21,16 +23,30 @@
@Override
public List<String> getPermissionList(Object loginId, String loginType) {
- SysUser user = iSysUserService.getById(loginId.toString());
- Set<String> menuPermission = sysPermissionService.getMenuPermission(user);
- //閲囩敤鐨勬槸鐢ㄦ埛閲岃嚜甯︾殑鏉冮檺锛屽疄鐜颁竴娆℃�ц闂畆eids,杩涜鍒ゆ柇鏄惁鍙互璁块棶
- return new ArrayList<>(menuPermission);
+ UserType userType = LoginUtils.getUserType(loginId);
+ if (userType == UserType.SYS_USER) {
+ Long userId = LoginUtils.getUserId();
+ SysUser user = iSysUserService.getById(userId);
+ Set<String> menuPermission = sysPermissionService.getMenuPermission(user);
+ //閲囩敤鐨勬槸鐢ㄦ埛閲岃嚜甯︾殑鏉冮檺锛屽疄鐜颁竴娆℃�ц闂畆eids,杩涜鍒ゆ柇鏄惁鍙互璁块棶
+ return new ArrayList<>(menuPermission);
+ } else if (userType == UserType.APP_USER) {
+ // app绔潈闄愯繑鍥� 鑷鏍规嵁涓氬姟缂栧啓
+ }
+ return new ArrayList<>();
}
@Override
public List<String> getRoleList(Object loginId, String loginType) {
- SysUser user = iSysUserService.getById(loginId.toString());
- Set<String> rolePermission = sysPermissionService.getRolePermission(user);
- return new ArrayList<>(rolePermission);
+ UserType userType = LoginUtils.getUserType(loginId);
+ if (userType == UserType.SYS_USER) {
+ Long userId = LoginUtils.getUserId();
+ SysUser user = iSysUserService.getById(userId);
+ Set<String> rolePermission = sysPermissionService.getRolePermission(user);
+ return new ArrayList<>(rolePermission);
+ } else if (userType == UserType.APP_USER) {
+ // app绔潈闄愯繑鍥� 鑷鏍规嵁涓氬姟缂栧啓
+ }
+ return new ArrayList<>();
}
}
--
Gitblit v1.9.3