From 37b2fa02d4e9540b67f9ec02740d7720ec38df3a Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 11 Dec 2020 14:08:52 +0800 Subject: [PATCH] fix conflict --- zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java b/zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java index 6ff44d6..c2fd404 100644 --- a/zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java +++ b/zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java @@ -4,6 +4,7 @@ import com.matrix.component.rabbitmq.MqTask; import com.matrix.component.rabbitmq.RabiitMqTemplate; import com.matrix.component.rabbitmq.RabiitMqTemplateFactory; +import com.matrix.core.tools.LogUtil; import com.matrix.system.shopXcx.mqTask.*; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -56,7 +57,7 @@ @Bean public RabiitMqTemplate rabiitMqTemplate() throws IOException { - + LogUtil.info("rabbitmq: {}, {}, {}, {}", host, port, username, password); RabiitMqTemplate rabiitMqTemplate = RabiitMqTemplateFactory.buildTemplate(host, port, username, password); //声明一个交换机 -- Gitblit v1.9.1