Merge branch 'westt/deal_judge' of rongrunxiang/OnlineJudge into master

src/main/java/com/example/onlinejudge/mapper/QuestionSubmitMapper.java

@@ -2,7 +2,7 @@ package com.example.onlinejudge.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.onlinejudge.model.entity.QuestionSubmit;
-import org.mapstruct.Mapper;
+import org.apache.ibatis.annotations.Mapper;
 
 
 @Mapper

src/main/java/com/example/onlinejudge/model/VO/UserVO.java

@@ -45,6 +45,9 @@ public class UserVO implements Serializable {
         userVO.setUserName(user.getUsername());
         userVO.setUserRole(user.getRole());
         userVO.setId(user.getId());
+        userVO.setUserProfile(null);
+        userVO.setUserAvatar(null);
+        userVO.setCreateTime(null);
         return userVO;
     }
 }

src/main/java/com/example/onlinejudge/service/impl/QuestionSubmitServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.example.onlinejudge.constant.CommonConstant;
 import com.example.onlinejudge.exception.BusinessException;
 import com.example.onlinejudge.judge.JudgeService;
+import com.example.onlinejudge.mapper.QuestionMapper;
 import com.example.onlinejudge.mapper.QuestionSubmitMapper;
 import com.example.onlinejudge.model.VO.QuestionSubmitVO;
 import com.example.onlinejudge.model.dto.questionSubmit.QuestionSubmitAddRequest;
@@ -75,18 +76,23 @@ public class QuestionSubmitServiceImpl extends ServiceImpl<QuestionSubmitMapper,
         // 设置初始状态
         questionSubmit.setStatus(QuestionSubmitStatusEnum.WAITING.getValue());
         questionSubmit.setJudgeInfo("{}");
+        /*
+        一定要设置0，要不然查不到
+         */
+        questionSubmit.setIsDelete(0);
         boolean save = this.save(questionSubmit);
+        System.out.println(questionSubmit);
         System.out.println(save);
         if (!save){
             throw new BusinessException(ResultCode.SYSTEM_ERROR, "数据插入失败");
         }
-        Long questionSubmitId = questionSubmit.getId();
+        long questionSubmitId = questionSubmit.getId();
         // 执行判题服务
         System.out.println("questionSubmitId = " + questionSubmitId);
         CompletableFuture.runAsync(() -> {
             judgeService.doJudge(questionSubmitId);
         });
-        //TODO: 为什么这里的 q1 是 null
+        //TODO: 为什么这里的 q1 是 null DONE
         QuestionSubmit q1 = this.getById(questionSubmitId);
         System.out.println(q1.getQuestionId());
         return questionSubmitId;

src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
       driver-class-name: com.mysql.cj.jdbc.Driver
       url: jdbc:mysql://localhost:3306/oj?useSSL=false&allowPublicKeyRetrieval=true&serverTimeZone=UTC
       username: root
-      password: 123456
+      password: colin123
       max-wait: 3000
       initial-size: 10
       max-active: 200