WANG 6 ani în urmă
părinte
comite
a456112113
46 a modificat fișierele cu 379 adăugiri și 880 ștergeri
  1. 0 19
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/AuthCloudServiceClient.java
  2. 18 2
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/BasicCloudClientSupport.java
  3. 0 19
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/CommonCloudServiceClient.java
  4. 0 19
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/CourseCloudServiceClient.java
  5. 0 19
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/DemoCloudServiceClient.java
  6. 1 22
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/FaceCloudServiceClient.java
  7. 0 19
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/OrgCloudServiceClient.java
  8. 0 19
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/RolePrivilegeCloudServiceClient.java
  9. 0 19
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/StudentCloudServiceClient.java
  10. 0 19
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/SysConfigCloudServiceClient.java
  11. 0 19
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/UserCloudServiceClient.java
  12. 18 2
      examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/BasicCloudClientSupport.java
  13. 0 19
      examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/ExamCloudServiceClient.java
  14. 0 19
      examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/ExamStudentCloudServiceClient.java
  15. 22 4
      examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/BasicCloudClientSupport.java
  16. 10 24
      examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkItemCloudServiceClient.java
  17. 14 28
      examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkResultCloudServiceClient.java
  18. 18 30
      examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkTaskCloudServiceClient.java
  19. 21 35
      examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkWorkCloudServiceClient.java
  20. 10 24
      examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkerCloudServiceClient.java
  21. 14 31
      examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/StudentPaperCloudServiceClient.java
  22. 20 4
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/AdminCloudClientSupport.java
  23. 12 29
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordCloudServiceClient.java
  24. 11 23
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordForMarkingCloudServiceClient.java
  25. 8 21
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordQuestionsCloudServiceClient.java
  26. 3 23
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamScoreCloudServiceClient.java
  27. 15 31
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamScoreDataCloudServiceClient.java
  28. 5 24
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamScoreObtainQueueCloudServiceClient.java
  29. 7 27
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/OeAdminScorePushCloudServiceClient.java
  30. 15 32
      examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/OeExamStudentCloudServiceClient.java
  31. 18 3
      examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/BasicCloudClientSupport.java
  32. 3 23
      examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/OeExamRecordForMarkingCloudServiceClient.java
  33. 4 25
      examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/OeExamScoreNoticeQueueCloudServiceClient.java
  34. 4 24
      examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/OeExamScoreObtainQueueCloudServiceClient.java
  35. 5 25
      examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/OeHandleByExamCaptureQueueFailedDisposeServiceClient.java
  36. 3 20
      examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/OeStudentExamRecordCloudServiceClient.java
  37. 18 2
      examcloud-core-oe-student-face-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/client/BasicCloudClientSupport.java
  38. 5 25
      examcloud-core-oe-student-face-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/client/ExamCaptureQueueCloudServiceClient.java
  39. 11 26
      examcloud-core-print-api-client/src/main/java/cn/com/qmth/examcloud/core/print/api/client/CoursePaperCloudServiceClient.java
  40. 20 4
      examcloud-core-print-api-client/src/main/java/cn/com/qmth/examcloud/core/print/api/client/PrintCloudClientSupport.java
  41. 18 2
      examcloud-exchange-inner-api-client/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/client/ExchangeCloudClientSupport.java
  42. 4 21
      examcloud-exchange-inner-api-client/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/client/SendSmsServiceClient.java
  43. 3 17
      examcloud-exchange-inner-api-client/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/client/UpyunCloudServiceClient.java
  44. 3 17
      examcloud-global-api-client/src/main/java/cn/com/qmth/examcloud/global/api/provider/HandleSyncCloudServiceClient.java
  45. 0 19
      examcloud-task-api-client/src/main/java/cn/com/qmth/examcloud/task/api/client/DataSyncCloudServiceClient.java
  46. 18 2
      examcloud-task-api-client/src/main/java/cn/com/qmth/examcloud/task/api/client/TaskCloudClientSupport.java

+ 0 - 19
examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/AuthCloudServiceClient.java

