日志注解新增是否保存响应参数

RuoYi

2021-09-16 ab8215d1ce6487d33a726e76cd64032a31b9698d

 ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java

@@ -1,6 +1,8 @@
package com.ruoyi.common.log.aspect;



import java.lang.reflect.Method;

import java.util.Collection;

import java.util.Iterator;

import java.util.Map;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;

@@ -16,17 +18,16 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.http.HttpMethod;

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.ruoyi.common.core.utils.SecurityUtils;

import com.ruoyi.common.core.utils.ServletUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.core.utils.ip.IpUtils;

import com.ruoyi.common.log.annotation.Log;

import com.ruoyi.common.log.enums.BusinessStatus;

import com.ruoyi.common.log.service.AsyncLogService;

import com.ruoyi.common.security.domain.LoginUser;

import com.ruoyi.common.security.utils.SecurityUtils;

import com.ruoyi.system.api.domain.SysOperLog;



/**

@@ -83,22 +84,17 @@
                return;

            }



            // 获取当前的用户

            LoginUser loginUser = SecurityUtils.getLoginUser();



            // *========数据库日志=========*//

            SysOperLog operLog = new SysOperLog();

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

            // 请求的地址

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

            operLog.setOperIp(ip);

            // 返回参数

            operLog.setJsonResult(JSON.toJSONString(jsonResult));



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

            if (loginUser != null)

            String username = SecurityUtils.getUsername();

            if (StringUtils.isNotBlank(username))

            {

                operLog.setOperName(loginUser.getUsername());

                operLog.setOperName(username);

            }



            if (e != null)

@@ -113,7 +109,7 @@
            // 设置请求方式

            operLog.setRequestMethod(ServletUtils.getRequest().getMethod());

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

            getControllerMethodDescription(joinPoint, controllerLog, operLog);

            getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);

            // 保存数据库

            asyncLogService.saveSysLog(operLog);

        }

@@ -133,7 +129,7 @@
     * @param operLog 操作日志

     * @throws Exception

     */

    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog) throws Exception

    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, SysOperLog operLog, Object jsonResult) throws Exception

    {

        // 设置action动作

        operLog.setBusinessType(log.businessType().ordinal());

@@ -146,6 +142,11 @@
        {

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

            setRequestValue(joinPoint, operLog);

        }

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

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

        {

            operLog.setJsonResult(StringUtils.substring(JSON.toJSONString(jsonResult), 0, 2000));

        }

    }



@@ -162,11 +163,6 @@
        {

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

            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));

        }

    }



@@ -196,7 +192,7 @@
        {

            for (int i = 0; i < paramsArray.length; i++)

            {

                if (!isFilterObject(paramsArray[i]))

                if (StringUtils.isNotNull(paramsArray[i]) && !isFilterObject(paramsArray[i]))

                {

                    try

                    {

@@ -218,8 +214,32 @@
     * @param o 对象信息。

     * @return 如果是需要过滤的对象，则返回true；否则返回false。

     */

    @SuppressWarnings("rawtypes")

    public boolean isFilterObject(final Object o)

    {

        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse;

        Class<?> clazz = o.getClass();

        if (clazz.isArray())

        {

            return clazz.getComponentType().isAssignableFrom(MultipartFile.class);

        }

        else if (Collection.class.isAssignableFrom(clazz))

        {

            Collection collection = (Collection) o;

            for (Iterator iter = collection.iterator(); iter.hasNext();)

            {

                return iter.next() instanceof MultipartFile;

            }

        }

        else if (Map.class.isAssignableFrom(clazz))

        {

            Map map = (Map) o;

            for (Iterator iter = map.entrySet().iterator(); iter.hasNext();)

            {

                Map.Entry entry = (Map.Entry) iter.next();

                return entry.getValue() instanceof MultipartFile;

            }

        }

        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse

                || o instanceof BindingResult;

    }

}