Merge remote-tracking branch 'origin/dev' into dev

08.src/Xingxi/xingxi-admin/src/main/resources/application-local.yml

@@ -6,7 +6,7 @@ spring:
         port: 5672
         username: developer01
         password: 123456
-        virtual-host: dev
+        virtual-host: xingxi-dev
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/mq/constant/InvoiceMqKey.java

@@ -14,17 +14,17 @@ public interface InvoiceMqKey {
     /**
      * 发票开具交换机
      */
-    String EDIT_EXCHANGE = "mq.exchange.topic.biandan.invoice";
+    String EDIT_EXCHANGE = "mq.exchange.topic.xingxi.invoice";
 
     /**
      *  发票开具申请路由KEY
      */
-    String EDIT_ROUTE_INVOICE_FOR_APPLY = "mq.route.biandan.invoice.apply";
+    String EDIT_ROUTE_INVOICE_FOR_APPLY = "mq.route.xingxi.invoice.apply";
 
 
     /**
      * 发票开具申请订阅队列
      */
-    String EDIT_QUEUE_INVOICE_FOR_APPLY_SHDZFP = "mq.queue.biandan.invoice.apply.shdzfp";
+    String EDIT_QUEUE_INVOICE_FOR_APPLY_SHDZFP = "mq.queue.xingxi.invoice.apply.shdzfp";
 
 }

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/mq/constant/WxSubscribeMessageMqKey.java

@@ -6,9 +6,9 @@ package com.xingxi.common.mq.constant;
 
 public interface WxSubscribeMessageMqKey {
 
-    String EDIT_EXCHANGE = "mq.exchange.topic.biandan.wxsubscribemessage";
+    String EDIT_EXCHANGE = "mq.exchange.topic.xingxi.wxsubscribemessage";
 
-    String EDIT_ROUTE_FOR_WXSUBSCRIBEMESSAGE_PUBLISH = "mq.route.biandan.wxsubscribemessage.publish";
+    String EDIT_ROUTE_FOR_WXSUBSCRIBEMESSAGE_PUBLISH = "mq.route.xingxi.wxsubscribemessage.publish";
 
-    String EDIT_QUEUE_FOR_WXSUBSCRIBEMESSAGE_PUBLISH = "mq.queue.biandan.wxsubscribemessage.publish";
+    String EDIT_QUEUE_FOR_WXSUBSCRIBEMESSAGE_PUBLISH = "mq.queue.xingxi.wxsubscribemessage.publish";
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/api/service/impl/CartsApiServiceImpl.java

@@ -302,7 +302,7 @@ class CartsApiServiceImpl implements CartsServiceI {
 
             MerchantProd mercProd = wxApiProductMapper.selectMerchantProdByMercProdId(carts.getMercProdId());
 
-            carts.setCheckFlag(EYesNo.YES.getVal());
+            carts.setCheckFlag(EYesNo.NO.getVal());
             carts.setUpdateUser(userContext.getCurrentUser().getUserId().toString());
             carts.setUpdateTime(DateUtils.getNowDate());
             cartsMapper.updateCarts(carts);

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/application-local.yml

@@ -55,7 +55,7 @@ spring:
     port: 5672
     username: developer01
     password: 123456
-    virtual-host: "dev"
+    virtual-host: "xingxi-dev"
     publisher-confirm-type: correlated
   # redis配置
   redis:

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/logback-local.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/appuser/server/dev/xingxi-miniprogram-api/logs/" />
+	<property name="log.path" value="/home/appuser/server/xingxi-miniprogram-api/logs/" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />