From 72675b17c49b53125a10da17e8ffdecdcff7c7de Mon Sep 17 00:00:00 2001
From: winkey <wwwgto@qq.com>
Date: Wed, 2 Apr 2025 15:08:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/ruoyi/common/satoken/utils/LoginHelper.java  | 8 ++++++--
 .../java/org/ruoyi/system/service/SysLoginService.java    | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/ruoyi/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/ruoyi/common/satoken/utils/LoginHelper.java
index fd8f8f2e..85a66984 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/ruoyi/common/satoken/utils/LoginHelper.java
+++ b/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);
-        SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
+        SaSession tokenSession = StpUtil.getTokenSession();
+        if (tokenSession != null) {
+            loginUser =  (LoginUser) tokenSession.get(LOGIN_USER_KEY);
+            SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
+        };
         return loginUser;
     }
 
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java
index 639feaf4..017388c1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/SysLoginService.java
+++ b/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) {
         }
     }

From feca08b3ec52bda350d346641741bceedf4cd20b Mon Sep 17 00:00:00 2001
From: winkey <wwwgto@qq.com>
Date: Wed, 2 Apr 2025 15:09:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E5=92=8C=E7=89=88=E6=9D=83=E4=BF=A1=E6=81=AF=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E4=BE=8B=E5=A4=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/ChatConfigController.java           | 18 ++++++++++++++++++
 .../controller/system/SysNoticeController.java |  1 -
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/ChatConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/ChatConfigController.java
index d18612a3..045f3838 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/ChatConfigController.java
+++ b/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"));
+    }
+
     /**
      * 查询系统参数
      *
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysNoticeController.java
index dcbe08a8..4f30a3af 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysNoticeController.java
+++ b/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公告）