Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into…

Merge remote-tracking branch 'origin/feature/20210720-购物车日志修改-张志恒' into feature/20210720-购物车日志修改-张志恒

call-back-service/src/main/java/cn/freemud/controller/CallBackController.java

@@ -16,6 +16,7 @@ import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.vo.OrderCallBackRequestVo;
 import cn.freemud.service.OrderCallBackService;
 import com.freemud.application.sdk.api.log.ApiAnnotation;
+import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogParams;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -34,8 +35,10 @@ public class CallBackController {
     private OrderCallBackService orderCallBackService;
 
     @PostMapping("/order")
-    @ApiAnnotation(logMessage = "orderCallBackHandle",printInfoLog = true)
+    @ApiAnnotation(logMessage = "/callback/order",printRequestLog = false)
     public BaseResponse orderCallBackHandle(@Valid @RequestBody @LogParams OrderCallBackRequestVo requestVo) {
+        ApiLog.infoMessage("orderCallBackHandle start url:{} orderCode:{} requestId:{}","/callback/order",
+                requestVo.getOrderCode(),requestVo.getRequestId());
         return orderCallBackService.orderCallBackHandle(requestVo);
     }
 

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

@@ -190,7 +190,7 @@ public class WebAspect {
                 if (logIgnore != null) {
                     statusCodeValue = json.getString(logIgnore.statusCodeFieldName());
                     messageValue = json.getString(logIgnore.messageFieldName());
-                    if (!this.printFeignResponseBodyLog && !logIgnore.printInfoLog() && !this.tempFeignPrintBodyLogMethods.contains(logIgnore.logMessage())) {
+                    if (!this.printFeignResponseBodyLog && !logIgnore.printInfoLog() && !this.tempFeignPrintBodyLogMethods.contains(currentMethod.getName())) {
                         String[] excludeStatusCodes = logIgnore.excludeStatusCodes();
                         if (!StringUtils.isEmpty(statusCodeValue) && this.containStatusCode(excludeStatusCodes, statusCodeValue)) {
                             logReult = result.getClass().newInstance();