From 7e6fd5f1a403618d9d2116c483783951e17a3509 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 01 十一月 2022 12:30:14 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/show/MarkService.java |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/lf/server/service/show/MarkService.java b/src/main/java/com/lf/server/service/show/MarkService.java
index 7c38ba1..b1cb186 100644
--- a/src/main/java/com/lf/server/service/show/MarkService.java
+++ b/src/main/java/com/lf/server/service/show/MarkService.java
@@ -1,27 +1,18 @@
 package com.lf.server.service.show;
 
-import com.lf.server.entity.all.HttpStatus;
 import com.lf.server.entity.ctrl.MarkJsonEntity;
 import com.lf.server.entity.show.MarkEntity;
 import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.*;
 import com.lf.server.mapper.show.MarkMapper;
-import com.lf.server.service.data.UploaderService;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
 
-import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.io.FileInputStream;
-import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Random;
 
 /**
  * 鏍囩粯
@@ -107,9 +98,10 @@
             return "Shp鏂囦欢鐢熸垚澶辫触";
         }
 
-        String zip = getZip(parent);
+        String zip = getZip();
         ZipHelper.zip(zip, parent);
         //download(res, zip);
+        FileHelper.deleteDir(parent);
 
         return "";
     }
@@ -139,8 +131,8 @@
         return rs;
     }
 
-    private String getZip(String parent) {
-        String path = parent + File.separator + WebHelper.getRandomInt(100000, 1000000) + ".zip";
+    private String getZip() {
+        String path = pathHelper.getDownloadFullPath() + File.separator + WebHelper.getRandomInt(100000, 1000000) + ".zip";
 
         File file = new File(path);
         if (file.exists() && !file.isDirectory()) {

--
Gitblit v1.9.3