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 @@