From d21773b0d86197d133ef4b16fe366232c345c665 Mon Sep 17 00:00:00 2001 From: ZQN <364596817@qq.com> Date: 星期三, 19 六月 2024 23:02:50 +0800 Subject: [PATCH] 报表添加 --- project-framework/src/main/java/com/project/framework/aspectj/LogAspect.java | 51 ++++++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/project-framework/src/main/java/com/project/framework/aspectj/LogAspect.java b/project-framework/src/main/java/com/project/framework/aspectj/LogAspect.java index 27a7081..cc89b0c 100644 --- a/project-framework/src/main/java/com/project/framework/aspectj/LogAspect.java +++ b/project-framework/src/main/java/com/project/framework/aspectj/LogAspect.java @@ -1,22 +1,5 @@ package com.project.framework.aspectj; -import java.util.Collection; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.project.system.domain.SysOperLog; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.AfterReturning; -import org.aspectj.lang.annotation.AfterThrowing; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.core.NamedThreadLocal; -import org.springframework.stereotype.Component; -import org.springframework.validation.BindingResult; -import org.springframework.web.multipart.MultipartFile; import com.alibaba.fastjson2.JSON; import com.project.common.annotation.Log; import com.project.common.core.domain.model.LoginUser; @@ -29,10 +12,27 @@ import com.project.common.utils.ip.IpUtils; import com.project.framework.manager.AsyncManager; import com.project.framework.manager.factory.AsyncFactory; +import com.project.system.domain.SysOperLog; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.AfterThrowing; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.core.NamedThreadLocal; +import org.springframework.stereotype.Component; +import org.springframework.validation.BindingResult; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Collection; +import java.util.Map; /** * 鎿嶄綔鏃ュ織璁板綍澶勭悊 - * + * * @author project */ @Aspect @@ -69,7 +69,7 @@ /** * 鎷︽埅寮傚父鎿嶄綔 - * + * * @param joinPoint 鍒囩偣 * @param e 寮傚父 */ @@ -84,7 +84,12 @@ try { // 鑾峰彇褰撳墠鐨勭敤鎴� - LoginUser loginUser = SecurityUtils.getLoginUser(); + LoginUser loginUser; + try { + loginUser = SecurityUtils.getLoginUser(); + } catch (Exception be){ + loginUser = null; + } // *========鏁版嵁搴撴棩蹇�=========*// SysOperLog operLog = new SysOperLog(); @@ -130,7 +135,7 @@ /** * 鑾峰彇娉ㄨВ涓鏂规硶鐨勬弿杩颁俊鎭� 鐢ㄤ簬Controller灞傛敞瑙� - * + * * @param log 鏃ュ織 * @param operLog 鎿嶄綔鏃ュ織 * @throws Exception @@ -158,7 +163,7 @@ /** * 鑾峰彇璇锋眰鐨勫弬鏁帮紝鏀惧埌log涓� - * + * * @param operLog 鎿嶄綔鏃ュ織 * @throws Exception 寮傚父 */ @@ -213,7 +218,7 @@ /** * 鍒ゆ柇鏄惁闇�瑕佽繃婊ょ殑瀵硅薄銆� - * + * * @param o 瀵硅薄淇℃伅銆� * @return 濡傛灉鏄渶瑕佽繃婊ょ殑瀵硅薄锛屽垯杩斿洖true锛涘惁鍒欒繑鍥瀎alse銆� */ -- Gitblit v1.9.1