Merge branch 'test' into pre-production

blade-service/logpm-factory/src/main/resources/application-dev.yml

@@ -10,6 +10,33 @@ server:
 #    password: ${blade.datasource.dev.password}
 
 spring:
+  #rabbitmq配置
+  rabbitmq:
+    host: 192.168.2.100
+    port: 5672
+    username: admin
+    password: admin
+    #虚拟host 可以不设置,使用server默认host
+    virtual-host: /
+    #确认消息已发送到队列(Queue)
+    publisher-returns: true
+    publisher-confirm-type: correlated
+    # 手动提交消息
+    listener:
+      simple:
+        acknowledge-mode: auto
+        default-requeue-rejected: false
+        retry:
+          enabled: true # 开启消费者失败重试
+          initial-interval: 1000 # 初识的失败等待时长为1秒
+          multiplier: 1 # 失败的等待时长倍数，下次等待时长 = multiplier * last-interval
+          max-attempts: 3 # 最大重试次数
+          stateless: true # true无状态；false有状态。如果业务中包含事务，这里改为false
+      direct:
+        acknowledge-mode: manual
+    template:
+      mandatory: true
+
   #排除DruidDataSourceAutoConfigure
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceDetailClient.java

@@ -75,8 +75,8 @@ public class AdvanceDetailClient implements IAdvanceDetailClient {
 	}
 
 	@Override
-	public DistributionParcelListEntityVO getByUnitNo(String UnitNo) {
-		return advanceDetailService.getByUnitNo(UnitNo);
+	public DistributionParcelListEntityVO getByUnitNo(String unitNo) {
+		return advanceDetailService.getByUnitNo(unitNo);
 	}
 
 }