Procházet zdrojové kódy

check if file's parent is null

sunyj před 7 roky
rodič
revize
5dcb99001f

+ 2 - 2
report-common/src/main/java/com/uas/report/util/FileUtils.java

@@ -52,7 +52,7 @@ public class FileUtils {
 		}
 		}
 
 
 		File file = new File(filePath);
 		File file = new File(filePath);
-		if (!file.getParentFile().exists()) {
+		if (file.getParentFile() != null && !file.getParentFile().exists()) {
 			file.getParentFile().mkdirs();
 			file.getParentFile().mkdirs();
 		}
 		}
 		FileOutputStream fos = new FileOutputStream(file);
 		FileOutputStream fos = new FileOutputStream(file);
@@ -72,7 +72,7 @@ public class FileUtils {
 	 * @return 写入的文件
 	 * @return 写入的文件
 	 */
 	 */
 	public static File write(File file, String content) throws IOException {
 	public static File write(File file, String content) throws IOException {
-		if (!file.getParentFile().exists()) {
+		if (file.getParentFile() != null && !file.getParentFile().exists()) {
 			file.getParentFile().mkdirs();
 			file.getParentFile().mkdirs();
 		}
 		}
 		file.createNewFile();
 		file.createNewFile();

+ 6 - 15
report-common/src/main/java/com/uas/report/util/ZipUtils.java

@@ -1,15 +1,9 @@
 package com.uas.report.util;
 package com.uas.report.util;
 
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
 import java.nio.charset.Charset;
 import java.nio.charset.Charset;
 import java.util.Enumeration;
 import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipEntry;
@@ -17,9 +11,6 @@ import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 import java.util.zip.ZipOutputStream;
 
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 /**
 /**
  * 压缩工具类
  * 压缩工具类
  * 
  * 
@@ -156,7 +147,7 @@ public class ZipUtils {
 				}
 				}
 				continue;
 				continue;
 			}
 			}
-			if (!outFile.getParentFile().exists()) {
+			if (outFile.getParentFile() != null && !outFile.getParentFile().exists()) {
 				outFile.getParentFile().mkdirs();
 				outFile.getParentFile().mkdirs();
 			}
 			}
 
 
@@ -206,7 +197,7 @@ public class ZipUtils {
 			}
 			}
 			InputStream inputStream = zipFile.getInputStream(zipEntry);
 			InputStream inputStream = zipFile.getInputStream(zipEntry);
 			File outFile = new File(folder.getPath() + File.separator + zipEntry.getName());
 			File outFile = new File(folder.getPath() + File.separator + zipEntry.getName());
-			if (!outFile.getParentFile().exists()) {
+			if (outFile.getParentFile() != null && !outFile.getParentFile().exists()) {
 				outFile.getParentFile().mkdirs();
 				outFile.getParentFile().mkdirs();
 			}
 			}
 
 

+ 1 - 1
report/src/main/java/com/uas/report/Application.java

@@ -41,7 +41,7 @@ public class Application extends SpringBootServletInitializer implements Applica
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
 		try {
 		try {
 			File logFile = new File("logs/log.log");
 			File logFile = new File("logs/log.log");
-			if (!logFile.getParentFile().exists()) {
+			if (logFile.getParentFile() != null && !logFile.getParentFile().exists()) {
 				logFile.getParentFile().mkdir();
 				logFile.getParentFile().mkdir();
 			}
 			}
 			System.setErr(new PrintStream(new FileOutputStream(logFile, true)));
 			System.setErr(new PrintStream(new FileOutputStream(logFile, true)));

+ 2 - 2
report/src/main/java/com/uas/report/service/impl/FileServiceImpl.java

@@ -138,7 +138,7 @@ public class FileServiceImpl implements FileService {
 		stringBuilder.append(fileName);
 		stringBuilder.append(fileName);
 		String targetFilePath = stringBuilder.toString();
 		String targetFilePath = stringBuilder.toString();
 		final File targetFile = new File(targetFilePath);
 		final File targetFile = new File(targetFilePath);
-		if (!targetFile.getParentFile().exists()) {
+		if (targetFile.getParentFile() != null && !targetFile.getParentFile().exists()) {
 			targetFile.getParentFile().mkdirs();
 			targetFile.getParentFile().mkdirs();
 		}
 		}
 		try {
 		try {
@@ -158,7 +158,7 @@ public class FileServiceImpl implements FileService {
 		filePath = getAbsolutePath(filePath, isAbsolutePath);
 		filePath = getAbsolutePath(filePath, isAbsolutePath);
 		File targetFile = new File(filePath + "/" + files[0].getOriginalFilename());
 		File targetFile = new File(filePath + "/" + files[0].getOriginalFilename());
 		// 检查路径是否存在
 		// 检查路径是否存在
-		if (!targetFile.getParentFile().exists()) {
+		if (targetFile.getParentFile() != null && !targetFile.getParentFile().exists()) {
 			targetFile.getParentFile().mkdirs();
 			targetFile.getParentFile().mkdirs();
 		}
 		}
 
 

+ 1 - 1
report/src/main/java/com/uas/report/service/impl/PrintServiceImpl.java

@@ -69,7 +69,7 @@ public class PrintServiceImpl implements PrintService {
 			throw new SQLException("获取数据源失败");
 			throw new SQLException("获取数据源失败");
 		}
 		}
 
 
-		if(!exportFile.getParentFile().exists()){
+		if(exportFile.getParentFile() != null && !exportFile.getParentFile().exists()){
             exportFile.getParentFile().mkdirs();
             exportFile.getParentFile().mkdirs();
         }
         }