xieyinlu/ruoyi-ai
1
0
Fork 0
mirror of https://gitcode.com/ageerle/ruoyi-ai.git synced 2026-04-04 07:26:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50 from winkeylucky/winkey-0502

Browse Source 
解决登录异常_和公共资源例外 0502
This commit is contained in:
ageerle
2025-04-07 14:02:35 +08:00
committed by GitHub
parent f76fdbf3ad feca08b3ec
commit c1162148b1
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

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

@@ -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"));
}
/**
* 查询系统参数
*

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

@@ -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公告）

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

@@ -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) {
}
}