From 3ee630743b9b6a5f8cfc12092428e340e89fe96e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E7=A7=8B=E8=8D=A3?= Date: Sat, 23 Nov 2019 21:41:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Jenkinsfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..3b73bb2ae --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,49 @@ +pipeline { + agent any + stages { + stage('检出') { + steps { + checkout([$class: 'GitSCM', branches: [[name: env.GIT_BUILD_REF]], + userRemoteConfigs: [[url: env.GIT_REPO_URL, credentialsId: env.CREDENTIALS_ID]]]) + } + } + stage('构建') { + steps { + sh 'mvn -version' + echo '构建中...' + sh 'mvn clean install -Dmaven.test.skip=true' + echo '构建完成.' + script { + def exists = fileExists 'README.md' + if (!exists) { + writeFile(file: 'README.md', text: 'Helloworld') + } + } + + archiveArtifacts(artifacts: 'README.md', fingerprint: true) + } + } + stage('测试') { + steps { + echo '单元测试中...' + echo '单元测试完成.' + writeFile(file: 'TEST-demo.junit4.AppTest.xml', text: ''' + + + + + + + + ''') + junit '*.xml' + } + } + stage('部署') { + steps { + echo '部署中...' + echo '部署完成' + } + } + } +} \ No newline at end of file From 6e004d7facaa8eb0f21f7772a9ef656d693bcf25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E7=A7=8B=E8=8D=A3?= Date: Sat, 23 Nov 2019 21:45:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Jenkinsfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b73bb2ae..b857ab48a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stage('检出') { steps { checkout([$class: 'GitSCM', branches: [[name: env.GIT_BUILD_REF]], - userRemoteConfigs: [[url: env.GIT_REPO_URL, credentialsId: env.CREDENTIALS_ID]]]) + userRemoteConfigs: [[url: env.GIT_REPO_URL, credentialsId: env.CREDENTIALS_ID]]]) } } stage('构建') { @@ -13,14 +13,7 @@ pipeline { echo '构建中...' sh 'mvn clean install -Dmaven.test.skip=true' echo '构建完成.' - script { - def exists = fileExists 'README.md' - if (!exists) { - writeFile(file: 'README.md', text: 'Helloworld') - } - } - - archiveArtifacts(artifacts: 'README.md', fingerprint: true) + archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true // 收集构建产物 } } stage('测试') { From cef8797cf0812e555572aa0c673fd9a75c07905a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E7=A7=8B=E8=8D=A3?= Date: Sat, 23 Nov 2019 22:16:42 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Jenkinsfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b857ab48a..ed62484ad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,16 +4,16 @@ pipeline { stage('检出') { steps { checkout([$class: 'GitSCM', branches: [[name: env.GIT_BUILD_REF]], - userRemoteConfigs: [[url: env.GIT_REPO_URL, credentialsId: env.CREDENTIALS_ID]]]) + userRemoteConfigs: [[url: env.GIT_REPO_URL, credentialsId: env.CREDENTIALS_ID]]]) } } stage('构建') { steps { sh 'mvn -version' echo '构建中...' - sh 'mvn clean install -Dmaven.test.skip=true' + sh 'mvn -U clean package -Dmaven.test.skip=true' echo '构建完成.' - archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true // 收集构建产物 + archiveArtifacts(artifacts: '**/target/*.jar', fingerprint: true) } } stage('测试') { From 8d2e7d795a23cb89ae30b219c733e56909c7979c Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 28 Nov 2019 19:32:25 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[setId][=E4=BF=AE=E5=A4=8D]:setId=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/WxBrandController.java | 2 +- .../controller/basic/WxShopController.java | 7 +-- .../iformall/service/impl/PosServiceImpl.java | 46 +++++++++---------- .../impl/WxCouponOrderServiceImpl.java | 8 ++-- .../controller/basic/WxBrandController.java | 2 +- 5 files changed, 32 insertions(+), 33 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index f9195c911..dc7d3a401 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -118,9 +118,9 @@ public class WxBrandController extends BaseController { logger.debug("[" + getIpAddr() + "] WxBrandController::hasBrand"); WxBrand wxBrand = new WxBrand() {{ setName(name); - setId(id); updateTenantInfo(getTenantInfo()); }}; + wxBrand.setId(id); return wxBrandService.hasBrand(wxBrand); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index 9dad02c0c..3d250fd55 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -116,10 +116,11 @@ public class WxShopController extends BaseController { @SystemControllerLog(description = "店铺管理-查询商铺号是否存在") public ResultData hasShopNumber(String shopNumber, Long id, Integer type) { logger.debug("[" + getIpAddr() + "] WxShopController::hasShopNumber"); - WxShop wxShop = new WxShop(); + WxShop wxShop = new WxShop() {{ + setShopNumber(shopNumber); + setType(type); + }}; wxShop.setId(id); - wxShop.setShopNumber(shopNumber); - wxShop.setType(type); wxShop.updateTenantInfo(getTenantInfo()); return wxShopService.hasShopNumber(wxShop); } diff --git a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java index c50991c8d..e82d2e04c 100644 --- a/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java +++ b/mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java @@ -2007,11 +2007,10 @@ public class PosServiceImpl implements PosService { WxMerchantBUser merchantBUser, WxOrder order, Long memId, Long posPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime) { + final IdWorker idWorker = IdWorker.get(); + Long payOrderId = idWorker.nextId(); WxPayOrder payOrder = new WxPayOrder() {{ Date curDate = new Date(); - final IdWorker idWorker = IdWorker.get(); - Long id = idWorker.nextId(); - setId(id); setTenantId(merchantBUser.getTenantId()); setCUserId(memId); setOrderId(order.getId()); @@ -2053,11 +2052,11 @@ public class PosServiceImpl implements PosService { Long memId, Integer sceneType, Long posPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime, String posPayOrderNo) { // 1. insert into PayOrder + final IdWorker idWorker = IdWorker.get(); + Long payOrderId = idWorker.nextId(); WxPayOrder payOrder = new WxPayOrder() {{ Date curDate = new Date(); - final IdWorker idWorker = IdWorker.get(); - Long id = idWorker.nextId(); - setId(id); + setId(payOrderId); setTenantId(merchantBUser.getTenantId()); setCUserId(memId); setBUserId(merchantBUser.getId()); @@ -2066,7 +2065,7 @@ public class PosServiceImpl implements PosService { setUpdateTime(curDate); setPayTimeStart(curDate); setPayTimeEnd(curDate); - setPayOrderNo(String.valueOf(id)); + setPayOrderNo(String.valueOf(payOrderId)); setPayAmount(neuPaymentAmount); setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode()); setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); @@ -2138,11 +2137,11 @@ public class PosServiceImpl implements PosService { WxOrder order, Long memId, Long posPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime, String posPayOrderNo) { // 1. insert into PayOrder + final IdWorker idWorker = IdWorker.get(); + Long payOrderId = idWorker.nextId(); WxPayOrder payOrder = new WxPayOrder() {{ Date curDate = new Date(); - final IdWorker idWorker = IdWorker.get(); - Long id = idWorker.nextId(); - setId(id); + setId(payOrderId); setTenantId(buUser.getTenantId()); setCUserId(memId); setBUserId(buUser.getId()); @@ -2151,7 +2150,7 @@ public class PosServiceImpl implements PosService { setUpdateTime(curDate); setPayTimeStart(curDate); setPayTimeEnd(curDate); - setPayOrderNo(String.valueOf(id)); + setPayOrderNo(String.valueOf(payOrderId)); setPayAmount(neuPaymentAmount); setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode()); setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); @@ -2201,11 +2200,11 @@ public class PosServiceImpl implements PosService { WxMerchant merchant, WxMerchantBUser buUser, WxOrder order, Long memId, Integer neuPayOrderType, Long neuPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime, String neuPayThirdNo) { // 1. insert into PayOrder + final IdWorker idWorker = IdWorker.get(); + Long payOrderId = idWorker.nextId(); WxPayOrder payOrder = new WxPayOrder() {{ Date curDate = new Date(); - final IdWorker idWorker = IdWorker.get(); - Long id = idWorker.nextId(); - setId(id); + setId(payOrderId); setTenantId(buUser.getTenantId()); setCUserId(memId); setOrderId(order.getId()); @@ -2213,7 +2212,7 @@ public class PosServiceImpl implements PosService { setUpdateTime(curDate); setPayTimeStart(curDate); setPayTimeEnd(curDate); - setPayOrderNo(String.valueOf(id)); + setPayOrderNo(String.valueOf(payOrderId)); setPayAmount(neuPaymentAmount); setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode()); setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); @@ -2286,12 +2285,12 @@ public class PosServiceImpl implements PosService { throw new MallinkException(ErrorCode.PAY_ORDER_NOT_FOUND); } // 2. insert into refund order + final IdWorker idWorker = IdWorker.get(); + Long refundId = idWorker.nextId(); WxRefundOrder refundPayOrder = new WxRefundOrder() {{ Date curDate = new Date(); - final IdWorker idWorker = IdWorker.get(); - Long id = idWorker.nextId(); - setId(id); - setRefundId(String.valueOf(id)); + setId(refundId); + setRefundId(String.valueOf(refundId)); setTenantId(buUser.getTenantId()); setCUserId(memId); setOrderId(refundOrder.getId()); @@ -2353,12 +2352,11 @@ public class PosServiceImpl implements PosService { logger.error(ErrorCode.POS_ORDER_HAD_SYNCED.getMessage()); throw new MallinkException(ErrorCode.POS_ORDER_HAD_SYNCED); } - + final IdWorker idWorker = IdWorker.get(); + Long orderId = idWorker.nextId(); WxOrder order = new WxOrder() {{ Date curr = new Date(); String bodyStr = "POS支付, 金额: " + posAmount; - final IdWorker idWorker = IdWorker.get(); - Long orderId = idWorker.nextId(); setId(orderId); setTenantId(merchantBUser.getTenantId()); setOrderNumber(orderId); @@ -2433,11 +2431,11 @@ public class PosServiceImpl implements PosService { } // 3. 创建退款订单 + final IdWorker idWorker = IdWorker.get(); + Long orderId = idWorker.nextId(); WxOrder order = new WxOrder() {{ Date curr = new Date(); String bodyStr = "POS退款, 金额: " + orderAmount; - final IdWorker idWorker = IdWorker.get(); - Long orderId = idWorker.nextId(); setId(orderId); setTenantId(buUser.getTenantId()); setType(EnumOrderType.POSPAY.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 1e9e66a28..03b646cc9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1262,11 +1262,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } // 添加payOrder + final IdWorker idWorker = IdWorker.get(); + Long payOrderId = idWorker.nextId(); WxPayOrder payOrder = new WxPayOrder() {{ Date curDate = new Date(); - final IdWorker idWorker = IdWorker.get(); - Long id = idWorker.nextId(); - setId(id); + setId(payOrderId); updateTenantInfo(microOrder); setCUserId(microOrder.getCUserId()); setOrderId(microOrder.getId()); @@ -1274,7 +1274,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { setUpdateTime(curDate); setPayTimeStart(curDate); setPayTimeEnd(curDate); - setPayOrderNo(String.valueOf(id)); + setPayOrderNo(String.valueOf(payOrderId)); if (microOrder.getPayment() > wxCoupon.getPrice()) { setPayAmount(wxCoupon.getPrice()); } else { diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index e333ca756..0850113ef 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -96,8 +96,8 @@ public class WxBrandController extends BaseController { logger.debug("[" + getIpAddr() + "] WxBrandController::hasBrand"); WxBrand wxBrand = new WxBrand() {{ setName(name); - setId(id); }}; + wxBrand.setId(id); wxBrand.updateTenantInfo(getTenantInfo()); return wxBrandService.hasBrand(wxBrand); } From 539f1009f8d530158ab70e3ed18f917a23826e32 Mon Sep 17 00:00:00 2001 From: Burce Date: Wed, 4 Dec 2019 17:49:43 +0800 Subject: [PATCH 5/5] =?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: