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("
  • "); if (f.isDirectory()) { - sb.append(""); + sb.append(""); sb.append(f.getName()); sb.append(""); sb.append(getHtml(f)); diff --git a/src/main/resources/templates/screen/demo.ftl b/src/main/resources/templates/screen/demo.ftl deleted file mode 100644 index ec9ad6a..0000000 --- a/src/main/resources/templates/screen/demo.ftl +++ /dev/null @@ -1,19 +0,0 @@ -
    - -
    - - diff --git a/src/main/resources/templates/screen/index.ftl b/src/main/resources/templates/screen/index.ftl index 41a1d38..343ec59 100644 --- a/src/main/resources/templates/screen/index.ftl +++ b/src/main/resources/templates/screen/index.ftl @@ -1,5 +1,5 @@
    -
    +
    @@ -11,7 +11,7 @@ <#list files as item>
  • <#if item.isDirectory()> - ${item.name} + ${item.name} <#else> ${item.name} @@ -77,6 +77,11 @@ pointer-events: none } + .file { + padding-bottom: 10px; + border-bottom: 3px solid #00a2e2; + } + .dir { } diff --git a/src/main/resources/templates/screen/success.ftl b/src/main/resources/templates/screen/success.ftl new file mode 100644 index 0000000..4b55b5a --- /dev/null +++ b/src/main/resources/templates/screen/success.ftl @@ -0,0 +1,3 @@ +
    + 上传成功!返回 +