Răsfoiți Sursa

Merge branch 'feature/denialOfService' into 'release'

附件不存在warn,不再Exception

See merge request o2oa/o2oa!1671
o2null 5 ani în urmă
părinte
comite
fb239fee8c

+ 0 - 16
o2server/x_console/src/main/java/com/x/server/console/action/ExceptionFileNotExist.java

@@ -1,16 +0,0 @@
-package com.x.server.console.action;
-
-
-import java.nio.file.Path;
-
-import com.x.base.core.project.exception.PromptException;
-
-class ExceptionFileNotExist extends PromptException {
-
-	private static final long serialVersionUID = -5515077418025884395L;
-
-	ExceptionFileNotExist(Path path) {
-		super("file not exist: {}.", path.toString());
-	}
-
-}

+ 1 - 1
o2server/x_console/src/main/java/com/x/server/console/action/RestoreData.java

@@ -226,7 +226,7 @@ public class RestoreData {
 			}
 			Path path = sub.resolve(Paths.get(so.path()).getFileName());
 			if (!Files.exists(path)) {
-				throw new ExceptionFileNotExist(path);
+				logger.warn("file not exist: {}.", path.toString());
 			}
 			try (InputStream input = Files.newInputStream(path)) {
 				so.saveContent(mapping, input, so.getName());