gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【更新】优化获取用户id的写法，兼容B、C端日志记录和数据记录

pull/213/head
xuyuxiang 2024-05-22 15:43:24 +08:00
parent 2616c755ba
commit 9785e2c8dd
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/core/aop/DevLogAop.java
View File

@ -90,10 +90,12 @@ public class DevLogAop {
CommonLog commonLog = method.getAnnotation(CommonLog.class); CommonLog commonLog = method.getAnnotation(CommonLog.class);
String userName = "未知"; String userName = "未知";
try { try {
SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser(); try {
if(ObjectUtil.isNotNull(loginUser)) { SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
userName = loginUser.getName(); if(ObjectUtil.isNotNull(loginUser)) {
} else { userName = loginUser.getName();
}
} catch (Exception e) {
SaBaseClientLoginUser clientLoginUser = StpClientLoginUserUtil.getClientLoginUser(); SaBaseClientLoginUser clientLoginUser = StpClientLoginUserUtil.getClientLoginUser();
if(ObjectUtil.isNotNull(clientLoginUser)) { if(ObjectUtil.isNotNull(clientLoginUser)) {
userName = clientLoginUser.getName(); userName = clientLoginUser.getName();

12
snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java
View File

@ -603,10 +603,14 @@ public class GlobalConfigure implements WebMvcConfigurer {
*/ */
private String getUserId() { private String getUserId() {
try { try {
String loginId = StpUtil.getLoginIdAsString(); try {
if (ObjectUtil.isNotEmpty(loginId)) { String loginId = StpUtil.getLoginIdAsString();
return loginId; if (ObjectUtil.isNotEmpty(loginId)) {
} else { return loginId;
} else {
return "-1";
}
} catch (Exception e) {
String clientLoginId = StpClientUtil.getLoginIdAsString(); String clientLoginId = StpClientUtil.getLoginIdAsString();
if (ObjectUtil.isNotEmpty(clientLoginId)) { if (ObjectUtil.isNotEmpty(clientLoginId)) {
return clientLoginId; return clientLoginId;