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-test.yml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 66114f5..30c4fe5 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -13,9 +13,9 @@
# commandTimeout: 5000
datasource:
# MySql
- url: jdbc:mysql://36.134.81.48:3306/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://61.131.136.25:2083/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: jfpt123
+ password: ZHba@0112
# rabbitmq 设置
# rabbitmq:
# host: 192.168.0.191
@@ -48,23 +48,27 @@
#图片批量上传zip
upload:
- localtion: ${UPLOAD_DIR:E:/test}
+# localtion: ${UPLOAD_DIR:E:/test}
+ localtion: ${UPLOAD_DIR:/home/zhongsong/anbao/}
maxFileSize: 10240KB
maxRequestSize: 102400KB
#ftp 设置
ftp:
- sqlConnect: jdbc:mysql://36.134.81.48:3306/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ sqlConnect: jdbc:mysql://61.131.136.25:2083/zhbaw-test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
ftpHost: 192.168.0.198
ftpPort: 21
ftpUserName: arsn
ftpPassword: 123456
+ ftpUserNameIn: arsn
+ ftpPasswordIn: 123456
ftpPath: anbao/
+ ftpPathIn: anbao/
localPath: E:\\anbao\\
ip: http://61.131.136.25:2081
jsonUrl: E:\\anbao\\
username: root
- password: jfpt123
+ password: ZHba@0112
qfqkBaseApiUrl: http://localhost:83
# qfqkBaseApiUrl : http://61.131.136.25:2082/api
--
Gitblit v1.9.3