Merge branch 'dev' into pre-production

blade-biz-common/src/main/java/org/springblade/common/utils/FileUtil.java

@@ -30,8 +30,7 @@ public class FileUtil extends TimerTask {
 	}
 
 	public static File checkZipFile(String reservationCode) {
-		String savePath = "D:/Test" +"/"+ reservationCode;
+		String savePath = CommonConstant.SYSTEMFILEPATH+"reservationZip/"+ reservationCode;
-
 		return new File(savePath+".zip");
 	}
 
@@ -169,7 +168,7 @@ public class FileUtil extends TimerTask {
 		}
 		//jdk 1.7 新特性自动关闭
 		InputStream in = con.getInputStream();
-		OutputStream out = new FileOutputStream(sf.getPath() + "\\" + str);
+		OutputStream out = new FileOutputStream(sf.getPath() + "/" + str);
 		//创建缓冲区
 		byte[] buff = new byte[1024];
 		int n;