From 14b0152a773f98127073829bcace246e3ed9ef48 Mon Sep 17 00:00:00 2001 From: wangqing Date: Fri, 19 Mar 2021 17:45:55 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=20=E9=A1=B9=E7=9B=AE=E5=81=9C?= =?UTF-8?q?=E6=AD=A2=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tduck/cloud/api/config/WebMvcConfig.java | 9 --------- .../web/controller/UserProjectController.java | 17 ++++++++++++++++- .../project/entity/enums/ProjectStatusEnum.java | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/config/WebMvcConfig.java b/tduck-api/src/main/java/com/tduck/cloud/api/config/WebMvcConfig.java index c27ffde..5ad2e25 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/config/WebMvcConfig.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/config/WebMvcConfig.java @@ -36,15 +36,6 @@ public class WebMvcConfig implements WebMvcConfigurer { "/**/*.woff", "/**/*.ttf"); - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedOrigins("*") - .allowCredentials(true) - .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") - .maxAge(36000); - } - @Override public void addInterceptors(InterceptorRegistry registry) { //所有路径都被拦截 diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java index 49a7ab2..db25840 100644 --- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java +++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java @@ -175,6 +175,20 @@ public class UserProjectController { return Result.success(projectService.updateById(entity)); } + /** + * 停止收集 + * + * @param request + * @return + */ + @Login + @PostMapping("/user/project/stop") + public Result stopProject(@RequestBody UserProjectEntity request) { + UserProjectEntity entity = projectService.getByKey(request.getKey()); + entity.setStatus(ProjectStatusEnum.STOP); + return Result.success(projectService.updateById(entity)); + } + /** * 删除项目 * @@ -421,8 +435,9 @@ public class UserProjectController { * * @return */ - @GetMapping("/setting/status") + @GetMapping("/setting/status1") public Result querySettingStatus(@RequestParam String projectKey, HttpServletRequest request) { + log.info("aaaaa"); return userProjectSettingService.getUserProjectSettingStatus(projectKey, HttpUtils.getIpAddr(request)); } diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectStatusEnum.java b/tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectStatusEnum.java index 947e97a..114e70a 100644 --- a/tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectStatusEnum.java +++ b/tduck-project/src/main/java/com/tduck/cloud/project/entity/enums/ProjectStatusEnum.java @@ -21,7 +21,7 @@ public enum ProjectStatusEnum { CREATE(1, "未发布"), RELEASE(2, "收集中"), - FINISH(4, "已结束"); + STOP(3 ,"停止发布"); @EnumValue