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

RuoYi

2024-10-17 8101ed752227a66e448e9fbd23aa7e1794842b66

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

@@ -4,6 +4,7 @@
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;

@@ -28,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;



/**

 * 操作日志记录处理

@@ -89,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(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)

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

        {

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

            setRequestValue(joinPoint, operLog);

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

        }

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

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

@@ -161,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 = ServletUtils.getParamMap(ServletUtils.getRequest());

            operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter()), 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)

@@ -190,7 +197,7 @@
                {

                    try

                    {

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

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

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

                    }

                    catch (Exception e)

@@ -205,9 +212,9 @@
    /**

     * 忽略敏感属性

     */

    public PropertyPreExcludeFilter excludePropertyPreFilter()

    public PropertyPreExcludeFilter excludePropertyPreFilter(String[] excludeParamNames)

    {

        return new PropertyPreExcludeFilter().addExcludes(EXCLUDE_PROPERTIES);

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

    }



    /**