opt@20210702-日志规范-lxx:#日志规范 合入 兆良日志代码

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

 package cn.freemud.aop;
 
 import cn.freemud.annotations.LogIgnore;
+import cn.freemud.utils.AppLogUtil;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
 import com.freemud.application.sdk.api.exception.IgnoreErrorAnnotation;
@@ -75,9 +76,7 @@ public class LogIgnoreAspect implements Ordered {
             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")});
-            }
+            AppLogUtil.debugLotsParams("获取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);
@@ -98,7 +97,7 @@ public class LogIgnoreAspect implements Ordered {
                     }
                 }
             }
-            ApiLog.infoConvertJson(logMethod.toString(), logIgnore.logMessage(), request, startTime, System.currentTimeMillis(), requestData, logObj);
+            ApiLog.infoConvertJson(logMethod.toString(), logIgnore.logMessage(), request, startTime, System.currentTimeMillis(), requestData, logObj,null,null);
             LogThreadLocal.removeTrackingNo();
             return object;
         }

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

@@ -3,7 +3,7 @@ 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 cn.freemud.utils.AppLogUtil;
 import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.log.ThirdPartyLog;
@@ -49,8 +49,8 @@ public class LogIgnoreFeignAspect {
         try {
             result = joinPoint.proceed();
         } catch (Exception ex) {
-            ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
-            LogUtil.thirdPartError(start, System.currentTimeMillis(), thirdPartLogVo, null);
+            ThirdPartLogVo thirdPartLogVo = AppLogUtil.createThirdPartLogVo(joinPoint);
+            AppLogUtil.thirdPartError(start, System.currentTimeMillis(), thirdPartLogVo, null);
             throw ex;
         }
         try {
@@ -60,7 +60,7 @@ public class LogIgnoreFeignAspect {
                 msig = (MethodSignature) sig;
                 Method currentMethod = sig.getDeclaringType().getDeclaredMethod(msig.getName(), msig.getParameterTypes());
                 Object logReult = result;
-                ThirdPartLogVo thirdPartLogVo = LogUtil.createThirdPartLogVo(joinPoint);
+                ThirdPartLogVo thirdPartLogVo = AppLogUtil.createThirdPartLogVo(joinPoint);
                 // 打印第三方出参日志
                 if (!this.printFeignResponseBodyLog) {
                     LogIgnoreFeign logIgnore = currentMethod.getAnnotation(LogIgnoreFeign.class);
@@ -80,7 +80,7 @@ public class LogIgnoreFeignAspect {
                         thirdPartLogVo.getUri(), thirdPartLogVo.getRequestBody(), logReult);
             }
         } catch (Exception e) {
-            LogUtil.error("WebAspect Feign Log Ignore error {}", "","",e);
+            AppLogUtil.errorLog("WebAspect Feign Log Ignore error {}", "","",e);
         }
         return result;
     }

order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java

@@ -192,9 +192,6 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
                     //只 传递一次, 防止后续开发 多张优惠券使用情况
                     couponCodeVerificationTransDto = null;
                 }
-                boolean ok = false;
-                Exception lastException = null;
-                CouponCodeResponseDto couponCodeResponseDto = null;
                 try {
                     //71.券核销
                     // todo 这循环有啥用-.-

order-application-service/src/main/java/cn/freemud/service/impl/EvaluationServiceImpl.java

@@ -5,7 +5,6 @@ import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.DateUtil;
 import cn.freemud.entities.dto.AddProductEvaluationReqDto;
 import cn.freemud.entities.dto.Evaluation.OrderEvaluationStatus;
-import cn.freemud.entities.dto.activity.ActivityRequestCommon;
 import cn.freemud.entities.dto.activity.CheckAndJoinRequest;
 import cn.freemud.entities.dto.activity.CheckAndJoinResponse;
 import cn.freemud.entities.vo.AddUserOrderEvaluationNewRequestVo;
@@ -16,10 +15,7 @@ import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.EvaluationService;
 import cn.freemud.service.thirdparty.ActivityApplicationClient;
-import cn.freemud.utils.DateUtils;
-import cn.freemud.utils.LogUtil;
 import cn.freemud.utils.ResponseUtil;
-import com.alibaba.fastjson.JSON;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOrderEvaluation;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentProductEvaluation;
 import com.freemud.api.assortment.datamanager.entity.dto.InsertOrderEvaluationReqDto;
@@ -36,7 +32,10 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
 
 /**
  * All rights Reserved, Designed By www.freemud.com