聚合层成功之后去掉返回日志，缩小线上日志量

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -3155,7 +3155,7 @@ public class OrderAdapter {
             orderPayDto.setPayCode(PayChannelType.TIKTOKPAY.getEbcode());
         }
         orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
-        orderPayDto.setMerchantDiscount(orderBean.getOriginalAmount().longValue()-orderBean.getAmount());
+//        orderPayDto.setMerchantDiscount(orderBean.getOriginalAmount().longValue()-orderBean.getAmount());
 
         return orderPayDto;
     }

order-application-service/src/main/java/cn/freemud/annotations/LogIgnore.java

+package cn.freemud.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @author wanghanghang
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface LogIgnore {
+    /**
+     * 是否打印日志，true打印，false不打印，注意设置成false状态码和状态码信息都不会打印
+     *
+     * @return
+     */
+    boolean printLog() default true;
+
+    /**
+     * printLog 设置成true的时候，可以排除哪些状态码的响应不用打印响应报文，只会打印状态码
+     * 默认成功100
+     * @return
+     */
+    String[] excludeSuccessCodes() default "100";
+
+    /**
+     * statusCodeFieldName 默认返回状态码字段为code
+     *
+     * @return
+     */
+    String codeFieldName() default "code";
+
+    /**
+     * statusCodeFieldName 默认返回状态码字段为message
+     *
+     * @return
+     */
+    String messageFieldName() default "message";
+
+    /**
+     * logMessage 日志打印
+     * @return
+     */
+    String logMessage() default "";
+}

order-application-service/src/main/java/cn/freemud/annotations/LogIgnoreFeign.java

+package cn.freemud.annotations;
+
+import java.lang.annotation.*;
+
+
+/**
+ * @author freemud
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(value = {ElementType.METHOD})
+@Documented
+@Inherited
+public @interface LogIgnoreFeign {
+
+    /**
+     * 是否打印日志，true打印，false不打印，注意设置成false状态码和状态码信息都不会打印
+     * @return
+     */
+    boolean printLog() default true;
+
+    /**
+     * printLog 设置成true的时候，可以排除哪些状态码的响应不用打印响应报文，只会打印状态码
+     *
+     * @return
+     */
+    String[] excludeStatusCodes() default "100";
+
+    String statusCodeFieldName() default "code";
+
+    String messageFieldName() default "message";
+
+}

order-application-service/src/main/java/cn/freemud/aop/IsConvertEnAspect.java

@@ -61,34 +61,11 @@ public class IsConvertEnAspect implements Ordered {
         return baseResponse;
     }
 
-
     private HttpServletRequest currentRequest() {
         ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         return Optional.ofNullable(servletRequestAttributes).map(ServletRequestAttributes::getRequest).orElse(null);
     }
 