@@ -1,35 +1,16 @@
 package cn.com.qmth.examcloud.core.basic.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.basic.api.AuthCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.LoginReq;
 import cn.com.qmth.examcloud.core.basic.api.response.LoginResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
 public class AuthCloudServiceClient extends BasicCloudClientSupport implements AuthCloudService {
 
 	private static final long serialVersionUID = -4571389823902680911L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public LoginResp login(LoginReq req) {
 		return post("auth/login", req, LoginResp.class);

+ 18 - 2
examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/BasicCloudClientSupport.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.client;
 
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
 
 /**
@@ -8,9 +9,24 @@ import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
  */
 public abstract class BasicCloudClientSupport extends CloudClientSupport {
 
+	private static final String APP_NAME = "EC-CORE-BASIC";
+
+	@Override
+	protected Integer getPort() {
+		return 10020;
+	}
+
 	@Override
-	public String getUrlPrefix() {
-		return "http://EC-CORE-BASIC/api/core/basic/";
+	protected String getRequestMappingPrefix() {
+		return "api/core/basic";
+	}
+
+	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);
 	}
 
 }

+ 0 - 19
examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/CommonCloudServiceClient.java

@@ -1,13 +1,10 @@
 package cn.com.qmth.examcloud.core.basic.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.basic.api.CommonCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetThirdPartyAccessInfoReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetThirdPartyAccessInfoResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
 public class CommonCloudServiceClient extends BasicCloudClientSupport
@@ -16,22 +13,6 @@ public class CommonCloudServiceClient extends BasicCloudClientSupport
 
 	private static final long serialVersionUID = 6826389318398035229L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public GetThirdPartyAccessInfoResp getThirdPartyAccessInfo(GetThirdPartyAccessInfoReq req) {
 		return post("common/getThirdPartyAccessInfo", req, GetThirdPartyAccessInfoResp.class);

+ 0 - 19
examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/CourseCloudServiceClient.java

@@ -1,15 +1,12 @@
 package cn.com.qmth.examcloud.core.basic.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.basic.api.CourseCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetCourseReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveCourseReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetCourseResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveCourseResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
  * 类注释
@@ -25,22 +22,6 @@ public class CourseCloudServiceClient extends BasicCloudClientSupport
 
 	private static final long serialVersionUID = -5246359107103119265L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public SaveCourseResp saveCourse(SaveCourseReq req) {
 		return post("course/saveCourse", req, SaveCourseResp.class);

+ 0 - 19
examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/DemoCloudServiceClient.java

@@ -1,13 +1,10 @@
 package cn.com.qmth.examcloud.core.basic.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.basic.api.DemoCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetXxxReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetXxxResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
  * demo 云服务客户端
@@ -20,25 +17,9 @@ public class DemoCloudServiceClient extends BasicCloudClientSupport implements D
 
 	private static final long serialVersionUID = -7456923008162697199L;
 
-	@Autowired
-	RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
 	@Override
 	public GetXxxResp getXxx(GetXxxReq req) {
 		return post("demo/getXxx", req, GetXxxResp.class);
 	}
 
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 }

+ 1 - 22
examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/FaceCloudServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.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.basic.api.FaceCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetStudentFaceReq;
@@ -11,7 +9,6 @@ import cn.com.qmth.examcloud.core.basic.api.request.SaveStudentFaceReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetStudentFaceResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetUsableFacesetListResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveStudentFaceResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
  * demo 云服务客户端
@@ -20,28 +17,10 @@ import cn.com.qmth.examcloud.web.redis.RedisClient;
  *
  */
 @Service
-public class FaceCloudServiceClient extends BasicCloudClientSupport
-		implements
-			FaceCloudService {
+public class FaceCloudServiceClient extends BasicCloudClientSupport implements FaceCloudService {
 
 	private static final long serialVersionUID = -7456923008162697199L;
 
-	@Autowired
-	RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public SaveStudentFaceResp saveStudentFace(SaveStudentFaceReq req) {
 		return post("studentFace/saveStudentFace", req, SaveStudentFaceResp.class);

+ 0 - 19
examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/OrgCloudServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.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.basic.api.OrgCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetAllOrgPropertiesReq;
@@ -15,7 +13,6 @@ import cn.com.qmth.examcloud.core.basic.api.response.GetOrgPropertyResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgsResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveOrgResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
  * 机构服务客户端
@@ -30,22 +27,6 @@ public class OrgCloudServiceClient extends BasicCloudClientSupport implements Or
 
 	private static final long serialVersionUID = -1608540743867447624L;
 
-	@Autowired
-	RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public SaveOrgResp saveOrg(SaveOrgReq orgReq) {
 		return post("org/saveOrg", orgReq, SaveOrgResp.class);

+ 0 - 19
examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/RolePrivilegeCloudServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.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.basic.api.RolePrivilegeCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.DeleteRoleReq;
@@ -11,7 +9,6 @@ import cn.com.qmth.examcloud.core.basic.api.request.SaveRoleReq;
 import cn.com.qmth.examcloud.core.basic.api.response.DeleteRoleResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetPrivilegeListResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveRoleResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
 public class RolePrivilegeCloudServiceClient extends BasicCloudClientSupport
@@ -20,22 +17,6 @@ public class RolePrivilegeCloudServiceClient extends BasicCloudClientSupport
 
 	private static final long serialVersionUID = 1627126406719389279L;
 
-	@Autowired
-	RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public SaveRoleResp saveRole(SaveRoleReq req) {
 		return post("rolePrivilege/saveRole", req, SaveRoleResp.class);

+ 0 - 19
examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/StudentCloudServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.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.basic.api.StudentCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetStudentReq;
@@ -11,7 +9,6 @@ import cn.com.qmth.examcloud.core.basic.api.request.UnbindStudentCodeReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetStudentResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveStudentResp;
 import cn.com.qmth.examcloud.core.basic.api.response.UnbindStudentCodeResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
 public class StudentCloudServiceClient extends BasicCloudClientSupport
@@ -20,22 +17,6 @@ public class StudentCloudServiceClient extends BasicCloudClientSupport
 
 	private static final long serialVersionUID = 7669672850482842766L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public SaveStudentResp saveStudent(SaveStudentReq req) {
 		return post("student/saveStudent", req, SaveStudentResp.class);

+ 0 - 19
examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/SysConfigCloudServiceClient.java

@@ -1,15 +1,12 @@
 package cn.com.qmth.examcloud.core.basic.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.basic.api.SysConfigCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetSysConfigReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SetSysConfigReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetSysConfigResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SetSysConfigResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
 public class SysConfigCloudServiceClient extends BasicCloudClientSupport
@@ -18,22 +15,6 @@ public class SysConfigCloudServiceClient extends BasicCloudClientSupport
 
 	private static final long serialVersionUID = -1572107451517177867L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public SetSysConfigResp setSysConfig(SetSysConfigReq req) {
 		return post("sysConfig/setSysConfig", req, SetSysConfigResp.class);

+ 0 - 19
examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/UserCloudServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.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.basic.api.UserCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.AddUserReq;
@@ -11,7 +9,6 @@ import cn.com.qmth.examcloud.core.basic.api.request.GetUserReq;
 import cn.com.qmth.examcloud.core.basic.api.response.AddUserResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetUserListResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetUserResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
  * 类注释
@@ -25,22 +22,6 @@ public class UserCloudServiceClient extends BasicCloudClientSupport implements U
 
 	private static final long serialVersionUID = 5562847036151453132L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public AddUserResp addUser(AddUserReq req) {
 		return post("user/addUser", req, AddUserResp.class);

+ 18 - 2
examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/BasicCloudClientSupport.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.examwork.api.client;
 
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
 
 /**
@@ -8,9 +9,24 @@ import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
  */
 public abstract class BasicCloudClientSupport extends CloudClientSupport {
 
+	private static final String APP_NAME = "EC-CORE-EXAMWORK";
+
+	@Override
+	protected Integer getPort() {
+		return 10020;
+	}
+
 	@Override
-	public String getUrlPrefix() {
-		return "http://EC-CORE-EXAMWORK/api/core/examwork/";
+	protected String getRequestMappingPrefix() {
+		return "api/core/examwork";
+	}
+
+	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);
 	}
 
 }

+ 0 - 19
examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/ExamCloudServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.examwork.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.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.CountExamStudentReq;
@@ -31,7 +29,6 @@ import cn.com.qmth.examcloud.examwork.api.response.LockExamStudentsResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.SetExamPropertyResp;
 import cn.com.qmth.examcloud.examwork.api.response.UnlockExamStudentsResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
  * @author chenken
@@ -44,22 +41,6 @@ public class ExamCloudServiceClient extends BasicCloudClientSupport implements E
 
 	private static final long serialVersionUID = -2880611326177571371L;
 
-	@Autowired
-	RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public SaveExamResp saveExam(SaveExamReq req) {
 		return post("exam/saveExam", req, SaveExamResp.class);

+ 0 - 19
examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/ExamStudentCloudServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.examwork.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.examwork.api.ExamStudentCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.CopyExamStudentsReq;
@@ -13,7 +11,6 @@ import cn.com.qmth.examcloud.examwork.api.response.CopyExamStudentsResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentPageResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
 public class ExamStudentCloudServiceClient extends BasicCloudClientSupport
@@ -22,22 +19,6 @@ public class ExamStudentCloudServiceClient extends BasicCloudClientSupport
 
 	private static final long serialVersionUID = -8874453764538303046L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public SaveExamStudentResp saveExamStudent(SaveExamStudentReq req) {
 		return post("examStudent/saveExamStudent", req, SaveExamStudentResp.class);

+ 22 - 4
examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/BasicCloudClientSupport.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.marking.api.client;
 
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
 
 /**
@@ -10,8 +11,25 @@ import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
  * @Version 2.0
  */
 public abstract class BasicCloudClientSupport extends CloudClientSupport {
-    @Override
-    public String getUrlPrefix() {
-        return "http://EC-CORE-MARKING/api/core/marking/";
-    }
+
+	private static final String APP_NAME = "EC-CORE-MARKING";
+
+	@Override
+	protected Integer getPort() {
+		return 10020;
+	}
+
+	@Override
+	protected String getRequestMappingPrefix() {
+		return "api/core/marking";
+	}
+
+	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);
+	}
+
 }

+ 10 - 24
examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkItemCloudServiceClient.java

@@ -1,15 +1,10 @@
 package cn.com.qmth.examcloud.marking.api.client;
 
+import org.springframework.stereotype.Service;
+
 import cn.com.qmth.examcloud.marking.api.MarkItemCloudService;
 import cn.com.qmth.examcloud.marking.api.request.SaveMarkItemReq;
-import cn.com.qmth.examcloud.marking.api.request.SaveMarkWorkReq;
 import cn.com.qmth.examcloud.marking.api.response.SaveMarkItemResp;
-import cn.com.qmth.examcloud.marking.api.response.SaveMarkWorkResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 /**
  * @ClassName MarkItemCloudServiceClient
@@ -19,23 +14,14 @@ import org.springframework.web.client.RestTemplate;
  * @Version 3.0
  */
 @Service
-public class MarkItemCloudServiceClient extends BasicCloudClientSupport implements MarkItemCloudService {
-    @Autowired
-    private RestTemplate restTemplate;
-    @Autowired
-    private RedisClient redisClient;
-    @Override
-    protected RestTemplate getRestTemplate() {
-        return this.restTemplate;
-    }
+public class MarkItemCloudServiceClient extends BasicCloudClientSupport
+		implements
+			MarkItemCloudService {
 
-    @Override
-    protected RedisClient getRedisClient() {
-        return this.redisClient;
-    }
+	private static final long serialVersionUID = -5718503048909635166L;
 
-    @Override
-    public SaveMarkItemResp saveMarkWork(SaveMarkItemReq req) {
-        return post("markItem/saveMarkItemList",req, SaveMarkItemResp.class);
-    }
+	@Override
+	public SaveMarkItemResp saveMarkWork(SaveMarkItemReq req) {
+		return post("markItem/saveMarkItemList", req, SaveMarkItemResp.class);
+	}
 }

+ 14 - 28
examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkResultCloudServiceClient.java

@@ -1,14 +1,11 @@
 package cn.com.qmth.examcloud.marking.api.client;
 
+import org.springframework.stereotype.Service;
+
 import cn.com.qmth.examcloud.marking.api.MarkResultCloudService;
 import cn.com.qmth.examcloud.marking.api.request.GetMarkResultReq;
 import cn.com.qmth.examcloud.marking.api.response.GetMarkResultPageResp;
 import cn.com.qmth.examcloud.marking.api.response.GetMarkResultResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 /**
  * @ClassName MarkResultCloudServiceClient
@@ -18,30 +15,19 @@ import org.springframework.web.client.RestTemplate;
  * @Version 3.0
  */
 @Service
-public class MarkResultCloudServiceClient extends BasicCloudClientSupport implements MarkResultCloudService {
-    @Autowired
-    RestTemplate restTemplate;
-
-    @Autowired
-    private RedisClient redisClient;
-
-    @Override
-    protected RestTemplate getRestTemplate() {
-        return restTemplate;
-    }
+public class MarkResultCloudServiceClient extends BasicCloudClientSupport
+		implements
+			MarkResultCloudService {
 
-    @Override
-    protected RedisClient getRedisClient() {
-        return redisClient;
-    }
+	private static final long serialVersionUID = -8231590717120316938L;
 
-    @Override
-    public GetMarkResultResp getMarkResult(GetMarkResultReq req) {
-        return post("markResult/getMarkResult",req,GetMarkResultResp.class);
-    }
+	@Override
+	public GetMarkResultResp getMarkResult(GetMarkResultReq req) {
+		return post("markResult/getMarkResult", req, GetMarkResultResp.class);
+	}
 
-    @Override
-    public GetMarkResultPageResp getMarkResultPage(GetMarkResultReq req) {
-        return post("markResult/getMarkResultPage",req,GetMarkResultPageResp.class);
-    }
+	@Override
+	public GetMarkResultPageResp getMarkResultPage(GetMarkResultReq req) {
+		return post("markResult/getMarkResultPage", req, GetMarkResultPageResp.class);
+	}
 }

+ 18 - 30
examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkTaskCloudServiceClient.java

@@ -1,5 +1,7 @@
 package cn.com.qmth.examcloud.marking.api.client;
 
+import org.springframework.stereotype.Service;
+
 import cn.com.qmth.examcloud.marking.api.MarkTaskCloudService;
 import cn.com.qmth.examcloud.marking.api.request.GetMarkTaskReq;
 import cn.com.qmth.examcloud.marking.api.request.SaveMarkTaskReq;
@@ -7,11 +9,6 @@ import cn.com.qmth.examcloud.marking.api.request.UpdateMarkTaskReq;
 import cn.com.qmth.examcloud.marking.api.response.GetMarkTaskResp;
 import cn.com.qmth.examcloud.marking.api.response.SaveMarkTaskResp;
 import cn.com.qmth.examcloud.marking.api.response.UpdateMarkTaskResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 /**
  * @ClassName MarkTaskCloudServiceClient
@@ -21,33 +18,24 @@ import org.springframework.web.client.RestTemplate;
  * @Version 3.0
  */
 @Service
-public class MarkTaskCloudServiceClient extends BasicCloudClientSupport implements MarkTaskCloudService {
-    @Autowired
-    private RestTemplate restTemplate;
-    @Autowired
-    private RedisClient redisClient;
-    @Override
-    protected RestTemplate getRestTemplate() {
-        return this.restTemplate;
-    }
+public class MarkTaskCloudServiceClient extends BasicCloudClientSupport
+		implements
+			MarkTaskCloudService {
 
-    @Override
-    protected RedisClient getRedisClient() {
-        return this.redisClient;
-    }
+	private static final long serialVersionUID = 3713704339599845609L;
 
-    @Override
-    public GetMarkTaskResp getMarkTask(GetMarkTaskReq req) {
-        return post("markTask/getMarkTask",req,GetMarkTaskResp.class);
-    }
+	@Override
+	public GetMarkTaskResp getMarkTask(GetMarkTaskReq req) {
+		return post("markTask/getMarkTask", req, GetMarkTaskResp.class);
+	}
 
-    @Override
-    public SaveMarkTaskResp saveMarkTask(SaveMarkTaskReq req) {
-        return post("markTask/saveMarkTask",req,SaveMarkTaskResp.class);
-    }
+	@Override
+	public SaveMarkTaskResp saveMarkTask(SaveMarkTaskReq req) {
+		return post("markTask/saveMarkTask", req, SaveMarkTaskResp.class);
+	}
 
-    @Override
-    public UpdateMarkTaskResp updateMarkTask(UpdateMarkTaskReq req) {
-        return post("markTask/updateMarkTask",req,UpdateMarkTaskResp.class);
-    }
+	@Override
+	public UpdateMarkTaskResp updateMarkTask(UpdateMarkTaskReq req) {
+		return post("markTask/updateMarkTask", req, UpdateMarkTaskResp.class);
+	}
 }

+ 21 - 35
examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkWorkCloudServiceClient.java

@@ -1,5 +1,7 @@
 package cn.com.qmth.examcloud.marking.api.client;
 
+import org.springframework.stereotype.Service;
+
 import cn.com.qmth.examcloud.marking.api.MarkWorkCloudService;
 import cn.com.qmth.examcloud.marking.api.request.GetMarkWorkReq;
 import cn.com.qmth.examcloud.marking.api.request.SaveMarkWorkReq;
@@ -7,11 +9,6 @@ import cn.com.qmth.examcloud.marking.api.request.UpdateMarkWorkReq;
 import cn.com.qmth.examcloud.marking.api.response.GetMarkWorkResp;
 import cn.com.qmth.examcloud.marking.api.response.SaveMarkWorkResp;
 import cn.com.qmth.examcloud.marking.api.response.UpdateMarkWorkResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 /**
  * @ClassName MarkWorkCloudServiceClient
@@ -21,34 +18,23 @@ import org.springframework.web.client.RestTemplate;
  * @Version 3.0
  */
 @Service
-public class MarkWorkCloudServiceClient extends BasicCloudClientSupport implements MarkWorkCloudService {
-    @Autowired
-    RestTemplate restTemplate;
-
-    @Autowired
-    private RedisClient redisClient;
-    @Override
-    protected RestTemplate getRestTemplate() {
-        return restTemplate;
-    }
-
-    @Override
-    protected RedisClient getRedisClient() {
-        return redisClient;
-    }
-
-    @Override
-    public GetMarkWorkResp getMarkWork(GetMarkWorkReq req) {
-        return post("markWorks/getAll",req, GetMarkWorkResp.class);
-    }
-
-    @Override
-    public SaveMarkWorkResp saveMarkWork(SaveMarkWorkReq req) {
-        return post("markWorks/saveMarkWork",req, SaveMarkWorkResp.class);
-    }
-
-    @Override
-    public UpdateMarkWorkResp updateMarkWork(UpdateMarkWorkReq req) {
-        return post("markWorks/updateMarkWork",req, UpdateMarkWorkResp.class);
-    }
+public class MarkWorkCloudServiceClient extends BasicCloudClientSupport
+		implements
+			MarkWorkCloudService {
+	private static final long serialVersionUID = -8517217664310649037L;
+
+	@Override
+	public GetMarkWorkResp getMarkWork(GetMarkWorkReq req) {
+		return post("markWorks/getAll", req, GetMarkWorkResp.class);
+	}
+
+	@Override
+	public SaveMarkWorkResp saveMarkWork(SaveMarkWorkReq req) {
+		return post("markWorks/saveMarkWork", req, SaveMarkWorkResp.class);
+	}
+
+	@Override
+	public UpdateMarkWorkResp updateMarkWork(UpdateMarkWorkReq req) {
+		return post("markWorks/updateMarkWork", req, UpdateMarkWorkResp.class);
+	}
 }

+ 10 - 24
examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/MarkerCloudServiceClient.java

@@ -1,13 +1,10 @@
 package cn.com.qmth.examcloud.marking.api.client;
 
+import org.springframework.stereotype.Service;
+
 import cn.com.qmth.examcloud.marking.api.MarkerCloudService;
 import cn.com.qmth.examcloud.marking.api.request.GetMarkerReq;
 import cn.com.qmth.examcloud.marking.api.response.GetMarkerResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 /**
  * @ClassName MarkerCloudServiceClient
@@ -17,25 +14,14 @@ import org.springframework.web.client.RestTemplate;
  * @Version 3.0
  */
 @Service
-public class MarkerCloudServiceClient extends BasicCloudClientSupport implements MarkerCloudService {
-    @Autowired
-    RestTemplate restTemplate;
-
-    @Autowired
-    private RedisClient redisClient;
-
-    @Override
-    protected RedisClient getRedisClient() {
-        return redisClient;
-    }
+public class MarkerCloudServiceClient extends BasicCloudClientSupport
+		implements
+			MarkerCloudService {
 
-    @Override
-    protected RestTemplate getRestTemplate() {
-        return restTemplate;
-    }
+	private static final long serialVersionUID = -5389986426755079298L;
 
-    @Override
-    public GetMarkerResp getMarker(GetMarkerReq getMarkerReq) {
-        return post("marker/getAll",getMarkerReq,GetMarkerResp.class);
-    }
+	@Override
+	public GetMarkerResp getMarker(GetMarkerReq getMarkerReq) {
+		return post("marker/getAll", getMarkerReq, GetMarkerResp.class);
+	}
 }

+ 14 - 31
examcloud-core-marking-api-client/src/main/java/cn/com/qmth/examcloud/marking/api/client/StudentPaperCloudServiceClient.java

@@ -1,15 +1,12 @@
 package cn.com.qmth.examcloud.marking.api.client;
 
+import org.springframework.stereotype.Service;
+
 import cn.com.qmth.examcloud.marking.api.StudentPaperCloudService;
 import cn.com.qmth.examcloud.marking.api.request.GetStudentPaperReq;
 import cn.com.qmth.examcloud.marking.api.request.SaveStudentPaperReq;
 import cn.com.qmth.examcloud.marking.api.response.GetStudentPaperResp;
 import cn.com.qmth.examcloud.marking.api.response.SaveStudentPaperResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 /**
  * @ClassName StudentPaperCloudServiceClient
@@ -19,33 +16,19 @@ import org.springframework.web.client.RestTemplate;
  * @Version 3.0
  */
 @Service
-public class StudentPaperCloudServiceClient extends BasicCloudClientSupport implements StudentPaperCloudService {
-
-    private static final long serialVersionUID = -8711706052966399720L;
-
-    @Autowired
-    RestTemplate restTemplate;
-
-    @Autowired
-    private RedisClient redisClient;
-
-    @Override
-    protected RestTemplate getRestTemplate() {
-        return restTemplate;
-    }
+public class StudentPaperCloudServiceClient extends BasicCloudClientSupport
+		implements
+			StudentPaperCloudService {
 
-    @Override
-    protected RedisClient getRedisClient() {
-        return redisClient;
-    }
+	private static final long serialVersionUID = -8711706052966399720L;
 
-    @Override
-    public GetStudentPaperResp getStudentPaper(GetStudentPaperReq req) {
-        return post("studentPaper/getPaper",req,GetStudentPaperResp.class);
-    }
+	@Override
+	public GetStudentPaperResp getStudentPaper(GetStudentPaperReq req) {
+		return post("studentPaper/getPaper", req, GetStudentPaperResp.class);
+	}
 
-    @Override
-    public SaveStudentPaperResp saveStudentPaper(SaveStudentPaperReq req) {
-        return post("studentPaper/savePaperList",req,SaveStudentPaperResp.class);
-    }
+	@Override
+	public SaveStudentPaperResp saveStudentPaper(SaveStudentPaperReq req) {
+		return post("studentPaper/savePaperList", req, SaveStudentPaperResp.class);
+	}
 }

+ 20 - 4
examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/AdminCloudClientSupport.java

@@ -7,6 +7,7 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.client;
 
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
 
 /**
@@ -15,9 +16,24 @@ import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
  */
 public abstract class AdminCloudClientSupport extends CloudClientSupport {
 
-    @Override
-    public String getUrlPrefix() {
-        return "http://EC-CORE-OE-ADMIN/api/core/oe/admin/";
-    }
+	private static final String APP_NAME = "EC-CORE-OE-ADMIN";
+
+	@Override
+	protected Integer getPort() {
+		return 10020;
+	}
+
+	@Override
+	protected String getRequestMappingPrefix() {
+		return "api/core/oe/admin";
+	}
+
+	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);
+	}
 
 }

+ 12 - 29
examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordCloudServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.admin.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.oe.admin.api.ExamRecordCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.CheckExamIsStartedReq;
@@ -11,46 +9,31 @@ import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryExamRecordForSelectS
 import cn.com.qmth.examcloud.core.oe.admin.api.response.CheckExamIsStartedResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetExamPhotoVerifyDataResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamRecordForSelectScoreResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
-
 
 @Service("examRecordCloudService")
-public class ExamRecordCloudServiceClient extends AdminCloudClientSupport implements ExamRecordCloudService {
+public class ExamRecordCloudServiceClient extends AdminCloudClientSupport
+		implements
+			ExamRecordCloudService {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 6596862028883396367L;
 
-	@Autowired
-    private RestTemplate restTemplate;
-	
-    @Autowired
-    private RedisClient redisClient;
-	
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
 	@Override
 	public CheckExamIsStartedResp checkExamIsStarted(CheckExamIsStartedReq examRecordReq) {
-		return post("examRecord/checkExamIsStarted", examRecordReq,CheckExamIsStartedResp.class);
+		return post("examRecord/checkExamIsStarted", examRecordReq, CheckExamIsStartedResp.class);
 	}
 
 	@Override
-	public QueryExamRecordForSelectScoreResp queryExamRecordForSelectScoreByScoreId(QueryExamRecordForSelectScoreReq req) {
-		return post("examRecord/queryExamRecordForSelectScoreByScoreId", req, QueryExamRecordForSelectScoreResp.class);
+	public QueryExamRecordForSelectScoreResp queryExamRecordForSelectScoreByScoreId(
+			QueryExamRecordForSelectScoreReq req) {
+		return post("examRecord/queryExamRecordForSelectScoreByScoreId", req,
+				QueryExamRecordForSelectScoreResp.class);
 	}
 
 	@Override
-	public QueryExamRecordForSelectScoreResp queryExamRecordForSelectScoreByExamStudentId(QueryExamRecordForSelectScoreReq req) {
-		return post("examRecord/queryExamRecordForSelectScoreByExamStudentId", req, QueryExamRecordForSelectScoreResp.class);
+	public QueryExamRecordForSelectScoreResp queryExamRecordForSelectScoreByExamStudentId(
+			QueryExamRecordForSelectScoreReq req) {
+		return post("examRecord/queryExamRecordForSelectScoreByExamStudentId", req,
+				QueryExamRecordForSelectScoreResp.class);
 	}
 
 	@Override

+ 11 - 23
examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordForMarkingCloudServiceClient.java

@@ -1,42 +1,30 @@
 package cn.com.qmth.examcloud.core.oe.admin.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.oe.admin.api.ExamRecordForMarkingCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.FindExamRecordForMarkingInfoReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryValidExamRecordInfoReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamRecordForMarkingInfoResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryValidExamRecordInfoResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
-public class ExamRecordForMarkingCloudServiceClient extends AdminCloudClientSupport implements ExamRecordForMarkingCloudService{
-	@Autowired
-    private RestTemplate restTemplate;
-	
-    @Autowired
-    private RedisClient redisClient;
-	
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
+public class ExamRecordForMarkingCloudServiceClient extends AdminCloudClientSupport
+		implements
+			ExamRecordForMarkingCloudService {
+	private static final long serialVersionUID = 2457700818728109540L;
 
 	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-    
-	@Override
-	public FindExamRecordForMarkingInfoResp findExamRecordForMarkingInfo(FindExamRecordForMarkingInfoReq findExamRecordForMarkingInfoReq) {
-		return post("examRecordForMarking/findExamRecordForMarkingInfo", findExamRecordForMarkingInfoReq, FindExamRecordForMarkingInfoResp.class);
+	public FindExamRecordForMarkingInfoResp findExamRecordForMarkingInfo(
+			FindExamRecordForMarkingInfoReq findExamRecordForMarkingInfoReq) {
+		return post("examRecordForMarking/findExamRecordForMarkingInfo",
+				findExamRecordForMarkingInfoReq, FindExamRecordForMarkingInfoResp.class);
 	}
 
 	@Override
 	public QueryValidExamRecordInfoResp queryValidExamRecordInfo(QueryValidExamRecordInfoReq req) {
-		return post("examRecordForMarking/queryValidExamRecordInfo", req, QueryValidExamRecordInfoResp.class);
+		return post("examRecordForMarking/queryValidExamRecordInfo", req,
+				QueryValidExamRecordInfoResp.class);
 	}
-	
+
 }

+ 8 - 21
examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamRecordQuestionsCloudServiceClient.java

@@ -1,37 +1,24 @@
 package cn.com.qmth.examcloud.core.oe.admin.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.oe.admin.api.ExamRecordQuestionsCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.QuerySubjectiveAnswerListReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.SaveSubjectiveQuestionScoreReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QuerySubjectiveAnswerListResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
-public class ExamRecordQuestionsCloudServiceClient extends AdminCloudClientSupport implements ExamRecordQuestionsCloudService{
-	
-	@Autowired
-    private RestTemplate restTemplate;
-	
-    @Autowired
-    private RedisClient redisClient;
+public class ExamRecordQuestionsCloudServiceClient extends AdminCloudClientSupport
+		implements
+			ExamRecordQuestionsCloudService {
 
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
+	private static final long serialVersionUID = 7406118545852910455L;
 
 	@Override
-	public QuerySubjectiveAnswerListResp querySubjectiveAnswerList(QuerySubjectiveAnswerListReq req) {
-		return post("examRecordQuestions/querySubjectiveAnswerList", req, QuerySubjectiveAnswerListResp.class);
+	public QuerySubjectiveAnswerListResp querySubjectiveAnswerList(
+			QuerySubjectiveAnswerListReq req) {
+		return post("examRecordQuestions/querySubjectiveAnswerList", req,
+				QuerySubjectiveAnswerListResp.class);
 	}
 
 	@Override

+ 3 - 23
examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamScoreCloudServiceClient.java

@@ -1,41 +1,21 @@
 package cn.com.qmth.examcloud.core.oe.admin.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.oe.admin.api.ExamScoreCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.QueryExamScoreReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryExamScoreResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
-public class ExamScoreCloudServiceClient extends AdminCloudClientSupport implements ExamScoreCloudService{
+public class ExamScoreCloudServiceClient extends AdminCloudClientSupport
+		implements
+			ExamScoreCloudService {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -5079612325935269180L;
 
-	@Autowired
-    private RestTemplate restTemplate;
-	
-    @Autowired
-    private RedisClient redisClient;
-	
 	@Override
 	public QueryExamScoreResp queryExamScore(QueryExamScoreReq req) {
 		return post("examScore/queryExamScore", req, QueryExamScoreResp.class);
 	}
 
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
 }

+ 15 - 31
examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamScoreDataCloudServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.admin.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.oe.admin.api.ExamScoreDataCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.FindExamScoreDataReq;
@@ -15,59 +13,45 @@ import cn.com.qmth.examcloud.core.oe.admin.api.response.GetAuditDataResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetScoreDataResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryCapturePhotoResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.QueryScoreDataResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
-public class ExamScoreDataCloudServiceClient extends AdminCloudClientSupport implements ExamScoreDataCloudService{
+public class ExamScoreDataCloudServiceClient extends AdminCloudClientSupport
+		implements
+			ExamScoreDataCloudService {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 702370114207337204L;
 
-	@Autowired
-    private RestTemplate restTemplate;
-	
-    @Autowired
-    private RedisClient redisClient;
-    
 	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
+	public FindExamScoreDataResp findExamScoreDataByScoreId(
+			FindExamScoreDataReq findExamScoreDataReq) {
+		return post("examScoreData/findExamScoreDataByScoreId", findExamScoreDataReq,
+				FindExamScoreDataResp.class);
 	}
 
 	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-	
-	@Override
-	public FindExamScoreDataResp findExamScoreDataByScoreId(FindExamScoreDataReq findExamScoreDataReq) {
-		return post("examScoreData/findExamScoreDataByScoreId", findExamScoreDataReq, FindExamScoreDataResp.class);
-	}
-
-	@Override
-	public FindExamScoreDataResp findExamScoreDataByExamIdAndStudentCode(FindExamScoreDataReq findExamScoreDataReq) {
-		return post("examScoreData/findExamScoreDataByExamIdAndStudentCode", findExamScoreDataReq, FindExamScoreDataResp.class);
+	public FindExamScoreDataResp findExamScoreDataByExamIdAndStudentCode(
+			FindExamScoreDataReq findExamScoreDataReq) {
+		return post("examScoreData/findExamScoreDataByExamIdAndStudentCode", findExamScoreDataReq,
+				FindExamScoreDataResp.class);
 	}
 
 	@Override
 	public GetScoreDataResp getScoreData(GetScoreDataReq req) {
-		return post("examScoreData/getScoreData",req,GetScoreDataResp.class);
+		return post("examScoreData/getScoreData", req, GetScoreDataResp.class);
 	}
 
 	@Override
 	public GetAuditDataResp getAuditData(GetAuditDataReq req) {
-		return post("examScoreData/getAuditData",req,GetAuditDataResp.class);
+		return post("examScoreData/getAuditData", req, GetAuditDataResp.class);
 	}
 
 	@Override
 	public QueryCapturePhotoResp queryCapturePhoto(QueryCapturePhotoReq req) {
-		return post("examScoreData/queryCapturePhoto",req,QueryCapturePhotoResp.class);
+		return post("examScoreData/queryCapturePhoto", req, QueryCapturePhotoResp.class);
 	}
 
 	@Override
 	public QueryScoreDataResp queryScoreData(QueryScoreDataReq req) {
-		return post("examScoreData/queryScoreData",req,QueryScoreDataResp.class);
+		return post("examScoreData/queryScoreData", req, QueryScoreDataResp.class);
 	}
 }

+ 5 - 24
examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/ExamScoreObtainQueueCloudServiceClient.java

@@ -1,32 +1,23 @@
 package cn.com.qmth.examcloud.core.oe.admin.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.oe.admin.api.ExamScoreObtainQueueCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.DeleteExamScoreQueueReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.GetTopExamScoreQueueReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.GetTopExamScoreQueueResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
-public class ExamScoreObtainQueueCloudServiceClient extends AdminCloudClientSupport implements ExamScoreObtainQueueCloudService{
+public class ExamScoreObtainQueueCloudServiceClient extends AdminCloudClientSupport
+		implements
+			ExamScoreObtainQueueCloudService {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 7442463539981662202L;
 
-	@Autowired
-    private RestTemplate restTemplate;
-	
-    @Autowired
-    private RedisClient redisClient;
-	
 	@Override
 	public GetTopExamScoreQueueResp getTopExamScoreQueue(GetTopExamScoreQueueReq req) {
-		return post("examScoreObtainQueue/getTopExamScoreQueue", req, GetTopExamScoreQueueResp.class);
+		return post("examScoreObtainQueue/getTopExamScoreQueue", req,
+				GetTopExamScoreQueueResp.class);
 	}
 
 	@Override
@@ -34,14 +25,4 @@ public class ExamScoreObtainQueueCloudServiceClient extends AdminCloudClientSupp
 		post("examScoreObtainQueue/deleteExamScoreQueue", req);
 	}
 
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
 }

+ 7 - 27
examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/OeAdminScorePushCloudServiceClient.java

@@ -1,46 +1,26 @@
 package cn.com.qmth.examcloud.core.oe.admin.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.oe.admin.api.OeAdminScorePushCloudService;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
  * 
- * @author  	chenken
- * @date    	2018年11月14日 下午6:49:20
- * @company 	QMTH
+ * @author chenken
+ * @date 2018年11月14日 下午6:49:20
+ * @company QMTH
  * @description 分数推送
  */
 @Service
-public class OeAdminScorePushCloudServiceClient extends AdminCloudClientSupport implements OeAdminScorePushCloudService{
+public class OeAdminScorePushCloudServiceClient extends AdminCloudClientSupport
+		implements
+			OeAdminScorePushCloudService {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 1682623291259562715L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-	
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-	
 	@Override
 	public void disposeScoreQueue() {
 		post("oeAdminScorePush/disposeScoreQueue", null);
 	}
-	
+
 }

+ 15 - 32
examcloud-core-oe-admin-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/admin/client/OeExamStudentCloudServiceClient.java

@@ -7,6 +7,8 @@
 
 package cn.com.qmth.examcloud.core.oe.admin.client;
 
+import org.springframework.stereotype.Service;
+
 import cn.com.qmth.examcloud.core.oe.admin.api.OeExamStudentCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.ExamStudentSyncAllDataReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.request.ExamStudentSyncPartDataReq;
@@ -14,11 +16,6 @@ import cn.com.qmth.examcloud.core.oe.admin.api.request.FindExamStudentInfoReq;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.ExamStudentSyncAllDataResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.ExamStudentSyncPartDataResp;
 import cn.com.qmth.examcloud.core.oe.admin.api.response.FindExamStudentInfoResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 /**
  * 考生信息接口
@@ -27,38 +24,24 @@ import org.springframework.web.client.RestTemplate;
  * @since: 2018/8/15
  */
 @Service("oeExamStudentCloudService")
-public class OeExamStudentCloudServiceClient extends AdminCloudClientSupport implements OeExamStudentCloudService {
-    private static final long serialVersionUID = -8874453764538303046L;
-    
-    @Autowired
-    private RestTemplate restTemplate;
-    
-    @Autowired
-    private RedisClient redisClient;
-    
-    @Override
-    protected RedisClient getRedisClient() {
-        return redisClient;
-    }
-
-    @Override
-    protected RestTemplate getRestTemplate() {
-        return restTemplate;
-    }
+public class OeExamStudentCloudServiceClient extends AdminCloudClientSupport
+		implements
+			OeExamStudentCloudService {
+	private static final long serialVersionUID = -8874453764538303046L;
 
-    @Override
-    public ExamStudentSyncAllDataResp syncExamStudentAllData(ExamStudentSyncAllDataReq req) {
-        return post("exam/student/sync/all/data", req, ExamStudentSyncAllDataResp.class);
-    }
+	@Override
+	public ExamStudentSyncAllDataResp<?> syncExamStudentAllData(ExamStudentSyncAllDataReq req) {
+		return post("exam/student/sync/all/data", req, ExamStudentSyncAllDataResp.class);
+	}
 
-    @Override
-    public ExamStudentSyncPartDataResp syncExamStudentPartData(ExamStudentSyncPartDataReq req) {
-        return post("exam/student/sync/part/data", req, ExamStudentSyncPartDataResp.class);
-    }
+	@Override
+	public ExamStudentSyncPartDataResp<?> syncExamStudentPartData(ExamStudentSyncPartDataReq req) {
+		return post("exam/student/sync/part/data", req, ExamStudentSyncPartDataResp.class);
+	}
 
 	@Override
 	public FindExamStudentInfoResp findExamStudentInfoBy(FindExamStudentInfoReq req) {
 		return post("exam/student/findExamStudentInfoBy", req, FindExamStudentInfoResp.class);
 	}
-	
+
 }

+ 18 - 3
examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/BasicCloudClientSupport.java

@@ -1,16 +1,31 @@
 package cn.com.qmth.examcloud.core.oe.student.api.client;
 
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
 
-
 /**
  * @author WANGWEI
  *
  */
 public abstract class BasicCloudClientSupport extends CloudClientSupport {
+
+	private static final String APP_NAME = "EC-CORE-OE-STUDENT";
+
 	@Override
-	public String getUrlPrefix() {
-		return "http://EC-CORE-OE-STUDENT/api/core/oe/student/";
+	protected Integer getPort() {
+		return 10020;
 	}
 
+	@Override
+	protected String getRequestMappingPrefix() {
+		return "api/core/oe/student";
+	}
+
+	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);
+	}
 }

+ 3 - 23
examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/OeExamRecordForMarkingCloudServiceClient.java

@@ -1,40 +1,20 @@
 package cn.com.qmth.examcloud.core.oe.student.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.oe.student.api.OeExamRecordForMarkingCloudService;
 import cn.com.qmth.examcloud.core.oe.student.api.request.SaveExamRecordForMarkingReq;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
-public class OeExamRecordForMarkingCloudServiceClient extends BasicCloudClientSupport  implements OeExamRecordForMarkingCloudService {
+public class OeExamRecordForMarkingCloudServiceClient extends BasicCloudClientSupport
+		implements
+			OeExamRecordForMarkingCloudService {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -8762454977750448054L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-	
 	@Override
 	public void saveExamRecordForMarking(SaveExamRecordForMarkingReq req) {
 		post("examRecordForMarking/saveExamRecordForMarking", req);
 	}
 
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
 }

+ 4 - 25
examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/OeExamScoreNoticeQueueCloudServiceClient.java

@@ -1,40 +1,19 @@
 package cn.com.qmth.examcloud.core.oe.student.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.oe.student.api.OeExamScoreNoticeQueueCloudService;
-import cn.com.qmth.examcloud.core.oe.student.api.OeExamScoreObtainQueueCloudService;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
-public class OeExamScoreNoticeQueueCloudServiceClient extends BasicCloudClientSupport  implements OeExamScoreNoticeQueueCloudService{
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -2866999608688584179L;
-
-	@Autowired
-	private RestTemplate restTemplate;
+public class OeExamScoreNoticeQueueCloudServiceClient extends BasicCloudClientSupport
+		implements
+			OeExamScoreNoticeQueueCloudService {
 
-	@Autowired
-	private RedisClient redisClient;
+	private static final long serialVersionUID = -2866999608688584179L;
 
 	@Override
 	public void sendObtainScoreNotice() {
 		post("examScoreNoticeQueue/sendObtainScoreNotice", null);
 	}
 
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
 }

+ 4 - 24
examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/OeExamScoreObtainQueueCloudServiceClient.java

@@ -1,39 +1,19 @@
 package cn.com.qmth.examcloud.core.oe.student.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.oe.student.api.OeExamScoreObtainQueueCloudService;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
-public class OeExamScoreObtainQueueCloudServiceClient extends BasicCloudClientSupport  implements OeExamScoreObtainQueueCloudService{
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -2866999608688584179L;
-
-	@Autowired
-	private RestTemplate restTemplate;
+public class OeExamScoreObtainQueueCloudServiceClient extends BasicCloudClientSupport
+		implements
+			OeExamScoreObtainQueueCloudService {
 
-	@Autowired
-	private RedisClient redisClient;
+	private static final long serialVersionUID = -2866999608688584179L;
 
 	@Override
 	public void updateObtainScoreNodifyQueue() {
 		post("examScoreObtainQueue/updateObtainScoreNodifyQueue", null);
 	}
 
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
 }

+ 5 - 25
examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/OeHandleByExamCaptureQueueFailedDisposeServiceClient.java

@@ -1,41 +1,21 @@
 package cn.com.qmth.examcloud.core.oe.student.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.oe.student.api.OeHandleByExamCaptureQueueFailedDisposeService;
 import cn.com.qmth.examcloud.core.oe.student.api.request.HandleByExamCaptureQueueFailedDisposeReq;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
-public class OeHandleByExamCaptureQueueFailedDisposeServiceClient extends BasicCloudClientSupport implements
-		OeHandleByExamCaptureQueueFailedDisposeService {
+public class OeHandleByExamCaptureQueueFailedDisposeServiceClient extends BasicCloudClientSupport
+		implements
+			OeHandleByExamCaptureQueueFailedDisposeService {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -802226410595457107L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-	
 	@Override
-	public void handleByExamCaptureQueueFailedDispose(HandleByExamCaptureQueueFailedDisposeReq req) {
+	public void handleByExamCaptureQueueFailedDispose(
+			HandleByExamCaptureQueueFailedDisposeReq req) {
 		post("handleByExamCaptureQueueFailedDispose", req);
 	}
 
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-	
 }

+ 3 - 20
examcloud-core-oe-student-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/client/OeStudentExamRecordCloudServiceClient.java

@@ -8,32 +8,15 @@ import cn.com.qmth.examcloud.core.oe.student.api.OeStudentExamRecordCloudService
 import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service("oeStudentExamRecordCloudService")
-public class OeStudentExamRecordCloudServiceClient extends BasicCloudClientSupport implements OeStudentExamRecordCloudService{
+public class OeStudentExamRecordCloudServiceClient extends BasicCloudClientSupport
+		implements
+			OeStudentExamRecordCloudService {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 3904195239759933649L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-	
 	@Override
 	public void cleanExamRecords() {
 		post("examRecord/cleanExamRecords", null, null);
 	}
 
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
 }

+ 18 - 2
examcloud-core-oe-student-face-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/client/BasicCloudClientSupport.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.student.face.client;
 
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
 
 /**
@@ -8,9 +9,24 @@ import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
  */
 public abstract class BasicCloudClientSupport extends CloudClientSupport {
 
+	private static final String APP_NAME = "EC-CORE-OE-STUDENT-FACE";
+
+	@Override
+	protected Integer getPort() {
+		return 10020;
+	}
+
 	@Override
-	public String getUrlPrefix() {
-		return "http://EC-CORE-OE-STUDENT-FACE/api/core/oe/student/face/";
+	protected String getRequestMappingPrefix() {
+		return "api/core/oe/student/face";
+	}
+
+	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);
 	}
 
 }

+ 5 - 25
examcloud-core-oe-student-face-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/student/face/client/ExamCaptureQueueCloudServiceClient.java

@@ -1,37 +1,17 @@
 package cn.com.qmth.examcloud.core.oe.student.face.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.oe.student.face.api.ExamCaptureQueueCloudService;
 import cn.com.qmth.examcloud.core.oe.student.face.api.request.ExamCaptureQueueReq;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service("examCaptureQueueCloudService")
-public class ExamCaptureQueueCloudServiceClient extends BasicCloudClientSupport implements ExamCaptureQueueCloudService{
+public class ExamCaptureQueueCloudServiceClient extends BasicCloudClientSupport
+		implements
+			ExamCaptureQueueCloudService {
 
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = -4653085252925280697L;
 
-	@Autowired
-    private RestTemplate restTemplate;
-	
-    @Autowired
-    private RedisClient redisClient;
-	
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
 	@Override
 	public void processingExamCaptureQueue() {
 		post("examCaptureQueue/processingExamCaptureQueue", null, null);
@@ -39,7 +19,7 @@ public class ExamCaptureQueueCloudServiceClient extends BasicCloudClientSupport
 
 	@Override
 	public void disposeExamCapturePhoto(ExamCaptureQueueReq examCaptureQueueReq) {
-		post("examCaptureQueue/disposeExamCapturePhoto", examCaptureQueueReq,null);
+		post("examCaptureQueue/disposeExamCapturePhoto", examCaptureQueueReq, null);
 	}
 
 	@Override
@@ -48,7 +28,7 @@ public class ExamCaptureQueueCloudServiceClient extends BasicCloudClientSupport
 	}
 
 	@Override
-	public void examCaptureQueueFailedDispose() throws Exception{
+	public void examCaptureQueueFailedDispose() throws Exception {
 		post("examCaptureQueue/examCaptureQueueFailedDispose", null, null);
 	}
 

+ 11 - 26
examcloud-core-print-api-client/src/main/java/cn/com/qmth/examcloud/core/print/api/client/CoursePaperCloudServiceClient.java

@@ -7,40 +7,25 @@
 
 package cn.com.qmth.examcloud.core.print.api.client;
 
+import org.springframework.stereotype.Service;
+
 import cn.com.qmth.examcloud.core.print.api.CoursePaperCloudService;
 import cn.com.qmth.examcloud.core.print.api.request.SyncCoursePaperReq;
 import cn.com.qmth.examcloud.core.print.api.response.SyncCoursePaperResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 /**
  * @author: fengdesheng
  * @since: 2018/11/15
  */
 @Service("coursePaperCloudServiceClient")
-public class CoursePaperCloudServiceClient extends PrintCloudClientSupport implements CoursePaperCloudService {
-    private static final long serialVersionUID = 1L;
-    @Autowired
-    private RestTemplate restTemplate;
-    @Autowired
-    private RedisClient redisClient;
-
-    @Override
-    protected RedisClient getRedisClient() {
-        return redisClient;
-    }
-
-    @Override
-    protected RestTemplate getRestTemplate() {
-        return restTemplate;
-    }
-
-    @Override
-    public SyncCoursePaperResp syncCoursePaper(SyncCoursePaperReq req) {
-        return post("course/paper/save", req, SyncCoursePaperResp.class);
-    }
+public class CoursePaperCloudServiceClient extends PrintCloudClientSupport
+		implements
+			CoursePaperCloudService {
+	private static final long serialVersionUID = 1L;
+
+	@Override
+	public SyncCoursePaperResp syncCoursePaper(SyncCoursePaperReq req) {
+		return post("course/paper/save", req, SyncCoursePaperResp.class);
+	}
 
 }

+ 20 - 4
examcloud-core-print-api-client/src/main/java/cn/com/qmth/examcloud/core/print/api/client/PrintCloudClientSupport.java

@@ -7,6 +7,7 @@
 
 package cn.com.qmth.examcloud.core.print.api.client;
 
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
 
 /**
@@ -15,9 +16,24 @@ import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
  */
 public abstract class PrintCloudClientSupport extends CloudClientSupport {
 
-    @Override
-    public String getUrlPrefix() {
-        return "http://EC-CORE-PRINT/api/core/prt/";
-    }
+	private static final String APP_NAME = "EC-CORE-PRINT";
+
+	@Override
+	protected Integer getPort() {
+		return 10020;
+	}
+
+	@Override
+	protected String getRequestMappingPrefix() {
+		return "api/core/prt";
+	}
+
+	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);
+	}
 
 }

+ 18 - 2
examcloud-exchange-inner-api-client/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/client/ExchangeCloudClientSupport.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.exchange.inner.api.client;
 
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
 
 /**
@@ -8,9 +9,24 @@ import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
  */
 public abstract class ExchangeCloudClientSupport extends CloudClientSupport {
 
+	private static final String APP_NAME = "EC-EXCHANGE";
+
+	@Override
+	protected Integer getPort() {
+		return 10020;
+	}
+
 	@Override
-	public String getUrlPrefix() {
-		return "http://EC-EXCHANGE/api/exchange/inner";
+	protected String getRequestMappingPrefix() {
+		return "api/exchange/inner";
+	}
+
+	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);
 	}
 
 }

+ 4 - 21
examcloud-exchange-inner-api-client/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/client/SendSmsServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.exchange.inner.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.exchange.inner.api.SendSmsCloudService;
 import cn.com.qmth.examcloud.exchange.inner.api.request.CaptureFailedAlarmReq;
@@ -10,7 +8,6 @@ import cn.com.qmth.examcloud.exchange.inner.api.request.CheckSmsCodeReq;
 import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq;
 import cn.com.qmth.examcloud.exchange.inner.api.response.CheckIdentifyingCodeResp;
 import cn.com.qmth.examcloud.exchange.inner.api.response.SendSmsResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
  * 
@@ -20,26 +17,12 @@ import cn.com.qmth.examcloud.web.redis.RedisClient;
  * @description SendSmsServiceClient.java
  */
 @Service
-public class SendSmsServiceClient extends ExchangeCloudClientSupport implements SendSmsCloudService {
+public class SendSmsServiceClient extends ExchangeCloudClientSupport
+		implements
+			SendSmsCloudService {
 
 	private static final long serialVersionUID = -2880611326177571371L;
 
-	@Autowired
-	RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public SendSmsResp sendIdentifyingCode(SendSmsReq sendSmsReq) {
 		return post("/sendSms/sendIdentifyingCode", sendSmsReq, SendSmsResp.class);
@@ -53,6 +36,6 @@ public class SendSmsServiceClient extends ExchangeCloudClientSupport implements
 
 	@Override
 	public void captureFailedAlarm(CaptureFailedAlarmReq captureFailedAlarmReq) {
-		post("/sendSms/captureFailedAlarm", captureFailedAlarmReq,null);
+		post("/sendSms/captureFailedAlarm", captureFailedAlarmReq, null);
 	}
 }

+ 3 - 17
examcloud-exchange-inner-api-client/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/client/UpyunCloudServiceClient.java

@@ -28,22 +28,6 @@ public class UpyunCloudServiceClient extends ExchangeCloudClientSupport
 
 	private static final long serialVersionUID = -7928075025404055161L;
 
-	@Autowired
-	RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public PutFileResp putFile(PutFileReq req) {
 		Map<String, String> params = Maps.newHashMap();
@@ -53,7 +37,9 @@ public class UpyunCloudServiceClient extends ExchangeCloudClientSupport
 		params.put("userId", String.valueOf(req.getUserId()));
 		params.put("filePath", req.getFilePath());
 
-		return postForm("upyun/putFile", params, new File(req.getFilePath()), PutFileResp.class);
+		// return postForm("upyun/putFile", params, new File(req.getFilePath()),
+		// PutFileResp.class);
+		return null;
 	}
 
 }

+ 3 - 17
examcloud-global-api-client/src/main/java/cn/com/qmth/examcloud/global/api/provider/HandleSyncCloudServiceClient.java

@@ -1,9 +1,7 @@
 package cn.com.qmth.examcloud.global.api.provider;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 import cn.com.qmth.examcloud.global.api.HandleSyncCloudService;
 import cn.com.qmth.examcloud.global.api.request.SyncCourseReq;
@@ -21,7 +19,6 @@ import cn.com.qmth.examcloud.global.api.response.SyncSpecialtyResp;
 import cn.com.qmth.examcloud.global.api.response.SyncStudentResp;
 import cn.com.qmth.examcloud.global.api.response.SyncUserResp;
 import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 @Service
 public class HandleSyncCloudServiceClient extends CloudClientSupport
@@ -30,24 +27,13 @@ public class HandleSyncCloudServiceClient extends CloudClientSupport
 
 	private static final long serialVersionUID = 4067990129534524566L;
 
-	@Autowired
-	private RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
 	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
+	protected String getRequestMappingPrefix() {
+		return null;
 	}
 
 	@Override
-	public String getUrlPrefix() {
+	protected Integer getPort() {
 		return null;
 	}
 

+ 0 - 19
examcloud-task-api-client/src/main/java/cn/com/qmth/examcloud/task/api/client/DataSyncCloudServiceClient.java

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.task.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.task.api.DataSyncCloudService;
 import cn.com.qmth.examcloud.task.api.request.SyncCourseReq;
@@ -19,7 +17,6 @@ import cn.com.qmth.examcloud.task.api.response.SyncOrgResp;
 import cn.com.qmth.examcloud.task.api.response.SyncSpecialtyResp;
 import cn.com.qmth.examcloud.task.api.response.SyncStudentResp;
 import cn.com.qmth.examcloud.task.api.response.SyncUserResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
  * 类注释
@@ -35,22 +32,6 @@ public class DataSyncCloudServiceClient extends TaskCloudClientSupport
 
 	private static final long serialVersionUID = -2880611326177571371L;
 
-	@Autowired
-	RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
 	@Override
 	public SyncCourseResp syncCourse(SyncCourseReq req) {
 		return post("dataSync/syncCourse", req, SyncCourseResp.class);

+ 18 - 2
examcloud-task-api-client/src/main/java/cn/com/qmth/examcloud/task/api/client/TaskCloudClientSupport.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.task.api.client;
 
+import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
 
 /**
@@ -8,9 +9,24 @@ import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
  */
 public abstract class TaskCloudClientSupport extends CloudClientSupport {
 
+	private static final String APP_NAME = "EC-TASK";
+
+	@Override
+	protected Integer getPort() {
+		return 10020;
+	}
+
 	@Override
-	public String getUrlPrefix() {
-		return "http://EC-TASK/api/cloud/task";
+	protected String getRequestMappingPrefix() {
+		return "api/cloud/task";
+	}
+
+	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);
 	}
 
 }