From 98f8d438a976d73e7c4f6434efc8867ebe2a07a5 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 05 Nov 2021 17:35:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application-dev.yml | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 8890bb6..2103911 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,8 +3,11 @@
redis:
##redis 单机环境配置
host: 127.0.0.1
- port: 6379
- password:
+
+# 内网
+ port: 6378
+ password: redispsw
+
database: 0
ssl: false
##redis 集群环境配置
@@ -13,9 +16,23 @@
# commandTimeout: 5000
datasource:
# MySql
- #url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
- #username: root
- #password: root
+# 内网版本
+ url: jdbc:mysql://localhost:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ username: root
+ password: zhba0728
+
+#ftp 设置
+ftp:
+ sqlConnect: jdbc:mysql://localhost:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ ftpHost: 47.49.21.194
+ ftpPort: 21
+ ftpUserName: ylcs
+ ftpPassword: Yly@123
+ ftpPath: anbao/
+ localPath: /home/song/anbao/
+ minioPath: /usr/local/minio/data/zhba/upload/picture
+ jsonUrl: /home/song/anbao/
+
# PostgreSQL
#url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
#username: postgres
@@ -25,9 +42,9 @@
#username: BLADEX_BOOT
#password: BLADEX_BOOT
# SqlServer
- url: jdbc:sqlserver://47.110.245.84:1433;DatabaseName=zhba
- username: sa
- password: jxpskj2018
+ #url: jdbc:sqlserver://47.49.21.216:1433;DatabaseName=zhba
+ #username: root
+ #password: jfpt123
#第三方登陆
social:
@@ -41,7 +58,7 @@
##是否启用分布式锁
enabled: false
##redis服务地址
- address: redis://127.0.0.1:6379
+ address: redis://127.0.0.1:6378
#本地文件上传
file:
remote-mode: true
--
Gitblit v1.9.3