From 539f1009f8d530158ab70e3ed18f917a23826e32 Mon Sep 17 00:00:00 2001 From: Burce Date: Wed, 4 Dec 2019 17:49:43 +0800 Subject: [PATCH] =?UTF-8?q?[MQ][=E5=8E=BB=E6=8E=89=E7=A1=AE=E8=AE=A4?= =?UTF-8?q?=E5=9B=9E=E8=B0=83]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/src/main/resources/application-dev.yml | 4 ++-- mallinkAdmin/src/main/resources/application-prod.yml | 2 +- mallinkAdmin/src/main/resources/application-test.yml | 2 +- mallinkBApi/src/main/resources/application-dev.yml | 2 +- mallinkBApi/src/main/resources/application-prod.yml | 2 +- mallinkBApi/src/main/resources/application-test.yml | 2 +- mallinkCApi/src/main/resources/application-dev.yml | 2 +- mallinkCApi/src/main/resources/application-prod.yml | 2 +- mallinkCApi/src/main/resources/application-test.yml | 2 +- mallinkCallback/src/main/resources/application-dev.yml | 2 +- mallinkCallback/src/main/resources/application-prod.yml | 2 +- mallinkCallback/src/main/resources/application-test.yml | 2 +- mallinkMQConsumer/src/main/resources/application-dev.yml | 2 +- mallinkMQConsumer/src/main/resources/application-prod.yml | 2 +- mallinkMQConsumer/src/main/resources/application-test.yml | 2 +- mallinkPosApi/src/main/resources/application-dev.yml | 2 +- mallinkPosApi/src/main/resources/application-prod.yml | 2 +- mallinkPosApi/src/main/resources/application-test.yml | 2 +- mallinkSchedule/src/main/resources/application-dev.yml | 2 +- mallinkSchedule/src/main/resources/application-prod.yml | 2 +- mallinkSchedule/src/main/resources/application-test.yml | 2 +- .../java/com/iformall/mq/impl/RabbitMqMessageProducer.java | 4 ++-- mallinkSysAdmin/src/main/resources/application-dev.yml | 2 +- mallinkSysAdmin/src/main/resources/application-prod.yml | 2 +- mallinkSysAdmin/src/main/resources/application-test.yml | 2 +- mallinkWebSocketServer/src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application-test.yml | 2 +- 28 files changed, 30 insertions(+), 30 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 52cee84f5..74fcc21dd 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ spring: include: rabbitMQ # JDBC datasource: - url: jdbc:mysql://202.165.179.86:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true + url: jdbc:mysql://127.0.0.1:3306/mallinkDev?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) type: com.alibaba.druid.pool.DruidDataSource @@ -70,7 +70,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / flyway: enabled: true diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 2cbb45cc9..5262cb910 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -58,7 +58,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / flyway: enabled: true diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml index d815e5e1d..7b527ed46 100644 --- a/mallinkAdmin/src/main/resources/application-test.yml +++ b/mallinkAdmin/src/main/resources/application-test.yml @@ -58,7 +58,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / flyway: enabled: true diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index e465495f6..e9c8847e3 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -69,7 +69,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index acaffbdf8..9fc4412a8 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -57,7 +57,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkBApi/src/main/resources/application-test.yml b/mallinkBApi/src/main/resources/application-test.yml index ca512975a..1602fa193 100644 --- a/mallinkBApi/src/main/resources/application-test.yml +++ b/mallinkBApi/src/main/resources/application-test.yml @@ -57,7 +57,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index b78462ff3..003918c8c 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -69,7 +69,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index ff09ecadb..994a6b68a 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -57,7 +57,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkCApi/src/main/resources/application-test.yml b/mallinkCApi/src/main/resources/application-test.yml index c9422fcce..b292a867a 100644 --- a/mallinkCApi/src/main/resources/application-test.yml +++ b/mallinkCApi/src/main/resources/application-test.yml @@ -57,7 +57,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkCallback/src/main/resources/application-dev.yml b/mallinkCallback/src/main/resources/application-dev.yml index 125d878f5..8862be1a5 100644 --- a/mallinkCallback/src/main/resources/application-dev.yml +++ b/mallinkCallback/src/main/resources/application-dev.yml @@ -70,7 +70,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index 619041695..3c750961c 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -58,7 +58,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkCallback/src/main/resources/application-test.yml b/mallinkCallback/src/main/resources/application-test.yml index c32ae67c4..5ed869367 100644 --- a/mallinkCallback/src/main/resources/application-test.yml +++ b/mallinkCallback/src/main/resources/application-test.yml @@ -58,7 +58,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index 0319ae450..f96048d10 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -69,7 +69,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 1b4f84713..a6f692b79 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -58,7 +58,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkMQConsumer/src/main/resources/application-test.yml b/mallinkMQConsumer/src/main/resources/application-test.yml index 75f98dcef..3e824c304 100644 --- a/mallinkMQConsumer/src/main/resources/application-test.yml +++ b/mallinkMQConsumer/src/main/resources/application-test.yml @@ -58,7 +58,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkPosApi/src/main/resources/application-dev.yml b/mallinkPosApi/src/main/resources/application-dev.yml index 5800e1335..9253630e5 100644 --- a/mallinkPosApi/src/main/resources/application-dev.yml +++ b/mallinkPosApi/src/main/resources/application-dev.yml @@ -69,7 +69,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkPosApi/src/main/resources/application-prod.yml b/mallinkPosApi/src/main/resources/application-prod.yml index 902ac9c3f..b763d5183 100644 --- a/mallinkPosApi/src/main/resources/application-prod.yml +++ b/mallinkPosApi/src/main/resources/application-prod.yml @@ -57,7 +57,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkPosApi/src/main/resources/application-test.yml b/mallinkPosApi/src/main/resources/application-test.yml index e3ac551fc..18de0e230 100644 --- a/mallinkPosApi/src/main/resources/application-test.yml +++ b/mallinkPosApi/src/main/resources/application-test.yml @@ -57,7 +57,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 0e1db3b32..4111bc3f4 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -69,7 +69,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index 214b7164f..d6de6a6fe 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -58,7 +58,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkSchedule/src/main/resources/application-test.yml b/mallinkSchedule/src/main/resources/application-test.yml index 467bb55ad..a106e74b8 100644 --- a/mallinkSchedule/src/main/resources/application-test.yml +++ b/mallinkSchedule/src/main/resources/application-test.yml @@ -58,7 +58,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java index 6b24b7f6c..92ca15c2f 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java @@ -38,8 +38,8 @@ public class RabbitMqMessageProducer implements MqBaseProducer , RabbitTemplate. @PostConstruct public void init() { - rabbitTemplate.setConfirmCallback(this); - rabbitTemplate.setReturnCallback(this); + //rabbitTemplate.setConfirmCallback(this); + //rabbitTemplate.setReturnCallback(this); } @Override diff --git a/mallinkSysAdmin/src/main/resources/application-dev.yml b/mallinkSysAdmin/src/main/resources/application-dev.yml index bb4679acc..93ff0f5ab 100644 --- a/mallinkSysAdmin/src/main/resources/application-dev.yml +++ b/mallinkSysAdmin/src/main/resources/application-dev.yml @@ -70,7 +70,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / flyway: enabled: true diff --git a/mallinkSysAdmin/src/main/resources/application-prod.yml b/mallinkSysAdmin/src/main/resources/application-prod.yml index cf2aee47b..bc4529498 100644 --- a/mallinkSysAdmin/src/main/resources/application-prod.yml +++ b/mallinkSysAdmin/src/main/resources/application-prod.yml @@ -58,7 +58,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / flyway: enabled: true diff --git a/mallinkSysAdmin/src/main/resources/application-test.yml b/mallinkSysAdmin/src/main/resources/application-test.yml index 3dc4d44be..62465c8e2 100644 --- a/mallinkSysAdmin/src/main/resources/application-test.yml +++ b/mallinkSysAdmin/src/main/resources/application-test.yml @@ -58,7 +58,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / flyway: enabled: true diff --git a/mallinkWebSocketServer/src/main/resources/application-dev.yml b/mallinkWebSocketServer/src/main/resources/application-dev.yml index 718331eb6..b39cdd2b9 100644 --- a/mallinkWebSocketServer/src/main/resources/application-dev.yml +++ b/mallinkWebSocketServer/src/main/resources/application-dev.yml @@ -69,7 +69,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkWebSocketServer/src/main/resources/application-prod.yml b/mallinkWebSocketServer/src/main/resources/application-prod.yml index 256ebef07..c9c07d7a8 100644 --- a/mallinkWebSocketServer/src/main/resources/application-prod.yml +++ b/mallinkWebSocketServer/src/main/resources/application-prod.yml @@ -58,7 +58,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: diff --git a/mallinkWebSocketServer/src/main/resources/application-test.yml b/mallinkWebSocketServer/src/main/resources/application-test.yml index d8bd05bca..8e8590167 100644 --- a/mallinkWebSocketServer/src/main/resources/application-test.yml +++ b/mallinkWebSocketServer/src/main/resources/application-test.yml @@ -58,7 +58,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true - publisher-returns: true + publisher-returns: false virtual-host: / aws: