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

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

@@ -0,0 +1,33 @@
+package cn.iselab.mooctest.site.common.constant;
+
+import cn.iselab.mooctest.site.dao.SubsiteDao;
+import cn.iselab.mooctest.site.models.Subsite;
+import cn.iselab.mooctest.site.service.common.SubsiteService;
+import cn.iselab.mooctest.site.service.common.impl.SubsiteServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Created by Liu on 2017/1/3.
+ */
+public class AnswerWayConstants {
+
+    public static final long DEV_ECLIPSE = 1;
+    public static final long APP_ECLIPSE = 2;
+    public static final long WEB_ECLIPSE = 3;
+    public static final long THIRD_PARTY = 4;
+    public static final long REPORT = 5;
+    public static final long EMBEDDED = 6;
+    public static final long JMETER = 7;
+
+//    public static final long PYTHON_SUBSITE_ID = 4;
+//    public static final int KIKBUG_SUBSITE_ID = 6;
+//    public static final long KIVUL_SUBSITE_ID = 7;
+//    public static final long DEV_SUBSITE_ID = 10;
+//    public static final int KIJAM_SUBSITE_ID = 12;
+//    public static final long DEVELOP_SUBSITE_ID = 13;
+}

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

@@ -1,53 +0,0 @@
-package cn.iselab.mooctest.site.common.constant;
-
-import cn.iselab.mooctest.site.dao.SubsiteDao;
-import cn.iselab.mooctest.site.models.Subsite;
-import cn.iselab.mooctest.site.service.common.SubsiteService;
-import cn.iselab.mooctest.site.service.common.impl.SubsiteServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Created by Liu on 2017/1/3.
- */
-public class SubsiteConstants {
-    /**
-     * Task Entrances
-     */
-    public static final String TASK_ENTRANCE_ECLIPSE = "http://121.199.32.102:8089/analysis?code=";
-    public static final String TASK_ENTRANCE_KIVUL = "http://kivul.mooctest.net/KiVul/welcome.mvc?code=";
-    public static final String TASK_ENTRANCE_PYTHON = "http://kivul.mooctest.net/KiVul/welcome.mvc?code=";
-    public static final String TASK_ENTRANCE_KIKBUG = "http://kikbug.mooctest.net/worker.html#/task/";
-
-    /**
-     * Subsites
-     */
-    public static final String KIKBUG_NAME = "Kikbug App Testing";
-
-    /**
-     * Secrets
-     */
-    public static final HashSet<String> SECRETS = new HashSet<String>(){
-        {
-            // TODO: Currently use constants pool for testing
-            // Add singleton to initialize the value-obtaing after @Autowired
-            add("kibug.mooctest.net");
-            add("dev.mooctest.net");
-            add("kivul.mooctest.net");
-            add("kijam.mooctest.net");
-            add("dev-d.mooctest.net");
-            add("py.mooctest.net:8080/KiVul");
-        }
-    };
-
-    public static final long PYTHON_SUBSITE_ID = 4;
-    public static final int KIKBUG_SUBSITE_ID = 6;
-    public static final long KIVUL_SUBSITE_ID = 7;
-    public static final long DEV_SUBSITE_ID = 10;
-    public static final int KIJAM_SUBSITE_ID = 12;
-    public static final long DEVELOP_SUBSITE_ID = 13;
-}

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/common/constant/TargetTypeConstants.java

@@ -0,0 +1,10 @@
+package cn.iselab.mooctest.site.common.constant;
+
+/**
+ * Created by HenryLee on 2017/9/5.
+ */
+public class TargetTypeConstants {
+    public static final int KIBUG = 6;
+    public static final int WEB = 8;
+    public static final int DEV = 10;
+}

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,14 +1,12 @@
 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.common.constant.ThirdPartConstants;
 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.dao.UserDao;
 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;
