From 608006b614b24aa14260981e17aef753b5dc88e6 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Wed, 20 Oct 2021 22:56:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=AE=A1=E7=90=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ebts/ebts-admin/src/main/resources/application.yml          | 6 +++---
 .../java/com/ebts/common/utils/file/FileUploadUtils.java    | 2 +-
 .../src/main/java/com/ebts/system/utils/FtpUtils.java       | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ebts/ebts-admin/src/main/resources/application.yml b/ebts/ebts-admin/src/main/resources/application.yml
index 8301e64..9bbabe6 100644
--- a/ebts/ebts-admin/src/main/resources/application.yml
+++ b/ebts/ebts-admin/src/main/resources/application.yml
@@ -27,9 +27,9 @@ ftp:
   # 字符集编码
   encoding: UTF-8
   # 资源域名末尾以/结尾
-  resources: https://download.odliken.top
-  #后端部署域名
-  apiurl: http://localhost:8085
+  resources: https://resources.ebts.top
+  #后端文件预览域名指向上面 ebts.profile 配置的文件路径
+  apiurl: http://apiurl.ebts.top
   # 公开目录
   pubfiles: pubfiles
   # 保护目录
diff --git a/ebts/ebts-common/src/main/java/com/ebts/common/utils/file/FileUploadUtils.java b/ebts/ebts-common/src/main/java/com/ebts/common/utils/file/FileUploadUtils.java
index de7787b..08809d0 100644
--- a/ebts/ebts-common/src/main/java/com/ebts/common/utils/file/FileUploadUtils.java
+++ b/ebts/ebts-common/src/main/java/com/ebts/common/utils/file/FileUploadUtils.java
@@ -136,7 +136,7 @@ public class FileUploadUtils {
     private static final String getPathFileName(String uploadDir, String fileName) throws IOException {
         int dirLastIndex = EBTSConfig.getProfile().length() + 1;
         String currentDir = StringUtils.substring(uploadDir, dirLastIndex);
-        String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName;
+        String pathFileName = "/" + currentDir + "/" + fileName;
         return pathFileName;
     }
 
diff --git a/ebts/ebts-system/src/main/java/com/ebts/system/utils/FtpUtils.java b/ebts/ebts-system/src/main/java/com/ebts/system/utils/FtpUtils.java
index 5042235..d7a8ec0 100644
--- a/ebts/ebts-system/src/main/java/com/ebts/system/utils/FtpUtils.java
+++ b/ebts/ebts-system/src/main/java/com/ebts/system/utils/FtpUtils.java
@@ -18,6 +18,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * @Author 18209
@@ -154,7 +155,7 @@ public class FtpUtils {
      * @return
      */
     public static SysFile uploadFtp(SysFile sysFile) {
-        String dir = EBTSConfig.getProfile() + sysFile.getFileAddr().substring(baseDir.length());
+        String dir = EBTSConfig.getProfile() + sysFile.getFileAddr();
         String ftpdir = "/";
         if (sysFile.getIsPublic().equals("1")) {
             ftpdir += pubfiles;
@@ -330,7 +331,7 @@ public class FtpUtils {
     }
 
     public static final String getExtension(String fileName) {
-        return FilenameUtils.getExtension(fileName);
+        return FilenameUtils.getExtension(fileName.toLowerCase());
     }
 
 }