Browse Source

修改文件删除方法

martin 2 years ago
parent
commit
f2b702a9b4

+ 16 - 11
api-common/src/main/java/api/common/util/FileUtil.java

@@ -757,27 +757,32 @@ public class FileUtil {
      * 删除文件或递归删除目录
      * 递归删除目录下的所有文件及子目录下所有文件
      */
-    public static boolean rm(File path) {
-        if (path.isDirectory()) {
-            String[] children = path.list();
-            if (children != null) {
-                for (String child : children) {
-                    boolean success = rm(new File(path, child));
-                    if (!success) {
-                        return false;
+    public static boolean rm(File file) {
+        if (!file.exists()) {
+            return false;
+        } else {
+            if (file.isDirectory()) {
+                String[] children = file.list();
+                if (children != null) {
+                    for (String child : children) {
+                        if (!rm(new File(file, child))) {
+                            return false;
+                        }
                     }
                 }
+                return true;
+            } else {
+                return file.delete();
             }
         }
-        return path.delete();
     }
 
     /**
      * 删除文件或递归删除目录
      * 递归删除目录下的所有文件及子目录下所有文件
      */
-    public static boolean rm(String path) throws Exception {
-        return rm(getFile(path));
+    public static boolean rm(String path) {
+        return rm(new File(path));
     }
 
 

+ 1 - 0
simulation-resource-scheduler/src/main/java/com/css/simulation/resource/scheduler/service/ProjectService.java

@@ -315,6 +315,7 @@ public class ProjectService {
             algorithmTarLinuxTempPath = linuxTempPath + "algorithm/" + algorithmCode + ".tar";
             if ("1".equals(dockerImport) && StringUtil.isNotEmpty(dockerImport)) { // 已经导入同时存在镜像名称
                 dockerImage = algorithmPO.getDockerImage();
+                return dockerImage;
             } else if (dockerImport == null || "0".equals(dockerImport)) {  // 未导入
                 String uploadMode = algorithmPO.getUploadMode();
                 if (DictConstants.ALGORITHM_UPLOAD_MODE_FILE.equals(uploadMode)) {