...

examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/BasicCloudClientSupport.java

@@ -1,18 +1,34 @@
 package cn.com.qmth.examcloud.core.questions.api.client;
 
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
 
 /**
- * @author  	weiwenhai
- * @date   		2018.8.15
- * @company		qmth
- * @describle	调卷规则路径
+ * @author weiwenhai
+ * @date 2018.8.15
+ * @company qmth
+ * @describle 调卷规则路径
  */
 public abstract class BasicCloudClientSupport extends CloudClientSupport {
 
+	private static final String APP_NAME = "EC-CORE-QUESTION";
+
+	@Override
+	protected Integer getPort() {
+		return 10020;
+	}
+
 	@Override
-	protected String getUrlPrefix() {
-		return "http://EC-CORE-QUESTION/api/core/questions/";
+	protected String getRequestMappingPrefix() {
+		return "api/core/questions";
+	}
+
+	protected void post(String requestMappingSuffix, BaseRequest body) {
+		super.post(APP_NAME, requestMappingSuffix, body);
+	}
+
+	protected <T> T post(String requestMappingSuffix, BaseRequest body, Class<T> responseType) {
+		return super.post(APP_NAME, requestMappingSuffix, body, responseType);
 	}
 
 }

examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/ExtractConfigCloudServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.api.client;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 import cn.com.qmth.examcloud.core.questions.api.ExtractConfigCloudService;
 import cn.com.qmth.examcloud.core.questions.api.request.GetBasePaperReq;
@@ -15,56 +13,40 @@ import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionAnswerResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionListResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetQuestionResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
- * @author 		weiwenhai
- * @date 		2018.8.15
- * @company		qmth
- * @description	调卷远程调用服务
+ * @author weiwenhai
+ * @date 2018.8.15
+ * @company qmth
+ * @description 调卷远程调用服务
  */
 @Service
-public class ExtractConfigCloudServiceClient extends BasicCloudClientSupport implements ExtractConfigCloudService{
+public class ExtractConfigCloudServiceClient extends BasicCloudClientSupport
+		implements
+			ExtractConfigCloudService {
 
 	private static final long serialVersionUID = 5635276170773870907L;
-	
-	@Autowired
-	private RestTemplate restTemplate;
 
-	@Autowired
-	private RedisClient redisClient;
-	
 	@Override
 	public GetPaperResp getPaper(GetPaperReq req) {
 		return post("extract_config/getPaper", req, GetPaperResp.class);
 	}
-	
+
 	@Override
 	public GetQuestionResp getQuestion(GetQuestionReq req) {
 		return post("extract_config/getQuestion", req, GetQuestionResp.class);
 	}
-	
+
 	@Override
 	public GetBasePaperResp getBasePaper(GetBasePaperReq req) {
 		return post("extract_config/getBasePaper", req, GetBasePaperResp.class);
 	}
-	
+
 	@Override
 	public GetQuestionListResp getQuestionList(GetQuestionListReq req) {
 		return post("extract_config/getQuestionList", req, GetQuestionListResp.class);
 	}
 
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
 	@Override
 	public GetQuestionAnswerResp getQuestionAnswer(GetQuestionAnswerReq req) {
 		return post("extract_config/getQuestionAnswerList", req, GetQuestionAnswerResp.class);

examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/PaperCloudServiceClient.java

@@ -1,33 +1,24 @@
 package cn.com.qmth.examcloud.core.questions.api.client;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 import cn.com.qmth.examcloud.core.questions.api.PaperCloudService;
 import cn.com.qmth.examcloud.core.questions.api.request.GetExtractConfigReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
 import cn.com.qmth.examcloud.core.questions.api.response.GetCommonResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetPaperResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
- * @author 		weiwenhai
- * @date		2018.10.8
- * @company		qmth
- * @description	试卷对象远程调用
+ * @author weiwenhai
+ * @date 2018.10.8
+ * @company qmth
+ * @description 试卷对象远程调用
  */
 @Service
-public class PaperCloudServiceClient extends BasicCloudClientSupport implements PaperCloudService{
+public class PaperCloudServiceClient extends BasicCloudClientSupport implements PaperCloudService {
 
 	private static final long serialVersionUID = 1657323811328647049L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-	
 	@Override
 	public GetPaperResp genPaper(GetQuestionListReq req) {
 		return post("default_paper/genPaper", req, GetPaperResp.class);
@@ -37,15 +28,5 @@ public class PaperCloudServiceClient extends BasicCloudClientSupport implements
 	public GetCommonResp examPaper(GetExtractConfigReq req) {
 		return post("default_paper/examPaper", req, GetCommonResp.class);
 	}
-	
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
 
 }

examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/QuestionCloudServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.questions.api.client;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 import cn.com.qmth.examcloud.core.questions.api.QuestionCloudService;
 import cn.com.qmth.examcloud.core.questions.api.request.GetDefaultQuesionListReq;
@@ -11,40 +9,25 @@ import cn.com.qmth.examcloud.core.questions.api.request.GetDefaultQuesionsReq;
 import cn.com.qmth.examcloud.core.questions.api.response.GetCommonResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetDefaultQuesionIdResp;
 import cn.com.qmth.examcloud.core.questions.api.response.GetDefaultQuestionsResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
- * @author 		weiwenhai
- * @date 		2018.9.10
- * @company		qmth
- * @describle	试题对象服务
+ * @author weiwenhai
+ * @date 2018.9.10
+ * @company qmth
+ * @describle 试题对象服务
  */
 @Service
-public class QuestionCloudServiceClient extends BasicCloudClientSupport implements QuestionCloudService{
+public class QuestionCloudServiceClient extends BasicCloudClientSupport
+		implements
+			QuestionCloudService {
 
 	private static final long serialVersionUID = 309315715614556772L;
-	
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
 
 	@Override
 	public GetDefaultQuesionIdResp saveQuestion(GetDefaultQuesionReq req) {
 		return post("default_question/save", req, GetDefaultQuesionIdResp.class);
 	}
 
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
 	@Override
 	public GetDefaultQuesionIdResp updateQuestion(GetDefaultQuesionReq req) {
 		return post("default_question/update", req, GetDefaultQuesionIdResp.class);