浏览代码

增加webSecurity部分

hushuyu 4 月之前
父节点
当前提交
f1358a0c28

+ 2 - 2
web/src/main/java/cn/seecoder/web/controller/project/ProjectController.java

@@ -87,7 +87,7 @@ public class ProjectController {
     @ApiOperation(value = "删除项目", httpMethod = "DELETE")
     @ApiImplicitParam(name = "projectId", dataType = "int", paramType = "query")
     @DeleteMapping
-    public Response<Object> deleteProject(@RequestParam("projectId") Integer projectId, @RequestParam("userId") Long userId) {
+    public Response<Object> deleteProject(@RequestParam("projectId") Integer projectId) {
         try{
             boolean res = projectService.deleteProject(projectId);
             if(res){
@@ -96,7 +96,7 @@ public class ProjectController {
                 return Response.buildFailure(503,"Delete project failed");
             }
         } catch (ServiceException e){
-            return Response.buildFailure(505, String.format("User: %s try to delete failed", userId));
+            return Response.buildFailure(505, "Try to delete failed");
         }
     }
 

+ 1 - 0
web/src/main/java/cn/seecoder/web/infrastructure/config/WebSecurityConfig.java

@@ -133,6 +133,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers(POST, "/project/relate/code").access("@authTools.checkProjOwnershipParam(request)")
                 .antMatchers(POST, "/project/relate").access("@authTools.checkProjOwnershipParam(request)")
                 .antMatchers(GET, "/project/relate/{projectId}").authenticated()
+                .antMatchers(DELETE, "/project").access("@authTools.checkProjOwnershipParam(request)")
                 // SQL Controller
                 .antMatchers(GET, "/sql/instances").access("@authTools.checkProjOwnershipParam(request)")
                 .antMatchers(POST, "/sql/exec").authenticated()

+ 1 - 1
web/src/main/java/cn/seecoder/web/service/fork/ForkService.java

@@ -3,5 +3,5 @@ package cn.seecoder.web.service.fork;
 import cn.seecoder.web.model.vo.fork.ForkVO;
 
 public interface ForkService {
-    public ForkVO forkProject(ForkVO forkVO);
+    ForkVO forkProject(ForkVO forkVO);
 }

+ 1 - 6
web/src/main/java/cn/seecoder/web/service/impl/project/ProjectServiceImpl.java

@@ -185,12 +185,7 @@ public class ProjectServiceImpl implements ProjectService {
             throw new ServiceException(HttpStatus.SC_NOT_FOUND, "项目不存在");
         }
         try {
-            List<Integer> userIds = seecoderGitlabApi.getJoinedUserByProject(projectId);
-            if(userIds.contains(UserService.loginUser().getId())){
-                projectMapper.deleteProjectById(projectId);
-            }else{
-                return false;
-            }
+            projectMapper.deleteProjectById(projectId);
         } catch (Exception e) {
             throw new ServiceException(HttpStatus.SC_INTERNAL_SERVER_ERROR, "删除项目失败", e);
         }