diff --git a/src/main/java/xyz/wbsite/action/GlobalController.java b/src/main/java/xyz/wbsite/action/GlobalController.java index e05470e..f01d70b 100644 --- a/src/main/java/xyz/wbsite/action/GlobalController.java +++ b/src/main/java/xyz/wbsite/action/GlobalController.java @@ -137,7 +137,6 @@ public class GlobalController implements ErrorController { } @RequestMapping("/upload") - @ResponseBody public String upload(HttpServletRequest request) { MultipartHttpServletRequest multipartHttpServletRequest = (MultipartHttpServletRequest) request; MultipartFile target = multipartHttpServletRequest.getFile("file"); @@ -164,7 +163,7 @@ public class GlobalController implements ErrorController { e.printStackTrace(); } - return ""; + return "screen/success"; } @Value("${file.root.path}") diff --git a/src/main/java/xyz/wbsite/action/screen/Index.java b/src/main/java/xyz/wbsite/action/screen/Index.java index 38c6d1f..33be7c3 100644 --- a/src/main/java/xyz/wbsite/action/screen/Index.java +++ b/src/main/java/xyz/wbsite/action/screen/Index.java @@ -16,21 +16,22 @@ public class Index extends Screen { @Override public void exec(Model model, HttpServletRequest request, HttpServletResponse response) { String path = request.getParameter("path"); + String filePath = null; if (path == null) { - path = root; + filePath = root; } else { - path = root + "/" + path; + filePath = root + "/" + path; } System.out.println(path); - File rootFile = new File(path); + File rootFile = new File(filePath); if (!rootFile.exists()) { rootFile.mkdirs(); } File[] files = rootFile.listFiles(); model.addAttribute("files", files); - model.addAttribute("path", new HtmlHepler().getPath(rootFile)); + model.addAttribute("path", path); model.addAttribute("html", new HtmlHepler()); } @@ -54,7 +55,7 @@ public class Index extends Screen { for (File f : file.listFiles()) { sb.append("