From 1afafa8818b784e2bd4b6894a94ce74fa9aef1e6 Mon Sep 17 00:00:00 2001
From: ArgonarioD <arnordorian@sina.com>
Date: Mon, 11 Jul 2022 21:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BA=86=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BA=86closeTask=E6=B2=A1=E6=B3=95?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E5=B7=A5=E4=BD=9C=E7=9A=84bug=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E9=99=90=E6=B5=81=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=EF=BC=88=E6=9C=AA=E6=B5=8B=E8=AF=95=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  10 ++++
 .../advice/ExceptionHandlerAdvice.java        |   7 +++
 .../annotation/RateLimit.java                 |  29 ++++++++++
 .../projectmanagement/aop/RateLimitAOP.java   |  53 ++++++++++++++++++
 .../controller/AnnouncementController.java    |  10 ++--
 .../controller/ProjectController.java         |  15 ++---
 .../controller/ProjectGroupController.java    |  14 ++---
 .../controller/StaffController.java           |  12 ++--
 .../controller/TaskController.java            |  15 ++---
 .../rmdjzz/projectmanagement/entity/Task.java |   1 +
 .../exception/TooManyRequestException.java    |  11 ++++
 .../interceptor/TokenInterceptor.java         |   4 +-
 .../service/ITaskService.java                 |   2 +-
 .../service/impl/StaffServiceImpl.java        |   2 +-
 .../service/impl/TaskServiceImpl.java         |   7 ++-
 .../projectmanagement/utils/FileUtils.java    |  25 ++++++---
 .../projectmanagement/utils/TokenUtils.java   |   1 +
 src/main/resources/static/账户导入模板.xlsx   | Bin 0 -> 9942 bytes
 18 files changed, 172 insertions(+), 46 deletions(-)
 create mode 100644 src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/annotation/RateLimit.java
 create mode 100644 src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/aop/RateLimitAOP.java
 create mode 100644 src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/exception/TooManyRequestException.java
 create mode 100644 src/main/resources/static/账户导入模板.xlsx

diff --git a/pom.xml b/pom.xml
index 4dfca6b..52d2888 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -71,6 +75,7 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
@@ -117,6 +122,11 @@
             <artifactId>poi-ooxml</artifactId>
             <version>5.2.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>31.1-jre</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/advice/ExceptionHandlerAdvice.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/advice/ExceptionHandlerAdvice.java
index c4ca39e..2ce4e01 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/advice/ExceptionHandlerAdvice.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/advice/ExceptionHandlerAdvice.java
@@ -2,6 +2,7 @@ package cn.edu.hfut.rmdjzz.projectmanagement.advice;
 
 import cn.edu.hfut.rmdjzz.projectmanagement.exception.BadRequestException;
 import cn.edu.hfut.rmdjzz.projectmanagement.exception.ForbiddenException;
+import cn.edu.hfut.rmdjzz.projectmanagement.exception.TooManyRequestException;
 import cn.edu.hfut.rmdjzz.projectmanagement.exception.UnauthorizedException;
 import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseMap;
 import lombok.extern.slf4j.Slf4j;
@@ -51,4 +52,10 @@ public class ExceptionHandlerAdvice {
                         .collect(Collectors.joining("，"))
         );
     }
