From 0cab6d8afcc97e8bc94ef200e24d8839281f44c8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 15 Aug 2021 15:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application-dev.yml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 3ff228b..4ecf79c 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,8 +3,8 @@
redis:
##redis 单机环境配置
host: 127.0.0.1
- port: 6378
- password: redispsw
+ port: 6379
+ password:
database: 0
ssl: false
##redis 集群环境配置
@@ -13,7 +13,7 @@
# commandTimeout: 5000
datasource:
# MySql
- url: jdbc:mysql://localhost:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://223.82.109.183:2083/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
password: zhba0728
# PostgreSQL
@@ -41,7 +41,7 @@
##是否启用分布式锁
enabled: false
##redis服务地址
- address: redis://127.0.0.1:6378
+ address: redis://127.0.0.1:6379
#本地文件上传
file:
remote-mode: true
--
Gitblit v1.9.3