From 0f4df6c351d87054ded6bd54f0c6b9f6253ea56f Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sun, 14 Mar 2021 20:42:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new
---
src/main/resources/application-dayline.yml | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/application-dayline.yml b/src/main/resources/application-dayline.yml
index abfbeb2..5065abd 100644
--- a/src/main/resources/application-dayline.yml
+++ b/src/main/resources/application-dayline.yml
@@ -7,9 +7,9 @@
profiles:
active: dayline
datasource:
- url: jdbc:mysql://120.27.238.55:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: ct_test
- password: 123456
+ url: jdbc:mysql://192.168.0.151:3306/db_hibit?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: db_hibit
+ password: hibit123!@#
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
@@ -48,13 +48,13 @@
## redis配置
redis:
## Redis数据库索引（默认为0）
- database: 1
+ database: 0
## Redis服务器地址
- host: 114.55.92.106
+ host: 192.168.0.36
## Redis服务器连接端口
port: 6379
## Redis服务器连接密码（默认为空）
- password: hibit123
+ password: d32ncxe@i3#!dV
jedis:
pool:
## 连接池最大连接数（使用负值表示没有限制）
@@ -72,10 +72,10 @@
## 连接超时时间（毫秒）
timeout: 30000
rabbitmq:
- host: 120.55.86.146
+ host: 192.168.0.36
port: 5672
- username: biyict
- password: biyict123
+ username: hibit
+ password: hibit123
publisher-confirm-type: correlated
--
Gitblit v1.9.1