Ver código fonte

Merge branch 'add-kivul' into 'DEV'

add for kivul



See merge request !364

LiHaoyu 8 anos atrás
pai
commit
dd57215890

+ 1 - 0
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/common/constant/AnswerWayConstants.java

@@ -23,6 +23,7 @@ public class AnswerWayConstants {
     public static final long REPORT = 5;
     public static final long EMBEDDED = 6;
     public static final long JMETER = 7;
+    public static final long KIVUL = 9;
 
 //    public static final long PYTHON_SUBSITE_ID = 4;   -》 -2
 //    public static final int KIKBUG_SUBSITE_ID = 6;

+ 2 - 0
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/common/constant/OwningPartyConstants.java

@@ -15,5 +15,7 @@ public class OwningPartyConstants {
 
     public final static Integer KAIYUN=4;
 
+    public final static Integer KIVUL=7;
+
     public final static String THIRDEMAIL="anheng@mooctest.net";
 }

+ 4 - 0
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/CaseLogicImpl.java

@@ -347,6 +347,10 @@ public class CaseLogicImpl implements CaseLogic {
                 if (report != null)
                     caseExtendsVO.setReportId(report.getId());
             }
+            if(caseExtendsVO.getAnswerWay() == AnswerWayConstants.KIVUL){
+                String openId = openId2UserIdService.findOpenIdByUserId(userId);
+                caseExtendsVO.setEntrance("http://api.mooctest.net/oauth/thirdPart?openId=" + openId + "&taskId=" + examId + "&thirdPartId=" + OwningPartyConstants.KIVUL + "&caseId=" + caseid);
+            }
             caseVoList.add(caseExtendsVO);
         }
         return caseVoList;