Merge branch 'seec'

seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/service/ExamService.java

@@ -28,6 +28,8 @@ public interface ExamService {
 
     JSONObject updateCoderExam(int examId, JSONObject examDTO);
 
+    JSONObject joinCoderExam(int examId);
+
     JSONObject getCoderExamByExamId(int examId);
 
     JSONObject getCoderProblemByProblemId(int problemId);

seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/serviceImpl/ExamServiceImpl.java

@@ -94,6 +94,11 @@ public class ExamServiceImpl implements ExamService {
         return coderService.updateCoderExam(examId, examDTO);
     }
 
+    @Override
+    public JSONObject joinCoderExam(int examId) {
+        return coderService.joinCoderExam(examId);
+    }
+
     @Override
     public JSONObject getCoderExamByExamId(int examId) {
         return coderService.getCoderExamByExamId(examId);

seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/serviceImpl/subsystem/CoderService.java

@@ -181,7 +181,7 @@ public class CoderService implements SubsystemService {
         JSONObject requestBody = new JSONObject(examDTO);
         String result = null;
         try {
-            result = httpService.sendPost(coderUrlPrefix+"/exam",requestBody, token);
+            result = httpService.sendPost(coderUrlPrefix+"/exam", requestBody, token);
         } catch (Exception e){
             e.printStackTrace();
         }
@@ -221,6 +221,22 @@ public class CoderService implements SubsystemService {
         return JSON.parseObject(result);
     }
 
+    /**
+     * 加入Coder考试
+     * @param examId
+     * @return
+     */
+    public JSONObject joinCoderExam(int examId) {
+        String token = httpService.getToken();
+        String result = null;
+        try {
+            result = httpService.sendPost(coderUrlPrefix+"/exam/"+examId+"/join", null, token);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return JSON.parseObject(result);
+    }
+
 
     /**
      * 根据id获得Coder的考试信息

seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/web/rest/ExamController.java

@@ -91,6 +91,11 @@ public class ExamController {
         return examService.updateCoderExam(examId, examDTO);
     }
 
+    @PostMapping("/coder/exam/{examId:\\d+}/join")
+    public JSONObject joinCoderExam(@PathVariable int examId) {
+        return examService.joinCoderExam(examId);
+    }
+
     /**
      * 根据examId获取考试信息
      * @param examId

seecoder-portal-server/src/main/resources/application-dev.yml

@@ -8,10 +8,10 @@ spring:
     show-sql: true
   datasource:
     url: jdbc:postgresql://localhost:5432/portal
-#    username: root
-#    password: 123456
     username: postgres
-    password: postgres
+    password: 123456
+#    username: postgres
+#    password: postgres
 
 aliyun:
   oss: