Merge branch 'add-docker-img' into 'DEV'

Add docker img







See merge request !487

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/configure/ClientFeatureConfiguration.java

@@ -14,4 +14,5 @@ public class ClientFeatureConfiguration {
     private boolean sms;
     private boolean email;
     private boolean oss;
+    private boolean webide;
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/BugVOWrapper.java

@@ -6,13 +6,8 @@ import cn.iselab.mooctest.site.util.data.JSONUtil;
 import cn.iselab.mooctest.site.web.data.forMongo.BugDTO;
 import cn.iselab.mooctest.site.web.data.fromKibug.BugVO;
 import cn.iselab.mooctest.site.web.util.Converter;
-import javassist.expr.NewExpr;
-import jdk.nashorn.internal.parser.JSONParser;
-import net.sf.json.JSON;
-import net.sf.json.util.JSONUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.springframework.boot.json.GsonJsonParser;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

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

@@ -16,6 +16,7 @@ import cn.iselab.mooctest.site.service.fromDev.IndexService;
 import cn.iselab.mooctest.site.service.fromKibug.ApplicationService;
 import cn.iselab.mooctest.site.service.fromKibug.ReportService;
 import cn.iselab.mooctest.site.service.instancePermission.CasePermissionService;
+import cn.iselab.mooctest.site.util.data.JSONUtil;
 import cn.iselab.mooctest.site.web.data.CaseExtendsVO;
 import cn.iselab.mooctest.site.web.data.CaseVO;
 import cn.iselab.mooctest.site.web.data.KeyAnalysisVO;
@@ -36,6 +37,7 @@ import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.GeneratePresignedUrlRequest;
 import com.aliyun.oss.model.OSSObjectSummary;
 import com.google.common.collect.Lists;
+import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
@@ -349,7 +351,7 @@ public class CaseLogicImpl implements CaseLogic {
             if (isWorker == true && (caseExtendsVO.getAnswerWay() == AnswerWayConstants.DEV_ECLIPSE || caseExtendsVO.getAnswerWay() == AnswerWayConstants.APP_ECLIPSE
                     || caseExtendsVO.getAnswerWay() == AnswerWayConstants.WEB_ECLIPSE || caseExtendsVO.getAnswerWay() == AnswerWayConstants.JMETER)) {
                 caseExtendsVO.setSecret(indexService.getSecret(userId, examId));
-                caseExtendsVO.setWebIDE("http://47.97.4.113:8081/?token="+indexService.getSecret(userId,examId)+"&extraCode="+indexService.getEntrance(caseid,caseExtends.getName(),"java"));
+                caseExtendsVO.setWebIDE(generateUrlForWebIDE(caseExtends,userId,examId,caseid));
                 caseExtendsVO.setSubmitted(assignedTaskService.isSubmitted(examId, userId, caseExtendsVO.getId(), caseExtendsVO.getCaseId()));
             }
             if (caseExtendsVO.getAnswerWay() == AnswerWayConstants.REPORT) {
@@ -507,4 +509,16 @@ public class CaseLogicImpl implements CaseLogic {
 
     }
 
+    private String generateUrlForWebIDE(CaseExtends caseExtends,Long userId,Long examId,Long caseId){
+        if(!JSONUtil.isJson(caseExtends.getProperties())){
+            return null;
+        }
+        JSONObject object=new JSONObject(caseExtends.getProperties());
+        if(object.has("imgName")){
+            return "http://47.97.4.113:8081/?token="+indexService.getSecret(userId,examId)+"&extraCode="+indexService.getEntrance(caseId,caseExtends.getName(),object.getString("imgName"));
+        }else {
+            return null;
+        }
+    }
+
 }

mooctest-site-server/src/main/resources/application.yaml

@@ -72,6 +72,7 @@ featureSwitch:
         sms: true
         email: true
         oss: true
+        webide: true
     server:
         rpcServerRunner: true
         rpcDevService: true
@@ -137,6 +138,7 @@ featureSwitch:
         sms: true
         email: true
         oss: true
+        webide: true
     server:
         rpcServerRunner: true
         rpcDevService: true
@@ -201,6 +203,7 @@ featureSwitch:
         sms: true
         email: true
         oss: true
+        webide: true
     server:
         rpcServerRunner: true
         rpcDevService: true
@@ -259,6 +262,7 @@ featureSwitch:
         sms: false
         email: false
         oss: false
+        webide: false
     server:
         rpcServerRunner: false
         rpcDevService: false