Merge branch 'dev' of http://git.mooctest.net/summer/crowdsource-backend into dev

# Conflicts:
#	src/main/java/edu/nju/service/AnalyzeService.java

src/main/java/edu/nju/service/AnalyzeService.java

@@ -80,8 +80,11 @@ public class AnalyzeService {
 	ExtraService extraService;
 
 	@Autowired
+
 	ShortTokenDao shortTokenDao;
 
+	ExamDao examDao;
+
 	@Value("${server.host}")
 	private String serverHost;
 	@Value("${report.port}")
@@ -825,8 +828,11 @@ public class AnalyzeService {
 //		cache.put("word","Hello Guava Cache");
 //		System.out.println(cache.getIfPresent("word"));
 
-
+		Exam exam = examDao.findById(caseId);
 		Task task=taskDao.findById(taskId);
+
+
+
 		long startTime=0;
 		long endTime=0;
 		String taskName="";
@@ -834,9 +840,11 @@ public class AnalyzeService {
 		if(task!=null) {
 			startTime = task.getStart_time();
 			endTime = task.getEnd_time();
-			taskName = task.getName();
 			writeMins = task.getTotal_mins();
 		}
+		if(exam!=null){
+			taskName = exam.getName();
+		}
 		String caseTakeId=caseId+"-"+taskId;
 		List<Bug>bugs=bdao.findByCaseid(caseTakeId);
 		int bugNum=bugs.size();
@@ -970,6 +978,9 @@ public class AnalyzeService {
 		StringBuffer managerCheckUrl = new StringBuffer("http://");
 		managerCheckUrl.append(serverHost).append(":").append(serverPort).append("/report/managerCheck/")
 				.append(taskId).append("/").append(caseId);
+		if(reports.size()!=0)
+			managerCheckUrl.append("?identity=0&report_id=").append(reports.get(0).getId())
+					.append("&worker_id=").append(reports.get(0).getWorker_id());
 		analyseVO.setManagerCheck(managerCheckUrl.toString());
 		return analyseVO;
 	}

src/main/java/edu/nju/util/AESUtil.java

@@ -4,6 +4,7 @@ package edu.nju.util;
 import javax.crypto.Cipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
+import java.net.URLEncoder;
 import java.util.Base64;
 
 public class AESUtil {
@@ -23,7 +24,8 @@ public class AESUtil {
             cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec);
             bytes = cipher.doFinal(bytes);
             bytes = Base64.getEncoder().encode(bytes);
-            return new String(bytes);
+            String res  = new String(bytes);
+            return URLEncoder.encode(res);
         } catch (Exception e) {
             e.printStackTrace();
             return null;