瀏覽代碼

更换打包工具,废除原有V3打包工具,换为hutool工具

dengsixing 3 年之前
父節點
當前提交
4717de954e

+ 3 - 3
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.net.multipart.UploadFile;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -1011,7 +1012,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             downloadName = num + "_images.zip";
             //打包
             String zipPath = cachePath + downloadName;
-            FileUtils.zipFile(zipPath, localImagesPath);
+            ZipUtil.zip(localImagesPath, zipPath);
             //上传压缩包
             uploadToOssUtil.upload(zipPath, String.format(cacheFormat, num) + downloadName);
             url = ossUrlPrefix + String.format(cacheFormat, num) + downloadName;
@@ -1376,8 +1377,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
 
             String zipPath = target + File.separator + "results/" + num + ".zip";
             new File(zipPath).delete();
-
-            FileUtils.zipFile(zipPath, target + File.separator + "results/ajk/");
+            ZipUtil.zip(target + File.separator + "results/ajk/", zipPath);
 //            String command = "bash /opt/ossutil/gzip.sh " + zipPath.replace(".zip", "") + " " + target + File.separator + "results/ajk/";
 //            log.info("压缩文件:" + command);
 //            CreateObjUtil.callshell(command);

+ 5 - 4
4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.core.util.ZipUtil;
 import com.alibaba.csp.sentinel.util.StringUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -4865,7 +4866,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             && new File(newData).exists()
             && new File(newResultData).exists()){
             //打包
-            FileUtils.zipFile(zipPath, newData);
+            ZipUtil.zip(newData, zipPath);
             //上传压缩包
             uploadToOssUtil.upload(zipPath, "downloads/extras/" + zipName);
             String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
@@ -4897,7 +4898,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     }
                 }
                 //打包
-                FileUtils.zipFile(zipPath, meshPath);
+                ZipUtil.zip(meshPath, zipPath);
                 //上传压缩包
                 uploadToOssUtil.upload(zipPath, "downloads/extras/" + zipName);
                 String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
@@ -4921,7 +4922,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 }
             }
 
-            FileUtils.zipFile(zipPath, editData);
+            ZipUtil.zip(editData, zipPath);
             //上传压缩包
             uploadToOssUtil.upload(zipPath, "downloads/extras/" + zipName);
             String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();
@@ -4945,7 +4946,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
         }
 
-        FileUtils.zipFile(zipPath, dataPath);
+        ZipUtil.zip(dataPath, zipPath);
         //上传压缩包
         uploadToOssUtil.upload(zipPath, "downloads/extras/" + zipName);
         String url = ossUrlPrefix + "downloads/extras/" + zipName + "?t=" + Calendar.getInstance().getTimeInMillis();