Administrator
2021-09-25 99d0d0e01655144327dcdd4340338a3a5d2daa54
ftp 连接配置修改
7 files modified
1 files added
305 ■■■■ changed files
src/main/java/org/springblade/common/config/FtpConfig.java 99 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/common/constant/FtpConstant.java 106 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/FTP/FtpUtil.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/FTP/MysqlCenlint.java 10 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/FTP/OutJson.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/FTP/monitor.java 14 ●●●●● patch | view | raw | blame | history
src/main/resources/application-dev.yml 26 ●●●●● patch | view | raw | blame | history
src/main/resources/application-test.yml 40 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/common/config/FtpConfig.java
New file
@@ -0,0 +1,99 @@
package org.springblade.common.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
/**
 * ftp 配置路径
 * @author zhongrj
 * @since 2021-9-24
 */
@ConfigurationProperties(prefix = "ftp")
@Component
public class FtpConfig {
    /**
     * sql connect
     */
    public static String sqlConnect;
    /**
     * ftp服务器IP地址
     */
    public static String ftpHost;
    /**
     * ftp服务器端口
     */
    public static int ftpPort;
    /**
     * ftp服务器用户名
     */
    public static String ftpUserName;
    /**
     * ftp服务器密码
     */
    public static String ftpPassword;
    /**
     * ftp服务器路径
     */
    public static String ftpPath;
    /**
     * 本地路径
     */
    public static String localPath;
    /**
     * minio内网ip
     */
    public static String minioPath;
    public static String jsonUrl;
    public void setSqlConnect(String sqlConnect) {
        FtpConfig.sqlConnect = sqlConnect;
    }
    public void setFtpHost(String ftpHost) {
        FtpConfig.ftpHost = ftpHost;
    }
    public void setFtpPort(int ftpPort) {
        FtpConfig.ftpPort = ftpPort;
    }
    public void setFtpUserName(String ftpUserName) {
        FtpConfig.ftpUserName = ftpUserName;
    }
    public void setFtpPassword(String ftpPassword) {
        FtpConfig.ftpPassword = ftpPassword;
    }
    public void setFtpPath(String ftpPath) {
        FtpConfig.ftpPath = ftpPath;
    }
    public void setLocalPath(String localPath) {
        FtpConfig.localPath = localPath;
    }
    public void setMinioPath(String minioPath) {
        FtpConfig.minioPath = minioPath;
    }
    public void setJsonUrl(String jsonUrl) {
        FtpConfig.jsonUrl = jsonUrl;
    }
}
src/main/java/org/springblade/common/constant/FtpConstant.java
@@ -1,53 +1,53 @@
package org.springblade.common.constant;
/**
 * @author zhongrj
 */
