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 | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index b6f5851..30c4fe5 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -2,7 +2,7 @@
spring:
redis:
##redis 单机环境配置
- host: 192.168.0.191
+ host: 127.0.0.1
port: 6379
password:
database: 0
@@ -13,9 +13,9 @@
# commandTimeout: 5000
datasource:
# MySql
- url: jdbc:mysql://192.168.0.191:3306/zhbaw?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: root
+ password: ZHba@0112
# rabbitmq 设置
# rabbitmq:
# host: 192.168.0.191
@@ -36,36 +36,40 @@
#password: zhbaw@2021
#jedis 配置
-#redis:
-# ##redis 单机环境配置
-# host: 192.168.0.191
-# port: 6379
-# password:
-# timeout: 10
-# poolMaxTotal: 1000
-# poolMaxIdle: 500
-# poolMaxWait: 500
+redis:
+ ##redis 单机环境配置
+ host: 127.0.0.1
+ port: 6379
+ password:
+ timeout: 10
+ poolMaxTotal: 1000
+ poolMaxIdle: 500
+ poolMaxWait: 500
#图片批量上传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://61.131.136.25:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
- ftpHost: 117.40.91.118
+ 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: zhbain
- ftpPassword: zhbain@123
+ 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: zhbaw
- password: 123456
- qfqkBaseApiUrl: http://192.168.0.198:83
+ username: root
+ password: ZHba@0112
+ qfqkBaseApiUrl: http://localhost:83
# qfqkBaseApiUrl : http://61.131.136.25:2082/api
#第三方登陆
--
Gitblit v1.9.3