From 14a843fdd01f0f74afb5b2325a33920e5df5904f Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 29 May 2020 11:10:17 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/chonggaoxiao/new_excoin.git

---
 src/main/resources/application.yml |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 820acc1..61560cd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -4,6 +4,8 @@
     context-path: /
 
 spring:
+  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
@@ -69,6 +71,21 @@
         min-idle: 8
     ## 连接超时时间(毫秒)
     timeout: 30000
+  rabbitmq:
+    host: 120.27.238.55
+    port: 5672
+    username: ct_rabbit
+    password: 123456
+    publisher-confirm-type: correlated
+
+
+#custom:
+#  rabbitmq:
+#    host: 120.27.238.55
+#    port: 5672
+#    username: ct_rabbit
+#    password: 123456
+
 mybatis-plus:
   mapper-locations: classpath:mapper/**/*.xml
 
@@ -76,6 +93,12 @@
 app:
   debug: true
   redis_expire: 3000
+  # k线更新任务控制
+  kline-update-job: false
+  #最新价任务控制
+  newest-price-update-job: true
+  #其他任务控制
+  other-job: true
 
 rsa:
   public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCCf8UFZK54AiK4PRu7tNd+Z8qZ77o/QXCnk25DRmygVpOEu5mGNSAvfnWmKp2pEV2RljeXq3Rid/+LQkonaebMJeXKSF0yxL/VgyeT8JaQ5gNbOrdfdlc+mFkXJyzyJt8YkvApEdPRNSU2ENBn7mgRfD0BYPM4vZ6/rv+de38FJwIDAQAB

--
Gitblit v1.9.1