dengsixing 1 개월 전
부모
커밋
ec3a359a04

+ 7 - 0
src/main/java/com/fdkankan/contro/constant/ZipConstant.java

@@ -0,0 +1,7 @@
+package com.fdkankan.contro.constant;
+
+public class ZipConstant {
+
+    public static final String zipPassword = "a3ad34136de359536af553f9e7f3cefd";
+
+}

+ 1 - 1
src/main/java/com/fdkankan/contro/service/IJmgaService.java

@@ -13,7 +13,7 @@ public interface IJmgaService {
 
     void checkLackFile(String dataSource);
 
-    void uploadSceneOrig(UploadSceneOrigParamVo param);
+    void uploadSceneOrig(UploadSceneOrigParamVo param) throws Exception;
 
     void noticeBuildBd(String ossHost, String uuid, String dir);
 

+ 12 - 3
src/main/java/com/fdkankan/contro/service/impl/JmgaServiceImpl.java

@@ -3,7 +3,6 @@ package com.fdkankan.contro.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.UUID;
-import cn.hutool.core.util.ZipUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -11,7 +10,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.util.CmdUtils;
 import com.fdkankan.contro.bean.SendCallAlgorithmDetail;
+import com.fdkankan.contro.constant.ZipConstant;
 import com.fdkankan.contro.entity.OrigFileUpload;
 import com.fdkankan.contro.entity.OrigFileUploadBatch;
 import com.fdkankan.contro.service.IJmgaService;
@@ -190,7 +191,7 @@ public class JmgaServiceImpl implements IJmgaService {
     }
 
     @Override
-    public void uploadSceneOrig(UploadSceneOrigParamVo param) {
+    public void uploadSceneOrig(UploadSceneOrigParamVo param) throws Exception {
         String uuid = UUID.randomUUID().toString();
 //        String zipName = FileUtil.getName(param.getFilePath());
         String zipName = uuid + ".zip";
@@ -198,7 +199,8 @@ public class JmgaServiceImpl implements IJmgaService {
         fYunFileService.downloadFileByCommand(zipDir + zipName, param.getFilePath());
 
         //解压缩
-        ZipUtil.unzip(new File(zipDir + zipName), new File(zipDir));
+        String unzipCmd = "unzip -p " + ZipConstant.zipPassword + " " + zipDir +  zipName;
+        CmdUtils.callLineSh(unzipCmd);
 
 //        this.noticeBuildBd();
 
@@ -210,6 +212,13 @@ public class JmgaServiceImpl implements IJmgaService {
 
     }
 
+//    public static void main(String[] args) {
+//        //解压缩
+//        ZipUtil.unzip(new File("D:\\test\\" + "123123.zip"), new File("D:\\test\\"));
+//        ZipUtil.unzip
+//
+//    }
+
     @Override
     public void noticeBuildBd(String ossHost, String uuid, String dir) {
         String prefix = "http://" + ossHost + "/";