浏览代码

同步安居客 命令打包改为java打包

dengsixing 2 年之前
父节点
当前提交
31e50668e9
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

+ 5 - 3
src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -3,6 +3,7 @@ package com.fdkankan.scene.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
 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;
@@ -2918,9 +2919,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             new File(zipPath).delete();
 
 //            FileUtils.zipFile(zipPath, target + File.separator + "results/ajk/");
-            String command = "bash /opt/ossutil/gzip.sh " + zipPath.replace(".zip", "") + " " + target + File.separator + "results/ajk/";
-            log.info("压缩文件:" + command);
-            CreateObjUtil.callshell(command);
+//            String command = "bash /opt/ossutil/gzip.sh " + zipPath.replace(".zip", "") + " " + target + File.separator + "results/ajk/";
+            ZipUtil.zip(target + File.separator + "results/ajk/", zipPath);
+//            log.info("压缩文件:" + command);
+//            CreateObjUtil.callshell(command);
 
             if(!new File(zipPath).exists()){
                 return  ResultData.error(ErrorCode.FAILURE_CODE_5043);