Browse Source

fix: 调用python的内部地址

haha 4 years ago
parent
commit
9019cbded7

+ 5 - 0
seec-oj-server/pom.xml

@@ -99,6 +99,11 @@
             <version>0.1.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.62</version>
+        </dependency>
 
     </dependencies>
 

+ 7 - 2
seec-oj-server/src/main/java/cn/seecoder/ojserver/controller/JudgeController.java

@@ -23,14 +23,19 @@ public class JudgeController {
         return Response.buildSuccess(true);
     }
 
+    @PostMapping("")
+    public Response postJudge() {
+        return Response.buildSuccess(true);
+    }
+
     @PostMapping("/code")
     public Response judgeCode(@RequestParam(value = "problemId") Integer problemId, @RequestBody CodeJudgeVO codeJudgeVO) {
-        Call call = MonitorClient.createCall(SeecSystem.CODER,"ojtest1","/api/judge/code");
+        Call call = MonitorClient.createCall(SeecSystem.CODER,"ojtest119","/api/judge/code");
         try{
             call.start();
             return Response.buildSuccess(judgeService.judgeCode(problemId, codeJudgeVO));
         }catch (Exception e){
-            MonitorClient.logError(SeecSystem.CODER,"ojtest1","/api/judge/code",e);
+            MonitorClient.logError(SeecSystem.CODER,"ojtest119","/api/judge/code",e);
             call.fail();
             throw e;
         }finally {

+ 1 - 1
seec-oj-server/src/main/java/cn/seecoder/ojserver/manager/JudgeManager.java

@@ -23,7 +23,7 @@ public class JudgeManager {
     }
 
     public JudgeResult judgeCodeQuestionAnswers(JudgeDTO judgeDTO) {
-        Call call = MonitorClient.createCall(SeecSystem.CODER,"ojtest1","callJudgeCode");
+        Call call = MonitorClient.createCall(SeecSystem.CODER,"ojtest119","callJudgeCode");
         call.start();
         Optional<JudgeResult> res = codeJudgeThirdPartyService.judgeCodeQuestionAnswers(judgeDTO);
         call.end();

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

@@ -2,6 +2,7 @@ package cn.seecoder.ojserver.service.impl;
 
 import cn.seecoder.codejudge.client.JudgeDTO;
 import cn.seecoder.codejudge.client.JudgeResult;
+import cn.seecoder.ojserver.asyncPost.MQConsumer;
 import cn.seecoder.ojserver.dao.entity.Problem;
 import cn.seecoder.ojserver.dao.entity.TestCase;
 import cn.seecoder.ojserver.exception.ThirdPartyServiceException;
@@ -9,13 +10,19 @@ import cn.seecoder.ojserver.manager.JudgeManager;
 import cn.seecoder.ojserver.manager.QuestionManager;
 import cn.seecoder.ojserver.model.vo.CodeJudgeVO;
 import cn.seecoder.ojserver.service.JudgeService;
+import cn.seecoder.ojserver.utils.PostHelper;
+import com.alibaba.fastjson.JSONObject;
 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.stereotype.Service;
+import com.alibaba.fastjson.JSON;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 @Service
@@ -31,7 +38,7 @@ public class JudgeServiceImpl implements JudgeService {
     @Override
     public JudgeResult judgeCode(Integer questionId, CodeJudgeVO codeJudgeVO) {
         try {
-            Call call = MonitorClient.createCall(SeecSystem.CODER,"ojtest1","buildJudge");
+            Call call = MonitorClient.createCall(SeecSystem.CODER,"ojtest119","buildJudge");
             call.start();
             JudgeDTO judgeDTO = new JudgeDTO();
             judgeDTO.setCode(codeJudgeVO.getCode());
@@ -45,14 +52,10 @@ public class JudgeServiceImpl implements JudgeService {
             judgeDTO.setInputList(inputList);
             judgeDTO.setOutputList(outputList);
             call.end();
-//            judgeDTO.setInputList(question.getInputOutputMapping().entrySet().stream().map(Map.Entry<String, String>::getKey).collect(Collectors.toList()));
-//            judgeDTO.setOutputList(question.getInputOutputMapping().entrySet().stream().map(Map.Entry<String, String>::getValue).collect(Collectors.toList()));
 
             return judgeManager.judgeCodeQuestionAnswers(judgeDTO);
         } catch (ThirdPartyServiceException exception) {
             throw exception;
         }
-
-
     }
 }

+ 1 - 1
seec-oj-server/src/main/resources/application-prod.yml

@@ -40,6 +40,6 @@ objective-judgement-client:
   host: https://seecoder-judgement.seec.seecoder.cn
 
 code-judgement-client:
-  host: https://ojljl.seec.seecoder.cn
+  host: http://environment-22-200.seec.svc.cluster.local:5000
 
 

+ 1 - 1
seec-oj-server/src/main/resources/application-test.yml

@@ -40,6 +40,6 @@ objective-judgement-client:
   host: https://seecoder-judgement.seec.seecoder.cn
 
 code-judgement-client:
-  host: https://oj.seec.seecoder.cn
+  host: https://ojljl.seec.seecoder.cn