From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001 From: Administrator <admin> Date: Sat, 18 Sep 2021 17:27:03 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/org/springblade/common/constant/FtpConstant.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/springblade/common/constant/FtpConstant.java b/src/main/java/org/springblade/common/constant/FtpConstant.java index 3a5360d..e51e2ca 100644 --- a/src/main/java/org/springblade/common/constant/FtpConstant.java +++ b/src/main/java/org/springblade/common/constant/FtpConstant.java @@ -8,15 +8,15 @@ /** * sql connect */ - String sql_connect_dev = "jdbc:mysql://223.82.109.183:2083/zhba"; + String sql_connect_dev = "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"; /** * sql connect */ - //String sql_connect_dev = "jdbc:mysql://localhost:3306/zhba"; + //String sql_connect_dev = "jdbc:mysql://localhost:3306/zhba?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true"; //ftp服务器IP地址 - String ftpHost_dev = "192.168.0.105"; + String ftpHost_dev = "192.168.0.112"; //ftp服务器IP地址 //String ftpHost_dev = "47.49.21.194"; @@ -26,11 +26,11 @@ //ftp服务器用户名 //String ftpUserName = "ylcs"; - String ftpUserName = "yly"; + String ftpUserName = "anonymous"; //ftp服务器密码 - String ftpPassword = "Yly@123"; + String ftpPassword = ""; //ftp服务器路径 @@ -42,6 +42,11 @@ //String localPath = "/home/song/anbao/"; String localPath = "D:\\anbao\\"; - //minio本地baocdiz - String MinioPath = "D:\\anbao\\"; + //minio本地保存地址 + //String MinioPath = "/usr/local/minio/data/zhba/upload/picture"; + String MinioPath ="D:\\ftptp\\"; + + + //String jsonUrl = "/usr/local/minio/data/zhba/upload/picture"; + String jsonUrl = "D:\\anbao\\"; } -- Gitblit v1.9.3