From 008303eaadd7f31423cd2b586b38146f509da187 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 14 Oct 2020 16:03:56 +0800
Subject: [PATCH] merge cuohe

---
 src/main/resources/application.yml |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b9fc797..e7a865f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -5,11 +5,11 @@
 
 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
-    password: ctcoin_123
+    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!@
     driver-class-name: com.mysql.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
@@ -48,7 +48,7 @@
   ## redis配置
   redis:
     ## Redis数据库索引(默认为0)
-    database: 2
+    database: 1
     ## Redis服务器地址
     host: 47.114.114.219
     ## Redis服务器连接端口
@@ -72,10 +72,10 @@
     ## 连接超时时间(毫秒)
     timeout: 30000
   rabbitmq:
-    host: 120.27.238.55
+    host: 47.114.114.219
     port: 5672
-    username: ct_rabbit
-    password: 123456
+    username: roc_user
+    password: roc123456
     publisher-confirm-type: correlated
 
 
@@ -93,13 +93,10 @@
 app:
   debug: false
   redis_expire: 3000
-  # k线更新任务控制
   kline-update-job: false
-  #最新价任务控制
   newest-price-update-job: false
-  #日线 该任务不能与最新价处于同一个服务器
+  exchange-trade: false
   day-line: false
-  #其他任务控制
   other-job: false
   loop-job: false
   rabbit-consumer: false

--
Gitblit v1.9.1