Merge pull request #21 from landy8530/1.0.3.1

Fixed a bug for IOException since the FileBaseDirectory not exists
landy8530 · Jun 16, 2019 · 9d65bee · 9d65bee
2 parents 086da93 + 049c514
commit 9d65bee
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 1 deletion.
diff --git a/commons-doc-server-netty/src/main/java/org/fortune/doc/server/support/DocServerHandler.java b/commons-doc-server-netty/src/main/java/org/fortune/doc/server/support/DocServerHandler.java
@@ -17,6 +17,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.net.URI;
 
 /**
@@ -283,6 +284,7 @@ private void writeMenu(MessageEvent e) {
     }
 
     static {
+        createFileBaseDirectoryIfNotExist();
         org.jboss.netty.handler.codec.http.multipart.DiskFileUpload.deleteOnExitTemporaryFile = false;
         org.jboss.netty.handler.codec.http.multipart.DiskFileUpload.baseDirectory = DocServerContainer
                 .getInstance().getFileBaseDirectory();
@@ -291,4 +293,12 @@ private void writeMenu(MessageEvent e) {
                 .getInstance().getFileBaseDirectory();
     }
 
+    //2019.06.16 修复【系统找不到指定路径】的异常问题
+    private static void createFileBaseDirectoryIfNotExist() {
+        String fileDir = DocServerContainer.getInstance().getFileBaseDirectory();
+        File dirFolder = new File(fileDir);
+
+        if (!dirFolder.exists())
+            dirFolder.mkdirs();
+    }
 }
diff --git a/commons-doc-server-netty/src/main/resources/config/doc-server.yml b/commons-doc-server-netty/src/main/resources/config/doc-server.yml
@@ -14,4 +14,4 @@ accounts:
     thumbHeight: 100
     thumbWidth: 100
 port: 9999 #端口号
-fileBaseDirectory: C:\06_temp\upload\tmp #临时文件的目录
+fileBaseDirectory: C:\06_temp\up\tmp #临时文件的目录
diff --git a/commons-doc-server-netty/src/main/webapp/META-INF/MANIFEST.MF b/commons-doc-server-netty/src/main/webapp/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path: 
+
diff --git a/commons-doc-server-netty/src/main/webapp/index.jsp b/commons-doc-server-netty/src/main/webapp/index.jsp
@@ -0,0 +1,12 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Commons-Doc-Server</title>
+</head>
+<body>
+静态资源服务器部署成功
+</body>
+</html>