feature：redis 哨兵、buyer_code\encoding 导入补0，

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java

@@ -479,7 +479,7 @@ public class CommodityController {
                 commodityCodeEntity.setXhfNsrsbh(xhfNsrsbh);
                 commodityCodeEntity.setXhfMc(xhfMc);
                 commodityCodeEntity.setXmmc(commodityExcel.getXmmc());
-                commodityCodeEntity.setZxbm(commodityExcel.getZxbm());
+                commodityCodeEntity.setZxbm(String.format("%18s", commodityExcel.getZxbm()).replace(' ', '0'));
                 commodityCodeEntity.setSpsm("");
                 commodityCodeEntity.setSpjm("");
                 String sl = commodityExcel.getSl();

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java

@@ -282,7 +282,7 @@ public class BuyerController {
                 buyerEntity.setBankOfDeposit(buyerImportExcel.getGhfYh());
                 buyerEntity.setBankNumber(buyerImportExcel.getGhfZh());
                 buyerEntity.setRemarks(buyerImportExcel.getGhfBz());
-                buyerEntity.setBuyerCode(buyerImportExcel.getGhfBm());
+                buyerEntity.setBuyerCode(String.format("%10s", buyerImportExcel.getGhfBm()).replace(' ', '0'));
                 buyerEntity.setEmail(buyerImportExcel.getGhfYx());
                 buyerEntity.setSjh(buyerImportExcel.getGhfSjh());
 

order-management-consumer/src/main/resources/bootstrap.yaml

@@ -39,7 +39,7 @@ sims:
     #订单数据库类型区分,要么mysql,要么Oracle,要么weblogic
     db: mysql
     #订单redis数据库类型区分,要么redis,要么redis-sentinel
-    redisDb: redis
+    redisDb: redis-sentinel
 
 # 0 mysql 1 oracle
 dataType: 0

pom.xml

@@ -62,7 +62,7 @@
         <sims.base.common.version>1.0.0-sdenergy</sims.base.common.version>
 
         <!-- 销项基础服务-队列服务 -->
-        <sims.base.rabbitmq.version>6.1.4.0-BASE</sims.base.rabbitmq.version>
+        <sims.base.rabbitmq.version>1.0.0-sdenergy</sims.base.rabbitmq.version>
 
         <!-- 销项基础服务-订单合并 -->
         <sims.base.order.merge.version>1.0.0-sdenergy</sims.base.order.merge.version>