From 69268ee915167e0fdf6d06ed9e8efe59a89b39c2 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 18 Nov 2018 18:17:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=E4=BC=9A?= =?UTF-8?q?=E8=AF=9D=E5=91=BD=E5=90=8DsysUser?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 2 +- .../main/java/com/ruoyi/framework/aspectj/LogAspect.java | 2 +- .../java/com/ruoyi/framework/shiro/realm/UserRealm.java | 2 +- .../com/ruoyi/framework/shiro/web/filter/LogoutFilter.java | 2 +- .../shiro/web/filter/online/OnlineSessionFilter.java | 2 +- .../src/main/java/com/ruoyi/framework/util/ShiroUtils.java | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) 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 2c04112b..4e20738f 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 @@ -60,7 +60,7 @@ public class DataScopeAspect return; } // 获取当前的用户 - SysUser currentUser = ShiroUtils.getUser(); + SysUser currentUser = ShiroUtils.getSysUser(); if (currentUser != null) { // 如果是超级管理员，则不过滤数据 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 6bc76866..557c68de 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 @@ -75,7 +75,7 @@ public class LogAspect } // 获取当前的用户 - SysUser currentUser = ShiroUtils.getUser(); + SysUser currentUser = ShiroUtils.getSysUser(); // *========数据库日志=========*// SysOperLog operLog = new SysOperLog(); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java index 418ce9f9..83924b68 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/realm/UserRealm.java @@ -55,7 +55,7 @@ public class UserRealm extends AuthorizingRealm @Override protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection arg0) { - SysUser user = ShiroUtils.getUser(); + SysUser user = ShiroUtils.getSysUser(); // 角色列表 Set roles = new HashSet(); // 功能列表 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java index 58041857..bf70f17c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/LogoutFilter.java @@ -47,7 +47,7 @@ public class LogoutFilter extends org.apache.shiro.web.filter.authc.LogoutFilter String redirectUrl = getRedirectUrl(request, response, subject); try { - SysUser user = ShiroUtils.getUser(); + SysUser user = ShiroUtils.getSysUser(); if (StringUtils.isNotNull(user)) { String loginName = user.getLoginName(); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java index e15f91ff..1e07f530 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/web/filter/online/OnlineSessionFilter.java @@ -53,7 +53,7 @@ public class OnlineSessionFilter extends AccessControlFilter boolean isGuest = onlineSession.getUserId() == null || onlineSession.getUserId() == 0L; if (isGuest == true) { - SysUser user = ShiroUtils.getUser(); + SysUser user = ShiroUtils.getSysUser(); if (user != null) { onlineSession.setUserId(user.getUserId()); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java index 59cc1579..ffb32ea3 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java @@ -32,7 +32,7 @@ public class ShiroUtils getSubjct().logout(); } - public static SysUser getUser() + public static SysUser getSysUser() { SysUser user = null; Object obj = getSession().getAttribute("sysUser"); @@ -58,12 +58,12 @@ public class ShiroUtils public static Long getUserId() { - return getUser().getUserId().longValue(); + return getSysUser().getUserId().longValue(); } public static String getLoginName() { - return getUser().getLoginName(); + return getSysUser().getLoginName(); } public static String getIp()