峰会图片压缩包上传

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityShowController.java

@@ -28,4 +28,6 @@ public class ActivityShowController extends BaseController<ActivityShowBiz, Acti
          }
          return ObjectRestResponse.createDefaultFail();
     }
+
+
 }

xx-universal/xx-universal-api/src/main/java/com/xxfc/platform/universal/constant/enumerate/FileTypeEnum.java

@@ -8,7 +8,9 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public enum FileTypeEnum {
     FILE_TYPE_ZIP("application/zip", ".zip"),
-    FILE_TYPE_RAR("application/octet-stream", ".rar");
+    FILE_TYPE_RAR("application/octet-stream", ".rar"),
+    FILE_TYPE_X_ZIP("application/x-zip-compressed", ".zip");
+
     public String type;
     public String fileStufix;
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/UploadController.java

@@ -8,6 +8,7 @@ import com.xxfc.platform.universal.dto.ImgDTO;
 import com.xxfc.platform.universal.dto.UploadImgDTO;
 import com.xxfc.platform.universal.service.FileUploadService;
 import com.xxfc.platform.universal.service.UploadService;
+import com.xxfc.platform.universal.service.UploadZipService;
 import com.xxfc.platform.universal.utils.ImgBase64Util;
 import com.xxfc.platform.universal.utils.PublicMsg;
 import com.xxfc.platform.universal.vo.Ueditor;
@@ -42,6 +43,8 @@ public class UploadController{
     UploadService uploadService;
     @Autowired
     FileUploadService fileUploadService;
+    @Autowired
+    UploadZipService uploadZipService;
 
       private static Integer MAX_DRIVING_LICENSE_SIZE = 10 * 1024 * 1024;//10M
 
@@ -180,9 +183,9 @@ public class UploadController{
 
     @PostMapping(value="/app/unauth/pictureZip")
     public ObjectRestResponse pictureZip(
-            @RequestParam("file")MultipartFile upfile,
-            @RequestParam(value = "prefix",defaultValue = "renovate")String prefix) throws Exception {
-        return fileUploadService.handlerUpload(upfile,null,prefix);
+            @RequestBody MultipartFile file,
+            @RequestBody String password) throws Exception {
+        return uploadZipService.uploadPictureZip(file,password);
     }
 }
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/UploadZipService.java

+package com.xxfc.platform.universal.service;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import net.lingala.zip4j.exception.ZipException;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+
+public interface UploadZipService {
+    ObjectRestResponse uploadPictureZip(MultipartFile file, String password) throws IOException;
+}

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/impl/FileUploadServiceImpl.java

@@ -102,7 +102,4 @@ public class FileUploadServiceImpl  implements FileUploadService {
         zin.closeEntry();
         return path;
     }
-
-
-
 }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/impl/UploadZipServiceImpl.java

+package com.xxfc.platform.universal.service.impl;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.universal.constant.enumerate.FileTypeEnum;
+import com.xxfc.platform.universal.service.UploadZipService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.util.Enumeration;
+import java.util.Objects;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+@Slf4j
+@Service
+public class UploadZipServiceImpl implements UploadZipService {
+
+    @Value("${universal.uploadPath}")
+    private String uploadPath ;
+    @Value("${universal.url}")
+    private String xx_url ;
+
+    private static final String APK_SUFFIX=".apk";
+    private static final String APK_NAME="xxfc.apk";
+    private static final String JPG=".jpg";
+    private static final String PNG=".png";
+
+    @Override
+    public ObjectRestResponse uploadPictureZip(MultipartFile file, String password) throws IOException {
+        if (Objects.isNull(file)) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"请上传压缩文件!");
+        }
+
+        String fileContentType = file.getContentType();
+        //将压缩包保存在指定路径
+        String packFilePath = uploadPath + File.separator + file.getName();
+        if (FileTypeEnum.FILE_TYPE_ZIP.type.equals(fileContentType)||FileTypeEnum.FILE_TYPE_X_ZIP.type.equals(fileContentType)) {
+            //zip解压缩处理
+            packFilePath += FileTypeEnum.FILE_TYPE_ZIP.fileStufix;
+        } else {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"上传的压缩包格式不正确,仅支持zip压缩文件!");
+        }
+        File fi = new File(packFilePath);
+        try {
+            file.transferTo(fi);
+        } catch (IOException e) {
+            log.error("zip file save to " + uploadPath + " error", e.getMessage(), e);
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"保存压缩文件到:" + uploadPath + " 失败!");
+        }
+            //zip压缩包
+        return   unPackZip(fi, password, uploadPath);
+
+    }
+
+    public ObjectRestResponse unPackZip(File file, String password, String destPath) throws IOException  {
+        ZipFile zipFile = new ZipFile(file);
+        Enumeration<? extends ZipEntry> entries = zipFile.entries();
+        while (entries.hasMoreElements()) {
+            ZipEntry entry = entries.nextElement();
+            if (entry.isDirectory()) {
+                 destPath =destPath+File.separator+ entry.getName();
+                File dir = new File(destPath);
+                dir.mkdir();
+            }else {
+
+            }
+
+
+        }
+
+       return null;
+    }
+}