Ver Fonte

update bok version

weijin há 4 anos atrás
pai
commit
fabcdd14a3

+ 18 - 0
codejudge-client/pom.xml

@@ -10,6 +10,24 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>codejudge-client</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>20.1.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.11.2</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

+ 12 - 1
judgement-client/pom.xml

@@ -18,10 +18,21 @@
             <version>0.2.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.11.2</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>RELEASE</version>
+            <version>2.11.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.11.2</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

+ 4 - 4
judgement-common/src/main/java/cn/seecoder/judgement/vo/question/BaseQuestionVO.java

@@ -28,11 +28,11 @@ public abstract class BaseQuestionVO {
 
     public static BaseQuestionVO convertBokQuestionToVO(@NonNull QuestionVO questionVO, boolean withAnswer) {
         switch (questionVO.getType()) {
-            case choice:
+            case CHOICE:
                 return new ChoiceQuestionVO(questionVO, withAnswer);
-            case true_false:
+            case TRUE_FALSE:
                 return new TrueOrFalseQuestionVO(questionVO, withAnswer);
-            case blank:
+            case BLANK:
                 return new BlankQuestionVO(questionVO, withAnswer);
 //            case multiple_choice:
 //                return new MultipleChoiceQuestionVO(questionVO, withAnswer);
@@ -49,7 +49,7 @@ public abstract class BaseQuestionVO {
         this.keyPoints = questionVO.getKeyPoints();
         this.tags = questionVO.getTags();
         this.knowledgeId = questionVO.getKnowledgeId();
-        this.lastModified = questionVO.getLastModifiedTime();
+        this.lastModified = Date.from(questionVO.getLastModifiedTime());
     }
 
     /**

+ 4 - 3
judgement-server/src/main/java/cn/seecoder/judgement/service/impl/JudgementServiceImpl.java

@@ -9,6 +9,7 @@ import cn.seecoder.judgement.vo.JudgedAnswersVO;
 import cn.seecoder.judgement.vo.question.BaseQuestionVO;
 import org.springframework.stereotype.Service;
 
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -57,14 +58,14 @@ public class JudgementServiceImpl implements JudgementService {
             record.setQuestionId(questionId);
             record.setPass(isTrue);
             record.setStudentAnswer(String.valueOf(answer));
-            record.setStartAt(answerRecordDTO.getStartAt());
-            record.setFinishAt(answerRecordDTO.getEndAt());
+            record.setStartAt(answerRecordDTO.getStartAt().toInstant(ZoneOffset.ofHours(8)));
+            record.setFinishAt(answerRecordDTO.getEndAt().toInstant(ZoneOffset.ofHours(8)));
 
             judgedAnswerRecords.add(record);
         });
         JudgedAnswersVO res = new JudgedAnswersVO(judgedAnswers);
 
-        SeecoderBokClient seecoderBokClient = new SeecoderBokClient("http://bok.seecoder.cn", 0);
+        SeecoderBokClient seecoderBokClient = new SeecoderBokClient("https://bok.seec.seecoder.cn");
         List<RecordVO> recordVOS = seecoderBokClient.createUserRecord(judgedAnswerRecords);
 
         System.out.println("results are as follows:");

+ 1 - 1
judgement-server/src/main/java/cn/seecoder/judgement/service/impl/QuestionServiceImpl.java

@@ -31,7 +31,7 @@ public class QuestionServiceImpl implements QuestionService {
 public class QuestionServiceImpl implements QuestionService {
     @Override
     public List<BaseQuestionVO> getQuestionsByIds(List<String> questionIds) {
-        SeecoderBokClient seecoderBokClient = new SeecoderBokClient("http://bok.seecoder.cn", 0);
+        SeecoderBokClient seecoderBokClient = new SeecoderBokClient("https://bok.seec.seecoder.cn");
         List<BaseQuestionVO> list1 = seecoderBokClient.getQuestionListByIds(questionIds).stream()
                 .map(bokQuestion -> BaseQuestionVO.convertBokQuestionToVO(bokQuestion, true))
                 .collect(Collectors.toList());

+ 3 - 1
judgement-server/src/main/resources/application.yml

@@ -3,4 +3,6 @@ spring:
     name: seec-playground
     url: jdbc:mysql://localhost:3306/seec-playground?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
     username: root
-    password: shidai16..
+    password: 12345678
+server:
+  port: 8088

+ 24 - 1
pom.xml

@@ -64,8 +64,31 @@
         <dependency>
             <groupId>cn.seecoder</groupId>
             <artifactId>seecoder-bok-client</artifactId>
-            <version>0.0.2</version>
+            <version>0.2.2</version>
         </dependency>
+
+        <dependency>
+            <groupId>cn.seecoder</groupId>
+            <artifactId>seecoder-bok-common</artifactId>
+            <version>0.2.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.4.1</version>
+        </dependency>
+
     </dependencies>
     <distributionManagement>
         <repository>