From ce4fb58f85eefe9fe6bb6213d8f1576d1925a5ef Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 07 Jul 2020 19:15:35 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin

---
 src/main/resources/application.yml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 61560cd..00375f5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -96,9 +96,21 @@
   # k线更新任务控制
   kline-update-job: false
   #最新价任务控制
-  newest-price-update-job: true
+  newest-price-update-job: false
+  #日线 该任务不能与最新价处于同一个服务器
+  day-line: false
   #其他任务控制
-  other-job: true
+  other-job: false
+  loop-job: false
+  rabbit-consumer: false
+  block-job: false
+
+aliyun:
+  oss:
+    end-point: https://oss-cn-hangzhou.aliyuncs.com
+    bucket-name: https://excoin.oss-cn-hangzhou.aliyuncs.com
+    access-key-id: LTAI4GBuydqbJ5bTsDP97Lpd
+    access-key-secret: vbCjQtPxABWjqtUlQfzjlA0qAY96fh
 
 rsa:
   public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCCf8UFZK54AiK4PRu7tNd+Z8qZ77o/QXCnk25DRmygVpOEu5mGNSAvfnWmKp2pEV2RljeXq3Rid/+LQkonaebMJeXKSF0yxL/VgyeT8JaQ5gNbOrdfdlc+mFkXJyzyJt8YkvApEdPRNSU2ENBn7mgRfD0BYPM4vZ6/rv+de38FJwIDAQAB

--
Gitblit v1.9.1