From 2b6e54e96e32999f1c2ef03f54c636d5f5961dee Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 02 Mar 2022 10:49:28 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea
---
src/main/java/com/xcong/excoin/quartz/job/ZhiyarRewardJob.java | 2 +-
src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java | 6 +++---
src/main/resources/application.yml | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java
index 99fdc25..875932a 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java
@@ -53,9 +53,9 @@
// TODO 测试环境关闭这个插入redis
redisUtils.set(CoinTypeConvert.convertToKey(symbol), price);
// 比较
- //websocketPriceService.comparePriceAsc(symbol, price);
- //websocketPriceService.comparePriceDesc(symbol, price);
- //System.out.println("比较完毕:"+symbol+"-"+price);
+ websocketPriceService.comparePriceAsc(symbol, price);
+ websocketPriceService.comparePriceDesc(symbol, price);
+// System.out.println("比较完毕:"+symbol+"-"+price);
}
diff --git a/src/main/java/com/xcong/excoin/quartz/job/ZhiyarRewardJob.java b/src/main/java/com/xcong/excoin/quartz/job/ZhiyarRewardJob.java
index 18dd0b9..8f17490 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/ZhiyarRewardJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/ZhiyarRewardJob.java
@@ -13,7 +13,7 @@
*/
@Slf4j
@Component
-@ConditionalOnProperty(prefix = "app", name = "newest-price-update-job", havingValue = "true")
+@ConditionalOnProperty(prefix = "app", name = "other-job", havingValue = "true")
public class ZhiyarRewardJob {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 696071d..af32131 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -72,10 +72,10 @@
## 连接超时时间（毫秒）
timeout: 30000
rabbitmq:
- host: 154.91.195.155
+ host: 120.27.238.55
port: 5672
- username: abc_user
- password: abc123
+ username: ct_rabbit
+ password: 123456
publisher-confirm-type: correlated
--
Gitblit v1.9.1