修复协同与非协同模式的问题，修复填写报告跳转url token失效问题

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

@@ -615,25 +615,11 @@ public class AnalyzeController {
 	public String detailToToken(String examId,String caseId,String userId, int roleId, String beginTime,String endTime){
 		JSONObject result = new JSONObject();
 		try {
-			ShortToken shortToken=aservice.findTokenByDetail(examId,caseId,userId);
-			if(shortToken==null){
-//				String token=AESUtil.encrypt(examId+"/"+caseId+"/"+userId);
-				String token= DigestUtils.md5DigestAsHex((UUID.randomUUID().toString()).getBytes());
-				ShortToken newShortToken=new ShortToken(token,beginTime,endTime,caseId,examId,userId,roleId,true);
-				aservice.saveShortToken(newShortToken);
-				result.put("result","success");
-				result.put("token",token);
-			}else{
-				String token= DigestUtils.md5DigestAsHex((UUID.randomUUID().toString()).getBytes());
-				shortToken.setToken(token);
-				shortToken.setBeginTime(beginTime);
-				shortToken.setEndTime(endTime);
-				shortToken.setRoleId(roleId);
-				shortToken.setDisabled(true);
-				aservice.saveShortToken(shortToken);
-				result.put("result","success");
-				result.put("token",shortToken.getToken());
-			}
+			String token= DigestUtils.md5DigestAsHex((UUID.randomUUID().toString()).getBytes());
+			ShortToken newShortToken=new ShortToken(token,beginTime,endTime,caseId,examId,userId,roleId,true);
+			aservice.saveShortToken(newShortToken);
+			result.put("result","success");
+			result.put("token",newShortToken.getToken());
 			return result.toString();
 		} catch (Exception e) {
 			e.printStackTrace();

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

@@ -283,7 +283,7 @@ public class ExtraController {
 	@RequestMapping(value = "/uploadExamUrl", method = RequestMethod.POST)
 	@ResponseBody
 	public String uploadExamUrl(String file, String file_name, String paper_type,
-								String case_id, String test_type, String description, String app_name, @PathVariable(required = false) String collaborative_type) {
+								String case_id, String test_type, String description, String app_name, String collaborative_type) {
 		try {
 			System.out.println("file " + file);
 			System.out.println("file_name " + file_name);
@@ -335,8 +335,10 @@ public class ExtraController {
 			System.out.println("dest_file " + dest.getPath());
 
 			if(collaborative_type == null || collaborative_type == ""){
+				System.out.println("collaborative_type == null || collaborative_type == ");
 				collaborative_type = CollaborativeType.IS_COLLABORATIVE.getId() + "";
 			}
+
 			String json = extraService.saveExam(case_id, dest.getPath(), app_name, paper_type, test_type, description, collaborative_type);
 			return json;
 		} catch (IOException e) {

src/main/java/edu/nju/entities/ShortToken.java

@@ -35,7 +35,6 @@ public class ShortToken implements Serializable {
 
     private boolean disabled;
 
-    @PersistenceConstructor
     public ShortToken(String token, String beginTime, String endTime, String caseId, String examId, String userId,int roleId,boolean disabled) {
         this.token = token;
         this.beginTime = beginTime;