系统用户会话命名sysUser

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)
         {
             // 如果是超级管理员，则不过滤数据

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();

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<String> roles = new HashSet<String>();
         // 功能列表

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();

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());

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()