From fba8eb05dcb8b08f894a3924316874b233030e92 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 15 Oct 2020 12:07:23 +0800
Subject: [PATCH] Merge branch 'pilot' of https://gitee.com/chonggaoxiao/new_excoin into pilot
---
src/main/resources/application-test.yml | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index a21709a..ef4745b 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -7,8 +7,8 @@
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
+ url: jdbc:mysql://47.96.73.250:3306/db_roc?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: shop_user
password: 123456
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
@@ -50,11 +50,11 @@
## Redis数据库索引（默认为0）
database: 1
## Redis服务器地址
- host: 47.114.114.219
+ host: 47.96.73.250
## Redis服务器连接端口
port: 6379
## Redis服务器连接密码（默认为空）
- password: biyi123
+ password: qwer12345678
jedis:
pool:
## 连接池最大连接数（使用负值表示没有限制）
@@ -72,9 +72,9 @@
## 连接超时时间（毫秒）
timeout: 30000
rabbitmq:
- host: 120.27.238.55
+ host: 47.96.73.250
port: 5672
- username: ct_rabbit
+ username: rabbit
password: 123456
publisher-confirm-type: correlated
@@ -95,12 +95,11 @@
redis_expire: 3000
kline-update-job: false
newest-price-update-job: false
- #日线 该任务不能与最新价处于同一个服务器
- trade: false
+ exchange-trade: true
day-line: false
other-job: false
loop-job: false
- rabbit-consumer: true
+ rabbit-consumer: false
block-job: false
aliyun:
--
Gitblit v1.9.1