From 798ab07db6464f24e353dcdf8397506ab246c91d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 13 Jul 2022 09:45:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application-dev.yml | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 25c0b8c..83f91a8 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,7 +3,7 @@
redis:
##redis 单机环境配置
host: 192.168.90.24
- port: 6379
+ port: 6381
password:
database: 0
ssl: false
@@ -26,7 +26,7 @@
# MySql
url: jdbc:mysql://192.168.90.24:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: ZHba@0112
+ password: NCzhba@2022
#图片批量上传zip
@@ -45,11 +45,12 @@
ftpUserNameIn: baftpout
ftpPasswordIn: baftpout
ftpPath: yly/anbao/
+ ftpPathIn: /
localPath: /home/zhongsong/anbao/
ip: http://47.49.36.190:9000
jsonUrl: /home/zhongsong/anbao/
username: root
- password: ZHba@0112
+ password: NCzhba@2022
# qfqkBaseApiUrl: http://61.131.136.25:2082/api
qfqkBaseApiUrl: http://192.168.90.24:83
@@ -65,7 +66,7 @@
##是否启用分布式锁
enabled: false
##redis服务地址
- address: redis://192.168.90.24:6379
+ address: redis://192.168.90.24:6381
#本地文件上传
file:
remote-mode: true
--
Gitblit v1.9.3