fix: mq修改

abi-cloud-qr-platform-server/pom.xml

@@ -108,10 +108,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-actuator</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/config/RabbitmqConfig.java

@@ -2,7 +2,14 @@ package com.abi.qms.platform.infrastructure.config;
 
 import com.abi.qms.platform.infrastructure.mq.TableStoreBatchInsertConsumer;
 import com.abi.qms.platform.infrastructure.mq.TableStoreBatchUpdateConsumer;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.Queue;
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
+import org.springframework.amqp.rabbit.connection.CorrelationData;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -13,6 +20,7 @@ import org.springframework.context.annotation.Configuration;
  * @date: 2021-05-11
  */
 @Configuration
+@Slf4j
 public class RabbitmqConfig {
 
 	@Bean(name = "qms_table_store_queue")
@@ -25,4 +33,19 @@ public class RabbitmqConfig {
 		return new Queue(TableStoreBatchUpdateConsumer.TABLE_STORE_BATCH_UPDATE_QUEUE);
 	}
 
+	@Autowired
+	private CachingConnectionFactory factory;
+
+	@Bean(name = "qmsRabbitTemplate")
+	public RabbitTemplate rabbitTemplate(){
+		RabbitTemplate template = new RabbitTemplate(factory);
+		template.setMessageConverter(new Jackson2JsonMessageConverter());
+		template.setMandatory(true);
+		template.setConfirmCallback((CorrelationData correlationData, boolean ack, String cause) ->
+				log.info("CorrelationData:{}, ack:{}, cause:{}", correlationData, ack, cause));
+		template.setReturnCallback((Message message, int replyCode, String replyText, String exchange, String routingKey) ->
+				log.info("message:{}, replyCode:{}, replyText:{}, exchange:{}, routingKey:{}", message, replyCode, replyText, exchange, routingKey));
+		return template;
+	}
+
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/util/AsyncTableStoreUtil.java

@@ -3,17 +3,13 @@ package com.abi.qms.platform.infrastructure.util;
 import com.abi.qms.platform.dao.tablestore.entity.QrCode;
 import com.abi.qms.platform.infrastructure.mq.TableStoreBatchInsertConsumer;
 import com.abi.qms.platform.infrastructure.mq.TableStoreBatchUpdateConsumer;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.apache.poi.ss.formula.functions.T;
-import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -24,7 +20,8 @@ import java.util.List;
 public class AsyncTableStoreUtil {
 
     @Autowired
-    private AmqpTemplate amqpTemplate;
+    @Qualifier("qmsRabbitTemplate")
+    private RabbitTemplate amqpTemplate;
 
     /**
      * 批量新增tableStore,码表
@@ -70,8 +67,8 @@ public class AsyncTableStoreUtil {
     }
 
     /**
-    * 更新行对象
-    */
+     * 更新行对象
+     */
     @Data
     public static class UpdateRowBean implements Serializable {
         private List<QrCode> entityList;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/GenerateCodeServiceImpl.java

@@ -35,7 +35,9 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
@@ -96,7 +98,8 @@ public class GenerateCodeServiceImpl implements GenerateCodeService {
     private BaseMaterialMapper baseMaterialMapper;
 
     @Autowired
-    private AmqpTemplate amqpTemplate;
+    @Qualifier("qmsRabbitTemplate")
+    private RabbitTemplate amqpTemplate;
 
     @Autowired
     private QrPackageBookingOrderService qrPackageBookingOrderService;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrPackageServiceImpl.java

@@ -71,7 +71,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -111,7 +113,8 @@ public class QrPackageServiceImpl implements QrPackageService {
     private QrPackageBatchMapper qrPackageBatchMapper;
 
     @Autowired
-    private AmqpTemplate amqpTemplate;
+    @Qualifier("qmsRabbitTemplate")
+    private RabbitTemplate amqpTemplate;
 
     @Autowired
     private SendmailUtil sendmailUtil;

abi-cloud-qr-platform-server/src/test/java/com/abi/qms/platform/GenerateCodeTest.java

@@ -7,7 +7,9 @@ import com.abi.qms.platform.dao.mapper.QrPackageMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.util.ArrayList;
@@ -23,7 +25,8 @@ import java.util.List;
 @Slf4j
 public class GenerateCodeTest {
 	@Autowired
-	private AmqpTemplate amqpTemplate;
+	@Qualifier("qmsRabbitTemplate")
+	private RabbitTemplate amqpTemplate;
 
 	@Autowired
 	private QrPackageMapper qrPackageMapper;