Browse Source

修改删除文件的问题

zhouxianguang 5 years ago
parent
commit
46dee53c43
2 changed files with 18 additions and 5 deletions
  1. 14 2
      helper/LjFileHelper.js
  2. 4 3
      router/lesson.js

+ 14 - 2
helper/LjFileHelper.js

@@ -377,9 +377,21 @@ class LjFileHelper
 
         var splitArr = fileUrl.split('/')
         var arrLen = splitArr.length;
-        for (var i = 3; i < arrLen - 1; i++)
+        var platform = os.platform();
+        if (platform == "win32")
+        {
+
+            for (var i = 3; i < arrLen - 1; i++)
+            {
+                folderDir += splitArr[i] + "\\";
+            }
+        }
+        else if(platform == "darwin")
         {
-            folderDir += splitArr[i] + "\\";
+            for (var i = 3; i < arrLen - 1; i++)
+            {
+                folderDir += splitArr[i] + "/";
+            }
         }
 
         var filePropObj = {};

+ 4 - 3
router/lesson.js

@@ -386,6 +386,7 @@ router.get("/delFile", function (req, res)
                         var url = resourceList[j].url;
                         var delFileProp = fileHelper.getFilePropertyNoMkdir(url);
                         var delFileDir = delFileProp.folderDir + delFileProp.fileName + "_new." + delFileProp.fileType;
+                        console.info("删除图片:"+delFileDir);
                         //判断文件是否存在
                         if (fs.existsSync(delFileDir))
                         {
@@ -406,7 +407,7 @@ router.get("/delFile", function (req, res)
                         var url = resourceList[j].url;
                         var delFileProp = fileHelper.getFilePropertyNoMkdir(url);
                         var delFileDir = delFileProp.folderDir + delFileProp.fileName + "_new.mp4";
-
+                        console.info("删除图片:"+delFileDir);
                         //判断文件是否存在
                         if (fs.existsSync(delFileDir))
                         {
@@ -426,7 +427,7 @@ router.get("/delFile", function (req, res)
                         var audio = audioObj.audio;
 
                         //删除图片
-                        if (image != null && image.url == "")
+                        if (image != null && image.url != "")
                         {
                             var delFileProp = fileHelper.getFilePropertyNoMkdir(url);
                             var delFileDir = delFileProp.folderDir + delFileProp.fileName + "_new." + delFileProp.fileType;
@@ -439,7 +440,7 @@ router.get("/delFile", function (req, res)
                         }
 
                         //删除语音
-                        if (audio != null && audio.url == "")
+                        if (audio != null && audio.url != "")
                         {
                             var delFileProp = fileHelper.getFilePropertyNoMkdir(url);
                             var delFileDir = delFileProp.folderDir + delFileProp.fileName + "_new.mp3";