Merge remote-tracking branch 'origin/dev_v5.0.1' into dev_v5.0.1

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

@@ -8,11 +8,13 @@ import cn.com.qmth.examcloud.core.questions.api.request.GetPaperReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionAnswerReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetRandomPaperReq;
 import cn.com.qmth.examcloud.core.questions.api.response.GetBasePaperResp;
 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.core.questions.api.response.GetRandomPaperResp;
 
 /**
  * @author weiwenhai
@@ -62,4 +64,8 @@ public class ExtractConfigCloudServiceClient extends AbstractCloudClientSupport
 		return post("extract_config/getQuestionStructure", req, GetQuestionListResp.class);
 	}
 
+	@Override
+	public GetRandomPaperResp getRandomPaper(GetRandomPaperReq req) {
+		return post("default_paper/randompaper", req, GetRandomPaperResp.class);
+	}
 }

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

@@ -5,10 +5,8 @@ import org.springframework.stereotype.Service;
 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.request.GetRandomPaperReq;
 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.core.questions.api.response.GetRandomPaperResp;
 
 /**
  * @author weiwenhai
@@ -31,9 +29,4 @@ public class PaperCloudServiceClient extends AbstractCloudClientSupport implemen
 		return post("default_paper/examPaper", req, GetCommonResp.class);
 	}
 
-	@Override
-	public GetRandomPaperResp getRandomPaper(GetRandomPaperReq req) {
-		return post("default_paper/randompaper", req, GetRandomPaperResp.class);
-	}
-
 }

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

@@ -6,11 +6,13 @@ import cn.com.qmth.examcloud.core.questions.api.request.GetPaperReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionAnswerReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionListReq;
 import cn.com.qmth.examcloud.core.questions.api.request.GetQuestionReq;
+import cn.com.qmth.examcloud.core.questions.api.request.GetRandomPaperReq;
 import cn.com.qmth.examcloud.core.questions.api.response.GetBasePaperResp;
 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.core.questions.api.response.GetRandomPaperResp;
 
 /**
  * @author 		weiwenhai
@@ -68,4 +70,11 @@ public interface ExtractConfigCloudService extends CloudService{
 	 * @return
 	 */
 	GetQuestionListResp getQuestionStructure(GetBasePaperReq req);
+	
+	
+	/**随机抽卷模式获取试卷
+	 * @param req
+	 * @return
+	 */
+	GetRandomPaperResp getRandomPaper(GetRandomPaperReq req);
 }

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

@@ -3,10 +3,8 @@ package cn.com.qmth.examcloud.core.questions.api;
 import cn.com.qmth.examcloud.api.commons.CloudService;
 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.request.GetRandomPaperReq;
 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.core.questions.api.response.GetRandomPaperResp;
 
 /**
  * @author 		weiwenhai
@@ -30,10 +28,4 @@ public interface PaperCloudService extends CloudService{
 	 */
 	GetCommonResp examPaper(GetExtractConfigReq req);
 	
-	/**随机抽卷模式获取试卷
-	 * @param req
-	 * @return
-	 */
-	GetRandomPaperResp getRandomPaper(GetRandomPaperReq req);
-	
 }