From 3a6a0fb877d87879c4e8c97d547d50acaa7bd664 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 16 Mar 2019 16:23:19 +0800 Subject: [PATCH] =?UTF-8?q?[MQ=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:TEST/RELEASE=E7=8E=AF=E5=A2=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/src/main/resources/application-dev.yml | 5 ++--- mallinkAdmin/src/main/resources/application-prod.yml | 10 ++++++++-- mallinkAdmin/src/main/resources/application-test.yml | 10 ++++++++-- mallinkAdmin/src/main/resources/application.yml | 3 +++ mallinkBApi/src/main/resources/application-prod.yml | 8 ++++++++ mallinkBApi/src/main/resources/application-test.yml | 8 ++++++++ mallinkCApi/src/main/resources/application-prod.yml | 8 ++++++++ mallinkCApi/src/main/resources/application-test.yml | 8 ++++++++ .../src/main/resources/application-prod.yml | 8 ++++++++ .../src/main/resources/application-test.yml | 8 ++++++++ .../java/com/iformall/schedule/WxAppVisitSchedule.java | 3 +-- .../src/main/resources/application-prod.yml | 8 ++++++++ .../src/main/resources/application-test.yml | 8 ++++++++ 13 files changed, 86 insertions(+), 9 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index d0a04afd3..67b288c92 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -24,9 +24,6 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" #jackson: #date-format: yyyy-MM-dd HH:mm:ss - flowable: - async-executor-activate: false - # REDIS redis: host: 202.165.179.86 @@ -53,6 +50,7 @@ spring: auth: true starttls: enable: true + # ROCKETMQ rocketmq: nameServer: 127.0.0.1:9876 producer: @@ -62,6 +60,7 @@ spring: max-message-size: 4194304 retry-another-broker-when-not-store-ok: false retry-times-when-send-failed: 2 + # RABBITMQ rabbitmq: host: 202.165.179.86 port: 5672 diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 9db121de5..ffd8ecb68 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -48,8 +48,14 @@ spring: auth: true starttls: enable: true - flowable: - async-executor-activate: false + # RABBITMQ + rabbitmq: + host: localhost + port: 5672 + username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) + password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) + publisher-confirms: true + virtual-host: / aws: clientRegion: cn-northwest-1 diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml index 6723531d3..0c245d0ca 100644 --- a/mallinkAdmin/src/main/resources/application-test.yml +++ b/mallinkAdmin/src/main/resources/application-test.yml @@ -48,8 +48,14 @@ spring: auth: true starttls: enable: true - flowable: - async-executor-activate: false + # RABBITMQ + rabbitmq: + host: 127.0.0.1 + port: 5672 + username: ENC(aSRr6mnSryEqzHHz1hJf1g==) + password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) + publisher-confirms: true + virtual-host: / aws: clientRegion: cn-northwest-1 diff --git a/mallinkAdmin/src/main/resources/application.yml b/mallinkAdmin/src/main/resources/application.yml index c67f34580..7c87e991b 100644 --- a/mallinkAdmin/src/main/resources/application.yml +++ b/mallinkAdmin/src/main/resources/application.yml @@ -37,6 +37,9 @@ spring: password: guest publisher-confirms: true virtual-host: / + # FLOWABLE + flowable: + async-executor-activate: false # @{link} https://github.com/abel533 diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index f1d7722d9..a40833cbe 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -47,6 +47,14 @@ spring: auth: true starttls: enable: true + # RABBITMQ + rabbitmq: + host: localhost + port: 5672 + username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) + password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) + publisher-confirms: true + virtual-host: / aws: clientRegion: cn-northwest-1 diff --git a/mallinkBApi/src/main/resources/application-test.yml b/mallinkBApi/src/main/resources/application-test.yml index 115615c5c..f378ae640 100644 --- a/mallinkBApi/src/main/resources/application-test.yml +++ b/mallinkBApi/src/main/resources/application-test.yml @@ -45,6 +45,14 @@ spring: auth: true starttls: enable: true + # RABBITMQ + rabbitmq: + host: 127.0.0.1 + port: 5672 + username: ENC(aSRr6mnSryEqzHHz1hJf1g==) + password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) + publisher-confirms: true + virtual-host: / aws: clientRegion: cn-northwest-1 diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 157b61197..e8897ea1e 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -47,6 +47,14 @@ spring: auth: true starttls: enable: true + # RABBITMQ + rabbitmq: + host: localhost + port: 5672 + username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) + password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) + publisher-confirms: true + virtual-host: / aws: clientRegion: cn-northwest-1 diff --git a/mallinkCApi/src/main/resources/application-test.yml b/mallinkCApi/src/main/resources/application-test.yml index 2a42a4067..2acad0a81 100644 --- a/mallinkCApi/src/main/resources/application-test.yml +++ b/mallinkCApi/src/main/resources/application-test.yml @@ -45,6 +45,14 @@ spring: auth: true starttls: enable: true + # RABBITMQ + rabbitmq: + host: 127.0.0.1 + port: 5672 + username: ENC(aSRr6mnSryEqzHHz1hJf1g==) + password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) + publisher-confirms: true + virtual-host: / aws: clientRegion: cn-northwest-1 diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 59f9d60a1..8081ace96 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -48,6 +48,14 @@ spring: auth: true starttls: enable: true + # RABBITMQ + rabbitmq: + host: localhost + port: 5672 + username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) + password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) + publisher-confirms: true + virtual-host: / aws: clientRegion: cn-northwest-1 diff --git a/mallinkMQConsumer/src/main/resources/application-test.yml b/mallinkMQConsumer/src/main/resources/application-test.yml index 275565455..14c53bbea 100644 --- a/mallinkMQConsumer/src/main/resources/application-test.yml +++ b/mallinkMQConsumer/src/main/resources/application-test.yml @@ -46,6 +46,14 @@ spring: auth: true starttls: enable: true + # RABBITMQ + rabbitmq: + host: 127.0.0.1 + port: 5672 + username: ENC(aSRr6mnSryEqzHHz1hJf1g==) + password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) + publisher-confirms: true + virtual-host: / aws: clientRegion: cn-northwest-1 diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java index dfdf881d2..7c4f1a442 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java @@ -99,8 +99,7 @@ public class WxAppVisitSchedule { WxMaService wxMaService = MaUtil.getWeappService(appInfo); try { List vtList = wxMaService.getAnalysisService().getDailyVisitTrend(lastDate, lastDate); - - System.out.println(vtList.toString()); + logger.info(vtList.toString()); for(WxMaVisitTrend maVisitTrend: vtList) { WxUserVisit v = new WxUserVisit(); v.setAppId(appInfo.getAppId()); diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index 59f9d60a1..8081ace96 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -48,6 +48,14 @@ spring: auth: true starttls: enable: true + # RABBITMQ + rabbitmq: + host: localhost + port: 5672 + username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) + password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) + publisher-confirms: true + virtual-host: / aws: clientRegion: cn-northwest-1 diff --git a/mallinkSchedule/src/main/resources/application-test.yml b/mallinkSchedule/src/main/resources/application-test.yml index 275565455..14c53bbea 100644 --- a/mallinkSchedule/src/main/resources/application-test.yml +++ b/mallinkSchedule/src/main/resources/application-test.yml @@ -46,6 +46,14 @@ spring: auth: true starttls: enable: true + # RABBITMQ + rabbitmq: + host: 127.0.0.1 + port: 5672 + username: ENC(aSRr6mnSryEqzHHz1hJf1g==) + password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) + publisher-confirms: true + virtual-host: / aws: clientRegion: cn-northwest-1