From d60ef625703cef756ca37155357906f54436e8e3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 29 Jul 2020 18:02:39 +0800
Subject: [PATCH] Merge branch 'master' into follow
---
src/main/resources/application.yml | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 840a4d5..d8cae7a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,9 +7,9 @@
profiles:
active: dev
datasource:
- url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: ct_test
- password: 123456
+ 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
+ password: ctcoin_123
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
@@ -48,7 +48,7 @@
## redis配置
redis:
## Redis数据库索引(默认为0)
- database: 1
+ database: 2
## Redis服务器地址
host: 47.114.114.219
## Redis服务器连接端口
@@ -91,12 +91,14 @@
app:
- debug: true
+ debug: false
redis_expire: 3000
# k线更新任务控制
kline-update-job: false
#最新价任务控制
newest-price-update-job: false
+ #日线 该任务不能与最新价处于同一个服务器
+ day-line: false
#其他任务控制
other-job: false
loop-job: false
--
Gitblit v1.9.1