Browse Source

将所有调用主站/api/user相关接口url放在zookeeper中

MengyangDuan 5 years ago
parent
commit
c8f16384e3

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

@@ -4,6 +4,7 @@ import edu.nju.entities.ReviewWorker;
 import edu.nju.model.ReviewWorkerVO;
 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;
@@ -18,6 +19,9 @@ public class ReviewWorkerDao {
     @Autowired
     private MongoOperations mongoOperations;
 
+    @Value("${mainsite.url}")
+    String mainSiteUrl;
+
     public String save(ReviewWorker worker) {
         mongoOperations.save(worker);
         return worker.getId();
@@ -53,7 +57,7 @@ public class ReviewWorkerDao {
     }
 
     public ReviewWorkerVO getEduInfo(ReviewWorker reviewWorker) {
-        String result = HTTP.sendGet("http://114.55.91.83:8191/api/user/" + reviewWorker.getOriginal_id(), "");
+        String result = HTTP.sendGet(mainSiteUrl+"/api/user/" + reviewWorker.getOriginal_id(), "");
         String name = "";
         String school = "";
         if (result != null && !result.equals("")) {

+ 5 - 1
src/main/java/edu/nju/service/AnalyzeService.java

@@ -13,6 +13,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.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.converter.StringHttpMessageConverter;
@@ -60,6 +61,9 @@ public class AnalyzeService {
 	@Autowired
 	TestCaseDao testCaseDao;
 
+	@Value("${mainsite.url}")
+	String mainSiteUrl;
+
 
 	Logger logger= LoggerFactory.getLogger(RecommendService.class);
 	
@@ -609,7 +613,7 @@ public class AnalyzeService {
 		for(int i=0;i<list.size();i++) {
 			String workerId = list.get(i).getKey();
 			int grade=list.get(i).getValue();
-			String result = HTTP.sendGet("http://114.55.91.83:8191/api/user/" + workerId, "");
+			String result = HTTP.sendGet(mainSiteUrl+"/api/user/" + workerId, "");
 			String name = "";
 			String school = "";
 			String province="";

+ 5 - 1
src/main/java/edu/nju/service/ExportService.java

@@ -10,6 +10,7 @@ import edu.nju.model.ExportBugDTO;
 import edu.nju.model.ExportReportDTO;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -30,13 +31,16 @@ public class ExportService {
     @Autowired
     BugScoreDao bugScoreDao;
 
+    @Value("${mainsite.url}")
+    String mainSiteUrl;
+
 
     public List<ExportReportDTO> getExportReport(String case_take_id){
         List<Report> reportList=reportDao.findByCaseTakeId(case_take_id);
         List<ExportReportDTO> exportReportDTOList=new ArrayList<>();
         for(Report report:reportList){
             String workerId=report.getWorker_id();
-            String result = HTTP.sendGet("http://114.55.91.83:8191/api/user/" + workerId, "");
+            String result = HTTP.sendGet(mainSiteUrl+"/api/user/" + workerId, "");
             String name="";
             if(result != null && !result.equals("")) {
                 JSONObject json = new JSONObject(result);

+ 5 - 1
src/main/java/edu/nju/service/ReviewService.java

@@ -6,6 +6,7 @@ import edu.nju.model.ReviewWorkerVO;
 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.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.converter.StringHttpMessageConverter;
@@ -53,6 +54,9 @@ public class ReviewService {
     @Autowired
     ReviewPaperDao reviewPaperDao;
 
+    @Value("${mainsite.url}")
+    String mainSiteUrl;
+
 
 
     public ReviewAnswer getAnswerByWorkerJobReportItem(String jobId,String reportId,String workerId,String itemId){
@@ -129,7 +133,7 @@ public class ReviewService {
         try {
             for(int i=0;i<reviewWorkers.size();i++){
                 ReviewWorker reviewWorker=reviewWorkers.get(i);
-                String result = HTTP.sendGet("http://114.55.91.83:8191/api/user/" + reviewWorker.getOriginal_id(), "");
+                String result = HTTP.sendGet(mainSiteUrl+"/api/user/" + reviewWorker.getOriginal_id(), "");
                 String name="";
                 String school="";
                 if(result != null && !result.equals("")) {

+ 5 - 1
src/main/java/edu/nju/service/SaveService.java

@@ -10,6 +10,7 @@ import java.util.Set;
 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.stereotype.Service;
 
 import edu.nju.dao.BugDao;
@@ -59,6 +60,9 @@ public class SaveService {
 	
 	@Autowired
 	AnalyzeService aservice;
+
+	@Value("${mainsite.url}")
+	String mainSiteUrl;
 	
 	public String save(String case_take_id, String bug_category, String description, String img_url, String severity, String recurrent, String title, String report_id, String parent, String page, String useCase, String case_id) {
 		try {
@@ -105,7 +109,7 @@ public class SaveService {
 		try {
 			String name = sdao.findById(report_id);
 			if(name.equals("null") || name.equals("")) {
-				String result = HTTP.sendGet("http://114.55.91.83:8191/api/user/" + worker_id, "");
+				String result = HTTP.sendGet(mainSiteUrl+"/api/user/" + worker_id, "");
 				if(result != null && !result.equals("")) { 
 					JSONObject json = new JSONObject(result);
 					sdao.save(report_id, worker_id, json.getString("name"));