From 3f2007cf9fd8f53a4230be2f8a72fdc12a78bc75 Mon Sep 17 00:00:00 2001
From: guoxin <371864209@qq.com>
Date: Fri, 22 Sep 2023 02:41:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=BC=E5=90=88=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E9=A2=84=E8=A7=88=E6=96=87=E4=BB=B6=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysFileController.java  | 21 +++++--------------
 .../main/resources/static/js/sys/file/view.js |  9 +-------
 .../resources/view/sys/file/fileView.html     |  2 --
 3 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java b/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java
index bc8285c..f6e95af 100644
--- a/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java
+++ b/shandan-system/src/main/java/com/keyware/shandan/system/controller/SysFileController.java
@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.ZipUtil;
+import cn.hutool.http.HttpUtil;
 import com.keyware.shandan.bianmu.service.DataLabelsService;
 import com.keyware.shandan.common.controller.BaseController;
 import com.keyware.shandan.common.entity.Result;
@@ -29,6 +30,10 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -120,22 +125,6 @@ public class SysFileController extends BaseController<SysFileService, SysFile, S
         }
         mav.addObject("readableFileSize", fileSize);
         mav.addObject("LabelConfigSet", labelsService.formConfigList());
-        File ff = new File(customProperties.getFileStorage().getPath() + File.separator + file.getPath());
-        if (!ff.exists()) {
-            mav.addObject("fileNotExists", true);
-        } else {
-            if (PoiFileReadUtil.isReadilyFile(ff)) {
-                try {
-                    String text = PoiFileReadUtil.parseTextByFile(ff);
-                    if (text == null) {
-                        mav.addObject("fileReadError", true);
-                    }
-                } catch (Exception e) {
-                    mav.addObject("fileReadError", true);
-                }
-            }
-        }
-
         return mav;
     }
 
diff --git a/shandan-system/src/main/resources/static/js/sys/file/view.js b/shandan-system/src/main/resources/static/js/sys/file/view.js
index c722ab6..a7c50e3 100644
--- a/shandan-system/src/main/resources/static/js/sys/file/view.js
+++ b/shandan-system/src/main/resources/static/js/sys/file/view.js
@@ -47,14 +47,7 @@ layui.use(['layer', 'laytpl', 'dropdown', 'carousel', 'form', 'datalabel'], func
         showWarningMsg('该文件中没有任何内容');
         return;
     }
-    if (fileNotExists) {
-        showErrorMsg('文件不存在');
-        return;
-    }
-    if (fileReadError) {
-        showErrorMsg('文件内容不可读，请下载查看');
-        return;
-    }
+
     let office_server = DICT.getOfficeServer();
 
     let if_src = office_server + '?url=' + encodeURIComponent(Base64.encode(fileViewUrl))
diff --git a/shandan-system/src/main/resources/view/sys/file/fileView.html b/shandan-system/src/main/resources/view/sys/file/fileView.html
index 6c3ff26..8d377c9 100644
--- a/shandan-system/src/main/resources/view/sys/file/fileView.html
+++ b/shandan-system/src/main/resources/view/sys/file/fileView.html
@@ -17,8 +17,6 @@
         const file = /*[[${fileData}]]*/ {};
         const fileViewUrl = /*[[${fileViewUrl}]]*/ '';
         const downloadUrl = /*[[${downloadUrl}]]*/ '';
-        const fileNotExists = /*[[${fileNotExists}]]*/ false;
-        const fileReadError = /*[[${fileReadError}]]*/ false;
     </script>
 </head>
 <body>