fix some bug

HimitZH · Nov 14, 2022 · 4bb1315 · 4bb1315
1 parent c3386f9
commit 4bb1315
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/manager/oj/HomeManager.java b/hoj-springboot/DataBackup/src/main/java/top/hcode/hoj/manager/oj/HomeManager.java
@@ -176,6 +176,7 @@ public List<RecentUpdatedProblemVO> getRecentUpdatedProblemList() {
         QueryWrapper<Problem> problemQueryWrapper = new QueryWrapper<>();
         problemQueryWrapper.select("id", "problem_id", "title", "type", "gmt_modified", "gmt_create");
         problemQueryWrapper.eq("auth", 1);
+        problemQueryWrapper.eq("is_group", false);
         problemQueryWrapper.orderByDesc("gmt_create");
         problemQueryWrapper.last("limit 10");
         List<Problem> problemList = problemEntityService.list(problemQueryWrapper);

diff --git a/hoj-springboot/DataBackup/src/main/resources/banner.txt b/hoj-springboot/DataBackup/src/main/resources/banner.txt
@@ -16,6 +16,6 @@ ${AnsiColor.BRIGHT_YELLOW}
 '---'         `---`                  '---'        `----'
             Hcode Online Judge(HOJ) - Backend
                     @Author Himit_ZH
-                    @Last Update 20221112
+                    @Last Update 20221114
           ->Github<- https://www.github.com/HimitZH/HOJ
           ->Gitee<-  https://gitee.com/himitzh0730/hoj
diff --git a/...ngboot/JudgeServer/src/main/java/top/hcode/hoj/dao/impl/JudgeServerEntityServiceImpl.java b/...ngboot/JudgeServer/src/main/java/top/hcode/hoj/dao/impl/JudgeServerEntityServiceImpl.java
@@ -44,7 +44,7 @@ public HashMap<String, Object> getJudgeServerInfo() {
 
         HashMap<String, Object> res = new HashMap<>();
 
-        res.put("version", "20221111");
+        res.put("version", "20221114");
         res.put("currentTime", new Date());
         res.put("judgeServerName", name);
         res.put("cpu", Runtime.getRuntime().availableProcessors());

diff --git a/hoj-springboot/JudgeServer/src/main/java/top/hcode/hoj/remoteJudge/task/Impl/HDUJudge.java b/hoj-springboot/JudgeServer/src/main/java/top/hcode/hoj/remoteJudge/task/Impl/HDUJudge.java
@@ -109,8 +109,12 @@ public RemoteJudgeRes result() {
         // 找到时
         Validate.isTrue(matcher.find());
         String rawStatus = matcher.group(1).replaceAll("<[\\s\\S]*?>", "").trim();
-        Constants.Judge judgeStatus = statusTypeMap.getOrDefault(rawStatus, Constants.Judge.STATUS_PENDING);
-
+        Constants.Judge judgeStatus;
+        if (rawStatus.contains("Runtime Error")){
+            judgeStatus = Constants.Judge.STATUS_RUNTIME_ERROR;
+        }else{
+            judgeStatus = statusTypeMap.getOrDefault(rawStatus, Constants.Judge.STATUS_PENDING);
+        }
         RemoteJudgeRes remoteJudgeRes = RemoteJudgeRes.builder()
                 .status(judgeStatus.getStatus())
                 .build();

diff --git a/hoj-springboot/JudgeServer/src/main/resources/banner.txt b/hoj-springboot/JudgeServer/src/main/resources/banner.txt
@@ -16,6 +16,6 @@ ${AnsiColor.BRIGHT_YELLOW}
 '---'         `---`                  '---'        `----'
             Hcode Online Judge(HOJ) - JudgeServer
                     @Author Himit_ZH
-                    @Last Update 20221111
+                    @Last Update 20221114
           ->Github<- https://www.github.com/HimitZH/HOJ
           ->Gitee<-  https://gitee.com/himitzh0730/hoj
diff --git a/hoj-vue/src/components/oj/group/DiscussionList.vue b/hoj-vue/src/components/oj/group/DiscussionList.vue
@@ -78,7 +78,7 @@
             <el-button
               icon="el-icon-delete-solid"
               size="mini"
-              @click.native="deleteGroupDiscussion([row.id])"
+              @click.native="deleteGroupDiscussion(row.id)"
               type="danger"
             >
             </el-button>
@@ -181,7 +181,7 @@ export default {
         this.currentChange(1);
       });
     },
-    deleteGroupDiscussion(uid, gid) {
+    deleteGroupDiscussion(did) {
       this.$confirm(
         this.$i18n.t('m.Delete_Discussion_Tips'),
         this.$i18n.t('m.Warning'),
@@ -193,7 +193,7 @@ export default {
       )
         .then(() => {
           this.loading = true;
-          api.deleteGroupDiscussion(uid, gid).then((res) => {
+          api.deleteGroupDiscussion(did).then((res) => {
             this.loading = true;
             mMessage.success(this.$i18n.t('m.Delete_successfully'));
             this.$emit('currentChange', 1);