Merge branch 'fix/#254' into 'develop'

修正导出时清空目录的bug

See merge request o2oa/o2oa!1189

o2server/x_console/src/main/java/com/x/server/console/action/DumpData.java

@@ -58,7 +58,6 @@ public class DumpData {
 			}
 		}
 		FileUtils.forceMkdir(this.dir);
-		FileUtils.cleanDirectory(this.dir);
 		this.catalog = new DumpRestoreDataCatalog();
 
 		/* 初始化完成 */

o2server/x_console/src/main/java/com/x/server/console/action/DumpStorage.java

@@ -61,7 +61,6 @@ public class DumpStorage {
 			}
 		}
 		FileUtils.forceMkdir(this.dir);
-		FileUtils.cleanDirectory(this.dir);
 		this.catalog = new DumpRestoreStorageCatalog();
 
 		List<String> storageContainerEntityNames = this.entities();

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

@@ -67,9 +67,9 @@ public class RestoreData {
 				return false;
 			}
 		}
-		this.catalog = XGsonBuilder.instance()
-				.fromJson(FileUtils.readFileToString(new File(dir.getAbsolutePath() + File.separator + "catalog.json"),
-						DefaultCharset.charset_utf_8), DumpRestoreDataCatalog.class);
+		this.catalog = XGsonBuilder.instance().fromJson(
+				FileUtils.readFileToString(new File(dir, "catalog.json"), DefaultCharset.charset_utf_8),
+				DumpRestoreDataCatalog.class);
 		return this.execute();
 	}
 
@@ -133,7 +133,7 @@ public class RestoreData {
 		File file = null;
 		for (int i = 0; i < files.size(); i++) {
 			file = files.get(i);
-			logger.print("restoring {}/{} part of data:{}.", (i + 1),  files.size(), cls.getName());
+			logger.print("restoring {}/{} part of data:{}.", (i + 1), files.size(), cls.getName());
 			JsonArray raws = this.convert(file);
 			em.getTransaction().begin();
 			for (JsonElement o : raws) {

o2server/x_console/src/main/java/com/x/server/console/action/RestoreStorage.java

@@ -72,10 +72,9 @@ public class RestoreStorage {
 				logger.print("path can not in base directory.");
 				return false;
 			}
-			this.catalog = XGsonBuilder.instance()
-					.fromJson(FileUtils.readFileToString(
-							new File(dir.getAbsolutePath() + File.separator + "catalog.json"),
-							DefaultCharset.charset_utf_8), DumpRestoreStorageCatalog.class);
+			this.catalog = XGsonBuilder.instance().fromJson(FileUtils
+					.readFileToString(new File(dir.getAbsolutePath(), "catalog.json"), DefaultCharset.charset_utf_8),
+					DumpRestoreStorageCatalog.class);
 		}
 		return this.execute();
 	}