Merge branch '20210702-日志规范-lxx' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java

call-back-service/src/main/resources/logback.xml

@@ -11,7 +11,7 @@
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
                 <pattern>
-                    {"level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}","grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}","message":%m}%n
+                    { "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "printMessage":"%m","messageData":[%X{messageData}]}%n
                 </pattern>
             </layout>
         </encoder>
@@ -78,10 +78,3 @@
     </root>
 
 </configuration>
\ No newline at end of file
-
-
-
-
-
-
-

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

@@ -13,7 +13,6 @@
 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;
@@ -64,7 +63,7 @@ public class OrderController {
     /**
      * 创建订单之前校验前面排队的订单数
      */
-    @LogIgnore(logMessage = "checkBeforeCreateOrder")
+    @ApiAnnotation(logMessage = "checkBeforeCreateOrder")
     @PostMapping("/checkBeforeCreateOrder")
     public BaseResponse checkBeforeCreateOrder(@Validated @LogParams @RequestBody CheckBeforeCreateOrderRequestVo checkBeforeCreateOrderRequestVo) {
         long start = System.currentTimeMillis();
@@ -81,7 +80,7 @@ public class OrderController {
      * 创建订单
      */
     @IsConvertEN
-    @LogIgnore(logMessage = "createOrder")
+    @ApiAnnotation(logMessage = "createOrder")
     @PostMapping("/createOrder")
     public BaseResponse createOrder(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) {
         return orderAdapterService.createOrderNew(createOrderVo);
@@ -90,7 +89,7 @@ public class OrderController {
     /**
      * 通用创建订单
      */
-    @LogIgnore(logMessage = "createOrderUniversal")
+    @ApiAnnotation(logMessage = "createOrderUniversal")
     @PostMapping("/createOrderUniversal")
     public BaseResponse createOrderUniversal(@Validated @LogParams @RequestBody Map<String, Object> param) {
         return orderAdapterService.createOrderUniversal(param);
@@ -99,7 +98,7 @@ public class OrderController {
     /**
      * 扫脸支付下单
      */
-    @LogIgnore(logMessage = "scanFaceCreateOrder")
+    @ApiAnnotation(logMessage = "scanFaceCreateOrder")
     @PostMapping("/scanFaceCreateOrder")
     public BaseResponse scanFaceCreateOrder(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) {
         return orderservice.scanFaceCreateOrder(createOrderVo);
@@ -108,7 +107,7 @@ public class OrderController {
     /**
      * APP下单，下单带商品信息，不经过购物车服务，不唤起支付
      */
-    @LogIgnore(logMessage = "appCreateOrder")
+    @ApiAnnotation(logMessage = "appCreateOrder")
     @PostMapping("/app/create")
     public BaseResponse appCreateOrder(@Validated @LogParams @RequestBody AppCreateOrderVo createOrderVo, BindingResult bindingResult) {
         return orderAdapterService.appCreateOrder(createOrderVo);
@@ -117,7 +116,7 @@ public class OrderController {
     /**
      * 订单支付成功后通知
      */
-    @LogIgnore(logMessage = "paySuccessCallback")
+    @ApiAnnotation(logMessage = "paySuccessCallback")
     @PostMapping("/paySuccessCallback")
     public String paySuccessCallback(@LogParams @RequestBody PaysuccessNoticeMessage message) {
         return orderAdapterService.paySuccessCallback(message);
@@ -126,7 +125,7 @@ public class OrderController {
     /**
      * 订单支付成功后通知
      */
-    @LogIgnore(logMessage = "newPaySuccessCallback")
+    @ApiAnnotation(logMessage = "newPaySuccessCallback")
     @PostMapping({"/newPaySuccessCallback","/openStoreQueryPaymentCallback"})
     public String newPaySuccessCallback(@LogParams @RequestBody NewPaysuccessNoticeMessage message) {
         return orderservice.newPaySuccessCallback(message);
@@ -135,7 +134,7 @@ public class OrderController {
     /**
      * 退款回掉通知
      */
-    @LogIgnore(logMessage = "refundNotifyCallback")
+    @ApiAnnotation(logMessage = "refundNotifyCallback")
     @PostMapping("/refundNotifyCallback")
     public String refundNotifyCallback(@LogParams @RequestBody RefundNotifyCallbackRequestVo requestVo) {
         return orderservice.refundNotifyCallback(requestVo);
@@ -146,9 +145,8 @@ public class OrderController {
     /**
      * 查询订单列表
      */
-//    @ApiAnnotation(logMessage = "queryOrders")
     @PostMapping("/queryOrders")
-    @LogIgnore(logMessage = "queryOrders")
+    @ApiAnnotation(logMessage = "queryOrders")
     public BaseResponse queryOrders(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
         return orderservice.queryOrders(queryOrderVo);
     }
@@ -159,7 +157,7 @@ public class OrderController {
      * @return
      */
     @IsConvertEN
-    @LogIgnore(logMessage = "previewOrderInfo")
+    @ApiAnnotation(logMessage = "previewOrderInfo")
     @PostMapping("/previewOrderInfo")
     public BaseResponse previewOrderInfo(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo){
         CreateReserveOrderVo createReserveOrderVo =  new CreateReserveOrderVo();
@@ -176,7 +174,7 @@ public class OrderController {
      * @return
      */
     @IsConvertEN
-    @LogIgnore(logMessage = "previewOrderInfoSvcCheck")
+    @ApiAnnotation(logMessage = "previewOrderInfoSvcCheck")
     @PostMapping("/previewOrderInfoSvcCheck")
     public BaseResponse previewOrderInfoSvcCheck(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo){
         CreateReserveOrderVo createReserveOrderVo =  new CreateReserveOrderVo();
@@ -192,7 +190,7 @@ public class OrderController {
     /**
      * 获取订单详情
      */
-    @LogIgnore(logMessage = "queryOrderById")
+    @ApiAnnotation(logMessage = "queryOrderById")
     @PostMapping("/queryOrderById")
     public BaseResponse queryOrderById(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
         return orderservice.queryOrderById(queryOrderVo.getOperation(),queryOrderVo.getSessionId(), queryOrderVo.getOid(),queryOrderVo.getPartnerId(),queryOrderVo.getChannelType());
@@ -211,7 +209,7 @@ public class OrderController {
     /**
      * 取消支付删除订单
      */
-    @LogIgnore(logMessage = "deleteOrder")
+    @ApiAnnotation(logMessage = "deleteOrder")
     @PostMapping("/deleteOrder")
     public BaseResponse deleteOrder(@Validated @LogParams @RequestBody DeleteOrderVo deleteOrderVo) {
         return orderservice.deleteOrder(deleteOrderVo);
@@ -230,7 +228,7 @@ public class OrderController {
     /**
      * 用户申请退款
      */
-    @LogIgnore(logMessage = "refund")
+    @ApiAnnotation(logMessage = "refund")
     @PostMapping("/refund")
     public BaseResponse refund(@Validated @LogParams @RequestBody OrderRefundVo orderRefundVo) {
         return orderservice.orderRefund(orderRefundVo);
@@ -239,7 +237,7 @@ public class OrderController {
     /**
      * 获取订单排队号
      */
-    @LogIgnore(logMessage = "queueIndex")
+    @ApiAnnotation(logMessage = "queueIndex")
     @PostMapping("/queueIndex")
     public BaseResponse getOrderQueueIndex(@Validated @LogParams @RequestBody QueryOrderQueueIndexVo queryOrderQueueIndexVo) {
         return orderservice.queryOrderQueueIndex(queryOrderQueueIndexVo);
@@ -249,7 +247,7 @@ public class OrderController {
     /**
      * 获取申请退款理由 1.9后作废
      */
-    @LogIgnore(logMessage = "getOrderRefundReason")
+    @ApiAnnotation(logMessage = "getOrderRefundReason")
     @ApiOperation(value = "获取申请退款理由", notes = "获取申请退款理由", produces = "application/json")
     @PostMapping("/getOrderRefundReason")
     public BaseResponse getRefundReason(@LogParams @RequestBody GetRefundReasonVo getRefundReasonVo) {
@@ -259,7 +257,7 @@ public class OrderController {
     /**
      * 获取申请退款理由
      */
-    @LogIgnore(logMessage = "getNewOrderRefundReason")
+    @ApiAnnotation(logMessage = "getNewOrderRefundReason")
     @ApiOperation(value = "获取申请退款理由", notes = "获取申请退款理由", produces = "application/json")
     @PostMapping("/getNewOrderRefundReason")
     public BaseResponse getNewRefundReason(@LogParams @RequestBody GetRefundReasonVo getRefundReasonVo) {
@@ -270,7 +268,7 @@ public class OrderController {
      * 查询桌号是否开台
      */
     @IsConvertEN
-    @LogIgnore(logMessage = "queryTableNumberStatus")
+    @ApiAnnotation(logMessage = "queryTableNumberStatus")
     @ApiOperation(value = "查询桌号是否开台", notes = "查询桌号是否开台", produces = "application/json")
     @PostMapping("/queryTableNumberStatus")
     public BaseResponse queryTableNumberStatus(@LogParams @RequestBody EncircleReserveBaseVo encircleReserveBaseVo) {
@@ -280,7 +278,7 @@ public class OrderController {
     /**
      * 查询30分钟未支付的优惠券订单
      */
-    @LogIgnore(logMessage = "queryOrderWithCoupon")
+    @ApiAnnotation(logMessage = "queryOrderWithCoupon")
     @ApiOperation(value = "查询30分钟未支付的优惠券订单", notes = "查询30分钟未支付的优惠券订单", produces = "application/json")
     @PostMapping("/queryOrderWithCoupon")
     public BaseResponse queryOrderWithCoupon(@LogParams @RequestBody QueryOrderWithCouponVo orderWithCouponVo) {
@@ -290,7 +288,7 @@ public class OrderController {
     /**
      * 订单确认完成
      */
-    @LogIgnore(logMessage = "affirm")
+    @ApiAnnotation(logMessage = "affirm")
     @PostMapping("/affirm")
     public BaseResponse orderAffirm(@Validated @LogParams @RequestBody OrderAffirmRequestVO request) {
         return mallOrderService.orderAffirm(request);
@@ -299,14 +297,14 @@ public class OrderController {
     /**
      * 创建预支付
      */
-    @LogIgnore(logMessage = "createPrepay")
+    @ApiAnnotation(logMessage = "createPrepay")
     @PostMapping("/createPrepay")
     public BaseResponse createPrepay(@Validated @LogParams @RequestBody CreatePrepayVo request) {
         return orderAdapterService.createPrepay(request);
     }
 
     @ApiOperation(value = "创建积分订单", notes = "创建积分订单", produces = "application/json")
-    @LogIgnore(logMessage = "createIntegralOrder")
+    @ApiAnnotation(logMessage = "createIntegralOrder")
     @PostMapping("/createIntegralOrder")
     public BaseResponse createIntegralOrder(@Validated @LogParams @RequestBody IntegralOrderVo request) {
         return orderservice.createIntegralOrder(request);
@@ -315,7 +313,7 @@ public class OrderController {
     /**
      * 查询用户积分订单列表
      */
-    @LogIgnore(logMessage = "queryOrderByConditions")
+    @ApiAnnotation(logMessage = "queryOrderByConditions")
     @PostMapping("/queryOrderByConditions")
     public BaseResponse queryOrderByConditions(@Validated @LogParams @RequestBody QueryOrderByConditionsRequestVo queryOrderByConditionsRequestVo) {
         return orderservice.queryOrderByConditions(queryOrderByConditionsRequestVo);
@@ -326,7 +324,7 @@ public class OrderController {
      * @param timeOutOrderVo
      * @return
      */
-    @LogIgnore(logMessage = "timeOutOrderRefund")
+    @ApiAnnotation(logMessage = "timeOutOrderRefund")
     @PostMapping("/timeOutOrderRefund")
     public BaseResponse timeOutOrderRefund(@Validated @LogParams @RequestBody TimeOutOrderVo timeOutOrderVo){
         return orderservice.timeOutOrderRefund(timeOutOrderVo);
@@ -336,7 +334,7 @@ public class OrderController {
      * @param requestVo
      * @return
      */
-    @LogIgnore(logMessage = "queryOrderRider")
+    @ApiAnnotation(logMessage = "queryOrderRider")
     @PostMapping("/queryOrderRider")
     public BaseResponse queryOrderRider(@Validated @LogParams @RequestBody OrderRiderRequestVo requestVo){
         return orderservice.queryOrderRider(requestVo);
@@ -346,7 +344,7 @@ public class OrderController {
     /**
      * 统计商户当日订单数
      */
-    @LogIgnore(logMessage = "queryTodayOrders")
+    @ApiAnnotation(logMessage = "queryTodayOrders")
     @PostMapping("/queryTodayOrders")
     public BaseResponse queryTodayOrders(@Validated @LogParams @RequestBody QueryOrderByConditionsRequestVo queryOrderByConditionsRequestVo) {
         return orderservice.queryTodayOrders(queryOrderByConditionsRequestVo);
@@ -355,7 +353,7 @@ public class OrderController {
     /**
      * 订单确认收货
      */
-    @LogIgnore(logMessage = "receive")
+    @ApiAnnotation(logMessage = "receive")
     @PostMapping("/receive")
     public BaseResponse orderReceive(@Validated @LogParams @RequestBody OrderReceiveRequestVO request) {
         return mallOrderService.orderReceive(request);
@@ -364,7 +362,7 @@ public class OrderController {
     /**
      * 退货快递信息
      */
-    @LogIgnore(logMessage = "refundExpress")
+    @ApiAnnotation(logMessage = "refundExpress")
     @PostMapping("/refundExpress")
     public BaseResponse refundExpress(@Validated @LogParams @RequestBody EditAfterSalesExpressVo editAfterSalesExpressVo) {
         return mallOrderService.saveAfterSalesExpress(editAfterSalesExpressVo);
@@ -373,7 +371,7 @@ public class OrderController {
     /**
      * 拼团失败批量退款
      */
-    @LogIgnore(logMessage = "spellGroupBatchRefund")
+    @ApiAnnotation(logMessage = "spellGroupBatchRefund")
     @PostMapping("/spellGroupFailRefund")
     public BaseResponse spellGroupFailRefund(@Validated @LogParams @RequestBody SpellGroupFailRefundVo refundVo) {
         return orderservice.spellGroupOrderFailRefund(refundVo);
@@ -382,7 +380,7 @@ public class OrderController {
     /**
      * 积分兑换记录查询（农工商）
      */
-    @LogIgnore(logMessage = "scoreRecord")
+    @ApiAnnotation(logMessage = "scoreRecord")
     @PostMapping("/scoreRecord")
     public BaseResponse scoreRecord(@Validated @LogParams @RequestBody QueryOrderVo queryOrderVo) {
         return orderservice.scoreRecord(queryOrderVo);
@@ -394,7 +392,7 @@ public class OrderController {
      * @param
      * @return
      */
-    @LogIgnore(logMessage = "reportSendOrderCount")
+    @ApiAnnotation(logMessage = "reportSendOrderCount")
     @GetMapping("/reportSendOrderCount")
     public BaseResponse reportSendOrderCount() throws Exception {
         AppLogUtil.infoLog("触发订单上报",null,null);
@@ -406,7 +404,7 @@ public class OrderController {
     /**
      * TLS定时器 每天凌晨 上报昨天 门店支付记录 到 门店服务去
      */
-    @LogIgnore(logMessage = "sendYesterDayStoreMsg")
+    @ApiAnnotation(logMessage = "sendYesterDayStoreMsg")
     @GetMapping("/sendYesterDayStoreMsg")
     public BaseResponse sendYesterDayStoreMsg() {
         orderReportJobHandler.sendYesterDayStoreMsg();

order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java

 package cn.freemud.manager;
 
 import cn.freemud.constant.RedisKeyConstant;
-import cn.freemud.enums.OrderType;
 import cn.freemud.enums.OrderTackCodeRuleEnum;
 import cn.freemud.redis.RedisCache;
+import cn.freemud.enums.OrderType;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentTackCodeRule;
 import com.freemud.api.assortment.datamanager.manager.AssortmentTackCodeRuleManager;
 import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest;
@@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;

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

@@ -39,6 +39,11 @@ import cn.freemud.entities.dto.ecology.SendMessageRequest;
 //import cn.freemud.entities.dto.ecology.SendMessageResponse;
 //import cn.freemud.entities.dto.ecology.SubscribeMessageRequest;
 //import cn.freemud.entities.dto.ecology.SendMessageRequest;
+import cn.freemud.entities.dto.delivery.*;
+import cn.freemud.entities.dto.ecology.SendMessageRequest;
+import cn.freemud.entities.dto.ecology.SendMessageResponse;
+import cn.freemud.entities.dto.ecology.SubscribeMessageRequest;
+import cn.freemud.entities.dto.ecology.SendMessageRequest;
 import cn.freemud.entities.dto.order.CreateOrderOperateDto;
 import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
 import cn.freemud.entities.dto.order.FacePayRequestDto;

order-application-service/src/main/resources/logback.xml

@@ -11,7 +11,7 @@
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
                 <pattern>
-                    {"level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}","grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}","message":%m}%n
+                    { "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "printMessage":"%m","messageData":[%X{messageData}]}%n
                 </pattern>
             </layout>
         </encoder>
@@ -78,10 +78,3 @@
     </root>
 
 </configuration>
\ No newline at end of file
-
-
-
-
-
-
-

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartCollageController.java

@@ -39,7 +39,7 @@ public class ShoppingCartCollageController {
      * 向拼单购物车中添加商品
      */
     @PostMapping(value = "/addGoods")
-    @LogIgnore(logMessage = "addGoods")
+    @ApiAnnotation(logMessage = "addGoods")
     public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).addGoods(request);
     }
@@ -47,7 +47,7 @@ public class ShoppingCartCollageController {
     /**
      * 修改拼单购物车中商品数量
      */
-    @LogIgnore(logMessage = "updateGoodsQty")
+    @ApiAnnotation(logMessage = "updateGoodsQty")
     @PostMapping(value = "/updateGoodsQty")
     public BaseResponse updateGoodsQty(@Validated @LogParams @RequestBody UpdateShoppingCartGoodsQtyRequestVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).updateGoodsQty(request);
@@ -56,7 +56,7 @@ public class ShoppingCartCollageController {
     /**
      * 查询购物车信息
      */
-    @LogIgnore(logMessage = "listCartGoods")
+    @ApiAnnotation(logMessage = "listCartGoods")
     @PostMapping(value = "/listCartGoods")
     public BaseResponse listCartGoods(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).getGoodsList(request);
@@ -65,7 +65,7 @@ public class ShoppingCartCollageController {
     /**
      * 清空自己的购物车
      */
-    @LogIgnore(logMessage = "clearPartCartGoods")
+    @ApiAnnotation(logMessage = "clearPartCartGoods")
     @PostMapping(value = "/clearPartCartGoods")
     public BaseResponse clearPartCartGoods(@Validated @LogParams @RequestBody ShoppingCartCollageClearRequestVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).clearPartCarGoods(request);
@@ -74,7 +74,7 @@ public class ShoppingCartCollageController {
     /**
      * 清空购物车
      */
-    @LogIgnore(logMessage = "clearCartGoods")
+    @ApiAnnotation(logMessage = "clearCartGoods")
     @PostMapping(value = "/clearCartGoods")
     public BaseResponse clearCartGoods(@Validated @LogParams @RequestBody ShoppingCartClearRequestVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).clear(request);
@@ -86,7 +86,7 @@ public class ShoppingCartCollageController {
      * @param getShoppingCartGoodsApportionRequestVo
      * @return
      */
-    @LogIgnore(logMessage = "getShoppingCartGoodsApportion")
+    @ApiAnnotation(logMessage = "getShoppingCartGoodsApportion")
     @PostMapping(value = "/getShoppingCartGoodsApportion")
     public BaseResponse getShoppingCartGoodsApportion(@Validated @LogParams @RequestBody GetShoppingCartGoodsApportionRequestVo getShoppingCartGoodsApportionRequestVo) {
         if (getShoppingCartGoodsApportionRequestVo == null || getShoppingCartGoodsApportionRequestVo.getShoppingCartInfoRequestVo() == null) {
@@ -110,7 +110,7 @@ public class ShoppingCartCollageController {
      * 查询购车信息无配送费
      * SVC卡支付check，check购物车金额加配送费小于储值卡金额
      */
-    @LogIgnore(logMessage = "listCartGoodsCheck")
+    @ApiAnnotation(logMessage = "listCartGoodsCheck")
     @PostMapping(value = "/listCartGoodsCheck")
     public BaseResponse listCartGoodsCheck(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartCollageServiceImpl.class).getGoodsListCheck(request);

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java

@@ -77,7 +77,7 @@ public class ShoppingCartController {
      * 从微信卡券向购物车中添加商品
      */
     @PostMapping(value = "/addGoodsByCard")
-    @LogIgnore(logMessage = "addGoodsByCard")
+    @ApiAnnotation(logMessage = "addGoodsByCard")
     public BaseResponse addGoodsByCard(@Validated @LogParams @RequestBody AddGoodsByWeixinCardRequestVo request) {
         return getInstanceByRequest(request).addGoodsByCard(request);
     }
@@ -87,7 +87,7 @@ public class ShoppingCartController {
      */
     @IsConvertEN
     @PostMapping(value = "/addGoods")
-    @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "addGoods")
+    @ApiAnnotation(logMessage = "addGoods")
     public BaseResponse addGoods(@Validated @LogParams @RequestBody AddShoppingCartGoodsRequestVo request) {
         ShoppingCartNewService instanceByRequest = getInstanceByRequest(request);
         if (instanceByRequest instanceof ShoppingCartNewServiceImpl && SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).newShoppingCartGray(request.getPartnerId(), request.getShopId())){
@@ -103,7 +103,7 @@ public class ShoppingCartController {
      */
     @IsConvertEN
     @PostMapping(value = "/updateGoodsQty")
-    @LogIgnore(logMessage = "updateGoodsQty")
+    @ApiAnnotation(logMessage = "updateGoodsQty")
     public BaseResponse updateGoodsQty(@Validated @LogParams @RequestBody UpdateShoppingCartGoodsQtyRequestVo request) {
         ShoppingCartNewService instanceByRequest = getInstanceByRequest(request);
         if (instanceByRequest instanceof ShoppingCartNewServiceImpl && SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).newShoppingCartGray(request.getPartnerId(), request.getShopId())){
@@ -119,7 +119,7 @@ public class ShoppingCartController {
      */
     @IsConvertEN
     @PostMapping(value = "/listCartGoods")
-    @LogIgnore(logMessage = "listCartGoods")
+    @ApiAnnotation(logMessage = "listCartGoods")
     public BaseResponse listCartGoods(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
         // 代金券 & 折扣券互斥校验
         BaseResponse baseResponse = verifyCouponCodes(request.getCouponCodes());
@@ -140,7 +140,7 @@ public class ShoppingCartController {
      * SVC卡支付check，check购物车金额加配送费小于储值卡金额
      */
     @PostMapping(value = "/listCartGoodsCheck")
-    @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "listCartGoodsCheck")
+    @ApiAnnotation(logMessage = "listCartGoodsCheck")
     public BaseResponse listCartGoodsCheck(@Validated @LogParams @RequestBody ShoppingCartInfoRequestVo request) {
         // 代金券 & 折扣券互斥校验
         BaseResponse baseResponse = verifyCouponCodes(request.getCouponCodes());
@@ -163,7 +163,7 @@ public class ShoppingCartController {
      */
     @IsConvertEN
     @PostMapping(value = "/clearCartGoods")
-    @LogIgnore(logMessage = "clearCartGoods")
+    @ApiAnnotation(logMessage = "clearCartGoods")
     public BaseResponse clearCartGoods(@Validated @LogParams @RequestBody ShoppingCartClearRequestVo request) {
         String sessionId = request.getSessionId();
         if (StringUtils.isEmpty(sessionId)) {
@@ -184,7 +184,7 @@ public class ShoppingCartController {
      */
     @IsConvertEN
     @PostMapping(value = "/getShoppingCartGoodsApportion")
-    @LogIgnore(logMessage = "getShoppingCartGoodsApportion")
+    @ApiAnnotation(logMessage = "getShoppingCartGoodsApportion")
     public BaseResponse getShoppingCartGoodsApportion(@Validated @LogParams @RequestBody GetShoppingCartGoodsApportionRequestVo getShoppingCartGoodsApportionRequestVo) {
         if (getShoppingCartGoodsApportionRequestVo == null || getShoppingCartGoodsApportionRequestVo.getShoppingCartInfoRequestVo() == null) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
@@ -240,7 +240,7 @@ public class ShoppingCartController {
      * 线下订单查询接口
      */
     @PostMapping(value = "/getMemberInfo")
-    @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/getMemberInfo")
+    @ApiAnnotation(logMessage = "/getMemberInfo")
     public BaseResponse getMemberInfo(@LogParams @RequestBody GetMemberInfoRequestDto request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).getMemberInfo(request);
     }
@@ -249,7 +249,7 @@ public class ShoppingCartController {
      * 结算页获取是否展示订单那备注配置
      */
     @PostMapping(value = "/getOpenStoreIappWxappConfig")
-    @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/getOpenStoreIappWxappConfig")
+    @ApiAnnotation(logMessage = "/getOpenStoreIappWxappConfig")
     public BaseResponse getOpenStoreIappWxappConfig(@LogParams @RequestBody OpenStoreIappWxappConfigRequestVo request) {
         return openStoreIappWxappConfigService.getOpenStoreIappWxappConfig(request);
     }
@@ -258,7 +258,7 @@ public class ShoppingCartController {
      * 结算页获取加价购活动商品列表
      */
     @PostMapping(value = "/premiumExchange")
-    @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/premiumExchange")
+    @ApiAnnotation(logMessage = "/premiumExchange")
     public BaseResponse premiumExchange(@LogParams @RequestBody @Validated PremiumExchangeRequestVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).premiumExchange(request);
     }
@@ -266,7 +266,7 @@ public class ShoppingCartController {
      * 券码查询购物车商品信息(平台结算页可用券列表用)
      */
     @PostMapping(value = "/getCartInfoByUser")
-    @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/getCartInfoByUser")
+    @ApiAnnotation(logMessage = "/getCartInfoByUser")
     public BaseResponse getCartInfoByUser(@LogParams @RequestBody @Validated CouponAvailableRequestVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).getCartInfoByUser(request);
     }
@@ -276,7 +276,7 @@ public class ShoppingCartController {
      * 替换老门店的商品到切换的门店下
      */
     @PostMapping(value = "/replaceGoodsByShop")
-    @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/replaceGoodsByShop")
+    @ApiAnnotation(logMessage = "/replaceGoodsByShop")
     public BaseResponse replaceGoodsByShop(@LogParams @RequestBody @Validated ShopGoodsReplaceVo request) {
         return SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).replaceGoodsByShop(request);
     }
@@ -290,7 +290,7 @@ public class ShoppingCartController {
      * 测试用，后续删除
      */
     @PostMapping(value = "/test/putCache")
-    @LogIgnore(excludeStatusCodes = {ResponseCodeConstant.RESPONSE_SUCCESS_STR},logMessage = "/putCache")
+    @ApiAnnotation(logMessage = "/putCache")
     public BaseResponse putCache(@LogParams @RequestBody @Validated PutCacheVo request) {
 
         com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto cartParamDto = new com.freemud.sdk.api.assortment.shoppingcart.domain.CartParamDto();

shopping-cart-application-service/src/main/resources/logback.xml

@@ -11,7 +11,7 @@
         <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
             <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
                 <pattern>
-                    {"level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}","grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}","message":%m}%n
+                    { "level":"%p", "timestamp":"%d", "projectName":"${PROJECT_NAME:-}", "grayVersion":"${eureka.instance.metadataMap.version}", "tid":"%tid", "scenarios":"%X{scenarios}", "printMessage":"%m","messageData":[%X{messageData}]}%n
                 </pattern>
             </layout>
         </encoder>