From 50a7e3f3a5a9f8058ab2cdbeda05a9ffa7a814ec Mon Sep 17 00:00:00 2001 From: copper Date: Tue, 24 Aug 2021 12:16:21 +0800 Subject: [PATCH] a --- .../survey/controller/ProjectController.java | 6 +++++- .../survey/controller/UserController.java | 20 +++++++++++++++++++ .../survey/service/ProjectService.java | 2 ++ .../example/survey/service/UserService.java | 2 ++ .../survey/service/impl/UserServiceImpl.java | 6 ++++++ src/main/resources/application.yml | 4 ++++ 6 files changed, 39 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/survey/controller/ProjectController.java b/src/main/java/com/example/survey/controller/ProjectController.java index e77226d..5ed1f7b 100644 --- a/src/main/java/com/example/survey/controller/ProjectController.java +++ b/src/main/java/com/example/survey/controller/ProjectController.java @@ -65,7 +65,11 @@ public class ProjectController { return new ResultVO(ResultEnum.SUCCESS); } - + @GetMapping("/tree") + public ResultVO treeRecord(@RequestParam(value = "uuid",required = false) String uuid){ + return new ResultVO(ResultEnum.SUCCESS); + } + @DeleteMapping("/project") public ResultVO deleteProject(@RequestBody DeleteProjectDTO deleteProjectDTO){ projectService.deleteProject(deleteProjectDTO); diff --git a/src/main/java/com/example/survey/controller/UserController.java b/src/main/java/com/example/survey/controller/UserController.java index 8a17742..be74cb2 100644 --- a/src/main/java/com/example/survey/controller/UserController.java +++ b/src/main/java/com/example/survey/controller/UserController.java @@ -3,6 +3,7 @@ package com.example.survey.controller; import com.example.survey.dto.user.*; import com.example.survey.enumeration.ResultEnum; import com.example.survey.service.UserService; +import com.example.survey.util.TokenUtil; import com.example.survey.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -10,6 +11,9 @@ import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.Map; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; + /** * @author Pope @@ -57,6 +61,22 @@ public class UserController { return resultVo; } + @GetMapping("/check") + public ResultVO check(ServletRequest servletRequest) { + //用户名密码验证 + HttpServletRequest request = (HttpServletRequest) servletRequest; + String token = request.getHeader("Authorization"); + ResultVO resultVo; + if (token == null) { + resultVo = new ResultVO(ResultEnum.NO_TOKEN); + return resultVo; + } + LoginVO loginVO = userService.checkAuth(token); + resultVo = new ResultVO(ResultEnum.SUCCESS); + resultVo.setData(loginVO); + return resultVo; + } + @PutMapping("/userRole") public ResultVO modifyUserRole(@RequestBody ModifyUserRoleDTO modifyUserRoleDTO) { diff --git a/src/main/java/com/example/survey/service/ProjectService.java b/src/main/java/com/example/survey/service/ProjectService.java index 57be3d7..a615f8b 100644 --- a/src/main/java/com/example/survey/service/ProjectService.java +++ b/src/main/java/com/example/survey/service/ProjectService.java @@ -62,4 +62,6 @@ public interface ProjectService { void addRecord(AddRecordDTO addRecordDTO); void deleteRecord(DeleteRecordDTO deleteRecordDTO); + + } diff --git a/src/main/java/com/example/survey/service/UserService.java b/src/main/java/com/example/survey/service/UserService.java index d095787..766ae96 100644 --- a/src/main/java/com/example/survey/service/UserService.java +++ b/src/main/java/com/example/survey/service/UserService.java @@ -18,6 +18,8 @@ public interface UserService { */ LoginVO matchAuth(LoginDTO loginDTO); + + LoginVO checkAuth(String token); /** * 注册用户 * diff --git a/src/main/java/com/example/survey/service/impl/UserServiceImpl.java b/src/main/java/com/example/survey/service/impl/UserServiceImpl.java index 686d864..a08b9d0 100644 --- a/src/main/java/com/example/survey/service/impl/UserServiceImpl.java +++ b/src/main/java/com/example/survey/service/impl/UserServiceImpl.java @@ -194,5 +194,11 @@ public class UserServiceImpl implements UserService { } + @Override + public LoginVO checkAuth(String token) { + // TODO Auto-generated method stub + return null; + } + } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9f96606..050e5fa 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,7 @@ spring: profiles: active: prod + servlet: + multipart: + max-request-size: 200MB + max-file-size: 200MB