Merge branch 'dev' into test

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

@@ -383,7 +383,7 @@ public class AnalyzeController {
 	public void analyseTask(String token, HttpServletResponse response ){
 		String realUrl = AESUtil.decrypt(token);
 		String [] decoder = url2decode(realUrl);
-		analyseExam2(decoder[0],decoder[1],response);
+		analyseExam2(decoder[1],decoder[0],response);
 //		return "redirect:/analyze/analyseExam2?"+realUrl;
 	}