Merge remote-tracking branch 'origin/prod' into prod

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

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

@@ -36,8 +36,8 @@ public class AnalyzeController {
 	@Autowired
 	ReportService rservice;
 
-	@Autowired
-	BlockChainAspect blockChainAspect;
+//	@Autowired
+//	BlockChainAspect blockChainAspect;
 	
 	//根据用例获取所有有效bug
 	@RequestMapping(value = "/valid")
@@ -377,24 +377,24 @@ public class AnalyzeController {
 		return aservice.getHistoricalData(workerId, caseTypeId);
 	}
 
-	@RequestMapping(value = "/uploadTestReportToBlockChain")
-	@ResponseBody
-	public void uploadTestReport(String bug_id,HttpServletResponse response){
-		try {
-			PrintWriter out = response.getWriter();
-			JSONObject result = new JSONObject();
-			if (blockChainAspect.uploadTestReportInfoToBlockChain(bug_id)) {
-				result.put("status","200");
-			}else{
-				result.put("status","500");
-			}
-			out.print(result);
-			out.flush();
-			out.close();
-		}catch (IOException e){
-			e.printStackTrace();
-		}
-	}
+//	@RequestMapping(value = "/uploadTestReportToBlockChain")
+//	@ResponseBody
+//	public void uploadTestReport(String bug_id,HttpServletResponse response){
+//		try {
+//			PrintWriter out = response.getWriter();
+//			JSONObject result = new JSONObject();
+//			if (blockChainAspect.uploadTestReportInfoToBlockChain(bug_id)) {
+//				result.put("status","200");
+//			}else{
+//				result.put("status","500");
+//			}
+//			out.print(result);
+//			out.flush();
+//			out.close();
+//		}catch (IOException e){
+//			e.printStackTrace();
+//		}
+//	}
 
 	@RequestMapping(value = "/analyseExam2")
 	@ResponseBody

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

@@ -28,8 +28,8 @@ public class UploadController {
 	@Autowired
 	CTBService ctbservice;
 
-	@Autowired
-	BlockChainAspect blockChainAspect;
+//	@Autowired
+//	BlockChainAspect blockChainAspect;
 	
 	//上传新的Bug报告
 	@RequestMapping(value = "/submit", method = RequestMethod.POST)
@@ -40,7 +40,7 @@ public class UploadController {
 		String id = saveservice.save(case_take_id, bug_category, description, img_url, severity, recurrent, title, report_id, parent, page, useCase, case_id);
 //		System.out.println(useCase);
 		if(!useCase.equals("null") && !id.equals("")) {flag = ctbservice.save(useCase, id, case_take_id, report_id);}
-		boolean uploadBlockResult=blockChainAspect.uploadTestReportInfoToBlockChain(id);
+//		boolean uploadBlockResult=blockChainAspect.uploadTestReportInfoToBlockChain(id);
 		if(flag && !id.equals("")) {
 			result.put("status", "200");
 			result.put("id", id);

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

@@ -64,10 +64,12 @@ public class AnalyzeService {
 	@Autowired
 	TestCaseDao testCaseDao;
 
-
 	@Value("${mainsite.url}")
 	String mainSiteUrl;
 
+	@Value("${mooctest.url}")
+	private String MOOCTEST_HOST;
+
 	@Autowired
 	ThumsUpDao thumsUpDao;
 
@@ -506,7 +508,7 @@ public class AnalyzeService {
 //			logger.info(worker_id);
 //		}
 		RestTemplate template = new RestTemplate();
-		String url = "http://www.mooctest.net/api/common/uploadCaseScore";
+		String url = MOOCTEST_HOST+"/api/common/uploadCaseScore";
 		String[] ids = case_take_id.split("-");
 		for(int i = 0; i < array.length(); i ++) {
 			MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<String, Object>();

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

@@ -15,6 +15,7 @@ import org.apache.commons.lang3.EnumUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -43,6 +44,9 @@ public class ExtraService {
 
 	@Autowired
 	CrowdSourceToReviewPaperDao crowdSourceToReviewPaperDao;
+
+	@Value("${mooctest.url}")
+	private String MOOCTEST_HOST;
 	
 	//测试用例相关
 	public String saveTestCase(String report_id, String name, String front, String behind, String description) {
@@ -168,7 +172,7 @@ public class ExtraService {
 	}
 
 	private Task getAndSaveTaskInfo(String id){
-		String result = HTTP.sendGet("http://www.mooctest.net/api/exam/" + id + "/info", "");
+		String result = HTTP.sendGet(MOOCTEST_HOST+"/api/exam/" + id + "/info", "");
 		if (!result.equals("")) {
 			JSONObject json = new JSONObject(result);
 			long beginTime = json.getLong("beginTime");

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

@@ -7,6 +7,7 @@ import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import edu.nju.util.HTTP;
 
@@ -50,6 +51,9 @@ public class NodeService {
     @Autowired
     ReviewWorkerDao reviewWorkerDao;
 
+    @Value("${mooctest.url}")
+    private String MOOCTEST_HOST;
+
 
     Logger logger= LoggerFactory.getLogger(RecommendService.class);
 
@@ -431,7 +435,7 @@ public class NodeService {
     }
 
     private String getCatchNodeUploadId(String taskId,AnswerNode answerNode,String workerOriginalId){
-        String url = "http://www.mooctest.net/api/dev/plugin/submitAnswersSig" + "?" +
+        String url = MOOCTEST_HOST+"/api/dev/plugin/submitAnswersSig" + "?" +
                 "taskID=" + taskId + "&" +
                 "workerID=" + workerOriginalId + "&" +
                 "caseName=CrowdReview";
@@ -455,7 +459,7 @@ public class NodeService {
         StringBuilder result = new StringBuilder();
         String uploadTime=String.valueOf(System.currentTimeMillis());
         String source="CrowdReview";
-        String url="http://www.mooctest.net/api/common/generalUploadCaughtNode/"+caseId+"/"+uploadTime+"/"+uploadId+"/"+source;
+        String url=MOOCTEST_HOST+"/api/common/generalUploadCaughtNode/"+caseId+"/"+uploadTime+"/"+uploadId+"/"+source;
         try{
             URL realUrl = new URL(url);
             // 打开和URL之间的连接
@@ -500,7 +504,7 @@ public class NodeService {
         String uploadTime=String.valueOf(System.currentTimeMillis());
         System.out.println(uploadTime);
         String source="CrowdReview";
-        String url="http://www.mooctest.net/api/common/generalUploadCaughtNode/"+"2664"+"/"+uploadTime+"/"+"298714"+"/"+source;
+        String url=MOOCTEST_HOST+"/api/common/generalUploadCaughtNode/"+"2664"+"/"+uploadTime+"/"+"298714"+"/"+source;
         try{
             URL realUrl = new URL(url);
             // 打开和URL之间的连接