|
@@ -4,7 +4,9 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
import cn.hutool.core.io.FileUtil;
|
|
|
import cn.hutool.core.lang.tree.Tree;
|
|
|
+import cn.hutool.core.thread.ThreadUtil;
|
|
|
import cn.hutool.core.util.ObjUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.fdkankan.filestorage.FileStorageTemplate;
|
|
|
import com.gis.common.annotation.LogAnnotation;
|
|
@@ -205,6 +207,15 @@ public class WorkOfflineListener implements ChannelAwareMessageListener {
|
|
|
e.printStackTrace();
|
|
|
} finally {
|
|
|
redisUtil.delete(key);
|
|
|
+ //无论结果如何都清空目录
|
|
|
+ if (StrUtil.isNotEmpty(param.getPath())&¶m.getPath().contains(param.getWorkId())){
|
|
|
+ log.info("删除离线包文件夹开始:{}", param.getPath());
|
|
|
+ ThreadUtil.execAsync(() -> {
|
|
|
+ String cmd = String.format(CmdConstant.RM_Folder, param.getPath());
|
|
|
+ CmdUtils.callLineSh(cmd);
|
|
|
+ log.info("删除离线包文件夹完成:{}", param.getPath());
|
|
|
+ });
|
|
|
+ }
|
|
|
channel.basicAck(deliveryTag, false);
|
|
|
}
|
|
|
}
|