Merge branch 'refactor-subsiteId' of git.mooctest.net:summer/main-site into refactor-subsiteId

# Conflicts:
#	mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/CaseExtendsVO.java
#	mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/CaseLogicImpl.java

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/common/constant/SubsiteConstants.java → mooctest-site-server/src/main/java/cn/iselab/mooctest/site/common/constant/AnswerWayConstants.java

@@ -14,7 +14,7 @@ import java.util.List;
 /**
  * Created by Liu on 2017/1/3.
  */
-public class SubsiteConstants {
+public class AnswerWayConstants {
     /**
      * Task Entrances
      */

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/models/App.java

@@ -28,7 +28,7 @@ public class App {
     private String url;
 
     @Column(name = "subsite_id")
-    private Long subsiteId;
+    private Long targetType;
 
     // 0为审核中，1审核通过，2审核失败
     @Column(name = "status")
@@ -87,13 +87,6 @@ public class App {
         this.url = url;
     }
 
-    public Long getSubsiteId() {
-        return subsiteId;
-    }
-
-    public void setSubsiteId(Long subsiteId) {
-        this.subsiteId = subsiteId;
-    }
 
     public Integer getStatus() {
         return status;
@@ -114,4 +107,12 @@ public class App {
     public void setMessage(String message) {
         this.message = message;
     }
+
+    public Long getTargetType() {
+        return targetType;
+    }
+
+    public void setTargetType(Long targetType) {
+        this.targetType = targetType;
+    }
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/models/CaseExtends.java

@@ -20,7 +20,7 @@ public class CaseExtends extends Case{
     @Column(name = "platform")
     private Short platform;
     @Column(name = "subsiteId")
-    private Long subsiteId;
+    private Long answerWay;
     @Column(name = "properties")
     private String properties;
 }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/rpc/Oauth2/impl/ExamServiceImpl2.java

@@ -1,12 +1,10 @@
 package cn.iselab.mooctest.site.rpc.Oauth2.impl;
 
 import cn.iselab.mooctest.site.common.constant.Constants;
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
 import cn.iselab.mooctest.site.dao.Exam2CaseDao;
 import cn.iselab.mooctest.site.dao.OpenId2UserIdDao;
 import cn.iselab.mooctest.site.dao.Task2CaseDao;
 import cn.iselab.mooctest.site.models.*;
-import cn.iselab.mooctest.site.models.instancePermission.TaskPermission;
 import cn.iselab.mooctest.site.rpc.oauth2.api.ExamService;
 import cn.iselab.mooctest.site.rpc.oauth2.data.*;
 import cn.iselab.mooctest.site.service.AssignedTaskService;

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/application/ApiService.java

@@ -41,8 +41,6 @@ public interface ApiService {
 
     String checkCaseExists(Long[] workerIds, String subsiteCaseId, Long taskId, String host);
 
-    String uploadApp(String host, String name, String caseUrl, Boolean isPublic, Long uploaderId);
-
     String addCase(String host, String caseId, String typeName, Long managerId, String name, String url, String description, Integer domain, boolean isPublic);
 
     String addCase(String host, String caseId, String typeName,

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/application/impl/ApiServiceImpl.java

@@ -2,7 +2,6 @@ package cn.iselab.mooctest.site.service.application.impl;
 
 import cn.iselab.mooctest.site.common.constant.AppConstants;
 import cn.iselab.mooctest.site.common.constant.PrivilegeConstants;
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
 import cn.iselab.mooctest.site.dao.*;
 import cn.iselab.mooctest.site.models.*;
 import cn.iselab.mooctest.site.service.application.ApiService;
@@ -322,31 +321,6 @@ public class ApiServiceImpl implements ApiService {
     }
 
     @Override
-    public String uploadApp(String host, String name, String caseUrl, Boolean isPublic, Long uploaderId) {
-        String message = "";
-        Subsite subsite = subsiteDao.findByBaseUrl(host);
-        if (subsite == null) {
-            return "No subsite match from host";
-        }
-
-        Manager uploader = managerDao.findById(uploaderId);
-        if (uploader == null) {
-            return "No such manager";
-        }
-
-        App app = new App();
-        app.setVisible(isPublic);
-        app.setName(name);
-        app.setSubsiteId(subsite.getId());
-        app.setStatus(0);
-        app.setCreateTime(new Timestamp(System.currentTimeMillis()));
-
-        appDao.save(app);
-
-        return message;
-    }
-
-    @Override
     public String addCase(String host, String caseId, String typeName,
                           String name, String url, String description, int domain, Long appId) {
         String message = "";

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/AssignedTaskServiceImpl.java

@@ -1,6 +1,5 @@
 package cn.iselab.mooctest.site.service.impl;
 
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
 import cn.iselab.mooctest.site.dao.AssignedTaskDao;
 import cn.iselab.mooctest.site.dao.CaseDao;
 import cn.iselab.mooctest.site.dao.SubjectDao;

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/CaseServiceImpl.java

@@ -1,6 +1,5 @@
 package cn.iselab.mooctest.site.service.impl;
 
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
 import cn.iselab.mooctest.site.dao.*;
 import cn.iselab.mooctest.site.models.*;
 import cn.iselab.mooctest.site.service.CaseService;

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/ExamServiceImpl.java

@@ -1,6 +1,5 @@
 package cn.iselab.mooctest.site.service.impl;
 
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
 import cn.iselab.mooctest.site.dao.Exam2PaperDao;
 import cn.iselab.mooctest.site.dao.ExamDao;
 import cn.iselab.mooctest.site.dao.ExamGroupUserDao;
@@ -8,7 +7,6 @@ import cn.iselab.mooctest.site.dao.Task2GroupDao;
 import cn.iselab.mooctest.site.models.*;
 import cn.iselab.mooctest.site.service.BaseService;
 import cn.iselab.mooctest.site.service.ExamService;
-import cn.iselab.mooctest.site.web.exception.HttpBadRequestException;
 import cn.iselab.mooctest.site.web.util.Converter;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.UnauthorizedException;

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/PaperServiceImpl.java

@@ -1,6 +1,5 @@
 package cn.iselab.mooctest.site.service.impl;
 
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
 import cn.iselab.mooctest.site.dao.Exam2PaperDao;
 import cn.iselab.mooctest.site.dao.PaperDao;
 import cn.iselab.mooctest.site.dao.Task2CaseDao;
@@ -24,7 +23,6 @@ import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/ApiController.java

@@ -102,11 +102,6 @@ public class ApiController extends BaseController {
         return apiLogic.addCaseKivul(request, body);
     }
 
-    @RequestMapping(value = UrlConstants.API_INTERNAL + "uploadApp", method = RequestMethod.POST)
-    public String uploadApp(HttpServletRequest request, @RequestBody UploadAppVO body) {
-        return apiLogic.uploadApp(request, body);
-    }
-
     @RequestMapping(value = UrlConstants.API_INTERNAL + "recordScore", method = RequestMethod.POST)
     public String recordScore(HttpServletRequest request, @RequestBody RecordScoreVO body) {
         return apiLogic.recordScore(request, body);

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/CaseController.java

@@ -1,30 +1,17 @@
 package cn.iselab.mooctest.site.web.ctrl;
 
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
 import cn.iselab.mooctest.site.common.constant.UrlConstants;
-import cn.iselab.mooctest.site.dao.AppDao;
-import cn.iselab.mooctest.site.dao.CaseDao;
-import cn.iselab.mooctest.site.dao.CaseExtendsDao;
-import cn.iselab.mooctest.site.dao.fromKibug.ApplicationDao;
-import cn.iselab.mooctest.site.dao.fromKibug.CaseFromKibugDao;
 import cn.iselab.mooctest.site.models.*;
-import cn.iselab.mooctest.site.models.fromKibug.Application;
-import cn.iselab.mooctest.site.models.fromKibug.CaseFromKibug;
 import cn.iselab.mooctest.site.models.instancePermission.TaskPermission;
 import cn.iselab.mooctest.site.models.instancePermission.CasePermission;
 import cn.iselab.mooctest.site.service.ExamService;
 import cn.iselab.mooctest.site.util.http.RequestUtils;
 import cn.iselab.mooctest.site.web.data.CaseExtendsVO;
 import cn.iselab.mooctest.site.web.data.CaseVO;
-import cn.iselab.mooctest.site.web.data.UserVO;
 import cn.iselab.mooctest.site.web.logic.CaseLogic;
-import cn.iselab.mooctest.site.web.util.Converter;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.shiro.authz.annotation.RequiresAuthentication;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.authz.annotation.RequiresUser;
-import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -34,8 +21,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.NotNull;
-import java.net.URL;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/fromDev/PluginController.java

@@ -1,6 +1,6 @@
 package cn.iselab.mooctest.site.web.ctrl.fromDev;
 
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
+import cn.iselab.mooctest.site.common.constant.AnswerWayConstants;
 import cn.iselab.mooctest.site.common.constant.UrlConstants;
 import cn.iselab.mooctest.site.common.web.ResponseMessage;
 import cn.iselab.mooctest.site.common.web.SuccessResult;
@@ -124,7 +124,7 @@ public class PluginController extends BaseController{
         String str = EncryptionUtil.decryptDES(workerStr);
         String userId = str.split("_")[1];
         String taskId = str.split("_")[0];
-        return pluginLogic.getCaseList(Long.parseLong(userId),Long.parseLong(taskId), SubsiteConstants.DEV_ECLIPSE);
+        return pluginLogic.getCaseList(Long.parseLong(userId),Long.parseLong(taskId), AnswerWayConstants.DEV_ECLIPSE);
     }
 
     @RequestMapping(value =UrlConstants.API_KIBUG + "plugin/login", method = RequestMethod.GET)
@@ -132,7 +132,7 @@ public class PluginController extends BaseController{
         String str = EncryptionUtil.decryptDES(workerStr);
         String userId = str.split("_")[1];
         String taskId = str.split("_")[0];
-        return pluginLogic.getCaseList(Long.parseLong(userId),Long.parseLong(taskId), new Long(SubsiteConstants.APP_ECLIPSE));
+        return pluginLogic.getCaseList(Long.parseLong(userId),Long.parseLong(taskId), new Long(AnswerWayConstants.APP_ECLIPSE));
     }
 
     @RequestMapping(value =UrlConstants.API_KIBUG + "plugin/case/{caseId}", method = RequestMethod.GET)

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/fromKibug/ApplicationController.java

@@ -100,7 +100,6 @@ public class ApplicationController {
     public Map<String, Object> createAutoTest(@RequestBody @NotNull AutoTestVO vo) throws Exception {
         vo.validate();
         long id = applicationService.createAutoTestApp(vo);
-        apiService.uploadApp(moocKiBugSecret,vo.getName(),UrlConstants.HOSTNAME + "#/app/" + id + "/info",false,vo.getManagerId());
 
         AppCreateEvent appCreateEvent = AppCreateEvent.create(id);
         eventUtil.post(appCreateEvent);

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/fromKibug/ScoreRuleController.java

@@ -1,29 +1,22 @@
 package cn.iselab.mooctest.site.web.ctrl.fromKibug;
 
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
+import cn.iselab.mooctest.site.common.constant.AnswerWayConstants;
 import cn.iselab.mooctest.site.common.constant.UrlConstants;
-import cn.iselab.mooctest.site.common.enums.AppPlatform;
 import cn.iselab.mooctest.site.common.web.ErrorResult;
 import cn.iselab.mooctest.site.common.web.ResponseMessage;
 import cn.iselab.mooctest.site.common.web.StatusCode;
 import cn.iselab.mooctest.site.common.web.SuccessResult;
-import cn.iselab.mooctest.site.models.Case;
 import cn.iselab.mooctest.site.models.CaseExtends;
 import cn.iselab.mooctest.site.models.Task;
-import cn.iselab.mooctest.site.models.fromKibug.*;
 import cn.iselab.mooctest.site.service.CaseService;
 import cn.iselab.mooctest.site.service.TaskService;
 import cn.iselab.mooctest.site.service.fromKibug.ScoreRuleService;
-import cn.iselab.mooctest.site.web.data.fromKibug.CaseListItemVO;
-import cn.iselab.mooctest.site.web.data.fromKibug.KibugTaskVO;
 import cn.iselab.mooctest.site.web.data.fromKibug.ScoreRuleItemVO;
 import cn.iselab.mooctest.site.web.data.fromKibug.ScoreRuleVO;
-import cn.iselab.mooctest.site.web.util.Converter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -46,15 +39,15 @@ public class ScoreRuleController {
         CaseExtends caseExtends = caseService.getCaseExtendsById(caseId);
         List<ScoreRuleItemVO> scoreRules;
         List<String> options;
-        switch(caseExtends.getSubsiteId().intValue()){
-            case (int) SubsiteConstants.DEV_ECLIPSE:
+        switch(caseExtends.getAnswerWay().intValue()){
+            case (int) AnswerWayConstants.DEV_ECLIPSE:
                 scoreRules = scoreRuleService.getDevScoreRule(taskId,caseId);
                 options = scoreRuleService.getDevOptions();
                 break;
-            case (int) SubsiteConstants.APP_ECLIPSE:
-            case (int) SubsiteConstants.WEB_ECLIPSE:
-            case (int) SubsiteConstants.THIRD_PARTY:
-            case (int) SubsiteConstants.REPORT:
+            case (int) AnswerWayConstants.APP_ECLIPSE:
+            case (int) AnswerWayConstants.WEB_ECLIPSE:
+            case (int) AnswerWayConstants.THIRD_PARTY:
+            case (int) AnswerWayConstants.REPORT:
                 scoreRules = scoreRuleService.getKibugScoreRule(taskId,caseId);
                 options = scoreRuleService.getKibugOptions();
                 break;
@@ -74,18 +67,18 @@ public class ScoreRuleController {
                                                @RequestBody ScoreRuleVO vo) throws Exception {
         vo.validate();
         CaseExtends ca=caseService.getCaseExtendsById(vo.getCaseId());
-        switch (ca.getSubsiteId().intValue()){
-            case (int) SubsiteConstants.DEV_ECLIPSE:scoreRuleService.updateDevScoreRule(taskId,caseId,vo.getWeights());break;
-            case (int) SubsiteConstants.APP_ECLIPSE:
-            case (int) SubsiteConstants.WEB_ECLIPSE:
-            case (int) SubsiteConstants.THIRD_PARTY:
-            case (int) SubsiteConstants.REPORT:scoreRuleService.updateKibugScoreRule(taskId,caseId,vo.getWeights());break;
+        switch (ca.getAnswerWay().intValue()){
+            case (int) AnswerWayConstants.DEV_ECLIPSE:scoreRuleService.updateDevScoreRule(taskId,caseId,vo.getWeights());break;
+            case (int) AnswerWayConstants.APP_ECLIPSE:
+            case (int) AnswerWayConstants.WEB_ECLIPSE:
+            case (int) AnswerWayConstants.THIRD_PARTY:
+            case (int) AnswerWayConstants.REPORT:scoreRuleService.updateKibugScoreRule(taskId,caseId,vo.getWeights());break;
             default :return new ErrorResult(StatusCode.PARAMETER_ERROR);
         }
 //        switch(task.getSubsiteId().intValue()){
-//            case (int) SubsiteConstants.DEV_SUBSITE_ID:scoreRuleService.updateDevScoreRule(taskId,caseId,vo.getWeights());break;
-//            case (int) SubsiteConstants.KIKBUG_SUBSITE_ID:
-//            case (int) SubsiteConstants.KIJAM_SUBSITE_ID:scoreRuleService.updateKibugScoreRule(taskId,caseId,vo.getWeights());break;
+//            case (int) AnswerWayConstants.DEV_SUBSITE_ID:scoreRuleService.updateDevScoreRule(taskId,caseId,vo.getWeights());break;
+//            case (int) AnswerWayConstants.KIKBUG_SUBSITE_ID:
+//            case (int) AnswerWayConstants.KIJAM_SUBSITE_ID:scoreRuleService.updateKibugScoreRule(taskId,caseId,vo.getWeights());break;
 //            default :return new ErrorResult(StatusCode.PARAMETER_ERROR);
 //        }
         return SuccessResult.ok();

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

@@ -21,5 +21,5 @@ public class CaseExtendsVO extends CaseVO{
     private long taskId;
     private String entrance;
     private Boolean submitted;
-    private long targetType;
+    private Long targetType;
 }

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

@@ -9,7 +9,7 @@ import java.sql.Timestamp;
 public class TargetVO {
 
     private Long id;
-    private Long subsiteId;
+    private Long targetType;
     private String name;
     private short complete;
     private Long createTimeMillis;
@@ -28,14 +28,6 @@ public class TargetVO {
         this.id = id;
     }
 
-    public Long getSubsiteId() {
-        return subsiteId;
-    }
-
-    public void setSubsiteId(Long subsiteId) {
-        this.subsiteId = subsiteId;
-    }
-
     public String getName() {
         return name;
     }
@@ -107,4 +99,12 @@ public class TargetVO {
     public void setOwnerId(long ownerId) {
         this.ownerId = ownerId;
     }
+
+    public Long getTargetType() {
+        return targetType;
+    }
+
+    public void setTargetType(Long targetType) {
+        this.targetType = targetType;
+    }
 }

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

@@ -21,7 +21,7 @@ public class AppVOWrapper extends BaseWrapper<AppVO, App> {
         vo.setCreateTime(app.getCreateTime().getTime());
         vo.setVisible(app.getVisible());
         vo.setStatus(app.getStatus());
-        vo.setSubsiteId(app.getSubsiteId());
+        vo.setSubsiteId(app.getTargetType());
         vo.setUrl(app.getUrl());
         vo.setId(app.getId());
 
@@ -36,7 +36,7 @@ public class AppVOWrapper extends BaseWrapper<AppVO, App> {
 
         app.setName(vo.getName());
         app.setId(vo.getId());
-        app.setSubsiteId(vo.getSubsiteId());
+        app.setTargetType(vo.getSubsiteId());
         Timestamp createTime = new Timestamp(System.currentTimeMillis());
         app.setCreateTime(createTime);
         app.setVisible(vo.getVisible());

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

@@ -16,7 +16,7 @@ public class TargetDevVOWrapper {
     public App wrap(TargetDevVO targetDevVO){
         App app=new App();
         app.setCreateTime(new Timestamp(targetDevVO.getCreateTimeMillis()));
-        app.setSubsiteId(targetDevVO.getSubsiteId());
+        app.setTargetType(targetDevVO.getTargetType());
         app.setMessage(targetDevVO.getExtra());
         app.setUrl(targetDevVO.getUrl());
         app.setName(targetDevVO.getName());

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

@@ -46,7 +46,7 @@ public class TargetKibugVOWrapper extends BaseWrapper<TargetKibugVO,Application>
         app.setName(targetKibugVO.getName());
         app.setUrl(targetKibugVO.getUrl());
         app.setVisible(targetKibugVO.isVisible());
-        app.setSubsiteId(targetKibugVO.getSubsiteId());
+        app.setTargetType(targetKibugVO.getTargetType());
         app.setStatus(targetKibugVO.getStatus());
         app.setOwnerId(targetKibugVO.getOwnerId());
         app.setUrl(targetKibugVO.getUrl());
@@ -58,7 +58,7 @@ public class TargetKibugVOWrapper extends BaseWrapper<TargetKibugVO,Application>
         TargetKibugVO targetKibugVO=wrap(application);
         targetKibugVO.setId(app.getId());
         targetKibugVO.setVisible(app.getVisible());
-        targetKibugVO.setSubsiteId(app.getSubsiteId());
+        targetKibugVO.setTargetType(app.getTargetType());
         targetKibugVO.setStatus(app.getStatus());
         targetKibugVO.setCreateTimeMillis(app.getCreateTime().getTime());
         targetKibugVO.setName(app.getName());

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

@@ -21,7 +21,7 @@ public class TargetVOWrapper extends BaseWrapper<TargetVO,App>{
         vo.setId(app.getId());
         vo.setCreateTimeMillis(app.getCreateTime().getTime());
         vo.setVisible(app.getVisible());
-        vo.setSubsiteId(app.getSubsiteId());
+        vo.setTargetType(app.getTargetType());
         vo.setName(app.getName());
         vo.setUrl(app.getUrl());
         vo.setStatus(app.getStatus());
@@ -37,7 +37,7 @@ public class TargetVOWrapper extends BaseWrapper<TargetVO,App>{
         app.setCreateTime(new Timestamp(targetVO.getCreateTimeMillis()));
         app.setName(targetVO.getName());
         app.setVisible(targetVO.isVisible());
-        app.setSubsiteId(targetVO.getSubsiteId());
+        app.setTargetType(targetVO.getTargetType());
         app.setOwnerId(targetVO.getOwnerId());
         return app;
     }

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

@@ -19,7 +19,7 @@ public class TargetWebVOWrapper{
         app.setCreateTime(new Timestamp(vo.getCreateTimeMillis()));
         app.setName(vo.getName());
         app.setVisible(vo.isVisible());
-        app.setSubsiteId(vo.getSubsiteId());
+        app.setTargetType(vo.getTargetType());
         app.setUrl(vo.getUrl());
         app.setOwnerId(vo.getOwnerId());
         app.setMessage(vo.getExtra());
@@ -40,7 +40,7 @@ public class TargetWebVOWrapper{
         vo.setId(app.getId());
         vo.setStatus(app.getStatus());
         vo.setVisible(app.getVisible());
-        vo.setSubsiteId(app.getSubsiteId());
+        vo.setTargetType(app.getTargetType());
         vo.setUrl(app.getUrl());
         return vo;
     }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/filter/ApiHeaderFilter.java

@@ -1,6 +1,6 @@
 package cn.iselab.mooctest.site.web.filter;
 
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
+import cn.iselab.mooctest.site.common.constant.AnswerWayConstants;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.*;
@@ -24,7 +24,7 @@ public class ApiHeaderFilter implements Filter {
         HttpServletResponse response = (HttpServletResponse) servletResponse;
 
         String secret = request.getHeader("secret");
-        if (secret == null || secret.length() == 0 || (!SubsiteConstants.SECRETS.contains(secret))){
+        if (secret == null || secret.length() == 0 || (!AnswerWayConstants.SECRETS.contains(secret))){
             response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Secret mismatch");
             filterChain.doFilter(request, response);
             return;

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

@@ -33,9 +33,7 @@ public interface ApiLogic {
     String addCase(HttpServletRequest request, AddCaseVO input);
 
     String addCaseKivul(HttpServletRequest request, AddCaseKivulVO input);
-
-    String uploadApp(HttpServletRequest request, UploadAppVO input);
-
+    
     String recordScore(HttpServletRequest request, RecordScoreVO input);
 
     String joinGroup(HttpServletRequest request, JoinGroupVO input);

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/fromDev/PluginLogic.java

@@ -52,7 +52,7 @@ public interface PluginLogic {
 
     PluginResultVO loginFromPlugin(String workerStr) throws Exception;
 
-    PluginResultVO getCaseList(Long userId, Long taskId, Long subsiteId) throws Exception;
+    PluginResultVO getCaseList(Long userId, Long taskId, Long answerWay) throws Exception;
 
     KibugCaseVO getKibugCase(Long userId, Long taskId, Long caseId) throws Exception ;
 

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

@@ -1,6 +1,6 @@
 package cn.iselab.mooctest.site.web.logic.fromDev.impl;
 
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
+import cn.iselab.mooctest.site.common.constant.AnswerWayConstants;
 import cn.iselab.mooctest.site.models.Task;
 import cn.iselab.mooctest.site.models.User;
 import cn.iselab.mooctest.site.models.fromKibug.Report;
@@ -222,7 +222,7 @@ public class PluginLogicImpl extends BaseLogic implements PluginLogic{
         List<CaseExtendsVO> caseExtendsVOS = caseLogic.getCasesForExam(paperId,Long.parseLong(taskId),user.getId());
         List<PluginCaseVO> cases = new ArrayList<>();
         for(CaseExtendsVO caseExtendsVO:caseExtendsVOS){
-            if(caseExtendsVO.getSubsiteId() == SubsiteConstants.DEV_ECLIPSE)
+            if(caseExtendsVO.getAnswerWay() == AnswerWayConstants.DEV_ECLIPSE)
                 cases.add(new EclipseCaseVO(caseExtendsVO));
         }
         pluginResultVO.setCases(cases);
@@ -249,7 +249,7 @@ public class PluginLogicImpl extends BaseLogic implements PluginLogic{
     }
 
     @Override
-    public PluginResultVO getCaseList(Long userId, Long taskId, Long subsiteId) throws Exception {
+    public PluginResultVO getCaseList(Long userId, Long taskId, Long answerWay) throws Exception {
         User user = userService.findByUserId(userId);
         if(user == null){
             throw new HttpUnauthorizedException("用户不存在");
@@ -266,7 +266,7 @@ public class PluginLogicImpl extends BaseLogic implements PluginLogic{
         List<CaseExtendsVO> caseExtendsVOS = caseLogic.getCasesForExam(paperId,taskId,user.getId());
         List<PluginCaseVO> cases = new ArrayList<>();
         for(CaseExtendsVO caseExtendsVO:caseExtendsVOS){
-            if(caseExtendsVO.getSubsiteId().equals(subsiteId))
+            if(caseExtendsVO.getAnswerWay().equals(answerWay))
                 cases.add(wrapPluginCaseVO(caseExtendsVO));
         }
         pluginResultVO.setCases(cases);
@@ -300,9 +300,9 @@ public class PluginLogicImpl extends BaseLogic implements PluginLogic{
     }
 
     private PluginCaseVO wrapPluginCaseVO(CaseExtendsVO caseExtends){
-        if(caseExtends.getSubsiteId()== SubsiteConstants.DEV_ECLIPSE){
+        if(caseExtends.getAnswerWay()== AnswerWayConstants.DEV_ECLIPSE){
             return new EclipseCaseVO(caseExtends);
-        }else if(caseExtends.getSubsiteId()== SubsiteConstants.APP_ECLIPSE || caseExtends.getSubsiteId()==SubsiteConstants.THIRD_PARTY){
+        }else if(caseExtends.getAnswerWay()== AnswerWayConstants.APP_ECLIPSE || caseExtends.getAnswerWay()== AnswerWayConstants.THIRD_PARTY){
             KibugPluginCaseVO vo = new KibugPluginCaseVO();
             vo.setId(caseExtends.getId());
             vo.setName(caseExtends.getName());

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

@@ -449,30 +449,6 @@ public class ApiLogicImpl implements ApiLogic {
     }
 
     @Override
-    public String uploadApp(HttpServletRequest request, UploadAppVO input) {
-        int statusCode = HTTP_OK;
-        String host = getSecretHeader(request);
-        if (host != null){
-            if (input == null){
-                return generateResponse(HTTP_INTERNAL_ERROR, "Exception occured" , "{}");
-            }
-            Boolean isPublic = input.getPublic();
-            String name = input.getName();
-            String caseUrl = input.getCaseUrl();
-            Long uploaderId = input.getUploaderId();
-
-            if (isPublic == null || name == null || caseUrl == null || uploaderId == null) {
-                return missingParameterResponse;
-            }
-
-            String message = apiService.uploadApp(host, name, caseUrl, isPublic, uploaderId);
-
-            return generateResponse(statusCode, message, apiService.booleanToJSON(message == null || message.length() == 0));
-        }
-        return generateResponse(statusCode, "Subsite mismatch", "{}");
-    }
-
-    @Override
     public String recordScore(HttpServletRequest request, RecordScoreVO input) {
         int statusCode = HTTP_OK;
         String host = getSecretHeader(request);

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

@@ -1,6 +1,6 @@
 package cn.iselab.mooctest.site.web.logic.impl;
 
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
+import cn.iselab.mooctest.site.common.constant.AnswerWayConstants;
 import cn.iselab.mooctest.site.data.CaseBlock;
 import cn.iselab.mooctest.site.models.*;
 import cn.iselab.mooctest.site.service.*;
@@ -8,7 +8,6 @@ import cn.iselab.mooctest.site.service.fromKibug.ScoreRuleService;
 import cn.iselab.mooctest.site.web.data.WeightDirtyVO;
 import cn.iselab.mooctest.site.web.data.fromKibug.ScoreRuleItemVO;
 import cn.iselab.mooctest.site.web.logic.CalculateSocreLogic;
-import org.json.JSONArray;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -41,14 +40,14 @@ public class CalculateScoreLogicImpl implements CalculateSocreLogic {
     @Override
     public void calculateScore(long taskId, long caseId) {
         CaseExtends caseExtends=caseService.getCaseExtendsById(caseId);
-        Long subsiteId=caseExtends.getSubsiteId();
-        if(subsiteId== SubsiteConstants.APP_ECLIPSE || subsiteId==SubsiteConstants.WEB_ECLIPSE
-                || subsiteId== SubsiteConstants.THIRD_PARTY || subsiteId== SubsiteConstants.REPORT ){
+        Long subsiteId=caseExtends.getAnswerWay();
+        if(subsiteId== AnswerWayConstants.APP_ECLIPSE || subsiteId== AnswerWayConstants.WEB_ECLIPSE
+                || subsiteId== AnswerWayConstants.THIRD_PARTY || subsiteId== AnswerWayConstants.REPORT ){
             calculateScoreService.calculateManual(taskId, caseId);
             calculateScoreService.calculateScript(taskId,caseId);
             List<ScoreRuleItemVO> scoreRule = scoreRuleService.getKibugScoreRule(taskId,caseId);
             calculateScoreService.calculateTotal(taskId,caseId,scoreRule);
-        }else if(subsiteId == SubsiteConstants.DEV_ECLIPSE){
+        }else if(subsiteId == AnswerWayConstants.DEV_ECLIPSE){
             calculateScoreService.calculateDevScore(taskId, caseId);
         }
     }
@@ -56,14 +55,14 @@ public class CalculateScoreLogicImpl implements CalculateSocreLogic {
     @Override
     public void calculateScore(long taskId, long caseId, long userId) throws Exception {
         CaseExtends caseExtends=caseService.getCaseExtendsById(caseId);
-        Long subsiteId=caseExtends.getSubsiteId();
-        if(subsiteId== SubsiteConstants.APP_ECLIPSE || subsiteId==SubsiteConstants.WEB_ECLIPSE
-                || subsiteId== SubsiteConstants.THIRD_PARTY || subsiteId== SubsiteConstants.REPORT ){
+        Long subsiteId=caseExtends.getAnswerWay();
+        if(subsiteId== AnswerWayConstants.APP_ECLIPSE || subsiteId== AnswerWayConstants.WEB_ECLIPSE
+                || subsiteId== AnswerWayConstants.THIRD_PARTY || subsiteId== AnswerWayConstants.REPORT ){
             calculateScoreService.calculatePersonalManual(taskId, caseId,userId);
             calculateScoreService.calculatePersonalScript(taskId,caseId,userId);
             List<ScoreRuleItemVO> scoreRule = scoreRuleService.getKibugScoreRule(taskId,caseId);
             calculateScoreService.calculatePersonalTotal(taskId,caseId,userId,scoreRule);
-        }else if(subsiteId == SubsiteConstants.DEV_ECLIPSE){
+        }else if(subsiteId == AnswerWayConstants.DEV_ECLIPSE){
             calculateScoreService.calculatePersonalDevScore(taskId, caseId,userId);
         }
     }

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

@@ -1,5 +1,6 @@
 package cn.iselab.mooctest.site.web.logic.impl;
 
+import cn.iselab.mooctest.site.common.constant.AnswerWayConstants;
 import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
 import cn.iselab.mooctest.site.common.constant.TargetTypeConstants;
 import cn.iselab.mooctest.site.common.constant.ThirdPartConstants;

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/ctrl/fromKibug/ScoreRuleControllerTest.java

@@ -1,6 +1,6 @@
 package cn.iselab.mooctest.site.web.ctrl.fromKibug;
 
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
+import cn.iselab.mooctest.site.common.constant.AnswerWayConstants;
 import cn.iselab.mooctest.site.common.constant.UrlConstants;
 import cn.iselab.mooctest.site.common.enums.ScoreRuleKey;
 import cn.iselab.mooctest.site.models.*;
@@ -57,23 +57,23 @@ public class ScoreRuleControllerTest {
         //arrange
         Task devTask = new Task();
         CaseExtends devCase = new CaseExtends();
-        devCase.setSubsiteId(SubsiteConstants.DEV_SUBSITE_ID);
-        devTask.setSubsiteId(SubsiteConstants.DEV_SUBSITE_ID);
+        devCase.setSubsiteId(AnswerWayConstants.DEV_SUBSITE_ID);
+        devTask.setSubsiteId(AnswerWayConstants.DEV_SUBSITE_ID);
         when(taskService.getTask(123)).thenReturn(devTask);
         when(caseService.getCaseExtendsById(456)).thenReturn(devCase);
 
         Task kibugTask = new Task();
         CaseExtends kibugCase = new CaseExtends();
-        kibugCase.setSubsiteId((long)SubsiteConstants.KIKBUG_SUBSITE_ID);
-        kibugTask.setSubsiteId((long)SubsiteConstants.KIKBUG_SUBSITE_ID);
+        kibugCase.setSubsiteId((long) AnswerWayConstants.KIKBUG_SUBSITE_ID);
+        kibugTask.setSubsiteId((long) AnswerWayConstants.KIKBUG_SUBSITE_ID);
         when(taskService.getTask(234)).thenReturn(kibugTask);
         when(caseService.getCaseExtendsById(567)).thenReturn(kibugCase);
 
 
         Task kijamTask = new Task();
         CaseExtends caseExtends = new CaseExtends();
-        caseExtends.setSubsiteId((long) SubsiteConstants.KIJAM_SUBSITE_ID);
-        kibugTask.setSubsiteId((long)SubsiteConstants.KIJAM_SUBSITE_ID);
+        caseExtends.setSubsiteId((long) AnswerWayConstants.KIJAM_SUBSITE_ID);
+        kibugTask.setSubsiteId((long) AnswerWayConstants.KIJAM_SUBSITE_ID);
         when(taskService.getTask(345)).thenReturn(kibugTask);
         when(caseService.getCaseExtendsById(678)).thenReturn(caseExtends);
 

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/logic/impl/CaseLogicImplTest.java

@@ -1,6 +1,6 @@
 package cn.iselab.mooctest.site.web.logic.impl;
 
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
+import cn.iselab.mooctest.site.common.constant.AnswerWayConstants;
 import cn.iselab.mooctest.site.data.CaseBlock;
 import cn.iselab.mooctest.site.models.*;
 import cn.iselab.mooctest.site.models.fromKibug.Application;
@@ -69,7 +69,7 @@ public class CaseLogicImplTest {
         short platform=5;
         caseExtendsVO.setPlatform(platform);
         caseExtendsVO.setProperties("");
-        caseExtendsVO.setSubsiteId(46L);
+        caseExtendsVO.setAnswerWay(46L);
         caseExtendsVO.setTargetId(123L);
         caseExtendsVO.setName("Test");
         caseExtendsVO.setDescription("This is just a test.");
@@ -80,7 +80,7 @@ public class CaseLogicImplTest {
         caseExtends = new CaseExtends();
         caseExtends.setId(456L);
         caseExtends.setTargetId(789L);
-        caseExtends.setSubsiteId((long)SubsiteConstants.KIKBUG_SUBSITE_ID);
+        caseExtends.setAnswerWay((long) AnswerWayConstants.APP_ECLIPSE);
         List<CaseExtends> caseExtendsList = new ArrayList<>();
         caseExtendsList.add(caseExtends);
         casePage = new PageImpl<>(caseExtendsList);
@@ -93,7 +93,7 @@ public class CaseLogicImplTest {
         short platform=5;
         caseExtends.setPlatform(platform);
         caseExtends.setProperties("");
-        caseExtends.setSubsiteId(46L);
+        caseExtends.setAnswerWay(46L);
         caseExtends.setTargetId(123L);
         caseExtends.setName("Test");
         caseExtends.setDescription("This is just a test.");
@@ -118,7 +118,7 @@ public class CaseLogicImplTest {
         short platform=5;
         caseExtends.setPlatform(platform);
         caseExtends.setProperties("");
-        caseExtends.setSubsiteId(46L);
+        caseExtends.setAnswerWay(46L);
         caseExtends.setTargetId(123L);
         caseExtends.setName("测试");
         caseExtends.setDescription("This is just a test.");
@@ -157,7 +157,7 @@ public class CaseLogicImplTest {
         short platform=5;
         caseExtends.setPlatform(platform);
         caseExtends.setProperties("");
-        caseExtends.setSubsiteId(46L);
+        caseExtends.setAnswerWay(46L);
         caseExtends.setTargetId(123L);
         caseExtends.setName("测试");
         caseExtends.setDescription("This is just a test.");
@@ -217,7 +217,7 @@ public class CaseLogicImplTest {
         App app=new App();
         app.setName("Test");
         CaseExtends cs=new CaseExtends();
-        cs.setSubsiteId(SubsiteConstants.DEV_SUBSITE_ID);
+        cs.setAnswerWay(AnswerWayConstants.APP_ECLIPSE);
         cs.setAppId(789L);
         when(caseService.getCaseExtendsById(123)).thenReturn(cs);
         when(appService.getAppById(789L)).thenReturn(app);

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/logic/impl/JobLogicImplTest.java

@@ -1,79 +0,0 @@
-package cn.iselab.mooctest.site.web.logic.impl;
-
-import cn.iselab.mooctest.site.data.AssignedCase;
-import cn.iselab.mooctest.site.models.AssignedTask;
-import cn.iselab.mooctest.site.service.AssignedTaskService;
-import cn.iselab.mooctest.site.web.data.JobVO;
-import cn.iselab.mooctest.site.web.exception.HttpForbiddenException;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.mockito.Mockito.when;
-
-/**
- * Created by shanshan on 2017/7/3.
- */
-public class JobLogicImplTest {
-    @InjectMocks
-    private JobLogicImpl jobLogic = new JobLogicImpl();
-
-    @Mock
-    private AssignedTaskService assignedTaskService;
-    @Mock
-    private JobVOWrapper jobVOWrapper;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void should_throwException_when_examIdExists() {
-        //arrange
-        long userId = 1L;
-        long examId = 2L;
-        when(assignedTaskService.getAssignedTask(examId,userId)).thenReturn(null);
-
-        //action
-        try{
-            jobLogic.getJobs(userId,examId);
-        }catch(Exception e){
-            //assert
-            Assert.assertEquals(HttpForbiddenException.class, e.getClass());
-            Assert.assertEquals("worker not task the task", e.getMessage());
-        }
-    }
-
-    @Test
-    public void should_returnJobs_when_givenExamId() {
-        //arrange
-        long userId = 1L;
-        long examId = 2L;
-        AssignedTask assignedTask = new AssignedTask();
-        assignedTask.setId(2L);
-        List<JobVO> voList = new ArrayList<>();
-        JobVO vo = new JobVO();
-        vo.setCaseId(123L);
-        voList.add(vo);
-        List<AssignedCase> jobList = new ArrayList<>();
-        AssignedCase job = new AssignedCase();
-        job.setCaseId(123L);
-        jobList.add(job);
-        when(assignedTaskService.getAssignedTask(examId,userId)).thenReturn(assignedTask);
-        when(assignedTaskService.getAssignedCases(assignedTask)).thenReturn(jobList);
-        when(jobVOWrapper.wrap(jobList)).thenReturn(voList);
-        //action
-        List<JobVO> result = jobLogic.getJobs(examId, userId);
-        //assert
-        Assert.assertEquals(voList,result);
-
-    }
-
-}