mjh 4 лет назад
Родитель
Сommit
1f612eb44a

+ 5 - 11
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/serviceImpl/ProjectServiceImpl.java

@@ -97,13 +97,6 @@ public class ProjectServiceImpl implements ProjectService {
         List<CourseProject> publicProjects = courseProjectRepository.findByCourse_IdAndIsPublic(courseId, true);
         for (CourseProject courseProject : publicProjects) {
             projects.getJSONArray("public").add(this.findProjectById(courseProject.getProjectId()));
-//            if (SecurityUtils.getCurrentUser().getRole() == UserRole.TEACHER) {
-//                projects.getJSONArray("public").add(findProjectById(courseProject.getProjectId()));
-//            } else {
-//                JSONObject object = new JSONObject();
-//                object.put("id", courseProject.getProjectId());
-//                projects.getJSONArray("public").add(object);
-//            }
         }
         // private
         JSONArray allProjects = this.findAllProjects();
@@ -156,11 +149,12 @@ public class ProjectServiceImpl implements ProjectService {
         }
         JSONObject devcloudResult = devcloudService.forkProject(projectId, name);
         log.info("devcloudService.forkProject: {}", devcloudResult);
+        CourseProject forkCourseProject = new CourseProject();
         Integer newProjectId = devcloudResult.getInteger("projectId");
-        courseProject.setProjectId(newProjectId);
-        courseProject.setCourse(courseMapper.courseVOToCourse(courseService.findCourseById(courseProject.getCourse().getId())));
-        courseProject.setPublic(false);
-        courseProjectRepository.save(courseProject);
+        forkCourseProject.setProjectId(newProjectId);
+        forkCourseProject.setCourse(courseProject.getCourse());
+        forkCourseProject.setPublic(false);
+        courseProjectRepository.save(forkCourseProject);
         // 若当前用户已组队,则将队友添加到当前项目当中
         List<UserVO> members;
         try {

+ 2 - 8
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/serviceImpl/subsystem/DevcloudServiceImpl.java

@@ -119,7 +119,6 @@ public class DevcloudServiceImpl implements DevcloudService {
         JSONObject result;
         JSONObject requestBody = new JSONObject();
         requestBody.put("projectId", projectId);
-//        requestBody.put("name", name);
         try {
             result = JSONObject.parseObject(
                     httpService.sendPost(
@@ -131,15 +130,10 @@ public class DevcloudServiceImpl implements DevcloudService {
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
-        try {
-            if (result.containsKey("code") && result.getInteger("code") == 200) {
-                return result.getJSONObject("data");
-            } else {
-                throw CustomErrorException.devcloudError(result.toString());
-            }
-        } catch (NullPointerException e) {
+        if (result == null) {
             throw CustomErrorException.devcloudError("forkProject() = NULL!");
         }
+        return result;
     }
 
     @Override