From 798cdba8345c0ab7557c0d34f348c9a085c7cd3e Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Wed, 14 Oct 2020 20:41:29 +0800
Subject: [PATCH] cpv配置
---
src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java | 4 ++--
src/main/resources/application-prod.yml | 2 +-
src/main/java/com/xcong/excoin/quartz/job/DayLineDataUpdateJob.java | 2 +-
src/main/resources/application.yml | 2 +-
src/main/resources/application-prodapp.yml | 17 +++++++++--------
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/quartz/job/DayLineDataUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/DayLineDataUpdateJob.java
index 6d6438c..8fe4026 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/DayLineDataUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/DayLineDataUpdateJob.java
@@ -23,7 +23,7 @@
**/
@Slf4j
@Component
-@ConditionalOnProperty(prefix = "app", name = "day-line", havingValue = "true")
+//@ConditionalOnProperty(prefix = "app", name = "day-line", havingValue = "true")
public class DayLineDataUpdateJob {
@Resource
diff --git a/src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java b/src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java
index f7d569a..57dd0c5 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/LoopExecutorJob.java
@@ -32,7 +32,7 @@
/**
* 更新快捷充值超时状态
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+ //@Scheduled(cron = "0/5 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void updateChargeUsdt() {
try {
@@ -46,7 +46,7 @@
/**
* 持仓费计算
*/
- @Scheduled(cron = "0 0 0 */1 * ?")
+ //@Scheduled(cron = "0 0 0 */1 * ?")
public void updateDoingPrice() {
log.info("#持仓费计算#");
try {
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index f40251b..d24a981 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -96,7 +96,7 @@
kline-update-job: false
newest-price-update-job: true
#日线 该任务不能与最新价处于同一个服务器
- trade: true
+ exchange-trade: true
day-line: false
other-job: true
loop-job: true
diff --git a/src/main/resources/application-prodapp.yml b/src/main/resources/application-prodapp.yml
index 0c57f69..df03ddb 100644
--- a/src/main/resources/application-prodapp.yml
+++ b/src/main/resources/application-prodapp.yml
@@ -7,9 +7,9 @@
profiles:
active: dev
datasource:
- url: jdbc:mysql://rm-bp1i2g5rg5dubo9s40o.mysql.rds.aliyuncs.com:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: roc_user
- password: roc123pasd!@
+ url: jdbc:mysql://121.196.181.91:3306/db_cpv?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: cpv_user
+ password: cpv123456
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
@@ -50,11 +50,11 @@
## Redis数据库索引（默认为0）
database: 1
## Redis服务器地址
- host: 47.114.114.219
+ host: 121.196.181.91
## Redis服务器连接端口
port: 6379
## Redis服务器连接密码（默认为空）
- password: biyi123
+ password: cpv1qaz!@#
jedis:
pool:
## 连接池最大连接数（使用负值表示没有限制）
@@ -72,10 +72,10 @@
## 连接超时时间（毫秒）
timeout: 30000
rabbitmq:
- host: 47.114.114.219
+ host: 121.196.181.91
port: 5672
- username: roc_user
- password: roc123456
+ username: cpv_user
+ password: cpv123456
publisher-confirm-type: correlated
@@ -95,6 +95,7 @@
redis_expire: 3000
kline-update-job: false
newest-price-update-job: false
+ #日线 该任务不能与最新价处于同一个服务器
exchange-trade: false
day-line: false
other-job: false
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b9fc797..8719aec 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,7 +5,7 @@
spring:
profiles:
- active: prod
+ active: prodapp
datasource:
url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
username: ctcoin_data
--
Gitblit v1.9.1