Merge branch 'master' of https://gitee.com/wjl2008_admin/nuttyreading-java

# Conflicts:
#	src/main/resources/weChatConfig.properties

src/main/java/com/peanut/modules/mq/Consumer/OrderCancelConsumer.java

@@ -21,6 +21,9 @@ public class OrderCancelConsumer {
     @RabbitListener(queues = DelayQueueConfig.ORDER_CANCEL_DEAD_LETTER_QUEUE)
     public void orderConsumer(String orderId) {
         BuyOrderEntity buyOrder = buyOrderService.getById(orderId);
+        if(buyOrder == null){
+            return;
+        }
         if(Constants.ORDER_STATUS_TO_BE_PAID.equals(buyOrder.getOrderStatus())){
             buyOrder.setOrderStatus(Constants.ORDER_STATUS_OUT_OF_TIME);
         }

src/main/resources/application.yml

@@ -11,7 +11,7 @@ connection-timeout: 6000000ms
 spring:
   # 环境 dev|test|prod
   profiles:
-    active: dev
+    active: prod
   # jackson时间格式化
   jackson:
     time-zone: GMT+8