From 92659bdcb2c3e7fc470a9a125cf84f13f3a16fb3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 19 Mar 2021 11:01:20 +0800
Subject: [PATCH] conflect
---
src/main/resources/application-dev.yml | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 087d7fa..0a9a752 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -15,24 +15,24 @@
datasource:
# 数据源-1，名称为 base
base:
- username: ct_test
- password: 123456
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
-# username: ctcoin_data
- # password: ctcoin_123
+# username: ct_test
+# password: 123456
# driver-class-name: com.mysql.cj.jdbc.Driver
-# url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_hibit?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+# url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
+ username: db_hibit
+ password: hibit123!@#
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://124.70.222.34:3306/db_hibit?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
redis:
# Redis数据库索引（默认为 0）
- database: 1
- ## Redis服务器地址
- host: 114.55.92.106
- ## Redis服务器连接端口
+ database: 0
+ # Redis服务器地址
+ host: 121.37.162.173
+ # Redis服务器连接端口
port: 6379
- ## Redis服务器连接密码（默认为空）
- password: hibit123
+ # Redis 密码
+ password: d32ncxe@i3#!dV
lettuce:
pool:
# 连接池中的最小空闲连接
--
Gitblit v1.9.1