Merge branch 'dev' into test

src/main/java/edu/nju/controller/AnalyzeController.java

@@ -627,7 +627,11 @@ public class AnalyzeController {
 
 	@RequestMapping(value = "/progress", method = RequestMethod.GET)
 	@ResponseBody
-	public Double crowdTestProgress(@RequestParam("caseId") String caseId, @RequestParam("taskId") String taskId){
+	public Double crowdTestProgress(String token){
+		String realUrl = AESUtil.decrypt(token);
+		String [] decoder = url2decode(realUrl);
+		String taskId=decoder[0];
+		String caseId=decoder[1];
 		Task task=taskDao.findById(taskId);
 		if(task.getEnd_time()>System.currentTimeMillis()){
 			return aservice.crowdTestProgressFromDB(caseId,taskId);

src/main/java/edu/nju/model/AnalyseVO2.java

@@ -61,6 +61,7 @@ public class AnalyseVO2 {
         this.workerDistribute = workerDistribute;
         this.workerRank = workerRank;
         this.gradeDistrubute = gradeDistrubute;
+        this.pageCover = pageCover;
     }