Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/information/controller/FtpUploadFile.java

@@ -110,9 +110,9 @@
   }

   public static void main(String[] args) {
      String ftpHost = "192.168.0.109";
      String ftpUserName = "anonymous";
      String ftpPassword = "";
      String ftpHost = "192.168.0.105";
      String ftpUserName = "yly";
      String ftpPassword = "Yly@123";
      int ftpPort = 21;
      //String ftpPath = "";  //目录名， ""表示根目录
      String ftpPath = "";  //目录名最好是英文，中文目录暂时还未成功上传