From 55c895565c73582a82830b796d425cd783adf92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E5=98=89=E9=98=B3?= <fjy8018@qq.com>
Date: Sat, 23 Jun 2018 20:37:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E9=87=8D?=
 =?UTF-8?q?=E5=AE=9A=E5=90=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fileupload/aspect/LoginAuthorizeAspect.java     |  3 ---
 .../fileupload/aspect/UploadAuthorizeAspect.java    |  2 +-
 .../fileupload/controller/LoginController.java      | 13 ++++++++++++-
 .../fileupload/controller/UploadController.java     |  4 ++--
 src/main/resources/templates/home/upload.html       |  2 +-
 .../resources/templates/{ => home}/upload/add.html  |  0
 6 files changed, 16 insertions(+), 8 deletions(-)
 rename src/main/resources/templates/{ => home}/upload/add.html (100%)

diff --git a/src/main/java/top/fjy8018/fileupload/aspect/LoginAuthorizeAspect.java b/src/main/java/top/fjy8018/fileupload/aspect/LoginAuthorizeAspect.java
index 6e24440..9e4c256 100644
--- a/src/main/java/top/fjy8018/fileupload/aspect/LoginAuthorizeAspect.java
+++ b/src/main/java/top/fjy8018/fileupload/aspect/LoginAuthorizeAspect.java
@@ -8,13 +8,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import top.fjy8018.fileupload.constant.GlobalConstant;
-import top.fjy8018.fileupload.dataobject.User;
 import top.fjy8018.fileupload.dataobject.view.UserPermission;
 import top.fjy8018.fileupload.enums.PercodeEnum;
 import top.fjy8018.fileupload.enums.ResultVOEnum;
 import top.fjy8018.fileupload.exception.FileUploadException;
-import top.fjy8018.fileupload.form.LoginForm;
 import top.fjy8018.fileupload.service.UserService;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/top/fjy8018/fileupload/aspect/UploadAuthorizeAspect.java b/src/main/java/top/fjy8018/fileupload/aspect/UploadAuthorizeAspect.java
index d0a088f..b5efac3 100644
--- a/src/main/java/top/fjy8018/fileupload/aspect/UploadAuthorizeAspect.java
+++ b/src/main/java/top/fjy8018/fileupload/aspect/UploadAuthorizeAspect.java
@@ -55,7 +55,7 @@ public class UploadAuthorizeAspect {
         log.info("【上传AOP】percodes:{},userPermission:{}",percodes[1],userPermission);
 
         if (!percodes[1].equals(PercodeEnum.FILE_UPLOAD.getMsg())){
-            log.warn("【越权下载】");
+            log.warn("【禁止上传】");
             throw new FileUploadException(ResultVOEnum.FORBIDDEN_ACCES);
         }
 
diff --git a/src/main/java/top/fjy8018/fileupload/controller/LoginController.java b/src/main/java/top/fjy8018/fileupload/controller/LoginController.java
index 98bcecf..d9995b8 100644
--- a/src/main/java/top/fjy8018/fileupload/controller/LoginController.java
+++ b/src/main/java/top/fjy8018/fileupload/controller/LoginController.java
@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import top.fjy8018.fileupload.config.ServerPropertiesConfig;
 import top.fjy8018.fileupload.dataobject.User;
 import top.fjy8018.fileupload.form.LoginForm;
 import top.fjy8018.fileupload.service.UserService;
@@ -27,6 +28,9 @@ public class LoginController {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private ServerPropertiesConfig serverProperties;
+
     @Resource
     HttpServletRequest request;
 
@@ -45,6 +49,13 @@ public class LoginController {
             request.getSession().setAttribute(USER_SESSION_KEY,user);
         }
 
-        return "home/upload.html";
+        return "redirect:"
+                .concat(request.getScheme())
+                .concat("://")
+                .concat(request.getServerName())
+                .concat(":")
+                .concat(serverProperties.getPortNum())
+                .concat(request.getContextPath())
+                .concat("/home/upload");
     }
 }
diff --git a/src/main/java/top/fjy8018/fileupload/controller/UploadController.java b/src/main/java/top/fjy8018/fileupload/controller/UploadController.java
index 079233d..1b9aa45 100644
--- a/src/main/java/top/fjy8018/fileupload/controller/UploadController.java
+++ b/src/main/java/top/fjy8018/fileupload/controller/UploadController.java
@@ -27,7 +27,7 @@ import java.util.Map;
  */
 @Slf4j
 @Controller
-@RequestMapping("/upload")
+@RequestMapping("/home/upload")
 public class UploadController {
 
     @Autowired
@@ -38,7 +38,7 @@ public class UploadController {
 
     @GetMapping("")
     public String toUploadPage(){
-        return "home/upload.html";
+        return "home/upload";
     }
 
     @PostMapping("/add")
diff --git a/src/main/resources/templates/home/upload.html b/src/main/resources/templates/home/upload.html
index b55f26f..4fe2383 100644
--- a/src/main/resources/templates/home/upload.html
+++ b/src/main/resources/templates/home/upload.html
@@ -6,7 +6,7 @@
 <body>
 <div th:insert="~{dist/thymeleaf/common_head :: #body_js}"></div>
 <div id="app">
-    <el-upload class="upload-demo" ref="upload" action="/fileupload/upload/add"
+    <el-upload class="upload-demo" ref="upload" action="/fileupload/home/upload/add"
                :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :auto-upload="false">
         <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
         <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>
diff --git a/src/main/resources/templates/upload/add.html b/src/main/resources/templates/home/upload/add.html
similarity index 100%
rename from src/main/resources/templates/upload/add.html
rename to src/main/resources/templates/home/upload/add.html