[1078] 合并新UI

src/main/java/com/genersoft/iot/vmp/conf/ftpServer/FtpServerConfig.java

@@ -1,8 +1,8 @@
 package com.genersoft.iot.vmp.conf.ftpServer;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.ftpserver.*;
 import org.apache.ftpserver.ftplet.FtpException;
-import org.apache.ftpserver.ftplet.Ftplet;
 import org.apache.ftpserver.listener.Listener;
 import org.apache.ftpserver.listener.ListenerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,13 +15,17 @@ import java.util.Map;
 
 @Configuration
 @ConditionalOnProperty(value = "ftp.enable", havingValue = "true")
+@Slf4j
 public class FtpServerConfig {
 
     @Autowired
     private UserManager userManager;
 
     @Autowired
-    private ftplet ftpPlet;
+    private Ftplet ftpPlet;
+
+    @Autowired
+    private FtpSetting ftpSetting;
 
     /**
      * ftp server init
@@ -30,28 +34,31 @@ public class FtpServerConfig {
     public FtpServer ftpServer() {
         FtpServerFactory serverFactory = new FtpServerFactory();
         ListenerFactory listenerFactory = new ListenerFactory();
-//        //1、设置服务端口
-        listenerFactory.setPort(3131);
-        //2、设置被动模式数据上传的接口范围,云服务器需要开放对应区间的端口给客户端
+        // 1、设置服务端口
+        listenerFactory.setPort(ftpSetting.getPort());
+        // 2、设置被动模式数据上传的接口范围,云服务器需要开放对应区间的端口给客户端
         DataConnectionConfigurationFactory dataConnectionConfFactory = new DataConnectionConfigurationFactory();
-        dataConnectionConfFactory.setPassivePorts("10000-10500");
+        dataConnectionConfFactory.setPassivePorts(ftpSetting.getPassivePorts());
         listenerFactory.setDataConnectionConfiguration(dataConnectionConfFactory.createDataConnectionConfiguration());
-        //4、替换默认的监听器
+        // 4、替换默认的监听器
         Listener listener = listenerFactory.createListener();
         serverFactory.addListener("default", listener);
-        //5、配置自定义用户事件
-        Map<String, Ftplet> ftpLets = new HashMap();
+        // 5、配置自定义用户事件
+        Map<String, org.apache.ftpserver.ftplet.Ftplet> ftpLets = new HashMap<>();
         ftpLets.put("ftpService", ftpPlet);
         serverFactory.setFtplets(ftpLets);
-        //6、读取用户的配置信息
-        //6.2、设置用信息
+        // 6、读取用户的配置信息
+        // 6.2、设置用信息
         serverFactory.setUserManager(userManager);
-        //7、实例化FTP Server
+        // 7、实例化FTP Server
         FtpServer server = serverFactory.createServer();
         try {
             server.start();
+            if (!server.isStopped()) {
+                log.info("[FTP服务] 已启动, 端口： {}", ftpSetting.getPort());
+            }
         } catch (FtpException e) {
-            System.out.println("ftp-启动失败" + e.getMessage());
+            log.info("[FTP服务] 启动失败 ", e);
         }
         return server;
     }

src/main/java/com/genersoft/iot/vmp/conf/ftpServer/FtpSetting.java

@@ -1,5 +1,6 @@
 package com.genersoft.iot.vmp.conf.ftpServer;
 
+import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
@@ -10,6 +11,7 @@ import org.springframework.stereotype.Component;
 @Component
 @ConfigurationProperties(prefix = "ftp", ignoreInvalidFields = true)
 @Order(0)
+@Data
 public class FtpSetting {
 
     private Boolean enable = Boolean.FALSE;
@@ -18,44 +20,5 @@ public class FtpSetting {
     private int port = 21;
     private String username = "admin";
     private String password = "admin";
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getIp() {
-        return ip;
-    }
-
-    public void setIp(String ip) {
-        this.ip = ip;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public void setPort(int port) {
-        this.port = port;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
+    private String passivePorts = "10000-10500";
 }

src/main/java/com/genersoft/iot/vmp/conf/ftpServer/Ftplet.java

@@ -13,9 +13,9 @@ import java.io.IOException;
 
 
 @Component
-public class ftplet extends DefaultFtplet {
+public class Ftplet extends DefaultFtplet {
 
-    private final Logger logger = LoggerFactory.getLogger(ftplet.class);
+    private final Logger logger = LoggerFactory.getLogger(Ftplet.class);
 
     @Value("${ftp.username}")
     private String username;