+
+    @ExceptionHandler(TooManyRequestException.class)
+    @ResponseStatus(HttpStatus.TOO_MANY_REQUESTS)
+    public ResponseMap handleTooManyRequestException(TooManyRequestException e) {
+        return ResponseMap.of(HttpStatus.TOO_MANY_REQUESTS.value(), e.getMessage());
+    }
 }
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/annotation/RateLimit.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/annotation/RateLimit.java
new file mode 100644
index 0000000..a971953
--- /dev/null
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/annotation/RateLimit.java
@@ -0,0 +1,29 @@
+package cn.edu.hfut.rmdjzz.projectmanagement.annotation;
+
+import java.lang.annotation.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author 佘语殊
+ * @since 2022/7/11 16:57
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Target({ElementType.METHOD})
+public @interface RateLimit {
+
+    /**
+     * 流量控制令牌桶标识符
+     */
+    String key() default "";
+
+    int permitsPerSecond();
+
+    long timeout() default 0;
+
+    TimeUnit timeUnit() default TimeUnit.MILLISECONDS;
+
+    long maxBurstSeconds() default 1;
+
+    String msg() default "系统繁忙，请稍后再试";
+}
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/aop/RateLimitAOP.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/aop/RateLimitAOP.java
new file mode 100644
index 0000000..84f0470
--- /dev/null
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/aop/RateLimitAOP.java
@@ -0,0 +1,53 @@
+package cn.edu.hfut.rmdjzz.projectmanagement.aop;
+
+import cn.edu.hfut.rmdjzz.projectmanagement.annotation.RateLimit;
+import cn.edu.hfut.rmdjzz.projectmanagement.exception.TooManyRequestException;
+import com.google.common.collect.Maps;
+import com.google.common.util.concurrent.RateLimiter;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Map;
+
+/**
+ * @author 佘语殊
+ * @since 2022/7/11 17:23
+ */
+@SuppressWarnings("UnstableApiUsage")
+@Aspect
+@Component
+public class RateLimitAOP {
+    private final Map<String, RateLimiter> rateLimitMap = Maps.newConcurrentMap();
+
+    @Around("@annotation(cn.edu.hfut.rmdjzz.projectmanagement.annotation.RateLimit)")
+    public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
+        MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        Method method = signature.getMethod();
+        RateLimit limit = method.getAnnotation(RateLimit.class);
+        if (limit == null) {
+            return joinPoint.proceed();
+        }
+
+        String key = limit.key();
+        RateLimiter limiter = rateLimitMap.get(key);
+        if (limiter == null) {
+            limiter = RateLimiter.create(limit.permitsPerSecond());
+            Class<? extends RateLimiter> clazz = limiter.getClass();
+            //TODO: DEBUG TEST
+            Field burstSecondsField = clazz.getDeclaredField("maxBurstSeconds");
+            burstSecondsField.setAccessible(true);
+            burstSecondsField.set(limiter, limit.maxBurstSeconds());
+            rateLimitMap.put(key, limiter);
+        }
+
+        if (!limiter.tryAcquire(limit.timeout(), limit.timeUnit())) {
+            throw new TooManyRequestException(limit.msg());
+        }
+        return joinPoint.proceed();
+    }
+}
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/AnnouncementController.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/AnnouncementController.java
index 9954183..35b1137 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/AnnouncementController.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/AnnouncementController.java
@@ -29,7 +29,7 @@ public class AnnouncementController {
 
     @SneakyThrows
     @GetMapping
-    public ResponseList<AnnouncementDTO> getAnnouncementList(@RequestHeader("Token") String token, @PathVariable Integer projectId) {
+    public ResponseList<AnnouncementDTO> getAnnouncementList(@RequestHeader(TokenUtils.HEADER_TOKEN) String token, @PathVariable Integer projectId) {
         if (projectGroupService.getProjectAccessLevel(token, projectId) == 0) {
             throw new ForbiddenException(IProjectGroupService.UNABLE_TO_ACCESS_PROJECT);
         }
@@ -39,7 +39,7 @@ public class AnnouncementController {
     @SneakyThrows
     @GetMapping("/{announcementId}")
     public ResponseMap getAnnouncementById(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId,
             @PathVariable Long announcementId
     ) {
@@ -52,7 +52,7 @@ public class AnnouncementController {
     @SneakyThrows
     @PostMapping
     public ResponseMap createAnnouncement(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId,
             @RequestBody Announcement announcement
     ) {
@@ -73,7 +73,7 @@ public class AnnouncementController {
     /*@SneakyThrows
     @PutMapping("/{announcementId}")
     public ResponseMap modifyAnnouncement(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId,
             @PathVariable Long announcementId,
             @RequestBody Announcement announcement
@@ -88,7 +88,7 @@ public class AnnouncementController {
     @SneakyThrows
     @DeleteMapping("/{announcementId}")
     public ResponseMap deleteAnnouncement(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId,
             @PathVariable Long announcementId
     ) {
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectController.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectController.java
index 8a550d9..02a2c19 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectController.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectController.java
@@ -5,6 +5,7 @@ import cn.edu.hfut.rmdjzz.projectmanagement.entity.dto.ProjectDTO;
 import cn.edu.hfut.rmdjzz.projectmanagement.exception.BadRequestException;
 import cn.edu.hfut.rmdjzz.projectmanagement.service.IProjectGroupService;
 import cn.edu.hfut.rmdjzz.projectmanagement.service.IProjectService;
+import cn.edu.hfut.rmdjzz.projectmanagement.utils.TokenUtils;
 import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.RequestPage;
 import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseList;
 import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseMap;
@@ -35,7 +36,7 @@ public class ProjectController {
     @SneakyThrows
     @GetMapping
     public ResponseList<ProjectDTO> getProjectListOfStaff(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @Valid RequestPage page,
             @Parameter(description = "参数列表见Project实体类，时间可以用xxxxStart与xxxxEnd来确定区间"
                     , required = true) @RequestParam("paramMap") Map<String, Object> paramMap
@@ -47,7 +48,7 @@ public class ProjectController {
     @SneakyThrows
     @GetMapping("/{projectId}")
     public ResponseMap getOneProjectBasicInfo(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable("projectId") Integer projectId
     ) {
         if (projectGroupService.getProjectAccessLevel(token, projectId) == 0) {
@@ -59,7 +60,7 @@ public class ProjectController {
     @Operation(description = "根据Token获取该员工的Project数")
     @SneakyThrows
     @GetMapping("/count")
-    public ResponseMap getProjectNumOfStaff(@RequestHeader("Token") String token) {
+    public ResponseMap getProjectNumOfStaff(@RequestHeader(TokenUtils.HEADER_TOKEN) String token) {
         return ResponseMap.ofSuccess()
                 .put("totalNum", projectService.countMyProjects(token));
     }
@@ -67,7 +68,7 @@ public class ProjectController {
     @SneakyThrows
     @PostMapping("/complete")
     public ResponseMap completeProject(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @Parameter(description = "只需要传projectId即可，例：{\"projectId\": 1}")
             @RequestBody Map<String, Object> map
     ) {
@@ -78,7 +79,7 @@ public class ProjectController {
 
     @SneakyThrows
     @PostMapping
-    public ResponseMap createProject(@RequestHeader("Token") String token, @RequestBody Project project) {
+    public ResponseMap createProject(@RequestHeader(TokenUtils.HEADER_TOKEN) String token, @RequestBody Project project) {
         projectService.createProject(token, project);
         return ResponseMap.ofSuccess();
     }
@@ -86,7 +87,7 @@ public class ProjectController {
     @SneakyThrows
     @PutMapping("/{projectId}")
     public ResponseMap updateProject(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId,
             @RequestBody Project project
     ) {
@@ -100,7 +101,7 @@ public class ProjectController {
     @SneakyThrows
     @GetMapping("/{projectId}/stats")
     public ResponseMap getProjectProcess(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId
     ) {
         return ResponseMap.ofSuccess(projectService.getProjectProcess(token, projectId));
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java
index 3bf7fcd..ca553a8 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/ProjectGroupController.java
@@ -43,7 +43,7 @@ public class ProjectGroupController {
     @GetMapping
     public ResponseList<ProjectGroupDTO> getGroupMembers(
             @PathVariable Integer projectId,
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             RequestPage page
     ) {
         if (projectGroupService.getProjectAccessLevel(token, projectId) == 0) {
@@ -59,7 +59,7 @@ public class ProjectGroupController {
     @SneakyThrows
     @GetMapping("/{staffId}")
     public ResponseMap getDesignatedStaffPosition(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId,
             @PathVariable Integer staffId
     ) {
@@ -77,7 +77,7 @@ public class ProjectGroupController {
     @SneakyThrows
     @PostMapping
     public ResponseMap addGroupMember(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId,
             @Parameter(description = "只传staffUsername和projectStaffPosition") @RequestBody GroupPositionVO groupPosition
     ) {
@@ -91,7 +91,7 @@ public class ProjectGroupController {
     @SneakyThrows
     @PutMapping("/{staffId}")
     public ResponseMap modifyDesignatedStaffPosition(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId,
             @PathVariable Integer staffId,
             @Parameter(description = "在body中只传projectStaffPosition") @RequestBody GroupPositionVO groupPosition
@@ -105,7 +105,7 @@ public class ProjectGroupController {
     @SneakyThrows
     @GetMapping("/stats")
     public ResponseMap getGroupPositionsStatistics(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId
     ) {
         return ResponseMap.ofSuccess(projectGroupService.collectStatsForGroupPositions(token, projectId));
@@ -114,7 +114,7 @@ public class ProjectGroupController {
     @SneakyThrows
     @GetMapping("/{staffId}/stats")
     public ResponseList<StaffProcessDTO> getProjectProcessOfStaff(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId,
             @PathVariable Integer staffId
     ) {
@@ -129,7 +129,7 @@ public class ProjectGroupController {
     @SneakyThrows
     @PutMapping("/{staffId}/transfer")
     public ResponseMap transferStaffTasks(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId,
             @PathVariable Integer staffId,
             @RequestBody Map<Long, Integer> transferMap
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/StaffController.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/StaffController.java
index eec249c..0d3ceb6 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/StaffController.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/StaffController.java
@@ -39,7 +39,7 @@ public class StaffController {
 
     @SneakyThrows
     @PostMapping("/logout")
-    public ResponseMap logout(@RequestHeader("Token") String token) {
+    public ResponseMap logout(@RequestHeader(TokenUtils.HEADER_TOKEN) String token) {
         if (staffService.logout(token)) {
             return ResponseMap.ofSuccess("登出成功");
         }
@@ -49,8 +49,8 @@ public class StaffController {
     @SneakyThrows
     @PostMapping(value = "/import")
     public ResponseMap importStaffs(
-            @RequestHeader("Token") String token,
-            @RequestHeader("File-Digest") String digest,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
+            @RequestHeader(FileUtils.HEADER_FILE_DIGEST) String digest,
             @RequestParam("uploadFile") MultipartFile uploadFile
     ) {
         if (null == uploadFile) {
@@ -69,15 +69,15 @@ public class StaffController {
 
     @SneakyThrows
     @GetMapping("/import/template")
-    public ResponseMap downloadTemplate(
-            @RequestHeader("Token") String token,
+    public void downloadTemplate(
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             HttpServletResponse response
     ) {
         if (TokenUtils.getStaffGlobalLevel(token) > 2) {
             throw new ForbiddenException(ForbiddenException.UNABLE_TO_OPERATE);
         }
         if (FileUtils.downloadResource("static/账户导入模板.xlsx", response)) {
-            return ResponseMap.ofSuccess();
+            return;
         }
         throw new BadRequestException(BadRequestException.OPERATE_FAILED);
     }
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java
index a4adf14..3c3e718 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/controller/TaskController.java
@@ -5,6 +5,7 @@ import cn.edu.hfut.rmdjzz.projectmanagement.entity.dto.TaskDTO;
 import cn.edu.hfut.rmdjzz.projectmanagement.exception.BadRequestException;
 import cn.edu.hfut.rmdjzz.projectmanagement.service.IProjectService;
 import cn.edu.hfut.rmdjzz.projectmanagement.service.ITaskService;
+import cn.edu.hfut.rmdjzz.projectmanagement.utils.TokenUtils;
 import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseList;
 import cn.edu.hfut.rmdjzz.projectmanagement.utils.http.ResponseMap;
 import lombok.SneakyThrows;
@@ -27,7 +28,7 @@ public class TaskController {
     @SneakyThrows
     @GetMapping("/{fatherId}/subtask")
     public ResponseList<TaskDTO> getSubTaskList(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable("projectId") Integer projectId,
             @PathVariable("fatherId") Long fatherId
     ) {
@@ -37,7 +38,7 @@ public class TaskController {
 
     @SneakyThrows
     @GetMapping("/mine")
-    public ResponseList<Task> getMyTasks(@RequestHeader("Token") String token, @PathVariable("projectId") Integer projectId) {
+    public ResponseList<Task> getMyTasks(@RequestHeader(TokenUtils.HEADER_TOKEN) String token, @PathVariable("projectId") Integer projectId) {
         List<Task> result = taskService.listMyTasks(token, projectId);
         return ResponseList.ofSuccess(result);
     }
@@ -45,7 +46,7 @@ public class TaskController {
     @SneakyThrows
     @GetMapping("/subtask/exist")
     public ResponseMap existSubTask(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable("projectId") Integer projectId,
             @RequestParam("taskId") Long taskId
     ) {
@@ -56,7 +57,7 @@ public class TaskController {
     @SneakyThrows
     @PostMapping
     public ResponseMap createTask(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable("projectId") Integer projectId,
             @RequestBody Task task
     ) {
@@ -70,7 +71,7 @@ public class TaskController {
     @SneakyThrows
     @PutMapping("/{taskId}")
     public ResponseMap modifyTask(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable("projectId") Integer projectId,
             @PathVariable("taskId") Long taskId,
             @RequestBody Task task
@@ -86,7 +87,7 @@ public class TaskController {
     @SneakyThrows
     @DeleteMapping("/{taskId}")
     public ResponseMap deleteTaskAndSubTask(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable("projectId") Integer projectId,
             @PathVariable("taskId") Long taskId
     ) {
@@ -99,7 +100,7 @@ public class TaskController {
     @SneakyThrows
     @GetMapping("/stats")
     public ResponseMap getTaskTrend(
-            @RequestHeader("Token") String token,
+            @RequestHeader(TokenUtils.HEADER_TOKEN) String token,
             @PathVariable Integer projectId
     ) {
         if(!projectService.checkOpenStatus(projectId)) {
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Task.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Task.java
index 3ea2b55..2f77fac 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Task.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/entity/Task.java
@@ -57,6 +57,7 @@ public class Task {
             "demandSource:需求来源 (String), estimatedManHours:预估工时 (Integer), severity:严重程度 (String), recurrenceProbability:复现概率 (String)")
     @TableField(typeHandler = JacksonTypeHandler.class)
     private Map<String, Object> attachedInfo;
+    private Integer childrenCount;
     @TableField("is_deleted")
     @TableLogic
     private Boolean deleted;
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/exception/TooManyRequestException.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/exception/TooManyRequestException.java
new file mode 100644
index 0000000..8d8cefb
--- /dev/null
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/exception/TooManyRequestException.java
@@ -0,0 +1,11 @@
+package cn.edu.hfut.rmdjzz.projectmanagement.exception;
+
+/**
+ * @author 佘语殊
+ * @since 2022/7/11 17:35
+ */
+public class TooManyRequestException extends Exception {
+    public TooManyRequestException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/interceptor/TokenInterceptor.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/interceptor/TokenInterceptor.java
index bc65bf2..294c5f1 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/interceptor/TokenInterceptor.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/interceptor/TokenInterceptor.java
@@ -27,7 +27,7 @@ public class TokenInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object object) throws TokenException {
         System.out.println(httpServletRequest.getRequestURL() + "  " + httpServletRequest.getMethod());
-        String token = httpServletRequest.getHeader("Token");
+        String token = httpServletRequest.getHeader(TokenUtils.HEADER_TOKEN);
         if (null == token || "".equals(token.trim())) {
             throw new TokenException("缺少Token");
         }
@@ -50,7 +50,7 @@ public class TokenInterceptor implements HandlerInterceptor {
                     Objects.requireNonNull(TokenUtils.getDuration(token)), TimeUnit.SECONDS
             );
         }
-        httpServletResponse.setHeader("Token", newToken);
+        httpServletResponse.setHeader(TokenUtils.HEADER_TOKEN, newToken);
         return true;
     }
 }
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java
index c16e35f..d8702a4 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java
@@ -45,7 +45,7 @@ public interface ITaskService extends IService<Task> {
 
     Task modifyTask(String token, Task task) throws BadRequestException, ForbiddenException;
 
-    Map<String, List<TaskTrendDTO>> getProjectTaskTrend(String token, Integer projectId) throws BadRequestException, ForbiddenException;
+    Map<String, List<TaskTrendDTO>> getProjectTaskTrend(String token, Integer projectId) throws ForbiddenException;
 
     Boolean transferStaffTasks(String token, Integer projectId, Integer transferredStaffId, Map<Long, Integer> transferMap) throws ForbiddenException, BadRequestException;
 
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/StaffServiceImpl.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/StaffServiceImpl.java
index ba7be16..ae5ee78 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/StaffServiceImpl.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/StaffServiceImpl.java
@@ -62,7 +62,7 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
                 Objects.requireNonNull(TokenUtils.getDuration(token)), TimeUnit.SECONDS
         );
         return new MapBuilder()
-                .put("Token", token)
+                .put(TokenUtils.HEADER_TOKEN, token)
                 .putAll(BeanUtils.beanToMap(staff, false))
                 .build();
     }
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java
index e121674..6cdc9b7 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java
@@ -246,13 +246,14 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
             throw new BadRequestException("还有子工作尚未完成");
         }
         try {
+            boolean closed = false;
             if (typeChangeValue != 0) {
                 task.setTaskClosedTime(LocalDateTime.now());
             }
             if (typeChangeValue == 2) {
-                closeTaskAndSubTask(token, task.getTaskProjectId(), task.getTaskId());
+                closed = closeTaskAndSubTask(token, task.getTaskProjectId(), task.getTaskId());
             }
-            if (baseMapper.update(task, Wrappers.<Task>lambdaQuery().eq(Task::getTaskId, task.getTaskId())) == 0) {
+            if (!closed && baseMapper.update(task, Wrappers.<Task>lambdaQuery().eq(Task::getTaskId, task.getTaskId())) == 0) {
                 throw new BadRequestException(BadRequestException.OPERATE_FAILED);
             }
         } catch (Exception e) {
@@ -263,7 +264,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements IT
     }
 
     @Override
-    public Map<String, List<TaskTrendDTO>> getProjectTaskTrend(String token, Integer projectId) throws BadRequestException, ForbiddenException {
+    public Map<String, List<TaskTrendDTO>> getProjectTaskTrend(String token, Integer projectId) throws ForbiddenException {
         if (projectGroupService.getProjectAccessLevel(token, projectId) == 0) {
             throw new ForbiddenException(ForbiddenException.UNABLE_TO_OPERATE);
         }
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/utils/FileUtils.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/utils/FileUtils.java
index 6a5420b..4ea5e9f 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/utils/FileUtils.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/utils/FileUtils.java
@@ -6,25 +6,36 @@ import org.springframework.util.MimeTypeUtils;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * @author 佘语殊
  * @since 2022/7/11 9:32
  */
 public class FileUtils {
+
+    public static final String HEADER_FILE_DIGEST = "File-Digest";
+
+    /**
+     * 直接在响应体中用八位字节流输出文件内容，并在响应头中加入File-Digest作为md5文件摘要校验码
+     * <p>
+     * 在Controller层调用时需要返回void
+     */
     public static Boolean downloadResource(String resourceName, HttpServletResponse response) throws IOException {
-        @Cleanup InputStream is = FileUtils.class.getResourceAsStream(resourceName);
-        if (is == null) {
-            throw new FileNotFoundException("该文件不存在");
-        }
-        @Cleanup BufferedInputStream bis = new BufferedInputStream(is);
+        @Cleanup InputStream is = FileUtils.class.getClassLoader().getResourceAsStream(resourceName);
+        BufferedInputStream bis = new BufferedInputStream(is);
+        bis.mark(bis.available() + 1);
         response.setContentType(MimeTypeUtils.APPLICATION_OCTET_STREAM_VALUE);
         response.setCharacterEncoding("UTF-8");
         ServletOutputStream out = response.getOutputStream();
-        response.addHeader("File-Digest", DigestUtils.md5DigestAsHex(bis));
+        response.addHeader(HEADER_FILE_DIGEST, DigestUtils.md5DigestAsHex(bis));
+        bis.reset();
         @Cleanup BufferedOutputStream bos = new BufferedOutputStream(out);
         bis.transferTo(bos);
+        bis.close();
         bos.flush();
         return true;
     }
diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/utils/TokenUtils.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/utils/TokenUtils.java
index c41330e..c2da352 100644
--- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/utils/TokenUtils.java
+++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/utils/TokenUtils.java
@@ -19,6 +19,7 @@ import java.util.Date;
 public final class TokenUtils {
     private final static String PV_KEY = "SignedByRMDJZZ";
 
+    public final static String HEADER_TOKEN = "Token";
     private final static String STAFF_USERNAME = "staffUsername";
     private final static String STAFF_ID = "staffId";
     private final static String STAFF_GLOBAL_LEVEL = "staffGlobalLevel";
diff --git a/src/main/resources/static/账户导入模板.xlsx b/src/main/resources/static/账户导入模板.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..35cd573fa03da06a3db03730f95f8a03ded46bc3
GIT binary patch
literal 9942
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

literal 0
HcmV?d00001