update ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/asp...

TwelveT

2021-11-12 2288fa218e2f703ce78105ff7615fd593953642a

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

@@ -1,23 +1,20 @@
package com.ruoyi.common.log.aspect;



import java.lang.reflect.Method;

import java.util.Collection;

import java.util.Map;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;

import org.aspectj.lang.JoinPoint;

import org.aspectj.lang.Signature;

import org.aspectj.lang.annotation.AfterReturning;

import org.aspectj.lang.annotation.AfterThrowing;

import org.aspectj.lang.annotation.Aspect;

import org.aspectj.lang.annotation.Pointcut;

import org.aspectj.lang.reflect.MethodSignature;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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.ServletUtils;

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

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



@@ -43,21 +39,15 @@
    @Autowired

    private AsyncLogService asyncLogService;



    // 配置织入点

    @Pointcut("@annotation(com.ruoyi.common.log.annotation.Log)")

    public void logPointCut()

    {

    }



    /**

     * 处理完请求后执行

     *

     * @param joinPoint 切点

     */

    @AfterReturning(pointcut = "logPointCut()", returning = "jsonResult")

    public void doAfterReturning(JoinPoint joinPoint, Object jsonResult)

    @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult")

    public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult)

    {

        handleLog(joinPoint, null, jsonResult);

        handleLog(joinPoint, controllerLog, null, jsonResult);

    }



    /**

@@ -66,39 +56,27 @@
     * @param joinPoint 切点

     * @param e 异常

     */

    @AfterThrowing(value = "logPointCut()", throwing = "e")

    public void doAfterThrowing(JoinPoint joinPoint, Exception e)

    @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e")

    public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e)

    {

        handleLog(joinPoint, e, null);

        handleLog(joinPoint, controllerLog, e, null);

    }



    protected void handleLog(final JoinPoint joinPoint, final Exception e, Object jsonResult)

    protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult)

    {

        try

        {

            // 获得注解

            Log controllerLog = getAnnotationLog(joinPoint);

            if (controllerLog == null)

            {

                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 +91,7 @@
            // 设置请求方式

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

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

            getControllerMethodDescription(joinPoint, controllerLog, operLog);

            getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);

            // 保存数据库

            asyncLogService.saveSysLog(operLog);

        }

@@ -133,7 +111,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 +124,11 @@
        {

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

            setRequestValue(joinPoint, operLog);

        }

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

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

        {

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

        }

    }



@@ -161,29 +144,8 @@
        if (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod))

        {

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

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

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

        }

        else

        {

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

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

        }

    }



    /**

     * 是否存在注解，如果存在就获取

     */

    private Log getAnnotationLog(JoinPoint joinPoint) throws Exception

    {

        Signature signature = joinPoint.getSignature();

        MethodSignature methodSignature = (MethodSignature) signature;

        Method method = methodSignature.getMethod();



        if (method != null)

        {

            return method.getAnnotation(Log.class);

        }

        return null;

    }



    /**

@@ -194,12 +156,18 @@
        String params = "";

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

        {

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

            for (Object o : paramsArray)

            {

                if (!isFilterObject(paramsArray[i]))

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

                {

                    Object jsonObj = JSON.toJSON(paramsArray[i]);

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

                    try

                    {

                        Object jsonObj = JSON.toJSON(o);

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

                    }

                    catch (Exception e)

                    {

                    }

                }

            }

        }

@@ -212,8 +180,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 (Object value : collection)

            {

                return value instanceof MultipartFile;

            }

        }

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

        {

            Map map = (Map) o;

            for (Object value : map.entrySet())

            {

                Map.Entry entry = (Map.Entry) value;

                return entry.getValue() instanceof MultipartFile;

            }

        }

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

                || o instanceof BindingResult;

    }

}