@@ -71,7 +69,7 @@ public class ExamServiceImpl2 implements ExamService {
         if(!examLogic.checkTaskViewPermission(userId, taskId)){
             throw new UnauthorizedException("no permission for task");
         }
-        PluginResultVO vo = pluginLogic.getCaseList(userId, taskId, subsiteId);
+        PluginResultVO vo = pluginLogic.getCaseList(userId, taskId);
         TaskVO taskVO = Converter.convert(TaskVO.class, vo);
         List<CaseItemVO> caseList = new ArrayList<>();
         vo.getCases().stream().forEach(caseItem -> {

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

@@ -17,9 +17,6 @@ public interface AssignedTaskService {
 
     List<AssignedTask> saveOrUpdateAssignedTask(List<AssignedTask> assignedTasks);
 
-    //obsolete
-    List<AssignedCase> getAssignedCases(AssignedTask assignedTask);
-
     List<AssignedCase> wrapAssignedCases(AssignedTask assignedTask);
 
     void addCase(long examId, long caseId, long participantId, String resultURL);

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

@@ -20,6 +20,8 @@ public interface TargetService {
 
     DevTarget findDevByUpLoadCaseId(long uploadCaseId);
 
+    WebTarget findWebByAppId(long appId);
+
     void createTargetDev(DevTarget devTarget);
 
     App findById(long id);

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

@@ -28,8 +28,6 @@ public interface TaskService {
 
     List<Task> getTaskListByGroupId(long groupId);
 
-    Task createTask(Task task, List<CaseBlock> caseBlocks, Set<Long> groupIds);
-
     List<Task> getTaskList(long managerId);
 
     int getManagerTaskCount(long managerId);

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

@@ -15,8 +15,6 @@ public interface ApiService {
 
     String getTaskTime(Long taskId);
 
-    String getCases(Long workerId);
-
     String checkCaseOwnership(Long workerId, Long taskId, String caseId);
 
     Worker workerExists(Long workerId);
@@ -43,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;
@@ -196,54 +195,6 @@ public class ApiServiceImpl implements ApiService {
         return result.toString();
     }
 
-
-    @Override
-    public String getCases(Long workerId) {
-        JSONArray result = new JSONArray();
-
-        List<AssignedTask> assignedTasks = assignedTaskDao.findByWorkerId(workerId);
-        Set<String> outputCaseIds = new HashSet<String>();
-        for (AssignedTask assignedTask : assignedTasks) {
-            Task taskAssigned = taskDao.findOne(assignedTask.getTaskId());
-            Subsite subsiteAssigned = subsiteDao.findOne(taskAssigned.getSubsiteId());
-            if (subsiteAssigned.getId() != SubsiteConstants.KIKBUG_SUBSITE_ID && subsiteAssigned.getId() != SubsiteConstants.KIJAM_SUBSITE_ID) {
-                continue;
-            }
-            JSONObject contentObj = new JSONObject(assignedTask.getContent());
-            JSONObject casesObj = contentObj.getJSONObject("cases");
-            Set<String> keySet = casesObj.keySet();
-            for (String key : keySet) {
-                outputCaseIds.add(key);
-                JSONObject caseObj = new JSONObject();
-                caseObj.put("caseId", key);
-                caseObj.put("taken", true);
-                caseObj.put("taskId", assignedTask.getTaskId());
-                result.put(caseObj);
-            }
-
-            List<Task2Case> task2Cases = paper2CaseDao.findByTaskId(assignedTask.getTaskId());
-            for (Task2Case task2Case : task2Cases) {
-                taskAssigned = taskDao.findOne(assignedTask.getTaskId());
-                subsiteAssigned = subsiteDao.findOne(taskAssigned.getSubsiteId());
-                if (subsiteAssigned.getId() != SubsiteConstants.KIKBUG_SUBSITE_ID || subsiteAssigned.getId() != SubsiteConstants.KIJAM_SUBSITE_ID) {
-                    continue;
-                }
-                Case cazeInTask = caseDao.findOne(task2Case.getCaseId());
-                if (!task2Case.getAutoSelect() && (!outputCaseIds.contains(cazeInTask.getCaseId()))) {
-                    outputCaseIds.add(cazeInTask.getCaseId());
-                    JSONObject caseObj = new JSONObject();
-                    caseObj.put("caseId", cazeInTask.getCaseId());
-                    caseObj.put("taken", false);
-                    caseObj.put("taskId", assignedTask.getTaskId());
-                    result.put(caseObj);
-                }
-
-            }
-        }
-
-        return result.toString();
-    }
-
     /**
      * POST methods
      */
@@ -370,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/fromDev/impl/PluginServiceImpl.java

@@ -109,7 +109,6 @@ public class PluginServiceImpl extends BaseService implements PluginService{
                 }catch (Exception e){
                     return false;
                 }
-                return true;
             } else {
                 grade.setScore(score);
             }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/fromKibug/KibugCaseService.java

@@ -14,8 +14,6 @@ import java.util.List;
 public interface KibugCaseService {
     List<CaseFromKibug> getCaseByApplication(Long appId, int page, int count) throws Exception;
 
-    List<CaseListItemVO> getCaseByWorker(Long workerId, AppPlatform platform, int page, int count) throws Exception;
-
     long create(CaseCreateVO vo) throws Exception;
 
     void updateCase(Long caseId, CaseCreateVO dto) throws Exception;

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

@@ -61,24 +61,6 @@ public class KibugCaseServiceImpl implements KibugCaseService {
     }
 
     @Override
-    public List<CaseListItemVO> getCaseByWorker(Long workerId, AppPlatform platform, int page, int count) throws Exception {
-        String sCaseItemList = apiService.getCases(workerId);
-        JavaType caseTakenListType = TypeFactory.defaultInstance().constructCollectionType(List.class, CaseTaken.class);
-        List<CaseTaken> caseItemList = mapper.readValue(sCaseItemList, caseTakenListType);
-        List<CaseListItemVO> caseList = new ArrayList<>();
-        for (CaseTaken caseTaken : caseItemList) {
-            CaseFromKibug temp = caseDao.findOne(caseTaken.getCaseId());
-            CaseListItemVO caseVo = Converter.convert(CaseListItemVO.class, temp);
-            if (temp != null) {
-                caseVo.setTaskId(caseTaken.getTaskId());
-                caseVo.setTaken(caseTaken.isTaken());
-                caseList.add(caseVo);
-            }
-        }
-        return caseList;
-    }
-
-    @Override
     public long create(CaseCreateVO vo) throws Exception {
         Application application = applicationService.getAppById(vo.getApplicationId());
         if (application == null) throw new IllegalOperationException();

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;
@@ -57,71 +56,6 @@ public class AssignedTaskServiceImpl extends BaseService implements AssignedTask
     }
 
     @Override
-    public List<AssignedCase> getAssignedCases(AssignedTask assignedTask) {
-
-        List<AssignedCase> assignedCases = new ArrayList<>();
-
-        String content = assignedTask.getContent();
-        String result = assignedTask.getResult();
-
-        JSONObject contentJson = new JSONObject(content);
-        JSONObject resultJson = new JSONObject(result).getJSONObject("results");
-
-        JSONObject casesJson = contentJson.getJSONObject("cases");
-        for (Object key : casesJson.keySet()) {
-
-            String keyStr = (String) key;
-            JSONObject caseJson = casesJson.getJSONObject(keyStr);
-
-            Subsite subsite = null;
-            Case caze = caseDao.findOne(caseJson.getLong("id"));
-            if (caze != null) {
-                Subject subject = subjectDao.findOne(caze.getSubjectId());
-                subsite = subsiteDao.findOne(subject.getSubsiteId());
-            }
-
-            AssignedCase assignedCase = new AssignedCase();
-            assignedCase.setCaseId(caseJson.getLong("id"));
-            assignedCase.setCaseName(caseJson.getString("name"));
-            assignedCase.setWeight(caseJson.getDouble("weight"));
-            assignedCase.setMaxScore(0.0D);
-            List<Result> resultList = new ArrayList<>();
-            assignedCase.setResults(resultList);
-
-            if (resultJson.has(keyStr)) {
-                JSONObject caseResultJson = resultJson.getJSONObject(keyStr);
-//                if (caseResultJson.has("maxScore")) {
-//                    assignedCase.setMaxScore(caseResultJson.getDouble("maxScore"));
-//                }
-                JSONArray scoreJsonArray = caseResultJson.getJSONArray("scores");
-                JSONArray resultUrlJsonArray = caseResultJson.getJSONArray("resultUrls");
-                for (int i = 0; i < scoreJsonArray.length(); i++) {
-                    Result submitResult = new Result();
-                    submitResult.setScore(scoreJsonArray.getDouble(i));
-                    String resultUrl = resultUrlJsonArray.getString(i);
-                    if (subsite != null) {
-                        if (subsite.getId() == SubsiteConstants.KIKBUG_SUBSITE_ID || subsite.getId() == SubsiteConstants.KIJAM_SUBSITE_ID) {
-                            resultUrl = "http://" + subsite.getBaseUrl() + "/{role}.html#/report/" + resultUrl;
-                        } else if (subsite.getId() == SubsiteConstants.DEV_SUBSITE_ID) {
-                            resultUrl = "http://" + subsite.getBaseUrl() + "/" + resultUrl;
-                        }
-                    }
-                    submitResult.setResultUrl(resultUrl);
-                    resultList.add(submitResult);
-                }
-                if (scoreJsonArray.length() > 0) {
-                    assignedCase.setMaxScore(scoreJsonArray.getDouble(scoreJsonArray.length() - 1));
-                }
-            }
-
-            assignedCases.add(assignedCase);
-
-        }
-
-        return assignedCases;
-    }
-
-    @Override
     public List<AssignedCase> wrapAssignedCases(AssignedTask assignedTask) {
         List<AssignedCase> assignedCases = new ArrayList<>();
         String result = assignedTask.getResult();

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;
@@ -204,13 +203,6 @@ public class CaseServiceImpl implements CaseService {
                             cb.like(a.<String>get("name"), "%" + StringUtils.trim(keyword) + "%")
                     );
                 }
-                //----------------------暂不考虑python和kivul子站数据--------------------------
-                predicate.getExpressions().add(
-                        cb.notEqual(a.<Integer>get("subsiteId"), SubsiteConstants.PYTHON_SUBSITE_ID)
-                );
-//                predicate.getExpressions().add(
-//                        cb.notEqual(a.<Integer>get("subsiteId"), SubsiteConstants.KIVUL_SUBSITE_ID)
-//                );
                 return predicate;
             }
         };

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;
@@ -66,7 +64,7 @@ public class ExamServiceImpl extends BaseService implements ExamService {
     @Override
     public Task createExam(Task exam, List<Long> groupIds) {
         //eeee
-        exam.setSubsiteId(SubsiteConstants.DEV_SUBSITE_ID);
+        exam.setSubsiteId(0L);
         exam = examDao.save(exam);
         for (Long groupId : groupIds) {
             Task2Group task2Group = new Task2Group();

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

@@ -166,9 +166,6 @@ public class GroupServiceImpl implements GroupService {
         group2Worker.setGroupId(groupId);
         group2Worker.setWorkerId(workerId);
         group2WorkerDao.save(group2Worker);
-
-        assignTasksForNewWorker(workerId, groupId);
-
         return workerService.getWorkerById(workerId);
     }
 
@@ -229,30 +226,6 @@ public class GroupServiceImpl implements GroupService {
         return groupDao.countByManagerId(managerId);
     }
 
-    private void assignTasksForNewWorker(long workerId, long groupId) {
-
-        List<Task2Group> task2Groups = task2GroupDao.findByGroupId(groupId);
-
-        List<Task> tasks = taskService.getTasks(task2Groups.stream().map(Task2Group::getTaskId).
-                collect(Collectors.toList()));
-        tasks = tasks.stream().filter(task -> task.getEndTime().after(new Timestamp(System.currentTimeMillis()))).
-                collect(Collectors.toList());
-
-
-        for (Task task : tasks) {
-            AssignedTask assignedTask = taskService.workerJoinTask(task.getId(), workerId);
-            List<AssignedCase> assignedCases = assignedTaskService.getAssignedCases(assignedTask);
-            List<Long> assignedCaseIds = assignedCases.stream().map(AssignedCase::getCaseId).
-                    collect(Collectors.toList());
-            for (Long assignedCaseId : assignedCaseIds) {
-                Task2Case task2Case = paper2CaseDao.findByTaskIdAndCaseId(task.getId(), assignedCaseId);
-                task2Case.setCount(task2Case.getCount() + 1);
-                paper2CaseDao.save(task2Case);
-            }
-        }
-
-    }
-
     @Override
     public Group save(Group group) {
         return groupDao.save(group);

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.common.constant.ThirdPartConstants;
 import cn.iselab.mooctest.site.dao.Exam2PaperDao;
 import cn.iselab.mooctest.site.dao.PaperDao;
@@ -26,7 +25,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/service/impl/TargetServiceImpl.java

@@ -77,6 +77,11 @@ public class TargetServiceImpl extends BaseService implements TargetService {
         return targetDevDao.findByUploadedCaseId(uploadCaseId);
     }
 
+    @Override
+    public WebTarget findWebByAppId(long appId) {
+        return targetWebDao.findBySuperId(appId);
+    }
+
     public void createTargetDev(DevTarget devTarget) {
         if (devTarget.getEndTimeMillis() == 0) {
             devTarget.setEndTimeMillis(System.currentTimeMillis() + 2592000000l);

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

@@ -63,83 +63,6 @@ public class TaskServiceImpl extends BaseService implements TaskService {
 
     private static Random random = new Random(System.currentTimeMillis());
 
-    @Override
-    public Task createTask(Task newTask, List<CaseBlock> caseBlocks, Set<Long> groupIds) {
-
-        // Insert into task
-        Task task = taskDao.save(newTask);
-
-        // Insert into task_2_group
-        for (Long groupId : groupIds) {
-            Task2Group task2Group = new Task2Group();
-            task2Group.setTaskId(task.getId());
-            task2Group.setGroupId(groupId);
-            task2GroupDao.save(task2Group);
-        }
-
-        List<Long> allCaseIds = new ArrayList<>();
-        caseBlocks.stream().forEach(caseBlock -> allCaseIds.addAll(caseBlock.getCaseIds()));
-        Map<Long, Case> caseMap = caseService.getCasesMap(allCaseIds);
-        Map<Long, Subject> subjectMap = subjectService.getSubjectMap();
-        Map<Long, Subsite> subsiteMap = subsiteService.getSubsiteMap();
-        Map<String, Integer> caseCountMap = new HashMap<>();
-
-        List<AssignedTask> assignedTasks = new ArrayList<>();
-        Set<Long> workerIds = new HashSet<>();
-
-        // Assign Task to workers
-        for (Long groupId : groupIds) {
-            List<Worker> workers = groupService.getWorkersByGroupId(groupId);
-            for (Worker worker : workers) {
-                if (workerIds.contains(worker.getId())) {
-                    continue;
-                } else {
-                    workerIds.add(worker.getId());
-                }
-                AssignedTask assignedTask = buildAssignedTask(task, worker.getId(), caseBlocks, caseMap, subjectMap,
-                        subsiteMap);
-                List<AssignedCase> assignedCases = assignedTaskService.getAssignedCases(assignedTask);
-                List<Long> assignedCaseIds = assignedCases.stream().map(AssignedCase::getCaseId).
-                        collect(Collectors.toList());
-                for (Long assignedCaseId : assignedCaseIds) {
-                    String taskCaseKey = task.getId() + "_" + assignedCaseId;
-                    caseCountMap.put(taskCaseKey, caseCountMap.getOrDefault(taskCaseKey, 0) + 1);
-                }
-                assignedTasks.add(assignedTask);
-            }
-        }
-        assignedTaskService.saveOrUpdateAssignedTask(assignedTasks);
-
-        for (CaseBlock caseBlock : caseBlocks) {
-            for (Long caseId : caseBlock.getCaseIds()) {
-
-                String taskCaseKey = task.getId() + "_" + caseId;
-                int taskCaseCount = caseCountMap.getOrDefault(taskCaseKey, 0);
-
-                Case caze = caseMap.get(caseId);
-                Task2Case task2Case = paper2CaseDao.findByTaskIdAndCaseId(task.getId(), caze.getId());
-                if (task2Case == null) {
-                    task2Case = new Task2Case();
-                    task2Case.setCaseId(caseId);
-                    task2Case.setTaskId(task.getId());
-                    task2Case.setAutoSelect(caseBlock.isAutoSelect());
-                    task2Case.setCaseIndex(caseBlocks.indexOf(caseBlock));
-                    task2Case.setWeight(caseBlock.getWeight());
-                    task2Case.setCount(taskCaseCount);
-                } else {
-                    if (task2Case.getCount() == null) {
-                        task2Case.setCount(taskCaseCount);
-                    } else {
-                        task2Case.setCount(task2Case.getCount() + taskCaseCount);
-                    }
-                }
-                paper2CaseDao.save(task2Case);
-            }
-        }
-
-        return task;
-    }
-
     private long randomSelectCaseId(List<Long> caseIds) {
         return caseIds.get(random.nextInt(caseIds.size()));
     }

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

@@ -52,12 +52,6 @@ public class ApiController extends BaseController {
         return apiLogic.getTaskTime(request);
     }
 
-    @RequestMapping(value = UrlConstants.API_INTERNAL + "getCases", method = RequestMethod.GET)
-    public String getCases(HttpServletRequest request)
-    {
-        return apiLogic.getCases(request);
-    }
-
     @RequestMapping(value = UrlConstants.API_INTERNAL + "checkOwnership", method = RequestMethod.GET)
     public String checkOwnership(HttpServletRequest request) {
         return apiLogic.checkOwnership(request);
@@ -108,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;
 
@@ -147,67 +132,4 @@ public class CaseController extends BaseController {
         }
         return caseLogic.getCasesForExam(paperId,examId,user.getId());
     }
-
-    //--------------------------------------------case 数据迁移---------------------------------------------------------------
-
-    @Autowired
-    private AppDao appDao;
-    @Autowired
-    private CaseDao caseDao;
-    @Autowired
-    private CaseFromKibugDao caseFromKibugDao;
-    @Autowired
-    private ApplicationDao applicationDao;
-    @Autowired
-    private CaseExtendsDao caseExtendsDao;
-
-    @RequestMapping(value =UrlConstants.API+"case/dataMigrate", method = RequestMethod.GET)
-    public void temp() {
-        Iterable<Case> cases = caseDao.findAll();
-        for(Case c:cases){
-            CaseExtends ce = new CaseExtends();
-            Converter.copy(ce, c);
-            Long subsiteId = null;
-            if(c.getUrl().contains("dev.mooctest.net"))
-                subsiteId = SubsiteConstants.DEV_SUBSITE_ID;
-            else if(c.getUrl().contains("kibug.mooctest.net"))
-                subsiteId = new Long(SubsiteConstants.KIKBUG_SUBSITE_ID);
-            else if(c.getUrl().contains("kijam.mooctest.net"))
-                subsiteId = new Long(SubsiteConstants.KIJAM_SUBSITE_ID);
-            else if(c.getUrl().contains("kivul.mooctest.net"))
-                subsiteId = SubsiteConstants.KIVUL_SUBSITE_ID;
-            else if(c.getUrl().contains("dev-d.mooctest.net"))
-                subsiteId = SubsiteConstants.DEVELOP_SUBSITE_ID;
-            ce.setSubsiteId(subsiteId);
-            caseExtendsDao.save(ce);
-        }
-
-        Iterable<CaseFromKibug> caseFromKibugs = caseFromKibugDao.findAll();
-        for(CaseFromKibug ck:caseFromKibugs){
-            Application app = applicationDao.findOne(ck.getApplicationId());
-            List<Case> caseList = caseDao.findByCaseId(""+ck.getId());
-            if(caseList==null||caseList.size()==0){
-                continue;
-            }
-            Case c = caseList.get(0);
-            CaseExtends ce  = new CaseExtends();
-            Converter.copy(ce, c);
-            ce.setTargetId(app.getId());
-            ce.setPlatform(app.getPlatform());
-
-            JSONObject resultObj = new JSONObject(app.getLaunchData());
-            resultObj.put("require",app.getRequireLocation());
-            resultObj.put("icon",app.getIconLocation());
-            resultObj.put("scriptTemplate",ck.getScriptTemplateUrl());
-            resultObj.put("testType", app.getTestType());
-
-            ce.setProperties(resultObj.toString());
-
-            caseExtendsDao.save(ce);
-        }
-    }
-
-    //-------------------------------------------case 数据迁移 end---------------------------------------------------------
-
-
 }

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

@@ -1,24 +0,0 @@
-package cn.iselab.mooctest.site.web.ctrl;
-
-import cn.iselab.mooctest.site.common.constant.UrlConstants;
-import cn.iselab.mooctest.site.web.data.AssignedCaseVO;
-import cn.iselab.mooctest.site.web.data.JobVO;
-import cn.iselab.mooctest.site.web.logic.JobLogic;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * Created by shanshan on 2017/7/3.
- */
-@RestController
-public class JobController {
-    @Autowired
-    private JobLogic jobLogic;
-    @RequestMapping(value = UrlConstants.API+"jobs", method = RequestMethod.GET)
-    public List<JobVO> getExamJob(@RequestParam(name = "userId") Long userId,
-                                  @RequestParam(name = "examId") Long examId) {
-        return jobLogic.getJobs(examId,userId);
-    }
-}

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

@@ -37,13 +37,6 @@ public class TaskController extends BaseController {
         return taskLogic.getTaskDetail(managerId, taskId);
     }
 
-    @RequestMapping(value = UrlConstants.API_MANAGER + "task/{id:\\d+}/assignedTask", method = RequestMethod.GET)
-    public List<AssignedTaskVO> getAssignedTasks(HttpServletRequest request, @PathVariable("id") long taskId) {
-        long managerId = RequestUtils.getManagerId(request);
-        return taskLogic.getAssignedTasks(managerId, taskId);
-    }
-
-
     @RequestMapping(value = UrlConstants.API_MANAGER + "task/{id:\\d+}/endTime", method = RequestMethod.PUT)
     public TaskVO updateTaskEndTime(HttpServletRequest request, @RequestBody TaskVO taskVO,
                                     @PathVariable("id") long taskId) {
@@ -52,19 +45,6 @@ public class TaskController extends BaseController {
         return taskLogic.updateTaskEndTime(managerId, taskVO);
     }
 
-    @RequestMapping(value = UrlConstants.API_ADMIN + "task/{id:\\d+}/assignedTask", method = RequestMethod.GET)
-    public List<AssignedTaskVO> getAssignedTasks(@PathVariable("id") long taskId) {
-        return taskLogic.getAssignedTasks(taskId);
-    }
-
-    @RequestMapping(value = UrlConstants.API_MANAGER + "task", method = RequestMethod.POST)
-    public TaskVO createManagerTask(HttpServletRequest request, @RequestBody TaskVO taskVO) {
-
-        long managerId = RequestUtils.getManagerId(request);
-        return taskLogic.createTask(taskVO, managerId);
-
-    }
-
     @RequestMapping(value = UrlConstants.API_WORKER + "task", method = RequestMethod.GET)
     public List<AssignedTaskVO> getWorkerTasks(HttpServletRequest request) {
         long workerId = RequestUtils.getWorkerId(request);

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;
@@ -97,22 +97,6 @@ public class PluginController extends BaseController{
         return pluginLogic.getVersion(area);
     }
 
-    @RequestMapping(value =UrlConstants.API_DEV + "plugin/login2", method = RequestMethod.GET)
-    public PluginResultVO loginFromPlugin2(HttpServletRequest request) {
-        String userEmail = request.getHeader("userEmail");
-        String userToken = request.getHeader("userToken");
-        String taskId = request.getHeader("taskId");
-        return pluginLogic.loginFromPlugin(userEmail,userToken,taskId);
-    }
-
-    @RequestMapping(value =UrlConstants.API_DEV + "plugin/getCaseList2", method = RequestMethod.GET)
-    public PluginResultVO getCaseList2(HttpServletRequest request) throws Exception{
-        String userEmail = request.getHeader("userEmail");
-        String userToken = request.getHeader("userToken");
-        String taskId = request.getHeader("taskId");
-        return pluginLogic.getCaseList(userEmail,userToken,taskId);
-    }
-
     @RequestMapping(value =UrlConstants.API_DEV + "plugin/login", method = RequestMethod.GET)
     public PluginResultVO loginFromPlugin(@RequestParam(name = "workerStr") String workerStr) throws Exception{
         return pluginLogic.loginFromPlugin(workerStr);
@@ -123,7 +107,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_SUBSITE_ID);
+        return pluginLogic.getCaseList(Long.parseLong(userId),Long.parseLong(taskId));
     }
 
     @RequestMapping(value =UrlConstants.API_KIBUG + "plugin/login", method = RequestMethod.GET)
@@ -131,7 +115,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.KIKBUG_SUBSITE_ID));
+        return pluginLogic.getCaseList(Long.parseLong(userId),Long.parseLong(taskId));
     }
 
     @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/KibugCaseController.java

@@ -37,49 +37,6 @@ public class KibugCaseController {
     private ApiLogic apiLogic;
 
     /**
-     * 搜索Case
-     *
-     * @param appId    由该app下划分的Case
-     * @param workerId 被该worker选中的Case
-     * @param platform 平台
-     * @param page     页码
-     * @param count    偏移量
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value= UrlConstants.API_KIBUG+"case", method = RequestMethod.GET)
-    public Map<String, Object> search(@RequestParam(name = "appId", required = false) Long appId,
-                                      @RequestParam(name = "workerId", required = false) Long workerId,
-                                      @RequestParam(name = "platform", required = false) String platform,
-                                      @RequestParam(name = "page", defaultValue = "0", required = false) Integer page,
-                                      @RequestParam(name = "count", defaultValue = "10", required = false) Integer count) throws Exception {
-        //if (AuthUtil.isWorker()) workerId = CurrentUser.get().getId();
-        SuccessResult successResult = new SuccessResult();
-        List<CaseListItemVO> caseVoList;
-        AppPlatform appPlatform = platform == null ? null : AppPlatform.parse(platform);
-        if (workerId != null) {
-            caseVoList = caseService.getCaseByWorker(workerId, appPlatform, page, count);
-        } else {
-            caseVoList = new ArrayList<>();
-            List<CaseFromKibug> caseList = caseService.getCaseByApplication(appId, page, count);
-            for (CaseFromKibug item : caseList) {
-                caseVoList.add(Converter.convert(CaseListItemVO.class, item));
-            }
-        }
-        for (CaseListItemVO item : caseVoList) {
-            try {
-                Application application = applicationService.getAppById(item.getApplicationId());
-                item.setIconLocation(application.getIconLocation());
-                item.setPlatform(AppPlatform.fromShort(application.getPlatform()).getPlatform());
-            } catch (Exception e) {
-                continue;
-            }
-        }
-        successResult.put(ResponseMessage.List_RESULT, caseVoList);
-        return successResult;
-    }
-
-    /**
      * 创建Case
      *
      * @param vo

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,13 +39,16 @@ public class ScoreRuleController {
         CaseExtends caseExtends = caseService.getCaseExtendsById(caseId);
         List<ScoreRuleItemVO> scoreRules;
         List<String> options;
-        switch(caseExtends.getSubsiteId().intValue()){
-            case (int) SubsiteConstants.DEV_SUBSITE_ID:
+        switch(caseExtends.getAnswerWay().intValue()){
+            case (int) AnswerWayConstants.DEV_ECLIPSE:
                 scoreRules = scoreRuleService.getDevScoreRule(taskId,caseId);
                 options = scoreRuleService.getDevOptions();
                 break;
-            case (int) SubsiteConstants.KIKBUG_SUBSITE_ID:
-            case (int) SubsiteConstants.KIJAM_SUBSITE_ID:
+            case (int) AnswerWayConstants.APP_ECLIPSE:
+            case (int) AnswerWayConstants.WEB_ECLIPSE:
+            case (int) AnswerWayConstants.JMETER:
+            case (int) AnswerWayConstants.THIRD_PARTY:
+            case (int) AnswerWayConstants.REPORT:
                 scoreRules = scoreRuleService.getKibugScoreRule(taskId,caseId);
                 options = scoreRuleService.getKibugOptions();
                 break;
@@ -72,17 +68,19 @@ public class ScoreRuleController {
                                                @RequestBody ScoreRuleVO vo) throws Exception {
         vo.validate();
         CaseExtends ca=caseService.getCaseExtendsById(vo.getCaseId());
-        //Task task = taskService.getTask(taskId);
-        switch (ca.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;
+        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.JMETER:
+            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

@@ -8,9 +8,9 @@ import lombok.Data;
  */
 @Data
 public class CaseExtendsVO extends CaseVO{
-    private Long targetId;
+    private Long appId;
     private Short platform;
-    private Long subsiteId;
+    private Long answerWay;
     private String properties;
     private String appLocation;
     private String targetName;
@@ -21,4 +21,5 @@ public class CaseExtendsVO extends CaseVO{
     private long taskId;
     private String entrance;
     private Boolean submitted;
+    private Long targetType;
 }

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

@@ -11,9 +11,10 @@ public class EclipseCaseVO extends PluginCaseVO {
     private String CaseId;
 
     public EclipseCaseVO(CaseExtendsVO c){
-        this.id = c.getId();
+        this.setId(c.getId());
         this.CaseId = c.getId() + "";
-        this.name = c.getName();
+        this.setName(c.getName());
+        this.setAnswerWay(c.getAnswerWay());
         Long subjectId = c.getSubjectId();
         String case_type = "";
         if(subjectId == 51)

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

@@ -11,4 +11,14 @@ public class KibugPluginCaseVO extends PluginCaseVO {
     private String category;
     private Long taskId;
     private boolean taken;
+
+    public KibugPluginCaseVO(){}
+    public KibugPluginCaseVO(CaseExtendsVO caseExtends){
+        this.setId(caseExtends.getId());
+        this.setName(caseExtends.getName());
+        this.setTaskId(caseExtends.getTaskId());
+        this.setDescription(caseExtends.getDescription());
+        this.setAnswerWay(caseExtends.getAnswerWay());
+        this.setTaken(true);
+    }
 }

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

@@ -7,6 +7,7 @@ import lombok.Data;
  */
 @Data
 public class PluginCaseVO {
-    protected Long id;
-    protected String name;
+    private Long id;
+    private String name;
+    private Long answerWay;
 }

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/JobVOWrapper.java

@@ -1,50 +0,0 @@
-package cn.iselab.mooctest.site.web.data.wrapper;
-
-import cn.iselab.mooctest.site.Application;
-import cn.iselab.mooctest.site.common.constant.SubsiteConstants;
-import cn.iselab.mooctest.site.data.AssignedCase;
-import cn.iselab.mooctest.site.models.Group;
-import cn.iselab.mooctest.site.service.CaseService;
-import cn.iselab.mooctest.site.service.fromKibug.ApplicationService;
-import cn.iselab.mooctest.site.web.data.AssignedCaseVO;
-import cn.iselab.mooctest.site.web.data.CaseExtendsVO;
-import cn.iselab.mooctest.site.web.data.GroupVO;
-import cn.iselab.mooctest.site.web.data.JobVO;
-import cn.iselab.mooctest.site.web.util.Converter;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * Created by shanshan on 2017/7/4.
- */
-@Service
-public class JobVOWrapper  extends BaseWrapper<JobVO, AssignedCase> {
-    @Autowired
-    private AssignedCaseVOWrapper assignedCaseVOWrapper;
-    @Autowired
-    private ApplicationService applicationService;
-    @Autowired
-    private CaseService caseService;
-
-    @Override
-    public JobVO wrap(AssignedCase assignedCase){
-        AssignedCaseVO assignedCaseVO = assignedCaseVOWrapper.wrap(assignedCase);
-        CaseExtendsVO caseExtendsVO = Converter.convert(CaseExtendsVO.class,caseService.getCaseExtendsById(assignedCaseVO.getCaseId()));
-        if(caseExtendsVO.getSubsiteId()== SubsiteConstants.KIKBUG_SUBSITE_ID){
-            try {
-                caseExtendsVO.setAppLocation(applicationService.getAppById(caseExtendsVO.getTargetId()).getAppLocation());
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-        JobVO result = new JobVO();
-        Converter.copy(result,assignedCaseVO);
-        result.setCaseInfo(caseExtendsVO);
-        return result;
-    }
-
-    @Override
-    public AssignedCase unwrap(JobVO data) {
-        return null;
-    }
-}

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,11 +24,6 @@ public class ApiHeaderFilter implements Filter {
         HttpServletResponse response = (HttpServletResponse) servletResponse;
 
         String secret = request.getHeader("secret");
-        if (secret == null || secret.length() == 0 || (!SubsiteConstants.SECRETS.contains(secret))){
-            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Secret mismatch");
-            filterChain.doFilter(request, response);
-            return;
-        }
 
         filterChain.doFilter(request, response);
     }

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

@@ -20,8 +20,6 @@ public interface ApiLogic {
 
     String getTaskTime(HttpServletRequest request);
 
-    String getCases(HttpServletRequest request);
-
     String checkOwnership(HttpServletRequest request);
 
     String getUserInfo(HttpServletRequest request);
@@ -35,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/JobLogic.java

@@ -1,13 +0,0 @@
-package cn.iselab.mooctest.site.web.logic;
-
-import cn.iselab.mooctest.site.web.data.AssignedCaseVO;
-import cn.iselab.mooctest.site.web.data.JobVO;
-
-import java.util.List;
-
-/**
- * Created by shanshan on 2017/7/3.
- */
-public interface JobLogic {
-    List<JobVO> getJobs(Long examId, Long userId);
-}

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

@@ -17,20 +17,14 @@ public interface TaskLogic {
 
 	TaskVO getTaskDetail(long managerId, long taskId);
 
-	TaskVO createTask(TaskVO task, long managerId);
-
 	List<AssignedTaskVO> getWorkerTasks(long workerId);
 
 	List<AssignedTaskVO> getWorkerTasksOfGroup(long groupId, long workerId);
 
 	List<TaskVO> getAllTasks();
 
-	List<AssignedTaskVO> getAssignedTasks(long managerId, long taskId);
-
 	TaskVO getTaskDetailByAdmin(long taskId);
 
-	List<AssignedTaskVO> getAssignedTasks(long taskId);
-
 	TaskVO updateTaskEndTime(long managerId, TaskVO taskVO);
 
 	ManagerVO addAssistantManager(long managerId, long taskId, ManagerVO assisManager);

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

@@ -46,13 +46,9 @@ public interface PluginLogic {
 
     boolean addDebugGrade(long workerId, long taskId, long caseId, double score);
 
-    PluginResultVO loginFromPlugin(String userEmail, String userToken, String taskId);
-
-    PluginResultVO getCaseList(String userEmail, String userToken, String taskId) throws Exception;
-
     PluginResultVO loginFromPlugin(String workerStr) throws Exception;
 
-    PluginResultVO getCaseList(Long userId, Long taskId, Long subsiteId) throws Exception;
+    PluginResultVO getCaseList(Long userId, Long taskId) 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.Case;
 import cn.iselab.mooctest.site.models.Task;
 import cn.iselab.mooctest.site.models.User;
@@ -28,6 +28,7 @@ import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.GeneratePresignedUrlRequest;
 import com.aliyun.oss.model.OSSObjectSummary;
 import com.aliyun.oss.model.ObjectListing;
+import org.hibernate.event.service.internal.EventListenerServiceInitiator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -92,9 +93,14 @@ public class PluginLogicImpl extends BaseLogic implements PluginLogic{
         Case casse=caseService.getCaseById(caseID);
         long targetId=casse.getAppId();
         String url =targetService.findById(targetId).getUrl();
+        boolean hasSuffix=url.contains(".zip");
         String fileName=url.substring(url.lastIndexOf("/")+1,url.length());
         //生成OSS的路径
-        String path = "target/" + fileName;
+        String path;
+        if(hasSuffix)
+            path = "target/" + fileName;
+        else
+            path = "target/" + fileName + ".zip";
 
         //打开OSS连接
         OSSClient client = new OSSClient(endPoint, accessKeyId, accessKeySecret);
@@ -197,47 +203,6 @@ public class PluginLogicImpl extends BaseLogic implements PluginLogic{
     }
 
     @Override
-    public PluginResultVO loginFromPlugin(String email, String token, String taskId) {
-        User user = userService.findByEmail(email);
-        if(user == null || !EncryptionUtil.encryptMD5(token).equals(user.getPassword())){
-            throw new HttpUnauthorizedException("账号或密码错误");
-        }
-        Task task = null;
-        List<TaskPermission> taskPermissions = taskPermissionService.getByUserIdAndInstanceId(user.getId(),Long.parseLong(taskId));
-        if(taskPermissions.size() != 0) {
-            task = taskService.getTask(Long.parseLong(taskId));
-        }else {
-            task = examService.getExamByIdAndParticipantIdIfPermited(Long.parseLong(taskId),user.getId());
-        }
-        return wrapLoginResultVO(task,user);
-    }
-
-    @Override
-    public PluginResultVO getCaseList(String email, String token, String taskId) throws Exception{
-        User user = userService.findByEmail(email);
-        if(user == null || !EncryptionUtil.encryptMD5(token).equals(user.getPassword())){
-            throw new HttpUnauthorizedException("账号或密码错误");
-        }
-        Task task = null;
-        List<TaskPermission> taskPermissions = taskPermissionService.getByUserIdAndInstanceId(user.getId(),Long.parseLong(taskId));
-        if(taskPermissions.size() != 0) {
-            task = taskService.getTask(Long.parseLong(taskId));
-        }else {
-            task = examService.getExamByIdAndParticipantIdIfPermited(Long.parseLong(taskId),user.getId());
-        }
-        PluginResultVO pluginResultVO = wrapLoginResultVO(task,user);
-        Long paperId = paperService.getByExamId(task.getId()).getId();
-        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_SUBSITE_ID)
-                cases.add(new EclipseCaseVO(caseExtendsVO));
-        }
-        pluginResultVO.setCases(cases);
-        return pluginResultVO;
-    }
-
-    @Override
     public PluginResultVO loginFromPlugin(String workerStr) throws Exception{
         String str = EncryptionUtil.decryptDES(workerStr);
         String userId = str.split("_")[1];
@@ -257,7 +222,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) throws Exception {
         User user = userService.findByUserId(userId);
         if(user == null){
             throw new HttpUnauthorizedException("用户不存在");
@@ -274,7 +239,6 @@ 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))
                 cases.add(wrapPluginCaseVO(caseExtendsVO));
         }
         pluginResultVO.setCases(cases);
@@ -308,18 +272,11 @@ public class PluginLogicImpl extends BaseLogic implements PluginLogic{
     }
 
     private PluginCaseVO wrapPluginCaseVO(CaseExtendsVO caseExtends){
-        if(caseExtends.getSubsiteId()== SubsiteConstants.DEV_SUBSITE_ID){
+        if(caseExtends.getAnswerWay()== AnswerWayConstants.DEV_ECLIPSE){
             return new EclipseCaseVO(caseExtends);
-        }else if(caseExtends.getSubsiteId()== SubsiteConstants.KIKBUG_SUBSITE_ID || caseExtends.getSubsiteId()==SubsiteConstants.KIJAM_SUBSITE_ID){
-            KibugPluginCaseVO vo = new KibugPluginCaseVO();
-            vo.setId(caseExtends.getId());
-            vo.setName(caseExtends.getName());
-            vo.setTaskId(caseExtends.getTaskId());
-            vo.setDescription(caseExtends.getDescription());
-            vo.setTaken(true);
-            return vo;
+        }else{
+            return new KibugPluginCaseVO(caseExtends);
         }
-        return null;
     }
 
     @Override

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

@@ -196,26 +196,6 @@ public class ApiLogicImpl implements ApiLogic {
     }
 
     @Override
-    public String getCases(HttpServletRequest request) {
-        int statusCode = HTTP_OK;
-        String host = getSecretHeader(request);
-        if (host != null){
-            if (request.getParameter("workerId") == null){
-                return missingParameterResponse;
-            }
-            Long workerId = Long.parseLong(request.getParameter("workerId"));
-
-            String message = "";
-            String result = apiService.getCases(workerId);
-            if (result == null || result.length() == 0){
-                message = "worker invalid";
-            }
-            return generateResponse(statusCode, message, result);
-        }
-        return generateResponse(statusCode, "Subsite mismatch", "{}");
-    }
-
-    @Override
     public String checkOwnership(HttpServletRequest request) {
         int statusCode = HTTP_OK;
 
@@ -469,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,13 +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.KIKBUG_SUBSITE_ID || subsiteId==SubsiteConstants.KIJAM_SUBSITE_ID){
+        Long subsiteId=caseExtends.getAnswerWay();
+        if(subsiteId== AnswerWayConstants.APP_ECLIPSE || subsiteId== AnswerWayConstants.WEB_ECLIPSE
+                || subsiteId== AnswerWayConstants.THIRD_PARTY || subsiteId== AnswerWayConstants.REPORT || subsiteId==AnswerWayConstants.JMETER){
             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_SUBSITE_ID || subsiteId == SubsiteConstants.DEVELOP_SUBSITE_ID){
+        }else if(subsiteId == AnswerWayConstants.DEV_ECLIPSE){
             calculateScoreService.calculateDevScore(taskId, caseId);
         }
     }
@@ -55,13 +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.KIKBUG_SUBSITE_ID || subsiteId==SubsiteConstants.KIJAM_SUBSITE_ID){
+        Long subsiteId=caseExtends.getAnswerWay();
+        if(subsiteId== AnswerWayConstants.APP_ECLIPSE || subsiteId== AnswerWayConstants.WEB_ECLIPSE
+                || subsiteId== AnswerWayConstants.THIRD_PARTY || subsiteId== AnswerWayConstants.REPORT || subsiteId==AnswerWayConstants.JMETER ){
             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_SUBSITE_ID || subsiteId == SubsiteConstants.DEVELOP_SUBSITE_ID){
+        }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,6 +1,7 @@
 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.common.constant.TargetTypeConstants;
 import cn.iselab.mooctest.site.common.constant.ThirdPartConstants;
 import cn.iselab.mooctest.site.data.CaseBlock;
 import cn.iselab.mooctest.site.models.*;
@@ -24,6 +25,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
+import java.lang.annotation.Target;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
@@ -134,9 +136,11 @@ public class CaseLogicImpl implements CaseLogic {
             }
             long caseid = caseBlock.getCaseIds().get(0);
             CaseExtendsVO caseExtendsVO = Converter.convert(CaseExtendsVO.class, caseService.getCaseExtendsById(caseid));
-            if (caseExtendsVO.getSubsiteId() == SubsiteConstants.KIKBUG_SUBSITE_ID) {
-                caseExtendsVO.setAppLocation(applicationService.getAppById(caseExtendsVO.getTargetId()).getAppLocation());
-                ;
+            if(caseExtendsVO.getAppId()!=null) {
+                App app = targetService.findById(caseExtendsVO.getAppId());
+                if (app.getTargetType() == TargetTypeConstants.KIBUG) {
+                    caseExtendsVO.setAppLocation(app.getUrl());
+                }
             }
             caseVoList.add(caseExtendsVO);
         }
@@ -161,13 +165,17 @@ public class CaseLogicImpl implements CaseLogic {
         Converter.copy(caseExtends, caseExtendsVO);
         caseExtends.setCreateTime(new Timestamp(System.currentTimeMillis()));
         caseExtends.setOwnerId(caseExtendsVO.getManagerId());
-        caseExtends.setAppId(caseExtendsVO.getTargetId());
-        if (caseExtendsVO.getSubsiteId() == SubsiteConstants.KIKBUG_SUBSITE_ID) {
-            Application application = applicationService.getApplicaitonByUploaderCaseId(caseExtendsVO.getTargetId());
+        caseExtends.setAppId(caseExtendsVO.getAppId());
+        App app = targetService.findById(caseExtendsVO.getAppId());
+        if(app.getTargetType() == TargetTypeConstants.KIBUG) {
+            Application application = applicationService.getApplicaitonByUploaderCaseId(caseExtendsVO.getAppId());
             caseExtends.setTargetId(application.getId());
-        } else if (caseExtendsVO.getSubsiteId() == SubsiteConstants.DEV_SUBSITE_ID || caseExtends.getSubsiteId() == SubsiteConstants.DEVELOP_SUBSITE_ID) {
-            DevTarget devTarget = targetService.findDevByUpLoadCaseId(caseExtendsVO.getTargetId());
+        } else if (app.getTargetType() == TargetTypeConstants.DEV) {
+            DevTarget devTarget = targetService.findDevByUpLoadCaseId(caseExtendsVO.getAppId());
             caseExtends.setTargetId(devTarget.getId());
+        } else if (app.getTargetType() == TargetTypeConstants.WEB) {
+            WebTarget webTarget = targetService.findWebByAppId(caseExtendsVO.getAppId());
+            caseExtends.setTargetId(webTarget.getId());
         }
 
         CaseExtends savedCase = caseService.save(caseExtends);
@@ -209,15 +217,9 @@ public class CaseLogicImpl implements CaseLogic {
             throw new IllegalArgumentException();
 
         CaseExtendsVO re = Converter.convert(CaseExtendsVO.class, caseExtends);
-
-        if (caseExtends.getSubsiteId() == SubsiteConstants.KIKBUG_SUBSITE_ID || caseExtends.getSubsiteId() == SubsiteConstants.KIJAM_SUBSITE_ID) {
-            Application application = applicationService.getAppById(caseExtends.getTargetId());
-            re.setTargetName(application.getName());
-        } else if (caseExtends.getSubsiteId() == SubsiteConstants.DEV_SUBSITE_ID || caseExtends.getSubsiteId() == SubsiteConstants.DEVELOP_SUBSITE_ID) {
-            App app = appService.getAppById(caseExtends.getAppId());
-            re.setTargetName(app.getName());
-        }
-
+        App app = targetService.findById(caseExtends.getAppId());
+        re.setTargetName(app.getName());
+        re.setTargetType(app.getTargetType());
         return re;
     }
 
@@ -239,27 +241,34 @@ public class CaseLogicImpl implements CaseLogic {
                 continue;
             }
             long caseid = caseBlock.getCaseIds().get(0);
-            CaseExtendsVO caseExtendsVO = Converter.convert(CaseExtendsVO.class, caseService.getCaseExtendsById(caseid));
+            CaseExtends caseExtends=caseService.getCaseExtendsById(caseid);
+            CaseExtendsVO caseExtendsVO = Converter.convert(CaseExtendsVO.class, caseExtends);
             caseExtendsVO.setTaskId(examId);
-            if (isWorker == true && caseExtendsVO.getSubsiteId() == SubsiteConstants.DEV_SUBSITE_ID){
+            if (caseExtends.getAppId() != null) {
+                App app=targetService.findById(caseExtends.getAppId());
+                caseExtendsVO.setTargetType(app.getTargetType());
+                if(app.getTargetType()==TargetTypeConstants.KIBUG) {
+                    caseExtendsVO.setAppLocation(app.getUrl());
+                }
+            }
+            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.setSubmitted(assignedTaskService.isSubmitted(examId,userId,caseExtendsVO.getId(),caseExtendsVO.getCaseId()));
             }
-            if (caseExtendsVO.getSubsiteId() == SubsiteConstants.KIKBUG_SUBSITE_ID) {
-                caseExtendsVO.setAppLocation(applicationService.getAppById(caseExtendsVO.getTargetId()).getAppLocation());
-                if(caseExtendsVO.getId()==297)
-                    caseExtendsVO.setSecret(indexService.getSecret(userId,examId));
-                else {
-                    Report report = reportService.getReport(examId, caseid, userId);
-                    if (report != null)
-                        caseExtendsVO.setReportId(report.getId());
-                    if (isManager)
-                        caseExtendsVO.setCaseReportUrl("/report/list/" + examId + "/" + caseid);
-                }
+            if (caseExtendsVO.getAnswerWay() == AnswerWayConstants.REPORT) {
+                Report report = reportService.getReport(examId, caseid, userId);
+                if (report != null)
+                    caseExtendsVO.setReportId(report.getId());
+                if (isManager)
+                    caseExtendsVO.setCaseReportUrl("/report/list/" + examId + "/" + caseid);
             }
-            if (caseExtendsVO.getSubsiteId() == SubsiteConstants.KIJAM_SUBSITE_ID) {
+            if (caseExtendsVO.getAnswerWay() == AnswerWayConstants.THIRD_PARTY) {
                 String openId=openId2UserIdService.findOpenIdByUserId(userId);
                 caseExtendsVO.setEntrance("http://api.mooctest.net/oauth/thirdPart?openId="+openId+"&taskId="+examId+"&thirdPartId="+ ThirdPartConstants.ZEZHONG+"&caseId="+caseid);
+                Report report = reportService.getReport(examId, caseid, userId);
+                if(report != null)
+                    caseExtendsVO.setReportId(report.getId());
             }
             caseVoList.add(caseExtendsVO);
         }

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

@@ -1,33 +0,0 @@
-package cn.iselab.mooctest.site.web.logic.impl;
-
-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.data.wrapper.JobVOWrapper;
-import cn.iselab.mooctest.site.web.exception.HttpForbiddenException;
-import cn.iselab.mooctest.site.web.logic.JobLogic;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * Created by shanshan on 2017/7/3.
- */
-@Service
-public class JobLogicImpl implements JobLogic {
-
-    @Autowired
-    AssignedTaskService assignedTaskService;
-    @Autowired
-    JobVOWrapper jobVOWrapper;
-
-    @Override
-    public List<JobVO> getJobs(Long examId, Long userId) {
-        AssignedTask assignedTask = assignedTaskService.getAssignedTask(examId, userId);
-        if (assignedTask == null) {
-            throw new HttpForbiddenException("worker not task the task");
-        }
-        return jobVOWrapper.wrap(assignedTaskService.getAssignedCases(assignedTask));
-    }
-}

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

@@ -148,90 +148,6 @@ public class TaskLogicImpl extends BaseLogic implements TaskLogic {
 
 	}
 
-	@Override
-	public TaskVO createTask(TaskVO taskVO, long managerId) {
-
-		List<ManagerSubsiteFeature> managerSubsiteFeatures = managerSubsiteFeatureService.getManagerSubsiteFeatureByManagerId(managerId);
-		List<Long> subsiteIds = new ArrayList<>();
-		for (ManagerSubsiteFeature managerSubsiteFeature : managerSubsiteFeatures) {
-			subsiteIds.add(managerSubsiteFeature.getSubsiteId());
-		}
-
-		if (!subsiteIds.contains(taskVO.getSubsiteId())) {
-			throw new HttpBadRequestException("Unauthorized Subsite feature");
-		}
-
-		long currTime = System.currentTimeMillis();
-		boolean isTaskTimeInvalid = currTime > taskVO.getBeginTime() || taskVO.getBeginTime() > taskVO.getEndTime();
-		if (isTaskTimeInvalid) {
-			throw new HttpBadRequestException("Invalid task time");
-		}
-
-		List<Task> tasks = taskService.getTaskList(managerId);
-		for (Task task : tasks) {
-			if (task.getName().equals(taskVO.getName())) {
-				throw new HttpBadRequestException("Task name already used by this manager");
-			}
-		}
-
-		Manager manager = managerService.getManagerById(managerId);
-		if (tasks.size() >= manager.getTaskNum()) {
-			throw new HttpBadRequestException("Manager task count exceed");
-		}
-
-		//check task name < 30
-		if (taskVO.getName().length() > 30) {
-			throw new HttpBadRequestException("Invalid task name");
-		}
-
-		List<CaseBlockVO> caseBlockVOs = taskVO.getCaseBlocks();
-		if (CollectionUtils.isEmpty(caseBlockVOs)) {
-			throw new HttpBadRequestException("Must have one or more caseblock");
-		}
-
-		adjustWeight(caseBlockVOs);
-
-		//check caseBlock:
-		for (CaseBlockVO blockVO : caseBlockVOs) {
-			List<Long> caseIds = blockVO.getCaseIds();
-
-			//one caseBlock contains at least 1 case
-			if (caseIds.size() < 1) {
-				throw new HttpBadRequestException("CaseBlock must contain at least 1 case");
-			}
-			//cases in one caseBlock has the same subjectId && added cazes are public && is_deleted of case is false
-			Case onecaze = caseService.getCaseById(caseIds.get(0));
-			for (long id : caseIds) {
-				if (!caseService.getCaseById(id).getSubjectId().equals(onecaze.getSubjectId())) {
-					throw new HttpBadRequestException("Case subject mismatch");
-				}
-				Case caze = caseService.getCaseById(id);
-				if (!caze.getVisible() && caze.getManagerId() != managerId) {
-					throw new HttpBadRequestException("No right for some case");
-				}
-				if (caze.getDeleted()) {
-					throw new HttpBadRequestException("expired case");
-				}
-			}
-
-		}
-
-		if (taskVO.getGroupIds() != null && groupService.getGroupsByManagerId(managerId).stream()
-				.map(Group::getId).collect(Collectors.toList()).containsAll(taskVO.getGroupIds())) {
-
-			taskVO.setManagerId(managerId);
-			Task task = taskVOWrapper.unwrap(taskVO);
-			task = taskService.createTask(task, caseBlockVOWrapper.unwrap(taskVO.getCaseBlocks()),
-					taskVO.getGroupIds().stream().collect(Collectors.toSet()));
-
-			return taskVOWrapper.wrap(task);
-		} else {
-			throw new HttpBadRequestException("No right for some group");
-		}
-
-
-	}
-
 	private void adjustWeight(List<CaseBlockVO> caseBlockVOs) {
 		double sum = 0D;
 		for (CaseBlockVO vo : caseBlockVOs) {
@@ -347,83 +263,6 @@ public class TaskLogicImpl extends BaseLogic implements TaskLogic {
 	}
 
 	@Override
-	public List<AssignedTaskVO> getAssignedTasks(long managerId, long taskId) {
-
-		Task task = taskService.getTask(taskId);
-
-		List<Task2AssistantManager> assistManagers = getAssistManagers(taskId);
-		Optional<Task2AssistantManager> task2AssistantManagerOptional = assistManagers.stream().
-				filter(assistantManager -> assistantManager.getManagerId() == managerId).findAny();
-
-		if (task.getManagerId() != managerId && !task2AssistantManagerOptional.isPresent()) {
-			throw new HttpBadRequestException("task not belong to the manager");
-		}
-
-//		currUser.ispermitted(task(id));
-		List<AssignedTaskVO> allAssignedTasks = getAssignedTasks(taskId);
-
-		if (task.getManagerId() == managerId) {
-			return allAssignedTasks;
-		}
-
-		Task2AssistantManager task2assistantManager = task2AssistantManagerOptional.get();
-
-		if (task2assistantManager.getStatus() == Task2AssistantManager.CLOSED) {
-			throw new HttpForbiddenException("task not allowed for the manager");
-		}
-
-
-		if (task2assistantManager.getStatus() == Task2AssistantManager.PARTIAL) {
-			List<AssignedTaskVO> assignedTaskvos = new ArrayList<>();
-			for (AssignedTaskVO assignedTaskvo : allAssignedTasks) {
-				Worker worker = workerService.getWorkerById(assignedTaskvo.getWorkerId());
-				if (worker.getTeacherName() == null) {
-					continue;
-				}
-				if (worker.getTeacherName().startsWith(managerService.getManagerById(managerId).getName())) {
-					assignedTaskvos.add(assignedTaskvo);
-				}
-			}
-			return assignedTaskvos;
-		} else {
-			return allAssignedTasks;
-		}
-
-	}
-
-	@Override
-	public List<AssignedTaskVO> getAssignedTasks(long taskId) {
-
-		List<AssignedTask> assignedTasks = assignedTaskService.getAssignedTasks(taskId);
-		List<Long> workerIds = assignedTasks.stream().map(AssignedTask::getWorkerId).
-				collect(Collectors.toList());
-
-		Map<Long, Worker> workerMap = workerService.getWorkerMap(workerIds);
-
-		List<AssignedTaskVO> assignedTaskVOs = new ArrayList<>();
-		assignedTasks.forEach(assignedTask -> {
-			AssignedTaskVO vo = assignedTaskVOWrapper.wrap(assignedTask);
-			vo.setWorkerName(workerMap.get(assignedTask.getWorkerId()).getName());
-			vo.setAssignedCases(assignedCaseVOWrapper.wrap(assignedTaskService.getAssignedCases(assignedTask)));
-//            boolean noResult = true;
-//            for (AssignedCaseVO assignedCaseVO : vo.getAssignedCases()) {
-//                if (assignedCaseVO.getResults().size() != 0) {
-//                    noResult = false;
-//                    break;
-//                }
-//            }
-//            if (!noResult) {
-//                assignedTaskVOs.add(vo);
-//            }
-			assignedTaskVOs.add(vo);
-		});
-
-
-		return assignedTaskVOs;
-	}
-
-
-	@Override
 	public TaskVO updateTaskEndTime(long managerId, TaskVO taskVO) {
 		Task task = taskService.getTask(taskVO.getId());
 		if (task.getManagerId() != managerId) {

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/service/impl/TargetServiceImplTest.java

@@ -68,7 +68,7 @@ public class TargetServiceImplTest {
         App app=new App();
         app.setId(1L);
         app.setVisible(false);
-        app.setSubsiteId(6L);
+        app.setTargetType(6L);
         app.setCreateTime(new Timestamp(1498479399));
         app.setStatus(0);
         app.setUrl("test");

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

@@ -114,7 +114,6 @@ public class ApplicationControllerTest {
     @Test
     public void createAutoTest() throws Exception {
         when(applicationService.createAutoTestApp(any(AutoTestVO.class))).thenReturn(123L);
-        when(apiService.uploadApp(eq(moocKiBugSecret),eq("appName"),eq(UrlConstants.HOSTNAME + "#/app/123/info"),eq(false),anyLong())).thenReturn("ok");
 
         JSONObject requestJson = new JSONObject();
         requestJson.put("managerId","13");

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

@@ -145,8 +145,8 @@ public class CaseControllerTest extends AbstractShiroTest{
         short platform=5;
         caseExtendsVO.setPlatform(platform);
         caseExtendsVO.setProperties("");
-        caseExtendsVO.setSubsiteId(46L);
-        caseExtendsVO.setTargetId(123L);
+        caseExtendsVO.setAnswerWay(46L);
+        caseExtendsVO.setAppId(123L);
         caseExtendsVO.setName("Test");
         caseExtendsVO.setDescription("This is just a test.");
         caseExtendsVO.setManagerId(17L);
@@ -176,8 +176,8 @@ public class CaseControllerTest extends AbstractShiroTest{
         short platform=5;
         caseExtendsVO.setPlatform(platform);
         caseExtendsVO.setProperties("");
-        caseExtendsVO.setSubsiteId(46L);
-        caseExtendsVO.setTargetId(123L);
+        caseExtendsVO.setAnswerWay(46L);
+        caseExtendsVO.setAppId(123L);
         caseExtendsVO.setName("Test");
         caseExtendsVO.setDescription("This is just a test.");
         caseExtendsVO.setManagerId(123L);
@@ -209,8 +209,8 @@ public class CaseControllerTest extends AbstractShiroTest{
         short platform=5;
         caseExtendsVO.setPlatform(platform);
         caseExtendsVO.setProperties("");
-        caseExtendsVO.setSubsiteId(46L);
-        caseExtendsVO.setTargetId(123L);
+        caseExtendsVO.setAnswerWay(46L);
+        caseExtendsVO.setAppId(123L);
         caseExtendsVO.setName("Test");
         caseExtendsVO.setDescription("This is just a test.");
         caseExtendsVO.setManagerId(123L);
@@ -245,8 +245,8 @@ public class CaseControllerTest extends AbstractShiroTest{
         caseExtendsVO.setId(123L);
         caseExtendsVO.setPlatform(platform);
         caseExtendsVO.setProperties("");
-        caseExtendsVO.setSubsiteId(46L);
-        caseExtendsVO.setTargetId(123L);
+        caseExtendsVO.setAnswerWay(46L);
+        caseExtendsVO.setAppId(123L);
         caseExtendsVO.setName("Test");
         caseExtendsVO.setDescription("This is just a test.");
         caseExtendsVO.setManagerId(17L);

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

@@ -1,64 +0,0 @@
-package cn.iselab.mooctest.site.web.ctrl;
-
-import cn.iselab.mooctest.site.web.data.AssignedCaseVO;
-import cn.iselab.mooctest.site.web.data.ExamVO;
-import cn.iselab.mooctest.site.web.data.JobVO;
-import cn.iselab.mooctest.site.web.logic.JobLogic;
-import org.json.JSONArray;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-/**
- * Created by shanshan on 2017/7/3.
- */
-public class JobControllerTest {
-    private MockMvc mockMvc;
-
-    @InjectMocks
-    private JobController jobController = new JobController();
-    @Mock
-    private JobLogic jobLogic;
-    @Before
-    public void setupMockMvc() {
-        initMocks(this);
-        mockMvc = MockMvcBuilders.standaloneSetup(jobController).build();
-    }
-
-    @Test
-    public void should_returnJob_when_givenExamIdAndUserId() throws Exception {
-        //arrange
-        JobVO jobVO = new JobVO();
-        jobVO.setCaseId(123L);
-        List<JobVO> voList = new ArrayList<>();
-        voList.add(jobVO);
-        when(jobLogic.getJobs(1L,2L)).thenReturn(voList);
-        //action
-        MvcResult result = mockMvc.perform(
-                get("/api/jobs").param("userId", "2").param("examId","1")
-        ).andDo(print()).andExpect(status().isOk()).andReturn();
-
-        //assert
-        JSONArray array = new JSONArray(result.getResponse().getContentAsString());
-        Assert.assertEquals(123L,array.getJSONObject(0).getLong("caseId"));
-
-    }
-
-
-}

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

@@ -72,7 +72,7 @@ public class TargetControllerTest {
         targetVO.setId(1L);
         targetVO.setName("test");
         targetVO.setUrl("test");
-        targetVO.setSubsiteId(1L);
+        targetVO.setTargetType(1L);
         targetVO.setCreateTimeMillis(1497856288L);
         targetVO.setStatus(1);
         targetVO.setEndTimeMillis(1497856289L);
@@ -82,7 +82,7 @@ public class TargetControllerTest {
         targetKibugVO.setId(1L);
         targetKibugVO.setName("test");
         targetKibugVO.setUrl("test");
-        targetKibugVO.setSubsiteId(1L);
+        targetKibugVO.setTargetType(1L);
         targetKibugVO.setCreateTimeMillis(1497856288L);
         targetKibugVO.setStatus(1);
         targetKibugVO.setEndTimeMillis(1497856289L);

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.setTargetId(AnswerWayConstants.DEV_ECLIPSE);
+        devTask.setSubsiteId(AnswerWayConstants.DEV_ECLIPSE);
         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.setAnswerWay((long) AnswerWayConstants.APP_ECLIPSE);
+        kibugTask.setSubsiteId((long) AnswerWayConstants.APP_ECLIPSE);
         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.setAnswerWay((long) AnswerWayConstants.REPORT);
+        kibugTask.setSubsiteId((long) AnswerWayConstants.REPORT);
         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,8 +69,8 @@ public class CaseLogicImplTest {
         short platform=5;
         caseExtendsVO.setPlatform(platform);
         caseExtendsVO.setProperties("");
-        caseExtendsVO.setSubsiteId(46L);
-        caseExtendsVO.setTargetId(123L);
+        caseExtendsVO.setAnswerWay(46L);
+        caseExtendsVO.setAppId(123L);
         caseExtendsVO.setName("Test");
         caseExtendsVO.setDescription("This is just a test.");
         caseExtendsVO.setManagerId(17L);
@@ -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,83 +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.AssignedCaseVO;
-import cn.iselab.mooctest.site.web.data.JobVO;
-import cn.iselab.mooctest.site.web.data.wrapper.AssignedCaseVOWrapper;
-import cn.iselab.mooctest.site.web.data.wrapper.JobVOWrapper;
-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.junit.Assert.*;
-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);
-
-    }
-
-}

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

@@ -72,7 +72,7 @@ public class TargetLogicImplTest {
         targetVO.setId(1L);
         targetVO.setName("test");
         targetVO.setUrl("test");
-        targetVO.setSubsiteId(1L);
+        targetVO.setTargetType(1L);
         targetVO.setCreateTimeMillis(1497856288L);
         targetVO.setStatus(1);
         targetVO.setEndTimeMillis(1497856289L);
@@ -80,7 +80,7 @@ public class TargetLogicImplTest {
 
         app.setId(1L);
         app.setName("test");
-        app.setSubsiteId(1L);
+        app.setTargetType(1L);
         app.setVisible(false);
         app.setStatus(1);
         app.setCreateTime(new Timestamp(1497856288L));
@@ -152,7 +152,7 @@ public class TargetLogicImplTest {
         targetKibugVO.setName("test");
         targetKibugVO.setPlatform("Android");
         targetKibugVO.setAppLocation("test");
-        targetKibugVO.setSubsiteId(6L);
+        targetKibugVO.setTargetType(6L);
         targetKibugVO.setVisible(false);
         targetKibugVO.setUrl("test");
         targetKibugVO.setCreateTimeMillis(1498469299L);
@@ -161,7 +161,7 @@ public class TargetLogicImplTest {
         app.setName("test");
         app.setId(1L);
         app.setCreateTime(new Timestamp(1498469299));
-        app.setSubsiteId(6L);
+        app.setTargetType(6L);
         app.setVisible(false);
         when(targetKibugVOWrapper.wrapApp(targetKibugVO)).thenReturn(app);
 
@@ -186,7 +186,7 @@ public class TargetLogicImplTest {
         targetKibugVO.setName("test");
         targetKibugVO.setPlatform("Android");
         targetKibugVO.setAppLocation("test");
-        targetKibugVO.setSubsiteId(6L);
+        targetKibugVO.setTargetType(6L);
         targetKibugVO.setVisible(false);
         targetKibugVO.setUrl("test");
         targetKibugVO.setCreateTimeMillis(1498469299L);
@@ -195,7 +195,7 @@ public class TargetLogicImplTest {
         app.setName("test");
         app.setId(1L);
         app.setCreateTime(new Timestamp(1498469299));
-        app.setSubsiteId(6L);
+        app.setTargetType(6L);
         app.setVisible(false);
         when(appService.getAppById(anyLong())).thenReturn(app);