Log注解支持DELETE请求的参数(IAMV6F)

RuoYi

2024-10-17 8101ed752227a66e448e9fbd23aa7e1794842b66

 src/main/java/com/ruoyi/framework/aspectj/LogAspect.java

@@ -4,18 +4,21 @@
import java.util.Map;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang3.ArrayUtils;

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 org.springframework.web.servlet.HandlerMapping;

import com.alibaba.fastjson.JSON;

import com.alibaba.fastjson2.JSON;

import com.ruoyi.common.enums.HttpMethod;

import com.ruoyi.common.filter.PropertyPreExcludeFilter;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.common.utils.ServletUtils;

import com.ruoyi.common.utils.StringUtils;

@@ -26,6 +29,7 @@
import com.ruoyi.framework.manager.factory.AsyncFactory;

import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.project.monitor.domain.SysOperLog;

import com.ruoyi.project.system.domain.SysUser;



/**

 * 操作日志记录处理

@@ -37,6 +41,21 @@
public class LogAspect

{

    private static final Logger log = LoggerFactory.getLogger(LogAspect.class);



    /** 排除敏感属性字段 */

    public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" };



    /** 计算操作消耗时间 */

    private static final ThreadLocal<Long> TIME_THREADLOCAL = new NamedThreadLocal<Long>("Cost Time");



    /**

     * 处理请求前执行

     */

    @Before(value = "@annotation(controllerLog)")

    public void boBefore(JoinPoint joinPoint, Log controllerLog)

    {

        TIME_THREADLOCAL.set(System.currentTimeMillis());

    }



    /**

     * 处理完请求后执行

@@ -65,7 +84,6 @@
    {

        try

        {



            // 获取当前的用户

            LoginUser loginUser = SecurityUtils.getLoginUser();



@@ -73,12 +91,17 @@
            SysOperLog operLog = new SysOperLog();

            operLog.setStatus(BusinessStatus.SUCCESS.ordinal());

            // 请求的地址

            String ip = IpUtils.getIpAddr(ServletUtils.getRequest());

            String ip = IpUtils.getIpAddr();

            operLog.setOperIp(ip);

            operLog.setOperUrl(ServletUtils.getRequest().getRequestURI());

            operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));

            if (loginUser != null)

            {

                operLog.setOperName(loginUser.getUsername());

                SysUser currentUser = loginUser.getUser();

                if (StringUtils.isNotNull(currentUser) && StringUtils.isNotNull(currentUser.getDept()))

                {

                    operLog.setDeptName(currentUser.getDept().getDeptName());

                }

            }



            if (e != null)

@@ -94,15 +117,20 @@
            operLog.setRequestMethod(ServletUtils.getRequest().getMethod());

            // 处理设置注解上的参数

            getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);

            // 设置消耗时间

            operLog.setCostTime(System.currentTimeMillis() - TIME_THREADLOCAL.get());

            // 保存数据库

            AsyncManager.me().execute(AsyncFactory.recordOper(operLog));

        }

        catch (Exception exp)

        {

            // 记录本地异常日志

            log.error("==前置通知异常==");

            log.error("异常信息:{}", exp.getMessage());

            exp.printStackTrace();

        }

        finally

        {

            TIME_THREADLOCAL.remove();

        }

    }



@@ -125,7 +153,7 @@
        if (log.isSaveRequestData())

        {

            // 获取参数的信息，传入到数据库中。

            setRequestValue(joinPoint, operLog);

            setRequestValue(joinPoint, operLog, log.excludeParamNames());

        }

        // 是否需要保存response，参数和值

        if (log.isSaveResponseData() && StringUtils.isNotNull(jsonResult))

@@ -140,25 +168,25 @@
     * @param operLog 操作日志

     * @throws Exception 异常

     */

    private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog) throws Exception

    private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog, String[] excludeParamNames) throws Exception

    {

        String requestMethod = operLog.getRequestMethod();

        if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))

        Map<?, ?> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());

        if (StringUtils.isEmpty(paramsMap) && StringUtils.equalsAny(requestMethod, HttpMethod.PUT.name(), HttpMethod.POST.name(), HttpMethod.DELETE.name()))

        {

            String params = argsArrayToString(joinPoint.getArgs());

            String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);

            operLog.setOperParam(StringUtils.substring(params, 0, 2000));

        }

        else

        {

            Map<?, ?> paramsMap = (Map<?, ?>) ServletUtils.getRequest().getAttribute(HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE);

            operLog.setOperParam(StringUtils.substring(paramsMap.toString(), 0, 2000));

            operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter(excludeParamNames)), 0, 2000));

        }

    }



    /**

     * 参数拼装

     */

    private String argsArrayToString(Object[] paramsArray)

    private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames)

    {

        String params = "";

        if (paramsArray != null && paramsArray.length > 0)

@@ -167,8 +195,14 @@
            {

                if (StringUtils.isNotNull(o) && !isFilterObject(o))

                {

                    Object jsonObj = JSON.toJSON(o);

                    params += jsonObj.toString() + " ";

                    try

                    {

                        String jsonObj = JSON.toJSONString(o, excludePropertyPreFilter(excludeParamNames));

                        params += jsonObj.toString() + " ";

                    }

                    catch (Exception e)

                    {

                    }

                }

            }

        }

@@ -176,6 +210,14 @@
    }



    /**

     * 忽略敏感属性

     */

    public PropertyPreExcludeFilter excludePropertyPreFilter(String[] excludeParamNames)

    {

        return new PropertyPreExcludeFilter().addExcludes(ArrayUtils.addAll(EXCLUDE_PROPERTIES, excludeParamNames));

    }



    /**

     * 判断是否需要过滤的对象。

     * 

     * @param o 对象信息。