From 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 七月 2025 21:18:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/LogAop.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/LogAop.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/LogAop.java
index d5123f4..0523d86 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/LogAop.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/core/aop/LogAop.java
@@ -1,5 +1,6 @@
package com.stylefeng.guns.core.aop;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.annotion.BussinessLog;
import com.stylefeng.guns.core.common.constant.dictmap.base.AbstractDictMap;
import com.stylefeng.guns.core.log.LogManager;
@@ -17,8 +18,10 @@
import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.lang.reflect.Method;
import java.util.Map;
@@ -31,16 +34,19 @@
@Aspect
@Component
public class LogAop {
-
+
private Logger log = LoggerFactory.getLogger(this.getClass());
-
+
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
@Pointcut(value = "@annotation(com.stylefeng.guns.core.common.annotion.BussinessLog)")
public void cutService() {
}
-
+
@Around("cutService()")
public Object recordSysLog(ProceedingJoinPoint point) throws Throwable {
-
+
//先执行业务
Object result = point.proceed();
@@ -67,7 +73,7 @@
String methodName = currentMethod.getName();
//如果当前用户未登录，不做日志
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
if (null == user) {
return;
}
--
Gitblit v1.7.1