Merge pull request #50 from winkeylucky/winkey-0502

解决登录异常_和公共资源例外 0502

ruoyi-common/ruoyi-common-satoken/src/main/java/org/ruoyi/common/satoken/utils/LoginHelper.java

@@ -2,6 +2,7 @@ package org.ruoyi.common.satoken.utils;
 
 import cn.dev33.satoken.context.SaHolder;
 import cn.dev33.satoken.context.model.SaStorage;
+import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.convert.Convert;
@@ -73,8 +74,11 @@ public class LoginHelper {
         if (loginUser != null) {
             return loginUser;
         }
-        loginUser = (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY);
+        SaSession tokenSession = StpUtil.getTokenSession();
-        SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
+        if (tokenSession != null) {
+            loginUser =  (LoginUser) tokenSession.get(LOGIN_USER_KEY);
+            SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
+        };
         return loginUser;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/ChatConfigController.java

@@ -63,6 +63,24 @@ public class ChatConfigController extends BaseController {
         return R.ok(configService.getConfigValue("sys",configKey));
     }
 
+    /**
+     * 查询版权信息
+     *
+     */
+    @GetMapping(value = "/configKey/copyright")
+    public R<String> getConfigKeyCopyright() {
+        return R.ok(configService.getConfigValue("sys","copyright"));
+    }
+
+    /**
+     * 查询logoImage
+     *
+     */
+    @GetMapping(value = "/configKey/logoImage")
+    public R<String> getConfigKeyLogoImage() {
+        return R.ok(configService.getConfigValue("sys","logoImage"));
+    }
+
     /**
      * 查询系统参数
      *

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysNoticeController.java

@@ -31,7 +31,6 @@ public class SysNoticeController extends BaseController {
     /**
      * 获取公告列表
      */
-    @SaCheckPermission("system:notice:list")
     @GetMapping("/list")
     public TableDataInfo<SysNoticeVo> list(SysNoticeBo notice, PageQuery pageQuery) {
         //公告类型（1通知 2公告）

ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java

@@ -228,7 +228,9 @@ public class SysLoginService {
                 TenantHelper.clearDynamic();
             }
             StpUtil.logout();
-            recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
+            if (loginUser !=null) {
+                recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
+            }
         } catch (NotLoginException ignored) {
         }
     }