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.yml | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7e1d602..e2bd03d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -4,10 +4,12 @@
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
- password: 123456
+ url: jdbc:mysql://180.215.221.145:3306/db_pilot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: pilot
+ password: pilot123!@#
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
@@ -46,13 +48,13 @@
## redis配置
redis:
## Redis数据库索引（默认为0）
- database: 1
+ database: 0
## Redis服务器地址
- host: 121.40.158.8
+ host: 180.215.221.145
## Redis服务器连接端口
port: 6379
## Redis服务器连接密码（默认为空）
- password: biyi123
+ password: pilot123!@#
jedis:
pool:
## 连接池最大连接数（使用负值表示没有限制）
@@ -69,13 +71,43 @@
min-idle: 8
## 连接超时时间（毫秒）
timeout: 30000
+ rabbitmq:
+ host: 27.124.4.94
+ port: 5672
+ username: pilot
+ password: pilot123
+ 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
app:
- debug: true
+ debug: false
redis_expire: 3000
+ kline-update-job: false
+ newest-price-update-job: false
+ exchange-trade: true
+ day-line: false
+ 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