-
-    /**
-     * 备用方法，避免code或者message信息不统一
-     * 过滤返参code是否在excludeStatusCodes存在
-     *
-     * @param excludeStatusCodes
-     * @param statusCodeValue
-     * @return
-     */
-    private boolean containStatusCode(String[] excludeStatusCodes, String statusCodeValue) {
-        if (excludeStatusCodes == null || excludeStatusCodes.length == 0) {
-            return false;
-        }
-        for (int i = 0; i < excludeStatusCodes.length; i++) {
-            if (excludeStatusCodes[i].equals(statusCodeValue)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
     @Override
     public int getOrder() {
         return 0;

order-application-service/src/main/java/cn/freemud/aop/LogIgnoreAspect.java

+package cn.freemud.aop;
+
+import cn.freemud.annotations.LogIgnore;
+import com.alibaba.fastjson.JSON;
+import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
+import com.freemud.application.sdk.api.exception.IgnoreErrorAnnotation;
+import com.freemud.application.sdk.api.log.ApiLog;
+import com.freemud.application.sdk.api.log.ErrorLog;
+import com.freemud.application.sdk.api.log.LogParams;
+import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.service.EmailAlertService;
+import com.google.common.collect.Lists;
+import org.apache.commons.beanutils.BeanUtils;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.Ordered;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author freemud_whh
+ */
+@Aspect
+@Component
+public class LogIgnoreAspect implements Ordered {
+
+    @Autowired
+    private EmailAlertService emailAlertService;
+
+    /**
+     * 是否打印响应报文日志，默认是false,若为true会覆盖注解里面的{@link LogIgnore}配置，输出响应报文里面所有的信息
+     */
+    @Value("${print-response-body-log-order-aoolication-service:false}")
+    private volatile boolean printResponseBodyLog = false;
+
+    /**
+     * 即使printResponseBodyLog设置为true, 该参数中包含的url也会被过滤且不打印日志
+     */
+    @Value("${exclude-print-body-log-methods:findNearPickUpStores,getMenuCategory}")
+    private volatile List<String> excludePrintBodyLogMethods = Lists.newArrayList();
+
+    @Pointcut("@annotation(cn.freemud.annotations.LogIgnore)")
+    public void pointcut() {
+    }
+
+    @Around("pointcut()")
+    public Object doAroundAdvice(ProceedingJoinPoint joinPoint) throws Throwable {
+        long startTime = System.currentTimeMillis();
+        StringBuilder logMethod = new StringBuilder(joinPoint.getSignature().getDeclaringTypeName());
+        logMethod.append(".");
+        logMethod.append(joinPoint.getSignature().getName());
+        Signature sig = joinPoint.getSignature();
+        MethodSignature msig = null;
+        if (!(sig instanceof MethodSignature)) {
+            throw new IllegalArgumentException("非法参数使用 ");
+        } else {
+            msig = (MethodSignature) sig;
+            Object target = joinPoint.getTarget();
+            Method currentMethod = target.getClass().getMethod(msig.getName(), msig.getParameterTypes());
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            if (ApiLog.isDebugEnabled()) {
+                ApiLog.debug("获取tracking的值====>{}", new Object[]{request.getHeader("x-transaction-id")});
+            }
+            LogThreadLocal.setTrackingNo(StringUtils.isEmpty(request.getHeader("x-transaction-id")) ? UUID.randomUUID().toString().replaceAll("-", "") : request.getHeader("x-transaction-id"));
+            List logArgs = this.getLogArgs(currentMethod, joinPoint);
+            String requestData = JSON.toJSONString(logArgs);
+            LogIgnore logIgnore = currentMethod.getAnnotation(LogIgnore.class);
+            Object object = joinPoint.proceed();
+            Object logObj = object;
+            if (logIgnore != null && logIgnore.printLog()) {
+                if (!this.printResponseBodyLog || excludePrintBodyLogMethods.contains(logIgnore.logMessage())) {
+                    String statusCodeValue = BeanUtils.getProperty(object, logIgnore.codeFieldName());
+                    String messageValue = BeanUtils.getProperty(object, logIgnore.messageFieldName());
+                    String[] excludeStatusCodes = logIgnore.excludeSuccessCodes();
+                    //当排除了这个状态码不打印响应的具体内容只会打印状态码和状态描述信息
+                     //当返回code在不打印的范围，则将打印信息变更为只打印code和message
+                    if (this.containStatusCode(excludeStatusCodes, statusCodeValue)) {
+                        logObj = object.getClass().newInstance();
+                        BeanUtils.setProperty(logObj, logIgnore.codeFieldName(), statusCodeValue);
+                        BeanUtils.setProperty(logObj, logIgnore.messageFieldName(), messageValue);
+                    }
+                }
+            }
+            ApiLog.infoConvertJson(logMethod.toString(), logIgnore.logMessage(), request, startTime, System.currentTimeMillis(), requestData, logObj);
+            LogThreadLocal.removeTrackingNo();
+            return object;
+        }
+    }
+
+    /**
+     * 过滤返参code是否在excludeStatusCodes存在
+     *
+     * @param excludeStatusCodes
+     * @param statusCodeValue
+     * @return
+     */
+    private boolean containStatusCode(String[] excludeStatusCodes, String statusCodeValue) {
+        if (excludeStatusCodes == null || excludeStatusCodes.length == 0) {
+            return false;
+        }
+        for (int i = 0; i < excludeStatusCodes.length; i++) {
+            if (excludeStatusCodes[i].equals(statusCodeValue)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 系统异常时，AfterThrowing在ApiAnnotation注解中已经处理。
+     * 此处先注释，暂不删除，代码保留
+     *
+     * @param joinPoint
+     * @return
+     */
+    @AfterThrowing(
+            pointcut = "pointcut()",
+            throwing = "e"
+    )
+    public void doAfterThrowing(JoinPoint joinPoint, Exception e) {
+        long startTime = System.currentTimeMillis();
+        Signature sig = joinPoint.getSignature();
+        Method currentMethod = null;
+        MethodSignature msig = null;
+        if (!(sig instanceof MethodSignature)) {
+            throw new IllegalArgumentException("非法参数使用");
+        } else {
+            msig = (MethodSignature) sig;
+            Object target = joinPoint.getTarget();
+            try {
+                currentMethod = target.getClass().getMethod(msig.getName(), msig.getParameterTypes());
+            } catch (NoSuchMethodException var19) {
+                var19.printStackTrace();
+            }
+            StringBuilder logMethod = new StringBuilder(joinPoint.getSignature().getDeclaringTypeName());
+            logMethod.append(".");
+            logMethod.append(joinPoint.getSignature().getName());
+            HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+            try {
+                Class<?> clz = e.getClass();
+                boolean clzHasAnno = clz.isAnnotationPresent(IgnoreErrorAnnotation.class);
+                if (!clzHasAnno) {
+                    this.emailAlertService.sendEmailAlert("系统全局异常", e);
+                }
+            } catch (Exception var17) {
+                ErrorLog.errorConvertJson(SDKCommonBaseContextWare.getAppName(), logMethod.toString(), "出错:" + e.getMessage(), request, startTime, System.currentTimeMillis(), this.getLogArgs(currentMethod, joinPoint), var17);
+            } finally {
+                ErrorLog.errorConvertJson(SDKCommonBaseContextWare.getAppName(), logMethod.toString(), "出错:" + e.getMessage(), request, startTime, System.currentTimeMillis(), this.getLogArgs(currentMethod, joinPoint), e);
+                LogThreadLocal.removeTrackingNo();
+            }
+        }
+    }
+
+    private List getLogArgs(Method method, JoinPoint joinPoint) {
+        if (method == null) {
+            return null;
+        } else {
+            Object[] args = joinPoint.getArgs();
+            if (args != null && args.length != 0) {
+                List logArgs = new ArrayList();
+                Parameter[] parameters = method.getParameters();
+                for (int j = 0; j < parameters.length; ++j) {
+                    Parameter parameter = parameters[j];
+                    LogParams logParams = (LogParams) parameter.getAnnotation(LogParams.class);
+                    if (logParams != null) {
+                        logArgs.add(args[j]);
+                    }
+                }
+                return logArgs;
+            } else {
+                return null;
+            }
+        }
+    }
+
+    @Override
+    public int getOrder() {
+        return 0;
+    }
+}

order-application-service/src/main/java/cn/freemud/aop/LogIgnoreFeignAspect.java

+package cn.freemud.aop;
+
+import cn.freemud.annotations.LogIgnore;
+import cn.freemud.annotations.LogIgnoreFeign;
+import cn.freemud.entities.vo.ThirdPartLogVo;
+import cn.freemud.utils.LogUtil;
+import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
+import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.freemud.application.sdk.api.log.ThirdPartyLog;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import java.lang.reflect.Method;
+
+/**
+ * @author freemud
+ * @title: LogIgnoreFeignAop
+ * @projectName order-group
+ * @description: TODO
+ * @date 2021/6/9上午10:53
+ */
+
+@Aspect
+@Component
+@Slf4j
+public class LogIgnoreFeignAspect {
+    /**
+     * 是否打印响应报文日志，默认是false,若为true会覆盖注解里面的{@link LogIgnore}配置，输出响应报文里面所有的信息
+     */
+    @Value("${print-feign-response-body-log-order-aoolication-service:true}")
+    private volatile boolean printFeignResponseBodyLog = true;
+
+    @Pointcut("execution(* cn.freemud.service.thirdparty..*.*(..))")
+    public void clientLog() {
+    }
+
+    @Around("clientLog()")
+    public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable {
+        long start = System.currentTimeMillis();
+        Object result = null;
+        try {
+            result = joinPoint.proceed();
+        } catch (Exception ex) {
+            ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
+            LogUtil.thirdPartError(start, System.currentTimeMillis(), thirdPartLogVo, null);
+            throw ex;
+        }
+        try {
+            Signature sig = joinPoint.getSignature();
+            MethodSignature msig = null;
+            if (sig instanceof MethodSignature) {
+                msig = (MethodSignature) sig;
+                Method currentMethod = sig.getDeclaringType().getDeclaredMethod(msig.getName(), msig.getParameterTypes());
+                Object logReult = result;
+                ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
+                // 打印第三方出参日志
+                if (!this.printFeignResponseBodyLog) {
+                    LogIgnoreFeign logIgnore = currentMethod.getAnnotation(LogIgnoreFeign.class);
+                    if (logIgnore != null && logIgnore.printLog()) {
+                        String statusCodeValue = org.apache.commons.beanutils.BeanUtils.getProperty(result, logIgnore.statusCodeFieldName());
+                        String messageValue = org.apache.commons.beanutils.BeanUtils.getProperty(result, logIgnore.messageFieldName());
+                        String[] excludeStatusCodes = logIgnore.excludeStatusCodes();
+                        //当排除了这个状态码不打印响应的具体内容只会打印状态码和状态描述信息
+                        if (!StringUtils.isEmpty(statusCodeValue) && this.containStatusCode(excludeStatusCodes, statusCodeValue)) {
+                            logReult = result.getClass().newInstance();
+                            org.apache.commons.beanutils.BeanUtils.setProperty(logReult, logIgnore.statusCodeFieldName(), statusCodeValue);
+                            org.apache.commons.beanutils.BeanUtils.setProperty(logReult, logIgnore.messageFieldName(), messageValue);
+                        }
+                    }
+                }
+                ThirdPartyLog.infoConvertJson(LogThreadLocal.getTrackingNo(), SDKCommonBaseContextWare.getAppName(), start, System.currentTimeMillis(),
+                        thirdPartLogVo.getUri(), thirdPartLogVo.getRequestBody(), logReult);
+            }
+        } catch (Exception e) {
+            LogUtil.error("WebAspect Feign Log Ignore error {}", "","",e);
+        }
+        return result;
+    }
+//    @Around("clientLog()")
+//    public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable {
+//        long start = System.currentTimeMillis();
+//        Object result = null;
+//        try {
+//            result = joinPoint.proceed();
+//        } catch (Exception ex) {
+//            ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
+//            LogUtil.thirdPartError(start, System.currentTimeMillis(), thirdPartLogVo, null);
+//            throw ex;
+//        }
+//        ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
+//        // 打印第三方出参日志
+//        ThirdPartyLog.infoConvertJson(LogThreadLocal.getTrackingNo(), SDKCommonBaseContextWare.getAppName(),start,System.currentTimeMillis(),
+//                thirdPartLogVo.getUri(),thirdPartLogVo.getRequestBody(),result);
+//        return result;
+//    }
+
+
+    /**
+     * 过滤返参code是否在excludeStatusCodes存在
+     *
+     * @param excludeStatusCodes
+     * @param statusCodeValue
+     * @return
+     */
+    private boolean containStatusCode(String[] excludeStatusCodes, String statusCodeValue) {
+        if (excludeStatusCodes == null || excludeStatusCodes.length == 0) {
+            return false;
+        }
+        for (int i = 0; i < excludeStatusCodes.length; i++) {
+            if (excludeStatusCodes[i].equals(statusCodeValue)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}

order-application-service/src/main/java/cn/freemud/aop/WebAspect.java

@@ -132,27 +132,7 @@ public class WebAspect {
         return result;
     }
 
-    @Pointcut("execution(* cn.freemud.service.thirdparty..*.*(..)) || execution(* cn.freemud.service.mccafe.thirdparty..*.*(..)) || execution(* cn.freemud.management.thirdparty..*.*(..))")
-    public void clientLog() {
-    }
 
-    @Around("clientLog()")
-    public Object doAround(ProceedingJoinPoint joinPoint) throws Throwable {
-        long start = System.currentTimeMillis();
-        Object result = null;
-        try {
-            result = joinPoint.proceed();
-        } catch (Exception ex) {
-            ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
-            LogUtil.thirdPartError(start, System.currentTimeMillis(), thirdPartLogVo, null);
-            throw ex;
-        }
-        ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
-        // 打印第三方出参日志
-        ThirdPartyLog.infoConvertJson(LogThreadLocal.getTrackingNo(), SDKCommonBaseContextWare.getAppName(),start,System.currentTimeMillis(),
-                thirdPartLogVo.getUri(),thirdPartLogVo.getRequestBody(),result);
-        return result;
-    }
 
     public String getNotFilterUrl(String redisKey, String configKey) {
         String notFilterUrl;

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -13,6 +13,7 @@
 package cn.freemud.controller;
 
 import cn.freemud.annotations.IsConvertEN;
+import cn.freemud.annotations.LogIgnore;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
@@ -162,8 +163,9 @@ public class OrderController {
     /**
      * 查询订单列表
      */
-    @ApiAnnotation(logMessage = "queryOrders")
+//    @ApiAnnotation(logMessage = "queryOrders")
     @PostMapping("/queryOrders")
+    @LogIgnore
     public BaseResponse queryOrders(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
         return orderservice.queryOrders(queryOrderVo);
     }