From c576b9f8f6a49a1efb27e5e7d1e09fc5f2336796 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 02 Dec 2020 17:58:44 +0800
Subject: [PATCH] Merge branch 'outcenter' of https://gitee.com/chonggaoxiao/new_excoin.git into outcenter

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

diff --git a/src/main/resources/application-dayline.yml b/src/main/resources/application-dayline.yml
index ebe047a..e01b39f 100644
--- a/src/main/resources/application-dayline.yml
+++ b/src/main/resources/application-dayline.yml
@@ -5,11 +5,11 @@
 
 spring:
   profiles:
-    active: dayline
+    active: dev
   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_moko?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+    username: moko_user
+    password: moko123!@#
     driver-class-name: com.mysql.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
@@ -48,13 +48,13 @@
   ## redis配置
   redis:
     ## Redis数据库索引(默认为0)
-    database: 2
+    database: 0
     ## Redis服务器地址
-    host: 47.114.114.219
+    host: 114.55.92.106
     ## Redis服务器连接端口
     port: 6379
     ## Redis服务器连接密码(默认为空)
-    password: biyi123
+    password: hibit123
     jedis:
       pool:
         ## 连接池最大连接数(使用负值表示没有限制)
@@ -72,10 +72,10 @@
     ## 连接超时时间(毫秒)
     timeout: 30000
   rabbitmq:
-    host: 120.55.86.146
+    host: 114.55.92.106
     port: 5672
-    username: biyict
-    password: biyict123
+    username: moko_user
+    password: moko123456
     publisher-confirm-type: correlated
 
 
@@ -95,11 +95,11 @@
   redis_expire: 3000
   kline-update-job: false
   newest-price-update-job: false
-  #日线 该任务不能与最新价处于同一个服务器
+  exchange-trade: false
   day-line: true
   other-job: false
   loop-job: false
-  rabbit-consumer: true
+  rabbit-consumer: false
   block-job: false
 
 aliyun:

--
Gitblit v1.9.1