Jelajahi Sumber

修改获取task信息的获取来源,改成配置项,设定为从信创获取

郭超 4 tahun lalu
induk
melakukan
19ee77678e

+ 5 - 1
src/main/java/edu/nju/controller/ExtraController.java

@@ -534,7 +534,11 @@ public class ExtraController {
 		}
 	}
 
-	//
+	/**
+	 * 获取任务相关信息
+	 * @param id 任务ID
+	 * @param response
+	 */
 	@RequestMapping(value = "/getTask")
 	@ResponseBody
 	public void getTask(String id, HttpServletResponse response) {

+ 10 - 2
src/main/java/edu/nju/controller/HistoryController.java

@@ -100,8 +100,16 @@ public class HistoryController {
 		}
 	}
 
-	//学生获取所有形成树状结构的bug根节点
-	@RequestMapping(value = "/getTreesStu")
+	/**
+	 * 获取所有形成树状结构的bug根节点
+	 * @param case_take_id
+	 * @param start
+	 * @param count
+	 * @param page
+	 * @param session
+	 * @param response
+	 */
+	@GetMapping(value = "/getTreesStu")
 	@ResponseBody
 	public void getTreesStu(String case_take_id, String start, String count, String page, HttpSession session, HttpServletResponse response) {
 		try {

+ 5 - 1
src/main/java/edu/nju/dao/TaskDao.java

@@ -4,6 +4,7 @@ import edu.nju.entities.Task;
 import edu.nju.util.HTTP;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -17,6 +18,9 @@ public class TaskDao {
     @Autowired
     private MongoOperations mongoOperations;
 
+    @Value("${main.site}")
+    private String mainSiteUrl;
+
     public Task save(Task task) {
         mongoOperations.save(task);
         return task;
@@ -33,7 +37,7 @@ public class TaskDao {
     }
 
     private Task getAndSaveTaskInfo(String id){
-        String result = HTTP.sendGet("http://www.mooctest.net/api/exam/" + id + "/info", "");
+        String result = HTTP.sendGet(mainSiteUrl + "/api/exam/" + id + "/info", "");
         if (!"".equals(result)) {
             JSONObject json = new JSONObject(result);
             long beginTime = json.getLong("beginTime");

+ 4 - 1
src/main/java/edu/nju/service/ExtraService.java

@@ -49,6 +49,8 @@ public class ExtraService {
 	@Value("${sanjiPageUrl}")
 	private String pageUrl;
 
+	@Value("${main.site}")
+	private String mainSiteUrl;
 
 	//测试用例相关
 	public String saveTestCase(String report_id, String name, String front, String behind, String description) {
@@ -184,7 +186,8 @@ public class ExtraService {
 	}
 
 	private Task getAndSaveTaskInfo(String id){
-		String result = HTTP.sendGet("http://www.mooctest.net/api/exam/" + id + "/info", "");
+		String result = HTTP.sendGet(mainSiteUrl + "/api/exam/" + id + "/info", "");
+		System.out.println("result " + result);
 		if (!result.equals("")) {
 			JSONObject json = new JSONObject(result);
 			long beginTime = json.getLong("beginTime");

+ 2 - 1
src/main/resources/application.yml

@@ -64,7 +64,8 @@ save:
   folder: /xinchuang
   input: /input
   output: /output
-
+main:
+  site: http://127.0.0.1:8080
 ---
 spring:
   profiles: private