fjy8018/fileuploadDemo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复登录重定向错误

Browse Source
This commit is contained in:
F嘉阳
2018-06-23 20:37:36 +08:00
parent 3c2306b005
commit 55c895565c
6 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/top/fjy8018/fileupload/aspect/LoginAuthorizeAspect.java
View File

@@ -8,13 +8,10 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; 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.dataobject.view.UserPermission;
import top.fjy8018.fileupload.enums.PercodeEnum; import top.fjy8018.fileupload.enums.PercodeEnum;
import top.fjy8018.fileupload.enums.ResultVOEnum; import top.fjy8018.fileupload.enums.ResultVOEnum;
import top.fjy8018.fileupload.exception.FileUploadException; import top.fjy8018.fileupload.exception.FileUploadException;
import top.fjy8018.fileupload.form.LoginForm;
import top.fjy8018.fileupload.service.UserService; import top.fjy8018.fileupload.service.UserService;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;

2
src/main/java/top/fjy8018/fileupload/aspect/UploadAuthorizeAspect.java
View File

@@ -55,7 +55,7 @@ public class UploadAuthorizeAspect {
log.info("【上传AOP】percodes:{},userPermission:{}",percodes[1],userPermission); log.info("【上传AOP】percodes:{},userPermission:{}",percodes[1],userPermission);
if (!percodes[1].equals(PercodeEnum.FILE_UPLOAD.getMsg())){ if (!percodes[1].equals(PercodeEnum.FILE_UPLOAD.getMsg())){
log.warn("【越权下载】"); log.warn("【禁止上传】");
throw new FileUploadException(ResultVOEnum.FORBIDDEN_ACCES); throw new FileUploadException(ResultVOEnum.FORBIDDEN_ACCES);
} }

13
src/main/java/top/fjy8018/fileupload/controller/LoginController.java
View File

@@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import top.fjy8018.fileupload.config.ServerPropertiesConfig;
import top.fjy8018.fileupload.dataobject.User; import top.fjy8018.fileupload.dataobject.User;
import top.fjy8018.fileupload.form.LoginForm; import top.fjy8018.fileupload.form.LoginForm;
import top.fjy8018.fileupload.service.UserService; import top.fjy8018.fileupload.service.UserService;
@@ -27,6 +28,9 @@ public class LoginController {
@Autowired @Autowired
private UserService userService; private UserService userService;
@Autowired
private ServerPropertiesConfig serverProperties;
@Resource @Resource
HttpServletRequest request; HttpServletRequest request;
@@ -45,6 +49,13 @@ public class LoginController {
request.getSession().setAttribute(USER_SESSION_KEY,user); 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");
} }
} }

4
src/main/java/top/fjy8018/fileupload/controller/UploadController.java
View File

@@ -27,7 +27,7 @@ import java.util.Map;
*/ */
@Slf4j @Slf4j
@Controller @Controller
@RequestMapping("/upload") @RequestMapping("/home/upload")
public class UploadController { public class UploadController {
@Autowired @Autowired
@@ -38,7 +38,7 @@ public class UploadController {
@GetMapping("") @GetMapping("")
public String toUploadPage(){ public String toUploadPage(){
return "home/upload.html"; return "home/upload";
} }
@PostMapping("/add") @PostMapping("/add")

2
src/main/resources/templates/home/upload.html
View File

@@ -6,7 +6,7 @@
<body> <body>
<div th:insert="~{dist/thymeleaf/common_head :: #body_js}"></div> <div th:insert="~{dist/thymeleaf/common_head :: #body_js}"></div>
<div id="app"> <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"> :on-preview="handlePreview" :on-remove="handleRemove" :file-list="fileList" :auto-upload="false">
<el-button slot="trigger" size="small" type="primary">选取文件</el-button> <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
<el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button> <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload">上传到服务器</el-button>

0
src/main/resources/templates/upload/add.html → src/main/resources/templates/home/upload/add.html
View File