public interface FtpConstant {
    /**
     * sql connect
     */
    //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?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.112";
    //ftp服务器IP地址
    String ftpHost_dev = "47.49.21.194";
    //ftp服务器端口
    int ftpPort = 21;
    //ftp服务器用户名
    String ftpUserName = "ylcs";
    //String ftpUserName = "anonymous";
    //ftp服务器密码
    String ftpPassword = "Yly@123";
    //String ftpPassword = "";
    //ftp服务器路径
    String ftpPath = "anbao/";
    /**
     * 本地路径
     */
    String localPath = "/home/song/anbao/";
    //String localPath = "D:\\anbao\\";
    //minio本地保存地址
    String MinioPath = "/usr/local/minio/data/zhba/upload/picture";
    //String MinioPath ="D:\\ftptp\\";
    String jsonUrl = "/home/song/anbao/";
    //String jsonUrl = "D:\\anbao\\";
}
//package org.springblade.common.constant;
//
///**
// * @author zhongrj
// */
//public interface FtpConstant {
//
//    /**
//     * sql connect
//     */
//    //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?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.112";
//
//    //ftp服务器IP地址
//    String ftpHost_dev = "47.49.21.194";
//
//    //ftp服务器端口
//    int ftpPort = 21;
//
//    //ftp服务器用户名
//    String ftpUserName = "ylcs";
//    //String ftpUserName = "anonymous";
//
//
//    //ftp服务器密码
//    String ftpPassword = "Yly@123";
//    //String ftpPassword = "";
//
//
//    //ftp服务器路径
//    String ftpPath = "anbao/";
//
//    /**
//     * 本地路径
//     */
//    String localPath = "/home/song/anbao/";
//    //String localPath = "D:\\anbao\\";
//
//    //minio本地保存地址
//    String minioPath = "/usr/local/minio/data/zhba/upload/picture";
//    //String MinioPath ="D:\\ftptp\\";
//
//
//    String jsonUrl = "/home/song/anbao/";
//    //String jsonUrl = "D:\\anbao\\";
//}
src/main/java/org/springblade/modules/FTP/FtpUtil.java
@@ -11,8 +11,7 @@
import java.net.SocketException;
import java.util.Date;
import static org.springblade.common.constant.FtpConstant.*;
import static org.springblade.common.constant.FtpConstant.ftpPath;
import static org.springblade.common.config.FtpConfig.*;
/**
 * ftp工具类
@@ -301,7 +300,7 @@
        } catch (FileNotFoundException e) {
            e.printStackTrace();
        }
        FtpUtil.uploadFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, ftpPath, "/",  "n"+response1+".json", in1);
        FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, "/",  "n"+response1+".json", in1);
    }
}
src/main/java/org/springblade/modules/FTP/MysqlCenlint.java
@@ -7,8 +7,8 @@
import java.sql.PreparedStatement;
import java.sql.SQLException;
import static org.springblade.common.constant.FtpConstant.localPath;
import static org.springblade.common.constant.FtpConstant.sql_connect_dev;
import static org.springblade.common.config.FtpConfig.localPath;
import static org.springblade.common.config.FtpConfig.sqlConnect;
public class MysqlCenlint {
@@ -21,7 +21,7 @@
            int ColumnCount;
            //int RowCount;
            String driver = "com.mysql.cj.jdbc.Driver";
            String url = sql_connect_dev; //换成要连接的数据库信息
            String url = sqlConnect; //换成要连接的数据库信息
            String user = "root";
            String password = "zhba0728";
            Class.forName ( driver );
@@ -50,7 +50,7 @@
            int ColumnCount;
            //int RowCount;
            String driver = "com.mysql.cj.jdbc.Driver";
            String url = sql_connect_dev; //换成要连接的数据库信息
            String url = sqlConnect; //换成要连接的数据库信息
            String user = "root";
            String password = "zhba0728";
            Class.forName ( driver );
@@ -79,7 +79,7 @@
            int ColumnCount;
            //int RowCount;
            String driver = "com.mysql.cj.jdbc.Driver";
            String url = sql_connect_dev; //换成要连接的数据库信息
            String url = sqlConnect; //换成要连接的数据库信息
            String user = "root";
            String password = "zhba0728";
            Class.forName ( driver );
src/main/java/org/springblade/modules/FTP/OutJson.java
@@ -1,6 +1,7 @@
package org.springblade.modules.FTP;
import org.springblade.common.constant.FtpConstant;
import org.springblade.common.config.FtpConfig;
import java.io.*;
@@ -155,7 +156,7 @@
     */
    public static String TestJson(String fileName){
        //File file = new File(FtpConstant.jsonUrl+fileName);
        File file = new File(FtpConstant.jsonUrl+fileName);
        File file = new File(FtpConfig.jsonUrl+fileName);
        StringBuilder localStrBulider = new StringBuilder();
        if(file.isFile() && file.exists()) {
            try {
src/main/java/org/springblade/modules/FTP/monitor.java
@@ -10,7 +10,8 @@
import java.io.IOException;
import java.io.InputStream;
import static org.springblade.common.constant.FtpConstant.*;
import static org.springblade.common.config.FtpConfig.*;
@Component
public class monitor {
@@ -26,9 +27,10 @@
        try {
            System.out.println("ftpHost = " + ftpHost);
            // 连接ftp服务器
            ftp.connect(ftpHost_dev, ftpPort);
            ftp.connect(ftpHost, ftpPort);
            // 登陆
@@ -80,7 +82,7 @@
                        String substring1 = fileName.substring(0, 1);
                        if (substring1.equals("w")) {
                            //把文件下载到本地
                            FtpUtil.downloadFtpFile(ftpHost_dev, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
                            FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
                            //
                            String s = OutJson.TestJson(fileName);
                            //sql语句
@@ -106,15 +108,15 @@
                            //删除本地文件
//                        MysqlCenlint.deletes(fileName);
                            MysqlCenlint.deletess(fileName);
                            FtpUtil.deleteFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
//                            FtpUtil.deleteFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
                            is.close();
                            ftp.completePendingCommand();
                        }
                        else {
                            //把文件下载到本地
                            FtpUtil.downloadFtpFile(ftpHost_dev, ftpUserName, ftpPassword, ftpPort, ftpPath, MinioPath, fileName);
                            FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, minioPath, fileName);
                            //MysqlCenlint.deletess(fileName);
                            FtpUtil.deleteFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
                            FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
                            is.close();
                            ftp.completePendingCommand();
                        }
src/main/resources/application-dev.yml
@@ -3,12 +3,10 @@
  redis:
    ##redis 单机环境配置
    host: 127.0.0.1
    port: 6379
    password:
#   内网
#    port: 6378
#    password: redispsw
    port: 6378
    password: redispsw
    database: 0
    ssl: false
@@ -18,14 +16,22 @@
    #  commandTimeout: 5000
  datasource:
    # MySql
    url: 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
#    内网版本
    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
#    内网版本
#    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
@@ -52,7 +58,7 @@
    ##是否启用分布式锁
    enabled: false
    ##redis服务地址
    address: redis://127.0.0.1:6379
    address: redis://127.0.0.1:6378
  #本地文件上传
  file:
    remote-mode: true
src/main/resources/application-test.yml
@@ -2,21 +2,48 @@
spring:
  redis:
    ##redis 单机环境配置
    ##将docker脚本部署的redis服务映射为宿主机ip
    ##生产环境推荐使用阿里云高可用redis服务并设置密码
    host: 127.0.0.1
    port: 6379
    password:
    database: 0
    ssl: false
    ##redis 集群环境配置
    #cluster:
    #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
    #  commandTimeout: 5000
  datasource:
    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
    # MySql
    url: 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
    username: root
    password: root
    password: zhba0728
#ftp 设置
ftp:
  sqlConnect: 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
  ftpHost: 192.168.0.199
  ftpPort: 21
  ftpUserName: arsn
  ftpPassword:
  ftpPath: anbao/
  localPath: D:\anbao\
  minioPath: D:\ftptp\
  jsonUrl: D:\anbao\
    # PostgreSQL
    #url: jdbc:postgresql://127.0.0.1:5432/bladex_boot
    #username: postgres
    #password: 123456
    # Oracle
    #url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
    #username: BLADEX_BOOT
    #password: BLADEX_BOOT
    # SqlServer
    #url: jdbc:sqlserver://47.49.21.216:1433;DatabaseName=zhba
    #username: root
    #password: jfpt123
#第三方登陆
social:
@@ -29,12 +56,11 @@
  lock:
    ##是否启用分布式锁
    enabled: false
    ##将docker脚本部署的redis服务映射为宿主机ip
    ##生产环境推荐使用阿里云高可用redis服务并设置密码
    ##redis服务地址
    address: redis://127.0.0.1:6379
    password: 123456
  #本地文件上传
  file:
    remote-mode: true
    upload-domain: http://localhost:8999
    remote-path: /usr/share/nginx/html