haha пре 3 година
родитељ
комит
241472fd2a

+ 5 - 18
seec-oj-server/src/main/java/cn/seecoder/ojserver/controller/JudgeController.java

@@ -29,36 +29,23 @@ public class JudgeController {
 
     @PostMapping("/code")
     public Response judgeCode(@RequestParam(value = "problemId") Integer problemId, @RequestBody CodeJudgeVO codeJudgeVO) {
-        Call call = MonitorClient.createCall(SeecSystem.CODER,"syncJudge","/api/judge/code");
-        try{
-            call.start();
-            return Response.buildSuccess(judgeService.syncJudgeCode(problemId, codeJudgeVO));
-        }catch (Exception e){
-            MonitorClient.logError(SeecSystem.CODER,"syncJudge","/api/judge/code",e);
-            call.fail();
-            throw e;
-        }finally {
-            call.end();
-        }
+        return Response.buildSuccess(judgeService.syncJudgeCode(problemId, codeJudgeVO));
     }
 
     @PostMapping("/asyncCode")
-    public Response asyncJudgeCode(@RequestParam(value = "problemId") Integer problemId, @RequestBody CodeJudgeVO codeJudgeVO){
+    public Response asyncJudgeCode(@RequestParam(value = "problemId") Integer problemId, @RequestBody CodeJudgeVO codeJudgeVO) {
         return Response.buildSuccess(judgeService.asyncJudgeCode(problemId, codeJudgeVO));
     }
 
     @PostMapping("/rabbit")
-    public Response rabbit(@RequestParam(value = "problemId") Integer problemId, @RequestBody CodeJudgeVO codeJudgeVO){
+    public Response rabbit(@RequestParam(value = "problemId") Integer problemId, @RequestBody CodeJudgeVO codeJudgeVO) {
         return Response.buildSuccess(judgeService.rabbit(problemId, codeJudgeVO));
     }
 
     @PostMapping("/mysqlAndMQ")
-    public Response mysqlAndMQ(@RequestParam(value = "problemId") Integer problemId, @RequestBody CodeJudgeVO codeJudgeVO){
-        return Response.buildSuccess(judgeService.rabbit(problemId, codeJudgeVO));
+    public Response mysqlAndMQ(@RequestParam(value = "problemId") Integer problemId, @RequestBody CodeJudgeVO codeJudgeVO) {
+        return Response.buildSuccess(judgeService.mysqlAndMQ(problemId, codeJudgeVO));
     }
 
 
-
-
-
 }

+ 0 - 3
seec-oj-server/src/main/java/cn/seecoder/ojserver/rabbitmq/RabbitMQConsumer.java

@@ -32,8 +32,6 @@ public class RabbitMQConsumer {
     @RabbitHandler
     @RabbitListener(queuesToDeclare = @Queue("notice_queue"))
     public void process(CodeJudgeDTO codeJudgeDTO) {
-        Call call = MonitorClient.createCall(SeecSystem.CODER,"asyncJudge","processJudge");
-        call.start();
         JudgeResult judgeResult = judgeService.judgeCode(codeJudgeDTO.getProblemId(), codeJudgeDTO.getCodeJudgeVO());
         CodeJudgeResultType message = CodeJudgeResultType.values()[JudgeResultType.ACCEPT.ordinal()];
         for (JudgeResult.Item item : judgeResult.getResultList()) {
@@ -62,7 +60,6 @@ public class RabbitMQConsumer {
         }else{
             throw new CodeJudgeException("找不到commit",103);
         }
-        call.end();
 
     }
 }

+ 0 - 10
seec-oj-server/src/main/java/cn/seecoder/ojserver/service/impl/JudgeServiceImpl.java

@@ -16,16 +16,12 @@ import cn.seecoder.ojserver.model.dto.CodeJudgeDTO;
 import cn.seecoder.ojserver.model.vo.CodeJudgeVO;
 import cn.seecoder.ojserver.service.JudgeService;
 
-import com.nju.edu.paasMonitorClient.MonitorClient;
-import com.nju.edu.paasMonitorClient.entity.Call;
-import com.nju.edu.paasMonitorCommon.enums.SeecSystem;
 import okhttp3.*;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -73,8 +69,6 @@ public class JudgeServiceImpl implements JudgeService {
 
     @Override
     public JudgeResult asyncJudgeCode(Integer questionId, CodeJudgeVO codeJudgeVO) {
-        Call call = MonitorClient.createCall(SeecSystem.CODER, "asyncJudge", "createCommit");
-        call.start();
         Commit commit = new Commit();
         commit.setUserId(0);
         commit.setProblemId(questionId);
@@ -82,12 +76,8 @@ public class JudgeServiceImpl implements JudgeService {
         commit.setLanguage(codeJudgeVO.getLanguage());
         commit.setCommitTime(new Date());
         commitDAO.save(commit);
-        call.end();
-        Call call1 = MonitorClient.createCall(SeecSystem.CODER, "asyncJudge", "commitToMQ");
-        call1.start();
         CodeJudgeDTO codeJudgeDTO = new CodeJudgeDTO(commit.getId(), questionId, codeJudgeVO);
         rabbitTemplate.convertAndSend("notice_queue", codeJudgeDTO);
-        call1.end();
         return null;
     }