update 固件上传到FTP服务器

jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java

@@ -99,12 +99,8 @@ public class CommonController {
 			// 上传文件路径
 			String filePath = JsowellConfig.getUploadPath();
 			// 上传并返回新文件名称
-			String fileName = FileUploadUtils.upload(filePath, file);
+			// String fileName = FileUploadUtils.upload(filePath, file);
-			try {
+			String fileName = FtpUtils.upLoad(filePath, file);
-				FtpUtils.upLoad(filePath, file);
-			} catch (Exception e) {
-				log.error("FTP上传固件error", e);
-			}
 			String url = serverConfig.getUrl() + fileName;
 			AjaxResult ajax = AjaxResult.success();
 			ajax.put("url", url);

jsowell-common/src/main/java/com/jsowell/common/util/file/FtpUtils.java

@@ -6,8 +6,10 @@ import com.jsowell.common.exception.file.FileSizeLimitExceededException;
 import com.jsowell.common.exception.file.InvalidExtensionException;
 
 
+import com.jsowell.common.util.ServletUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.id.IdUtils;
+import com.jsowell.common.util.ip.IpUtils;
 import org.apache.commons.io.FilenameUtils;
 
 import org.apache.commons.net.ftp.FTPClient;
@@ -48,20 +50,22 @@ public class FtpUtils {
      */
     public static String upLoad(String baseDir, MultipartFile file) throws Exception {
         FTPClient ftp = new FTPClient();
+        baseDir = "/";
         try {
             /** 1. 检查文件大小和扩展名是否符合要求*/
             assertFile(file);
             /** 2. 产生新的文件名，目的使得文件名统一为英文字符加数字;fileName包含文件后缀名*/
             String fileName = reBuildFileName(file);
             /** 3. 连接ftp服务器*/
-            ftp.connect(ftpConfig.getIp(), ftpConfig.getPort());
+            String ip = IpUtils.getIpFormDomainName(ftpConfig.getIp());
+            ftp.connect(ip, ftpConfig.getPort());
             ftp.login(ftpConfig.getUsername(), ftpConfig.getPassword());
             if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
                 // 不合法时断开连接
                 ftp.disconnect();
                 throw new IOException("ftp连接异常，异常码为:" + ftp.getReplyCode());
             }
-            String path = ftpConfig.getUploadPath() + baseDir;
+            String path = baseDir;
             String[] dirs = path.split("/");
             ftp.changeWorkingDirectory("/");
             /** 4. 判断ftp服务器目录是否存在  不存在则创建*/
@@ -221,7 +225,8 @@ public class FtpUtils {
     public static final String reBuildFileName(MultipartFile file) {
         String fileName = file.getOriginalFilename();
         String extension = getExtension(file);
-        fileName = IdUtils.fastUUID() + "." + extension;
+        // 2024年6月3日14点29分修改 保持原名称
+        // fileName = IdUtils.fastUUID() + "." + extension;
         return fileName;
     }
 
@@ -246,7 +251,7 @@ public class FtpUtils {
      * @return
      */
     public static final boolean isAllowedExtension(String extension) {
-        for (String str : MimeTypeUtils.IMAGE_EXTENSION) {
+        for (String str : MimeTypeUtils.FIRMWARE_EXTENSION) {
             if (str.equalsIgnoreCase(extension)) {
                 return true;
             }

jsowell-common/src/main/java/com/jsowell/common/util/ip/IpUtils.java

@@ -1,6 +1,7 @@
 package com.jsowell.common.util.ip;
 
 import com.jsowell.common.constant.Constants;
+import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
@@ -222,4 +223,20 @@ public class IpUtils {
     public static boolean isUnknown(String checkString) {
         return StringUtils.isBlank(checkString) || "unknown".equalsIgnoreCase(checkString);
     }
+
+    /**
+     * 根据域名获取ip
+     * @param domainName
+     * @return
+     */
+    public static String getIpFormDomainName(String domainName) {
+        String ip;
+        try {
+            String server = StringUtils.removeHttp(domainName);
+            ip = InetAddress.getByName(server).getHostAddress();
+        } catch (UnknownHostException e) {
+            throw new BusinessException("", "无法解析出IP");
+        }
+        return ip;
+    }
 }