From ca56382b006e3a88a72d261f720c6a682c515c64 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 7 Apr 2018 21:48:00 +0800
Subject: [PATCH] startup.bat move to /WEB-INF/

---
 .../java/com/jeesite/common/io/FileUtils.java | 25 +-----------
 .../src/main/resources/views/error/404.html   |  7 +---
 web/bin/run-web.bat                           |  2 +-
 web/src/main/webapp/WEB-INF/startup.bat       | 38 +++++++++++++++++++
 web/src/main/webapp/startup.bat               | 25 ------------
 5 files changed, 42 insertions(+), 55 deletions(-)
 create mode 100644 web/src/main/webapp/WEB-INF/startup.bat
 delete mode 100644 web/src/main/webapp/startup.bat

diff --git a/common/src/main/java/com/jeesite/common/io/FileUtils.java b/common/src/main/java/com/jeesite/common/io/FileUtils.java
index a476533c..d0c1ef80 100644
--- a/common/src/main/java/com/jeesite/common/io/FileUtils.java
+++ b/common/src/main/java/com/jeesite/common/io/FileUtils.java
@@ -625,8 +625,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 				}
 				zouts.closeEntry();
 				fin.close();
-				System.out
-						.println("添加文件 " + file.getAbsolutePath() + " 到zip文件中!");
+				logger.debug("添加文件 " + file.getAbsolutePath() + " 到zip文件中!");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
@@ -698,26 +697,6 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 	 * @return 返回错误信息，无错误信息返回null
 	 */
 	public static String downFile(File file, HttpServletRequest request, HttpServletResponse response, String fileName){
-		String error = null;
-		if (file != null && file.exists()) {
-			if (file.isFile()) {
-				if (file.length() <= 0) {
-					error = "该文件是一个空文件。";
-				}
-				if (!file.canRead()) {
-					error = "该文件没有读取权限。";
-				}
-			} else {
-				error = "该文件是一个文件夹。";
-			}
-		} else {
-			error = "文件已丢失或不存在！";
-		}
-		if (error != null){
-			logger.debug("---------------" + file + " " + error);
-			return error;
-		}
-
 		long fileLength = file.length(); // 记录文件大小
 		long pastLength = 0; 	// 记录已下载文件大小
 		int rangeSwitch = 0; 	// 0：从头开始的全文下载；1：从某字节开始的下载（bytes=27000-）；2：从某字节开始到某字节结束的下载（bytes=27000-39000）
@@ -778,7 +757,7 @@ public class FileUtils extends org.apache.commons.io.FileUtils {
 			// 是从开始下载
 			logger.debug("---------------是从开始进行下载！");
 		}
-
+		
 		try {
 			response.addHeader("Content-Disposition", "attachment; filename=\"" + 
 					EncodeUtils.encodeUrl(StringUtils.isBlank(fileName) ? file.getName() : fileName) + "\"");
diff --git a/modules/core/src/main/resources/views/error/404.html b/modules/core/src/main/resources/views/error/404.html
index 002f056e..5155853b 100644
--- a/modules/core/src/main/resources/views/error/404.html
+++ b/modules/core/src/main/resources/views/error/404.html
@@ -1,5 +1,5 @@
 <% 
-@servlet.getResponse().setStatus(404);
+@servlet.getResponse().setStatus(responseStatus!404);
 
 var message = @ObjectUtils.toString(@request.getAttribute("message"));
 
@@ -7,11 +7,6 @@ if (isBlank(message)){
 	message = text('sys.error.404.message');
 }
 
-// 下载文件不存在的异常，状态码设为正常
-if (message == '文件已丢失或不存在！'){
-	@servlet.getResponse().setStatus(200);
-}
-
 // 如果是异步请求或是手机端，则直接返回信息
 if (@ServletUtils.isAjaxRequest(request)) {
 	print(message);
diff --git a/web/bin/run-web.bat b/web/bin/run-web.bat
index e2f35661..ec1ee7c8 100644
--- a/web/bin/run-web.bat
+++ b/web/bin/run-web.bat
@@ -20,7 +20,7 @@ call mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U
 cd target/
 call unzip -n *.war -d web
 
-cd web
+cd web/WEB-INF/
 call startup.bat
 
 pause
\ No newline at end of file
diff --git a/web/src/main/webapp/WEB-INF/startup.bat b/web/src/main/webapp/WEB-INF/startup.bat
new file mode 100644
index 00000000..1cdccfa0
--- /dev/null
+++ b/web/src/main/webapp/WEB-INF/startup.bat
@@ -0,0 +1,38 @@
+@echo off
+rem /**
+rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
+rem  *
+rem  * Author: ThinkGem@163.com
+rem  * 
+rem  */
+echo.
+echo [��Ϣ] ����Web���̡�
+echo.
+rem pause
+rem echo.
+
+%~d0
+cd %~dp0
+
+title %cd%
+
+set JAVA_OPTS=-Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not "%JAVA_HOME%" == "" goto gotJavaHome
+goto end
+
+:noJavaHome
+set RUN_JAVA=java
+goto runJava
+
+:gotJavaHome
+set RUN_JAVA=%JAVA_HOME%\bin\java
+goto runJava
+
+:runJava
+call %RUN_JAVA% -cp %cd%/../ %JAVA_OPTS% org.springframework.boot.loader.WarLauncher
+goto end
+
+:end
+pause
diff --git a/web/src/main/webapp/startup.bat b/web/src/main/webapp/startup.bat
deleted file mode 100644
index 8c654641..00000000
--- a/web/src/main/webapp/startup.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-@echo off
-rem /**
-rem  * Copyright (c) 2013-Now http://jeesite.com All rights reserved.
-rem  *
-rem  * Author: ThinkGem@163.com
-rem  * 
-rem  */
-echo.
-echo [��Ϣ] ����Web���̡�
-echo.
-rem pause
-rem echo.
-
-%~d0
-cd %~dp0
-
-title %cd%
-
-set JAVA_OPTS= -Xms256m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m
-
-set CURR_DIR=%cd%
-cd..
-call java -cp %CURR_DIR% org.springframework.boot.loader.WarLauncher
-
-pause
\ No newline at end of file