wangwei 6 years ago
parent
commit
dce1697927
100 changed files with 3075 additions and 3075 deletions
  1. 96 96
      examcloud-commons-api-client/src/main/java/cn/com/qmth/examcloud/commons/api/provider/HandleSyncCloudServiceClient.java
  2. 91 91
      examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/HandleSyncCloudService.java
  3. 42 42
      examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/request/SyncBaseRequest.java
  4. 9 9
      examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncCourseResp.java
  5. 9 9
      examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncExamResp.java
  6. 9 9
      examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncExamStudentResp.java
  7. 9 9
      examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncOrgResp.java
  8. 9 9
      examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncSpecialtyResp.java
  9. 9 9
      examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncStudentResp.java
  10. 9 9
      examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncUserResp.java
  11. 37 37
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/AuthCloudServiceClient.java
  12. 16 16
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/BasicCloudClientSupport.java
  13. 1 1
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/CommonCloudServiceClient.java
  14. 1 1
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/CourseCloudServiceClient.java
  15. 1 1
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/DemoCloudServiceClient.java
  16. 60 60
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/FaceCloudServiceClient.java
  17. 1 1
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/OrgCloudServiceClient.java
  18. 54 54
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/RolePrivilegeCloudServiceClient.java
  19. 54 54
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/StudentCloudServiceClient.java
  20. 47 47
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/SysConfigCloudServiceClient.java
  21. 1 1
      examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/UserCloudServiceClient.java
  22. 25 25
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/AuthCloudService.java
  23. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/CommonCloudService.java
  24. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/CourseCloudService.java
  25. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/DemoCloudService.java
  26. 47 47
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/FaceCloudService.java
  27. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/OrgCloudService.java
  28. 25 25
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/RolePrivilegeCloudService.java
  29. 47 47
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/StudentCloudService.java
  30. 22 22
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/SysConfigCloudService.java
  31. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/UserCloudService.java
  32. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/CourseBean.java
  33. 76 76
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/FacesetBean.java
  34. 79 79
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/RoleBean.java
  35. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/StudentBean.java
  36. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/StudentFaceBean.java
  37. 68 68
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/ThirdPartyAccessBean.java
  38. 135 135
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/UserBean.java
  39. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/AddUserReq.java
  40. 59 59
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/DeleteRoleReq.java
  41. 19 19
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetAllOrgPropertiesReq.java
  42. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetCourseReq.java
  43. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetOrgListByNameLikeReq.java
  44. 39 39
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetOrgPropertyReq.java
  45. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetOrgReq.java
  46. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetOrgsReq.java
  47. 29 29
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetPrivilegeListReq.java
  48. 26 26
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetStudentFaceReq.java
  49. 48 48
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetStudentReq.java
  50. 19 19
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetSysConfigReq.java
  51. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetThirdPartyAccessInfoReq.java
  52. 19 19
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetUsableFacesetListReq.java
  53. 49 49
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetUserListReq.java
  54. 39 39
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetUserReq.java
  55. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetXxxReq.java
  56. 87 87
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/LoginReq.java
  57. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveCourseReq.java
  58. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveOrgReq.java
  59. 46 46
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveRoleReq.java
  60. 86 86
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveStudentFaceReq.java
  61. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveStudentReq.java
  62. 29 29
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SetSysConfigReq.java
  63. 39 39
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/UnbindStudentCodeReq.java
  64. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/AddUserResp.java
  65. 23 23
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/DeleteRoleResp.java
  66. 21 21
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetAllOrgPropertiesResp.java
  67. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetCourseResp.java
  68. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetOrgListByNameLikeResp.java
  69. 19 19
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetOrgPropertyResp.java
  70. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetOrgResp.java
  71. 32 32
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetOrgsResp.java
  72. 21 21
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetPrivilegeListResp.java
  73. 34 34
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetStudentFaceResp.java
  74. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetStudentResp.java
  75. 29 29
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetSysConfigResp.java
  76. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetThirdPartyAccessInfoResp.java
  77. 22 22
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetUsableFacesetListResp.java
  78. 32 32
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetUserListResp.java
  79. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetUserResp.java
  80. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetXxxResp.java
  81. 20 20
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/LoginResp.java
  82. 1 1
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SaveCourseResp.java
  83. 20 20
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SaveRoleResp.java
  84. 29 29
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SaveStudentFaceResp.java
  85. 59 59
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SaveStudentResp.java
  86. 29 29
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SetSysConfigResp.java
  87. 21 21
      examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/UnbindStudentCodeResp.java
  88. 1 1
      examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/BasicCloudClientSupport.java
  89. 131 131
      examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/ExamCloudServiceClient.java
  90. 1 1
      examcloud-core-examwork-api-client/src/main/java/cn/com/qmth/examcloud/examwork/api/client/ExamStudentCloudServiceClient.java
  91. 155 155
      examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/ExamCloudService.java
  92. 1 1
      examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/ExamStudentCloudService.java
  93. 1 1
      examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamBean.java
  94. 69 69
      examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamCourseRelationBean.java
  95. 46 46
      examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamPaperTypeRelation.java
  96. 1 1
      examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamSpecialSettingsBean.java
  97. 278 278
      examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamStudentBean.java
  98. 51 51
      examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/CopyExamStudentsReq.java
  99. 131 131
      examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/CountExamStudentReq.java
  100. 49 49
      examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/GetExamCourseListReq.java

+ 96 - 96
examcloud-commons-api-client/src/main/java/cn/com/qmth/examcloud/commons/api/provider/HandleSyncCloudServiceClient.java

@@ -1,96 +1,96 @@
-package cn.com.qmth.examcloud.commons.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.commons.api.HandleSyncCloudService;
-import cn.com.qmth.examcloud.commons.api.request.SyncCourseReq;
-import cn.com.qmth.examcloud.commons.api.request.SyncExamReq;
-import cn.com.qmth.examcloud.commons.api.request.SyncExamStudentReq;
-import cn.com.qmth.examcloud.commons.api.request.SyncOrgReq;
-import cn.com.qmth.examcloud.commons.api.request.SyncSpecialtyReq;
-import cn.com.qmth.examcloud.commons.api.request.SyncStudentReq;
-import cn.com.qmth.examcloud.commons.api.request.SyncUserReq;
-import cn.com.qmth.examcloud.commons.api.response.SyncCourseResp;
-import cn.com.qmth.examcloud.commons.api.response.SyncExamResp;
-import cn.com.qmth.examcloud.commons.api.response.SyncExamStudentResp;
-import cn.com.qmth.examcloud.commons.api.response.SyncOrgResp;
-import cn.com.qmth.examcloud.commons.api.response.SyncSpecialtyResp;
-import cn.com.qmth.examcloud.commons.api.response.SyncStudentResp;
-import cn.com.qmth.examcloud.commons.api.response.SyncUserResp;
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.commons.web.support.CloudClientSupport;
-
-@Service
-public class HandleSyncCloudServiceClient extends CloudClientSupport
-		implements
-			HandleSyncCloudService {
-
-	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;
-	}
-
-	@Override
-	public String getUrlPrefix() {
-		return null;
-	}
-
-	@Override
-	public SyncCourseResp syncCourse(SyncCourseReq req) {
-		String url = req.getUrl();
-		return exchange(url, HttpMethod.POST, req, SyncCourseResp.class);
-	}
-
-	@Override
-	public SyncOrgResp syncOrg(SyncOrgReq req) {
-		String url = req.getUrl();
-		return exchange(url, HttpMethod.POST, req, SyncOrgResp.class);
-	}
-
-	@Override
-	public SyncStudentResp syncStudent(SyncStudentReq req) {
-		String url = req.getUrl();
-		return exchange(url, HttpMethod.POST, req, SyncStudentResp.class);
-	}
-
-	@Override
-	public SyncExamStudentResp syncExamStudent(SyncExamStudentReq req) {
-		String url = req.getUrl();
-		return exchange(url, HttpMethod.POST, req, SyncExamStudentResp.class);
-	}
-
-	@Override
-	public SyncSpecialtyResp syncSpecialty(SyncSpecialtyReq req) {
-		String url = req.getUrl();
-		return exchange(url, HttpMethod.POST, req, SyncSpecialtyResp.class);
-	}
-
-	@Override
-	public SyncExamResp syncExam(SyncExamReq req) {
-		String url = req.getUrl();
-		return exchange(url, HttpMethod.POST, req, SyncExamResp.class);
-	}
-
-	@Override
-	public SyncUserResp syncUser(SyncUserReq req) {
-		String url = req.getUrl();
-		return exchange(url, HttpMethod.POST, req, SyncUserResp.class);
-	}
-
-}
+package cn.com.qmth.examcloud.commons.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.commons.api.HandleSyncCloudService;
+import cn.com.qmth.examcloud.commons.api.request.SyncCourseReq;
+import cn.com.qmth.examcloud.commons.api.request.SyncExamReq;
+import cn.com.qmth.examcloud.commons.api.request.SyncExamStudentReq;
+import cn.com.qmth.examcloud.commons.api.request.SyncOrgReq;
+import cn.com.qmth.examcloud.commons.api.request.SyncSpecialtyReq;
+import cn.com.qmth.examcloud.commons.api.request.SyncStudentReq;
+import cn.com.qmth.examcloud.commons.api.request.SyncUserReq;
+import cn.com.qmth.examcloud.commons.api.response.SyncCourseResp;
+import cn.com.qmth.examcloud.commons.api.response.SyncExamResp;
+import cn.com.qmth.examcloud.commons.api.response.SyncExamStudentResp;
+import cn.com.qmth.examcloud.commons.api.response.SyncOrgResp;
+import cn.com.qmth.examcloud.commons.api.response.SyncSpecialtyResp;
+import cn.com.qmth.examcloud.commons.api.response.SyncStudentResp;
+import cn.com.qmth.examcloud.commons.api.response.SyncUserResp;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
+import cn.com.qmth.examcloud.web.support.CloudClientSupport;
+
+@Service
+public class HandleSyncCloudServiceClient extends CloudClientSupport
+		implements
+			HandleSyncCloudService {
+
+	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;
+	}
+
+	@Override
+	public String getUrlPrefix() {
+		return null;
+	}
+
+	@Override
+	public SyncCourseResp syncCourse(SyncCourseReq req) {
+		String url = req.getUrl();
+		return exchange(url, HttpMethod.POST, req, SyncCourseResp.class);
+	}
+
+	@Override
+	public SyncOrgResp syncOrg(SyncOrgReq req) {
+		String url = req.getUrl();
+		return exchange(url, HttpMethod.POST, req, SyncOrgResp.class);
+	}
+
+	@Override
+	public SyncStudentResp syncStudent(SyncStudentReq req) {
+		String url = req.getUrl();
+		return exchange(url, HttpMethod.POST, req, SyncStudentResp.class);
+	}
+
+	@Override
+	public SyncExamStudentResp syncExamStudent(SyncExamStudentReq req) {
+		String url = req.getUrl();
+		return exchange(url, HttpMethod.POST, req, SyncExamStudentResp.class);
+	}
+
+	@Override
+	public SyncSpecialtyResp syncSpecialty(SyncSpecialtyReq req) {
+		String url = req.getUrl();
+		return exchange(url, HttpMethod.POST, req, SyncSpecialtyResp.class);
+	}
+
+	@Override
+	public SyncExamResp syncExam(SyncExamReq req) {
+		String url = req.getUrl();
+		return exchange(url, HttpMethod.POST, req, SyncExamResp.class);
+	}
+
+	@Override
+	public SyncUserResp syncUser(SyncUserReq req) {
+		String url = req.getUrl();
+		return exchange(url, HttpMethod.POST, req, SyncUserResp.class);
+	}
+
+}

+ 91 - 91
examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/HandleSyncCloudService.java

@@ -1,91 +1,91 @@
-package cn.com.qmth.examcloud.commons.api;
-
-import cn.com.qmth.examcloud.commons.api.request.SyncCourseReq;
-import cn.com.qmth.examcloud.commons.api.request.SyncExamReq;
-import cn.com.qmth.examcloud.commons.api.request.SyncExamStudentReq;
-import cn.com.qmth.examcloud.commons.api.request.SyncOrgReq;
-import cn.com.qmth.examcloud.commons.api.request.SyncSpecialtyReq;
-import cn.com.qmth.examcloud.commons.api.request.SyncStudentReq;
-import cn.com.qmth.examcloud.commons.api.request.SyncUserReq;
-import cn.com.qmth.examcloud.commons.api.response.SyncCourseResp;
-import cn.com.qmth.examcloud.commons.api.response.SyncExamResp;
-import cn.com.qmth.examcloud.commons.api.response.SyncExamStudentResp;
-import cn.com.qmth.examcloud.commons.api.response.SyncOrgResp;
-import cn.com.qmth.examcloud.commons.api.response.SyncSpecialtyResp;
-import cn.com.qmth.examcloud.commons.api.response.SyncStudentResp;
-import cn.com.qmth.examcloud.commons.api.response.SyncUserResp;
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-
-/**
- * 处理同步服务
- *
- * @author WANGWEI
- * @date 2018年9月18日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface HandleSyncCloudService extends CloudService {
-
-	/**
-	 * 同步课程
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	SyncCourseResp syncCourse(SyncCourseReq req);
-
-	/**
-	 * 同步机构
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	SyncOrgResp syncOrg(SyncOrgReq req);
-
-	/**
-	 * 同步学生
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	SyncStudentResp syncStudent(SyncStudentReq req);
-
-	/**
-	 * 同步考生
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	SyncExamStudentResp syncExamStudent(SyncExamStudentReq req);
-
-	/**
-	 * 同步专业
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	SyncSpecialtyResp syncSpecialty(SyncSpecialtyReq req);
-
-	/**
-	 * 同步考试
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	SyncExamResp syncExam(SyncExamReq req);
-
-	/**
-	 * 同步用户
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	SyncUserResp syncUser(SyncUserReq req);
-
-}
+package cn.com.qmth.examcloud.commons.api;
+
+import cn.com.qmth.examcloud.commons.api.request.SyncCourseReq;
+import cn.com.qmth.examcloud.commons.api.request.SyncExamReq;
+import cn.com.qmth.examcloud.commons.api.request.SyncExamStudentReq;
+import cn.com.qmth.examcloud.commons.api.request.SyncOrgReq;
+import cn.com.qmth.examcloud.commons.api.request.SyncSpecialtyReq;
+import cn.com.qmth.examcloud.commons.api.request.SyncStudentReq;
+import cn.com.qmth.examcloud.commons.api.request.SyncUserReq;
+import cn.com.qmth.examcloud.commons.api.response.SyncCourseResp;
+import cn.com.qmth.examcloud.commons.api.response.SyncExamResp;
+import cn.com.qmth.examcloud.commons.api.response.SyncExamStudentResp;
+import cn.com.qmth.examcloud.commons.api.response.SyncOrgResp;
+import cn.com.qmth.examcloud.commons.api.response.SyncSpecialtyResp;
+import cn.com.qmth.examcloud.commons.api.response.SyncStudentResp;
+import cn.com.qmth.examcloud.commons.api.response.SyncUserResp;
+import cn.com.qmth.examcloud.web.cloud.api.CloudService;
+
+/**
+ * 处理同步服务
+ *
+ * @author WANGWEI
+ * @date 2018年9月18日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public interface HandleSyncCloudService extends CloudService {
+
+	/**
+	 * 同步课程
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	SyncCourseResp syncCourse(SyncCourseReq req);
+
+	/**
+	 * 同步机构
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	SyncOrgResp syncOrg(SyncOrgReq req);
+
+	/**
+	 * 同步学生
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	SyncStudentResp syncStudent(SyncStudentReq req);
+
+	/**
+	 * 同步考生
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	SyncExamStudentResp syncExamStudent(SyncExamStudentReq req);
+
+	/**
+	 * 同步专业
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	SyncSpecialtyResp syncSpecialty(SyncSpecialtyReq req);
+
+	/**
+	 * 同步考试
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	SyncExamResp syncExam(SyncExamReq req);
+
+	/**
+	 * 同步用户
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	SyncUserResp syncUser(SyncUserReq req);
+
+}

+ 42 - 42
examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/request/SyncBaseRequest.java

@@ -1,42 +1,42 @@
-package cn.com.qmth.examcloud.commons.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-/**
- * 同步请求基类
- *
- * @author WANGWEI
- * @date 2018年9月18日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public abstract class SyncBaseRequest extends BaseRequest {
-
-	private static final long serialVersionUID = -8613637552589526722L;
-
-	/**
-	 * URL
-	 */
-	private String url;
-
-	/**
-	 * 同步类型. "update","delete"
-	 */
-	private String syncType;
-
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	public String getSyncType() {
-		return syncType;
-	}
-
-	public void setSyncType(String syncType) {
-		this.syncType = syncType;
-	}
-
-}
+package cn.com.qmth.examcloud.commons.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+/**
+ * 同步请求基类
+ *
+ * @author WANGWEI
+ * @date 2018年9月18日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public abstract class SyncBaseRequest extends BaseRequest {
+
+	private static final long serialVersionUID = -8613637552589526722L;
+
+	/**
+	 * URL
+	 */
+	private String url;
+
+	/**
+	 * 同步类型. "update","delete"
+	 */
+	private String syncType;
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+	public String getSyncType() {
+		return syncType;
+	}
+
+	public void setSyncType(String syncType) {
+		this.syncType = syncType;
+	}
+
+}

+ 9 - 9
examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncCourseResp.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.commons.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class SyncCourseResp extends BaseResponse {
-
-	private static final long serialVersionUID = 7936504812326252001L;
-
-}
+package cn.com.qmth.examcloud.commons.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class SyncCourseResp extends BaseResponse {
+
+	private static final long serialVersionUID = 7936504812326252001L;
+
+}

+ 9 - 9
examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncExamResp.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.commons.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class SyncExamResp extends BaseResponse {
-
-	private static final long serialVersionUID = -2525511284759482508L;
-
-}
+package cn.com.qmth.examcloud.commons.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class SyncExamResp extends BaseResponse {
+
+	private static final long serialVersionUID = -2525511284759482508L;
+
+}

+ 9 - 9
examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncExamStudentResp.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.commons.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class SyncExamStudentResp extends BaseResponse {
-
-	private static final long serialVersionUID = -5737186324930608232L;
-
-}
+package cn.com.qmth.examcloud.commons.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class SyncExamStudentResp extends BaseResponse {
+
+	private static final long serialVersionUID = -5737186324930608232L;
+
+}

+ 9 - 9
examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncOrgResp.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.commons.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class SyncOrgResp extends BaseResponse {
-
-	private static final long serialVersionUID = -805572917696214078L;
-
-}
+package cn.com.qmth.examcloud.commons.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class SyncOrgResp extends BaseResponse {
+
+	private static final long serialVersionUID = -805572917696214078L;
+
+}

+ 9 - 9
examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncSpecialtyResp.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.commons.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class SyncSpecialtyResp extends BaseResponse {
-
-	private static final long serialVersionUID = 3408737667742502112L;
-
-}
+package cn.com.qmth.examcloud.commons.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class SyncSpecialtyResp extends BaseResponse {
+
+	private static final long serialVersionUID = 3408737667742502112L;
+
+}

+ 9 - 9
examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncStudentResp.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.commons.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class SyncStudentResp extends BaseResponse {
-
-	private static final long serialVersionUID = -7642849789026746525L;
-
-}
+package cn.com.qmth.examcloud.commons.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class SyncStudentResp extends BaseResponse {
+
+	private static final long serialVersionUID = -7642849789026746525L;
+
+}

+ 9 - 9
examcloud-commons-api/src/main/java/cn/com/qmth/examcloud/commons/api/response/SyncUserResp.java

@@ -1,9 +1,9 @@
-package cn.com.qmth.examcloud.commons.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class SyncUserResp extends BaseResponse {
-
-	private static final long serialVersionUID = 7943381055657229504L;
-
-}
+package cn.com.qmth.examcloud.commons.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class SyncUserResp extends BaseResponse {
+
+	private static final long serialVersionUID = 7943381055657229504L;
+
+}

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

@@ -1,37 +1,37 @@
-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.commons.web.redis.RedisClient;
-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;
-
-@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);
-	}
-}
+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);
+	}
+}

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

@@ -1,16 +1,16 @@
-package cn.com.qmth.examcloud.core.basic.api.client;
-
-import cn.com.qmth.examcloud.commons.web.support.CloudClientSupport;
-
-/**
- * @author WANGWEI
- *
- */
-public abstract class BasicCloudClientSupport extends CloudClientSupport {
-
-	@Override
-	public String getUrlPrefix() {
-		return "http://EC-CORE-BASIC/api/core/basic/";
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.client;
+
+import cn.com.qmth.examcloud.web.support.CloudClientSupport;
+
+/**
+ * @author WANGWEI
+ *
+ */
+public abstract class BasicCloudClientSupport extends CloudClientSupport {
+
+	@Override
+	public String getUrlPrefix() {
+		return "http://EC-CORE-BASIC/api/core/basic/";
+	}
+
+}

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

@@ -4,10 +4,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 
 
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.basic.api.CommonCloudService;
 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.request.GetThirdPartyAccessInfoReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetThirdPartyAccessInfoResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetThirdPartyAccessInfoResp;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 
 @Service
 @Service
 public class CommonCloudServiceClient extends BasicCloudClientSupport
 public class CommonCloudServiceClient extends BasicCloudClientSupport

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

@@ -4,12 +4,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 
 
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.basic.api.CourseCloudService;
 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.GetCourseReq;
 import cn.com.qmth.examcloud.core.basic.api.request.SaveCourseReq;
 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.GetCourseResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveCourseResp;
 import cn.com.qmth.examcloud.core.basic.api.response.SaveCourseResp;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 
 /**
 /**
  * 类注释
  * 类注释

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

@@ -4,10 +4,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 
 
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.basic.api.DemoCloudService;
 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.request.GetXxxReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetXxxResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetXxxResp;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 
 /**
 /**
  * demo 云服务客户端
  * demo 云服务客户端

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

@@ -1,60 +1,60 @@
-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.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.core.basic.api.FaceCloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.GetStudentFaceReq;
-import cn.com.qmth.examcloud.core.basic.api.request.GetUsableFacesetListReq;
-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;
-
-/**
- * demo 云服务客户端
- * 
- * @author WANGWEI
- *
- */
-@Service
-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);
-	}
-
-	@Override
-	public GetUsableFacesetListResp getUsableFacesetList(GetUsableFacesetListReq req) {
-		return post("studentFace/getUsableFacesetList", req, GetUsableFacesetListResp.class);
-	}
-
-	@Override
-	public GetStudentFaceResp getStudentFace(GetStudentFaceReq req) {
-		return post("studentFace/getStudentFace", req, GetStudentFaceResp.class);
-	}
-
-}
+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;
+import cn.com.qmth.examcloud.core.basic.api.request.GetUsableFacesetListReq;
+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 云服务客户端
+ * 
+ * @author WANGWEI
+ *
+ */
+@Service
+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);
+	}
+
+	@Override
+	public GetUsableFacesetListResp getUsableFacesetList(GetUsableFacesetListReq req) {
+		return post("studentFace/getUsableFacesetList", req, GetUsableFacesetListResp.class);
+	}
+
+	@Override
+	public GetStudentFaceResp getStudentFace(GetStudentFaceReq req) {
+		return post("studentFace/getStudentFace", req, GetStudentFaceResp.class);
+	}
+
+}

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

@@ -4,7 +4,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 
 
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.basic.api.OrgCloudService;
 import cn.com.qmth.examcloud.core.basic.api.OrgCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetAllOrgPropertiesReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetAllOrgPropertiesReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgPropertyReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgPropertyReq;
@@ -16,6 +15,7 @@ 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.GetOrgResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgsResp;
 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.core.basic.api.response.SaveOrgResp;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 
 /**
 /**
  * 机构服务客户端
  * 机构服务客户端

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

@@ -1,54 +1,54 @@
-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.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.core.basic.api.RolePrivilegeCloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.DeleteRoleReq;
-import cn.com.qmth.examcloud.core.basic.api.request.GetPrivilegeListReq;
-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;
-
-@Service
-public class RolePrivilegeCloudServiceClient extends BasicCloudClientSupport
-		implements
-			RolePrivilegeCloudService {
-
-	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);
-	}
-
-	@Override
-	public DeleteRoleResp deleteRole(DeleteRoleReq req) {
-		return post("rolePrivilege/deleteRole", req, DeleteRoleResp.class);
-	}
-
-	@Override
-	public GetPrivilegeListResp getPrivilegeList(GetPrivilegeListReq req) {
-		return post("rolePrivilege/getPrivilegeList", req, GetPrivilegeListResp.class);
-	}
-
-}
+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;
+import cn.com.qmth.examcloud.core.basic.api.request.GetPrivilegeListReq;
+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
+		implements
+			RolePrivilegeCloudService {
+
+	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);
+	}
+
+	@Override
+	public DeleteRoleResp deleteRole(DeleteRoleReq req) {
+		return post("rolePrivilege/deleteRole", req, DeleteRoleResp.class);
+	}
+
+	@Override
+	public GetPrivilegeListResp getPrivilegeList(GetPrivilegeListReq req) {
+		return post("rolePrivilege/getPrivilegeList", req, GetPrivilegeListResp.class);
+	}
+
+}

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

@@ -1,54 +1,54 @@
-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.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.core.basic.api.StudentCloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.GetStudentReq;
-import cn.com.qmth.examcloud.core.basic.api.request.SaveStudentReq;
-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;
-
-@Service
-public class StudentCloudServiceClient extends BasicCloudClientSupport
-		implements
-			StudentCloudService {
-
-	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);
-	}
-
-	@Override
-	public GetStudentResp getStudent(GetStudentReq req) {
-		return post("student/getStudent", req, GetStudentResp.class);
-	}
-
-	@Override
-	public UnbindStudentCodeResp unbindStudentCode(UnbindStudentCodeReq req) {
-		return post("student/unbindStudentCode", req, UnbindStudentCodeResp.class);
-	}
-
-}
+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;
+import cn.com.qmth.examcloud.core.basic.api.request.SaveStudentReq;
+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
+		implements
+			StudentCloudService {
+
+	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);
+	}
+
+	@Override
+	public GetStudentResp getStudent(GetStudentReq req) {
+		return post("student/getStudent", req, GetStudentResp.class);
+	}
+
+	@Override
+	public UnbindStudentCodeResp unbindStudentCode(UnbindStudentCodeReq req) {
+		return post("student/unbindStudentCode", req, UnbindStudentCodeResp.class);
+	}
+
+}

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

@@ -1,47 +1,47 @@
-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.commons.web.redis.RedisClient;
-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;
-
-@Service
-public class SysConfigCloudServiceClient extends BasicCloudClientSupport
-		implements
-			SysConfigCloudService {
-
-	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);
-	}
-
-	@Override
-	public GetSysConfigResp getSysConfig(GetSysConfigReq req) {
-		return post("sysConfig/getSysConfig", req, GetSysConfigResp.class);
-	}
-
-}
+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
+		implements
+			SysConfigCloudService {
+
+	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);
+	}
+
+	@Override
+	public GetSysConfigResp getSysConfig(GetSysConfigReq req) {
+		return post("sysConfig/getSysConfig", req, GetSysConfigResp.class);
+	}
+
+}

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

@@ -4,7 +4,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 
 
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
 import cn.com.qmth.examcloud.core.basic.api.UserCloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.AddUserReq;
 import cn.com.qmth.examcloud.core.basic.api.request.AddUserReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetUserListReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetUserListReq;
@@ -12,6 +11,7 @@ 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.AddUserResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetUserListResp;
 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.core.basic.api.response.GetUserResp;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 
 /**
 /**
  * 类注释
  * 类注释

+ 25 - 25
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/AuthCloudService.java

@@ -1,25 +1,25 @@
-package cn.com.qmth.examcloud.core.basic.api;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.LoginReq;
-import cn.com.qmth.examcloud.core.basic.api.response.LoginResp;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年9月13日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface AuthCloudService extends CloudService {
-
-	/**
-	 * 登录
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	LoginResp login(LoginReq req);
-
-}
+package cn.com.qmth.examcloud.core.basic.api;
+
+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.cloud.api.CloudService;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年9月13日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public interface AuthCloudService extends CloudService {
+
+	/**
+	 * 登录
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	LoginResp login(LoginReq req);
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/CommonCloudService.java

@@ -1,8 +1,8 @@
 package cn.com.qmth.examcloud.core.basic.api;
 package cn.com.qmth.examcloud.core.basic.api;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetThirdPartyAccessInfoReq;
 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.core.basic.api.response.GetThirdPartyAccessInfoResp;
+import cn.com.qmth.examcloud.web.cloud.api.CloudService;
 
 
 /**
 /**
  * 类注释
  * 类注释

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/CourseCloudService.java

@@ -1,10 +1,10 @@
 package cn.com.qmth.examcloud.core.basic.api;
 package cn.com.qmth.examcloud.core.basic.api;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetCourseReq;
 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.request.SaveCourseReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetCourseResp;
 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.core.basic.api.response.SaveCourseResp;
+import cn.com.qmth.examcloud.web.cloud.api.CloudService;
 
 
 /**
 /**
  * 课程服务
  * 课程服务

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/DemoCloudService.java

@@ -1,8 +1,8 @@
 package cn.com.qmth.examcloud.core.basic.api;
 package cn.com.qmth.examcloud.core.basic.api;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetXxxReq;
 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.core.basic.api.response.GetXxxResp;
+import cn.com.qmth.examcloud.web.cloud.api.CloudService;
 
 
 /**
 /**
  * demo 云服务接口
  * demo 云服务接口

+ 47 - 47
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/FaceCloudService.java

@@ -1,47 +1,47 @@
-package cn.com.qmth.examcloud.core.basic.api;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.GetStudentFaceReq;
-import cn.com.qmth.examcloud.core.basic.api.request.GetUsableFacesetListReq;
-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;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年7月18日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface FaceCloudService extends CloudService {
-
-	/**
-	 * 方法注释
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	SaveStudentFaceResp saveStudentFace(SaveStudentFaceReq req);
-
-	/**
-	 * 方法注释
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetUsableFacesetListResp getUsableFacesetList(GetUsableFacesetListReq req);
-
-	/**
-	 * 方法注释
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetStudentFaceResp getStudentFace(GetStudentFaceReq req);
-
-}
+package cn.com.qmth.examcloud.core.basic.api;
+
+import cn.com.qmth.examcloud.core.basic.api.request.GetStudentFaceReq;
+import cn.com.qmth.examcloud.core.basic.api.request.GetUsableFacesetListReq;
+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.cloud.api.CloudService;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年7月18日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public interface FaceCloudService extends CloudService {
+
+	/**
+	 * 方法注释
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	SaveStudentFaceResp saveStudentFace(SaveStudentFaceReq req);
+
+	/**
+	 * 方法注释
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetUsableFacesetListResp getUsableFacesetList(GetUsableFacesetListReq req);
+
+	/**
+	 * 方法注释
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetStudentFaceResp getStudentFace(GetStudentFaceReq req);
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/OrgCloudService.java

@@ -1,6 +1,5 @@
 package cn.com.qmth.examcloud.core.basic.api;
 package cn.com.qmth.examcloud.core.basic.api;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.GetAllOrgPropertiesReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetAllOrgPropertiesReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgPropertyReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgPropertyReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
@@ -11,6 +10,7 @@ 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.GetOrgResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgsResp;
 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.core.basic.api.response.SaveOrgResp;
+import cn.com.qmth.examcloud.web.cloud.api.CloudService;
 
 
 /**
 /**
  * 机构服务
  * 机构服务

+ 25 - 25
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/RolePrivilegeCloudService.java

@@ -1,25 +1,25 @@
-package cn.com.qmth.examcloud.core.basic.api;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.DeleteRoleReq;
-import cn.com.qmth.examcloud.core.basic.api.request.GetPrivilegeListReq;
-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;
-
-/**
- * 角色权限云服务
- * 
- * @author WANGWEI
- *
- */
-public interface RolePrivilegeCloudService extends CloudService {
-
-	SaveRoleResp saveRole(SaveRoleReq req);
-
-	DeleteRoleResp deleteRole(DeleteRoleReq req);
-
-	GetPrivilegeListResp getPrivilegeList(GetPrivilegeListReq req);
-
-}
+package cn.com.qmth.examcloud.core.basic.api;
+
+import cn.com.qmth.examcloud.core.basic.api.request.DeleteRoleReq;
+import cn.com.qmth.examcloud.core.basic.api.request.GetPrivilegeListReq;
+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.cloud.api.CloudService;
+
+/**
+ * 角色权限云服务
+ * 
+ * @author WANGWEI
+ *
+ */
+public interface RolePrivilegeCloudService extends CloudService {
+
+	SaveRoleResp saveRole(SaveRoleReq req);
+
+	DeleteRoleResp deleteRole(DeleteRoleReq req);
+
+	GetPrivilegeListResp getPrivilegeList(GetPrivilegeListReq req);
+
+}

+ 47 - 47
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/StudentCloudService.java

@@ -1,47 +1,47 @@
-package cn.com.qmth.examcloud.core.basic.api;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-import cn.com.qmth.examcloud.core.basic.api.request.GetStudentReq;
-import cn.com.qmth.examcloud.core.basic.api.request.SaveStudentReq;
-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;
-
-/**
- * 学生接口服务
- * 
- * @author chenken
- * @date 2018年5月4日 下午5:10:40
- * @company QMTH
- * @description StudentCloudService.java
- */
-public interface StudentCloudService extends CloudService {
-
-	/**
-	 * 插入或更新学生
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 */
-	SaveStudentResp saveStudent(SaveStudentReq req);
-
-	/**
-	 * 查询学生信息
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetStudentResp getStudent(GetStudentReq req);
-
-	/**
-	 * 解绑学号
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	UnbindStudentCodeResp unbindStudentCode(UnbindStudentCodeReq req);
-
-}
+package cn.com.qmth.examcloud.core.basic.api;
+
+import cn.com.qmth.examcloud.core.basic.api.request.GetStudentReq;
+import cn.com.qmth.examcloud.core.basic.api.request.SaveStudentReq;
+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.cloud.api.CloudService;
+
+/**
+ * 学生接口服务
+ * 
+ * @author chenken
+ * @date 2018年5月4日 下午5:10:40
+ * @company QMTH
+ * @description StudentCloudService.java
+ */
+public interface StudentCloudService extends CloudService {
+
+	/**
+	 * 插入或更新学生
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 */
+	SaveStudentResp saveStudent(SaveStudentReq req);
+
+	/**
+	 * 查询学生信息
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetStudentResp getStudent(GetStudentReq req);
+
+	/**
+	 * 解绑学号
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	UnbindStudentCodeResp unbindStudentCode(UnbindStudentCodeReq req);
+
+}

+ 22 - 22
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/SysConfigCloudService.java

@@ -1,22 +1,22 @@
-package cn.com.qmth.examcloud.core.basic.api;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-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;
-
-/**
- * 系统配置
- *
- * @author WANGWEI
- * @date 2018年12月3日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface SysConfigCloudService extends CloudService {
-
-	SetSysConfigResp setSysConfig(SetSysConfigReq req);
-
-	GetSysConfigResp getSysConfig(GetSysConfigReq req);
-
-}
+package cn.com.qmth.examcloud.core.basic.api;
+
+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.cloud.api.CloudService;
+
+/**
+ * 系统配置
+ *
+ * @author WANGWEI
+ * @date 2018年12月3日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public interface SysConfigCloudService extends CloudService {
+
+	SetSysConfigResp setSysConfig(SetSysConfigReq req);
+
+	GetSysConfigResp getSysConfig(GetSysConfigReq req);
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/UserCloudService.java

@@ -1,12 +1,12 @@
 package cn.com.qmth.examcloud.core.basic.api;
 package cn.com.qmth.examcloud.core.basic.api;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.core.basic.api.request.AddUserReq;
 import cn.com.qmth.examcloud.core.basic.api.request.AddUserReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetUserListReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetUserListReq;
 import cn.com.qmth.examcloud.core.basic.api.request.GetUserReq;
 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.AddUserResp;
 import cn.com.qmth.examcloud.core.basic.api.response.GetUserListResp;
 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.core.basic.api.response.GetUserResp;
+import cn.com.qmth.examcloud.web.cloud.api.CloudService;
 
 
 /**
 /**
  * 学生接口服务
  * 学生接口服务

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/CourseBean.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.bean;
 package cn.com.qmth.examcloud.core.basic.api.bean;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
 
 
 public class CourseBean implements JsonSerializable {
 public class CourseBean implements JsonSerializable {
 
 

+ 76 - 76
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/FacesetBean.java

@@ -1,76 +1,76 @@
-package cn.com.qmth.examcloud.core.basic.api.bean;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-
-/**
- * face++ faceset
- *
- * @author WANGWEI
- * @date 2018年9月3日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class FacesetBean implements JsonSerializable {
-
-	private static final long serialVersionUID = -1831392800541099736L;
-
-	private Long id;
-
-	private String facesetToken;
-
-	private Long faceCount;
-
-	private String outerId;
-
-	private String displayName;
-
-	private String tags;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getFacesetToken() {
-		return facesetToken;
-	}
-
-	public void setFacesetToken(String facesetToken) {
-		this.facesetToken = facesetToken;
-	}
-
-	public Long getFaceCount() {
-		return faceCount;
-	}
-
-	public void setFaceCount(Long faceCount) {
-		this.faceCount = faceCount;
-	}
-
-	public String getOuterId() {
-		return outerId;
-	}
-
-	public void setOuterId(String outerId) {
-		this.outerId = outerId;
-	}
-
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	public void setDisplayName(String displayName) {
-		this.displayName = displayName;
-	}
-
-	public String getTags() {
-		return tags;
-	}
-
-	public void setTags(String tags) {
-		this.tags = tags;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.bean;
+
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
+
+/**
+ * face++ faceset
+ *
+ * @author WANGWEI
+ * @date 2018年9月3日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class FacesetBean implements JsonSerializable {
+
+	private static final long serialVersionUID = -1831392800541099736L;
+
+	private Long id;
+
+	private String facesetToken;
+
+	private Long faceCount;
+
+	private String outerId;
+
+	private String displayName;
+
+	private String tags;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getFacesetToken() {
+		return facesetToken;
+	}
+
+	public void setFacesetToken(String facesetToken) {
+		this.facesetToken = facesetToken;
+	}
+
+	public Long getFaceCount() {
+		return faceCount;
+	}
+
+	public void setFaceCount(Long faceCount) {
+		this.faceCount = faceCount;
+	}
+
+	public String getOuterId() {
+		return outerId;
+	}
+
+	public void setOuterId(String outerId) {
+		this.outerId = outerId;
+	}
+
+	public String getDisplayName() {
+		return displayName;
+	}
+
+	public void setDisplayName(String displayName) {
+		this.displayName = displayName;
+	}
+
+	public String getTags() {
+		return tags;
+	}
+
+	public void setTags(String tags) {
+		this.tags = tags;
+	}
+
+}

+ 79 - 79
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/RoleBean.java

@@ -1,79 +1,79 @@
-package cn.com.qmth.examcloud.core.basic.api.bean;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年5月25日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class RoleBean implements JsonSerializable {
-
-	private static final long serialVersionUID = -916123953402843015L;
-
-	private Long roleId;
-
-	private String roleCode;
-
-	private String roleName;
-
-	private Long rootOrgId;
-
-	/**
-	 * 构造函数
-	 *
-	 */
-	public RoleBean() {
-	}
-
-	/**
-	 * 构造函数
-	 *
-	 * @param rootOrgId
-	 * @param roleId
-	 * @param roleCode
-	 * @param roleName
-	 */
-	public RoleBean(Long rootOrgId, Long roleId, String roleCode, String roleName) {
-		super();
-		this.rootOrgId = rootOrgId;
-		this.roleId = roleId;
-		this.roleCode = roleCode;
-		this.roleName = roleName;
-	}
-
-	public Long getRoleId() {
-		return roleId;
-	}
-
-	public void setRoleId(Long roleId) {
-		this.roleId = roleId;
-	}
-
-	public String getRoleCode() {
-		return roleCode;
-	}
-
-	public void setRoleCode(String roleCode) {
-		this.roleCode = roleCode;
-	}
-
-	public String getRoleName() {
-		return roleName;
-	}
-
-	public void setRoleName(String roleName) {
-		this.roleName = roleName;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.bean;
+
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年5月25日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class RoleBean implements JsonSerializable {
+
+	private static final long serialVersionUID = -916123953402843015L;
+
+	private Long roleId;
+
+	private String roleCode;
+
+	private String roleName;
+
+	private Long rootOrgId;
+
+	/**
+	 * 构造函数
+	 *
+	 */
+	public RoleBean() {
+	}
+
+	/**
+	 * 构造函数
+	 *
+	 * @param rootOrgId
+	 * @param roleId
+	 * @param roleCode
+	 * @param roleName
+	 */
+	public RoleBean(Long rootOrgId, Long roleId, String roleCode, String roleName) {
+		super();
+		this.rootOrgId = rootOrgId;
+		this.roleId = roleId;
+		this.roleCode = roleCode;
+		this.roleName = roleName;
+	}
+
+	public Long getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Long roleId) {
+		this.roleId = roleId;
+	}
+
+	public String getRoleCode() {
+		return roleCode;
+	}
+
+	public void setRoleCode(String roleCode) {
+		this.roleCode = roleCode;
+	}
+
+	public String getRoleName() {
+		return roleName;
+	}
+
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/StudentBean.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.bean;
 package cn.com.qmth.examcloud.core.basic.api.bean;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
 
 
 public class StudentBean implements JsonSerializable {
 public class StudentBean implements JsonSerializable {
 
 

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/StudentFaceBean.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.bean;
 package cn.com.qmth.examcloud.core.basic.api.bean;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
 
 
 /**
 /**
  * 学生人脸识别信息
  * 学生人脸识别信息

+ 68 - 68
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/ThirdPartyAccessBean.java

@@ -1,68 +1,68 @@
-package cn.com.qmth.examcloud.core.basic.api.bean;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-
-/**
- * 第三方接入信息
- *
- * @author WANGWEI
- * @date 2018年7月5日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class ThirdPartyAccessBean implements JsonSerializable {
-
-	private static final long serialVersionUID = 9212710623859419481L;
-
-	/**
-	 * 顶级机构ID
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 应用ID
-	 */
-	private String appId;
-
-	/**
-	 * 密钥
-	 */
-	private String secretKey;
-
-	/**
-	 * 时间差范围
-	 */
-	private Long timeRange;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getAppId() {
-		return appId;
-	}
-
-	public void setAppId(String appId) {
-		this.appId = appId;
-	}
-
-	public String getSecretKey() {
-		return secretKey;
-	}
-
-	public void setSecretKey(String secretKey) {
-		this.secretKey = secretKey;
-	}
-
-	public Long getTimeRange() {
-		return timeRange;
-	}
-
-	public void setTimeRange(Long timeRange) {
-		this.timeRange = timeRange;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.bean;
+
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
+
+/**
+ * 第三方接入信息
+ *
+ * @author WANGWEI
+ * @date 2018年7月5日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class ThirdPartyAccessBean implements JsonSerializable {
+
+	private static final long serialVersionUID = 9212710623859419481L;
+
+	/**
+	 * 顶级机构ID
+	 */
+	private Long rootOrgId;
+
+	/**
+	 * 应用ID
+	 */
+	private String appId;
+
+	/**
+	 * 密钥
+	 */
+	private String secretKey;
+
+	/**
+	 * 时间差范围
+	 */
+	private Long timeRange;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getAppId() {
+		return appId;
+	}
+
+	public void setAppId(String appId) {
+		this.appId = appId;
+	}
+
+	public String getSecretKey() {
+		return secretKey;
+	}
+
+	public void setSecretKey(String secretKey) {
+		this.secretKey = secretKey;
+	}
+
+	public Long getTimeRange() {
+		return timeRange;
+	}
+
+	public void setTimeRange(Long timeRange) {
+		this.timeRange = timeRange;
+	}
+
+}

+ 135 - 135
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/bean/UserBean.java

@@ -1,135 +1,135 @@
-package cn.com.qmth.examcloud.core.basic.api.bean;
-
-import java.util.List;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年5月25日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class UserBean implements JsonSerializable {
-
-	private static final long serialVersionUID = -4157068941699776174L;
-
-	/**
-	 * 用户ID
-	 */
-	private Long userId;
-
-	/**
-	 * 登陆名
-	 */
-	private String loginName;
-
-	/**
-	 * 用户名
-	 */
-	private String name;
-
-	/**
-	 * 显示名
-	 */
-	private String displayName;
-
-	/**
-	 * 顶级机构(学校)ID
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 顶级机构(学校)名称
-	 */
-	private String rootOrgName;
-
-	/**
-	 * 学习中心 ID
-	 */
-	private Long orgId;
-
-	/**
-	 * 学习中心名称
-	 */
-	private String orgName;
-
-	/**
-	 * 角色集合
-	 */
-	private List<RoleBean> roleList;
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public String getLoginName() {
-		return loginName;
-	}
-
-	public void setLoginName(String loginName) {
-		this.loginName = loginName;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getDisplayName() {
-		return displayName;
-	}
-
-	public void setDisplayName(String displayName) {
-		this.displayName = displayName;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getRootOrgName() {
-		return rootOrgName;
-	}
-
-	public void setRootOrgName(String rootOrgName) {
-		this.rootOrgName = rootOrgName;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-	public List<RoleBean> getRoleList() {
-		return roleList;
-	}
-
-	public void setRoleList(List<RoleBean> roleList) {
-		this.roleList = roleList;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.bean;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年5月25日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class UserBean implements JsonSerializable {
+
+	private static final long serialVersionUID = -4157068941699776174L;
+
+	/**
+	 * 用户ID
+	 */
+	private Long userId;
+
+	/**
+	 * 登陆名
+	 */
+	private String loginName;
+
+	/**
+	 * 用户名
+	 */
+	private String name;
+
+	/**
+	 * 显示名
+	 */
+	private String displayName;
+
+	/**
+	 * 顶级机构(学校)ID
+	 */
+	private Long rootOrgId;
+
+	/**
+	 * 顶级机构(学校)名称
+	 */
+	private String rootOrgName;
+
+	/**
+	 * 学习中心 ID
+	 */
+	private Long orgId;
+
+	/**
+	 * 学习中心名称
+	 */
+	private String orgName;
+
+	/**
+	 * 角色集合
+	 */
+	private List<RoleBean> roleList;
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	public String getLoginName() {
+		return loginName;
+	}
+
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getDisplayName() {
+		return displayName;
+	}
+
+	public void setDisplayName(String displayName) {
+		this.displayName = displayName;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getRootOrgName() {
+		return rootOrgName;
+	}
+
+	public void setRootOrgName(String rootOrgName) {
+		this.rootOrgName = rootOrgName;
+	}
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+	public List<RoleBean> getRoleList() {
+		return roleList;
+	}
+
+	public void setRoleList(List<RoleBean> roleList) {
+		this.roleList = roleList;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/AddUserReq.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.core.basic.api.request;
 
 
 import java.util.List;
 import java.util.List;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
 
 
 /**
 /**
  * 类注释
  * 类注释

+ 59 - 59
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/DeleteRoleReq.java

@@ -1,59 +1,59 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class DeleteRoleReq extends BaseRequest {
-
-	private static final long serialVersionUID = 1378679217589137402L;
-
-	private Long id;
-
-	private String code;
-
-	private String name;
-
-	private Long rootOrgId;
-
-	private boolean cascade;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public boolean isCascade() {
-		return cascade;
-	}
-
-	public void setCascade(boolean cascade) {
-		this.cascade = cascade;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class DeleteRoleReq extends BaseRequest {
+
+	private static final long serialVersionUID = 1378679217589137402L;
+
+	private Long id;
+
+	private String code;
+
+	private String name;
+
+	private Long rootOrgId;
+
+	private boolean cascade;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public boolean isCascade() {
+		return cascade;
+	}
+
+	public void setCascade(boolean cascade) {
+		this.cascade = cascade;
+	}
+
+}

+ 19 - 19
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetAllOrgPropertiesReq.java

@@ -1,19 +1,19 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class GetAllOrgPropertiesReq extends BaseRequest {
-
-	private static final long serialVersionUID = -2480857346739167675L;
-
-	private Long orgId;
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class GetAllOrgPropertiesReq extends BaseRequest {
+
+	private static final long serialVersionUID = -2480857346739167675L;
+
+	private Long orgId;
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetCourseReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 package cn.com.qmth.examcloud.core.basic.api.request;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
 
 
 /**
 /**
  * 类注释
  * 类注释

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetOrgListByNameLikeReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 package cn.com.qmth.examcloud.core.basic.api.request;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
 
 
 public class GetOrgListByNameLikeReq extends BaseRequest {
 public class GetOrgListByNameLikeReq extends BaseRequest {
 
 

+ 39 - 39
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetOrgPropertyReq.java

@@ -1,39 +1,39 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class GetOrgPropertyReq extends BaseRequest {
-
-	private static final long serialVersionUID = 8445489864946182160L;
-
-	private Long orgId;
-
-	private String keyName;
-
-	private Long keyId;
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getKeyName() {
-		return keyName;
-	}
-
-	public void setKeyName(String keyName) {
-		this.keyName = keyName;
-	}
-
-	public Long getKeyId() {
-		return keyId;
-	}
-
-	public void setKeyId(Long keyId) {
-		this.keyId = keyId;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class GetOrgPropertyReq extends BaseRequest {
+
+	private static final long serialVersionUID = 8445489864946182160L;
+
+	private Long orgId;
+
+	private String keyName;
+
+	private Long keyId;
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public String getKeyName() {
+		return keyName;
+	}
+
+	public void setKeyName(String keyName) {
+		this.keyName = keyName;
+	}
+
+	public Long getKeyId() {
+		return keyId;
+	}
+
+	public void setKeyId(Long keyId) {
+		this.keyId = keyId;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetOrgReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 package cn.com.qmth.examcloud.core.basic.api.request;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
 
 
 public class GetOrgReq extends BaseRequest {
 public class GetOrgReq extends BaseRequest {
 
 

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetOrgsReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 package cn.com.qmth.examcloud.core.basic.api.request;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
 
 
 public class GetOrgsReq extends BaseRequest {
 public class GetOrgsReq extends BaseRequest {
 
 

+ 29 - 29
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetPrivilegeListReq.java

@@ -1,29 +1,29 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class GetPrivilegeListReq extends BaseRequest {
-
-	private static final long serialVersionUID = -2241264953393891893L;
-
-	private Long rootOrgId;
-
-	private Long roleId;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getRoleId() {
-		return roleId;
-	}
-
-	public void setRoleId(Long roleId) {
-		this.roleId = roleId;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class GetPrivilegeListReq extends BaseRequest {
+
+	private static final long serialVersionUID = -2241264953393891893L;
+
+	private Long rootOrgId;
+
+	private Long roleId;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Long roleId) {
+		this.roleId = roleId;
+	}
+
+}

+ 26 - 26
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetStudentFaceReq.java

@@ -1,26 +1,26 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年9月4日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class GetStudentFaceReq extends BaseRequest {
-
-	private static final long serialVersionUID = -7703603729469051005L;
-
-	private Long studentId;
-
-	public Long getStudentId() {
-		return studentId;
-	}
-
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年9月4日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class GetStudentFaceReq extends BaseRequest {
+
+	private static final long serialVersionUID = -7703603729469051005L;
+
+	private Long studentId;
+
+	public Long getStudentId() {
+		return studentId;
+	}
+
+	public void setStudentId(Long studentId) {
+		this.studentId = studentId;
+	}
+
+}

+ 48 - 48
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetStudentReq.java

@@ -1,48 +1,48 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class GetStudentReq extends BaseRequest {
-
-	private static final long serialVersionUID = 2135618523755240278L;
-
-	/**
-	 * 顶级机构ID
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 学生ID
-	 */
-	private Long studentId;
-
-	/**
-	 * 身份证号码
-	 */
-	private String identityNumber;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getStudentId() {
-		return studentId;
-	}
-
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class GetStudentReq extends BaseRequest {
+
+	private static final long serialVersionUID = 2135618523755240278L;
+
+	/**
+	 * 顶级机构ID
+	 */
+	private Long rootOrgId;
+
+	/**
+	 * 学生ID
+	 */
+	private Long studentId;
+
+	/**
+	 * 身份证号码
+	 */
+	private String identityNumber;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getStudentId() {
+		return studentId;
+	}
+
+	public void setStudentId(Long studentId) {
+		this.studentId = studentId;
+	}
+
+	public String getIdentityNumber() {
+		return identityNumber;
+	}
+
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+
+}

+ 19 - 19
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetSysConfigReq.java

@@ -1,19 +1,19 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class GetSysConfigReq extends BaseRequest {
-
-	private static final long serialVersionUID = 2737057867242610859L;
-
-	private String key;
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class GetSysConfigReq extends BaseRequest {
+
+	private static final long serialVersionUID = 2737057867242610859L;
+
+	private String key;
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetThirdPartyAccessInfoReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 package cn.com.qmth.examcloud.core.basic.api.request;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
 
 
 public class GetThirdPartyAccessInfoReq extends BaseRequest {
 public class GetThirdPartyAccessInfoReq extends BaseRequest {
 
 

+ 19 - 19
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetUsableFacesetListReq.java

@@ -1,19 +1,19 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class GetUsableFacesetListReq extends BaseRequest {
-
-	private static final long serialVersionUID = -6219983651710389305L;
-
-	private Long rootOrgId;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class GetUsableFacesetListReq extends BaseRequest {
+
+	private static final long serialVersionUID = -6219983651710389305L;
+
+	private Long rootOrgId;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+}

+ 49 - 49
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetUserListReq.java

@@ -1,49 +1,49 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class GetUserListReq extends BaseRequest {
-
-	private static final long serialVersionUID = -5423361956786896423L;
-
-	private Long rootOrgId;
-
-	private Long start;
-
-	private Long roleId;
-
-	private String roleCode;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getStart() {
-		return start;
-	}
-
-	public void setStart(Long start) {
-		this.start = start;
-	}
-
-	public Long getRoleId() {
-		return roleId;
-	}
-
-	public void setRoleId(Long roleId) {
-		this.roleId = roleId;
-	}
-
-	public String getRoleCode() {
-		return roleCode;
-	}
-
-	public void setRoleCode(String roleCode) {
-		this.roleCode = roleCode;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class GetUserListReq extends BaseRequest {
+
+	private static final long serialVersionUID = -5423361956786896423L;
+
+	private Long rootOrgId;
+
+	private Long start;
+
+	private Long roleId;
+
+	private String roleCode;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getStart() {
+		return start;
+	}
+
+	public void setStart(Long start) {
+		this.start = start;
+	}
+
+	public Long getRoleId() {
+		return roleId;
+	}
+
+	public void setRoleId(Long roleId) {
+		this.roleId = roleId;
+	}
+
+	public String getRoleCode() {
+		return roleCode;
+	}
+
+	public void setRoleCode(String roleCode) {
+		this.roleCode = roleCode;
+	}
+
+}

+ 39 - 39
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetUserReq.java

@@ -1,39 +1,39 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class GetUserReq extends BaseRequest {
-
-	private static final long serialVersionUID = 6450873611171541831L;
-
-	private Long rootOrgId;
-
-	private Long userId;
-
-	private String loginName;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public String getLoginName() {
-		return loginName;
-	}
-
-	public void setLoginName(String loginName) {
-		this.loginName = loginName;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class GetUserReq extends BaseRequest {
+
+	private static final long serialVersionUID = 6450873611171541831L;
+
+	private Long rootOrgId;
+
+	private Long userId;
+
+	private String loginName;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Long userId) {
+		this.userId = userId;
+	}
+
+	public String getLoginName() {
+		return loginName;
+	}
+
+	public void setLoginName(String loginName) {
+		this.loginName = loginName;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetXxxReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 package cn.com.qmth.examcloud.core.basic.api.request;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
 
 
 /**
 /**
  * @author WANGWEI
  * @author WANGWEI

+ 87 - 87
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/LoginReq.java

@@ -1,87 +1,87 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class LoginReq extends BaseRequest {
-
-	private static final long serialVersionUID = 79813981418301573L;
-
-	/**
-	 * 顶级机构ID
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 域名
-	 */
-	private String domain;
-
-	/**
-	 * 登陆账号类型
-	 */
-	private String accountType;
-
-	/**
-	 * 登陆账号值
-	 */
-	private String accountValue;
-
-	/**
-	 * 密码
-	 */
-	private String password;
-
-	/**
-	 * 客户端IP
-	 */
-	private String clientIp;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getDomain() {
-		return domain;
-	}
-
-	public void setDomain(String domain) {
-		this.domain = domain;
-	}
-
-	public String getAccountType() {
-		return accountType;
-	}
-
-	public void setAccountType(String accountType) {
-		this.accountType = accountType;
-	}
-
-	public String getAccountValue() {
-		return accountValue;
-	}
-
-	public void setAccountValue(String accountValue) {
-		this.accountValue = accountValue;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public String getClientIp() {
-		return clientIp;
-	}
-
-	public void setClientIp(String clientIp) {
-		this.clientIp = clientIp;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class LoginReq extends BaseRequest {
+
+	private static final long serialVersionUID = 79813981418301573L;
+
+	/**
+	 * 顶级机构ID
+	 */
+	private Long rootOrgId;
+
+	/**
+	 * 域名
+	 */
+	private String domain;
+
+	/**
+	 * 登陆账号类型
+	 */
+	private String accountType;
+
+	/**
+	 * 登陆账号值
+	 */
+	private String accountValue;
+
+	/**
+	 * 密码
+	 */
+	private String password;
+
+	/**
+	 * 客户端IP
+	 */
+	private String clientIp;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getDomain() {
+		return domain;
+	}
+
+	public void setDomain(String domain) {
+		this.domain = domain;
+	}
+
+	public String getAccountType() {
+		return accountType;
+	}
+
+	public void setAccountType(String accountType) {
+		this.accountType = accountType;
+	}
+
+	public String getAccountValue() {
+		return accountValue;
+	}
+
+	public void setAccountValue(String accountValue) {
+		this.accountValue = accountValue;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getClientIp() {
+		return clientIp;
+	}
+
+	public void setClientIp(String clientIp) {
+		this.clientIp = clientIp;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveCourseReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 package cn.com.qmth.examcloud.core.basic.api.request;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
 
 
 public class SaveCourseReq extends BaseRequest {
 public class SaveCourseReq extends BaseRequest {
 
 

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveOrgReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 package cn.com.qmth.examcloud.core.basic.api.request;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
 
 
 /**
 /**
  * 类注释
  * 类注释

+ 46 - 46
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveRoleReq.java

@@ -1,46 +1,46 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年9月3日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class SaveRoleReq extends BaseRequest {
-
-	private static final long serialVersionUID = 5909926191507766711L;
-
-	private String code;
-
-	private String name;
-
-	private Long rootOrgId;
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年9月3日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class SaveRoleReq extends BaseRequest {
+
+	private static final long serialVersionUID = 5909926191507766711L;
+
+	private String code;
+
+	private String name;
+
+	private Long rootOrgId;
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+}

+ 86 - 86
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveStudentFaceReq.java

@@ -1,86 +1,86 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年7月18日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class SaveStudentFaceReq extends BaseRequest {
-
-	private static final long serialVersionUID = -8260481601116583797L;
-
-	private Long rootOrgId;
-
-	private Long studentId;
-
-	private String faceToken;
-
-	private String facesetToken;
-
-	private String photoName;
-
-	private String operator;
-
-	private Long faceCount;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getStudentId() {
-		return studentId;
-	}
-
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
-
-	public String getFaceToken() {
-		return faceToken;
-	}
-
-	public void setFaceToken(String faceToken) {
-		this.faceToken = faceToken;
-	}
-
-	public String getFacesetToken() {
-		return facesetToken;
-	}
-
-	public void setFacesetToken(String facesetToken) {
-		this.facesetToken = facesetToken;
-	}
-
-	public String getPhotoName() {
-		return photoName;
-	}
-
-	public void setPhotoName(String photoName) {
-		this.photoName = photoName;
-	}
-
-	public String getOperator() {
-		return operator;
-	}
-
-	public void setOperator(String operator) {
-		this.operator = operator;
-	}
-
-	public Long getFaceCount() {
-		return faceCount;
-	}
-
-	public void setFaceCount(Long faceCount) {
-		this.faceCount = faceCount;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年7月18日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class SaveStudentFaceReq extends BaseRequest {
+
+	private static final long serialVersionUID = -8260481601116583797L;
+
+	private Long rootOrgId;
+
+	private Long studentId;
+
+	private String faceToken;
+
+	private String facesetToken;
+
+	private String photoName;
+
+	private String operator;
+
+	private Long faceCount;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getStudentId() {
+		return studentId;
+	}
+
+	public void setStudentId(Long studentId) {
+		this.studentId = studentId;
+	}
+
+	public String getFaceToken() {
+		return faceToken;
+	}
+
+	public void setFaceToken(String faceToken) {
+		this.faceToken = faceToken;
+	}
+
+	public String getFacesetToken() {
+		return facesetToken;
+	}
+
+	public void setFacesetToken(String facesetToken) {
+		this.facesetToken = facesetToken;
+	}
+
+	public String getPhotoName() {
+		return photoName;
+	}
+
+	public void setPhotoName(String photoName) {
+		this.photoName = photoName;
+	}
+
+	public String getOperator() {
+		return operator;
+	}
+
+	public void setOperator(String operator) {
+		this.operator = operator;
+	}
+
+	public Long getFaceCount() {
+		return faceCount;
+	}
+
+	public void setFaceCount(Long faceCount) {
+		this.faceCount = faceCount;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SaveStudentReq.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.request;
 package cn.com.qmth.examcloud.core.basic.api.request;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
 
 
 public class SaveStudentReq extends BaseRequest {
 public class SaveStudentReq extends BaseRequest {
 
 

+ 29 - 29
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SetSysConfigReq.java

@@ -1,29 +1,29 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class SetSysConfigReq extends BaseRequest {
-
-	private static final long serialVersionUID = -6852583351399210497L;
-
-	private String key;
-
-	private String value;
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class SetSysConfigReq extends BaseRequest {
+
+	private static final long serialVersionUID = -6852583351399210497L;
+
+	private String key;
+
+	private String value;
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}

+ 39 - 39
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/UnbindStudentCodeReq.java

@@ -1,39 +1,39 @@
-package cn.com.qmth.examcloud.core.basic.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class UnbindStudentCodeReq extends BaseRequest {
-
-	private static final long serialVersionUID = -1622586655285073431L;
-
-	private Long rootOrgId;
-
-	private String identityNumber;
-
-	private String studentCode;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class UnbindStudentCodeReq extends BaseRequest {
+
+	private static final long serialVersionUID = -1622586655285073431L;
+
+	private Long rootOrgId;
+
+	private String identityNumber;
+
+	private String studentCode;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public String getIdentityNumber() {
+		return identityNumber;
+	}
+
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+
+	public String getStudentCode() {
+		return studentCode;
+	}
+
+	public void setStudentCode(String studentCode) {
+		this.studentCode = studentCode;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/AddUserResp.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.response;
 package cn.com.qmth.examcloud.core.basic.api.response;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
 
 
 /**
 /**
  * 类注释
  * 类注释

+ 23 - 23
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/DeleteRoleResp.java

@@ -1,23 +1,23 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-import cn.com.qmth.examcloud.core.basic.api.bean.RoleBean;
-
-public class DeleteRoleResp extends BaseResponse {
-
-	/**
-	 * 属性注释
-	 */
-	private static final long serialVersionUID = 3861498499053730038L;
-
-	private RoleBean roleBean;
-
-	public RoleBean getRoleBean() {
-		return roleBean;
-	}
-
-	public void setRoleBean(RoleBean roleBean) {
-		this.roleBean = roleBean;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.core.basic.api.bean.RoleBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class DeleteRoleResp extends BaseResponse {
+
+	/**
+	 * 属性注释
+	 */
+	private static final long serialVersionUID = 3861498499053730038L;
+
+	private RoleBean roleBean;
+
+	public RoleBean getRoleBean() {
+		return roleBean;
+	}
+
+	public void setRoleBean(RoleBean roleBean) {
+		this.roleBean = roleBean;
+	}
+
+}

+ 21 - 21
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetAllOrgPropertiesResp.java

@@ -1,21 +1,21 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import java.util.Map;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class GetAllOrgPropertiesResp extends BaseResponse {
-
-	private static final long serialVersionUID = -3389812285108955277L;
-
-	private Map<String, String> props;
-
-	public Map<String, String> getProps() {
-		return props;
-	}
-
-	public void setProps(Map<String, String> props) {
-		this.props = props;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import java.util.Map;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class GetAllOrgPropertiesResp extends BaseResponse {
+
+	private static final long serialVersionUID = -3389812285108955277L;
+
+	private Map<String, String> props;
+
+	public Map<String, String> getProps() {
+		return props;
+	}
+
+	public void setProps(Map<String, String> props) {
+		this.props = props;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetCourseResp.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.basic.api.response;
 package cn.com.qmth.examcloud.core.basic.api.response;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
 
 
 /**
 /**
  * 类注释
  * 类注释

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetOrgListByNameLikeResp.java

@@ -2,8 +2,8 @@ package cn.com.qmth.examcloud.core.basic.api.response;
 
 
 import java.util.List;
 import java.util.List;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
 import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
 import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
 
 
 public class GetOrgListByNameLikeResp extends BaseResponse {
 public class GetOrgListByNameLikeResp extends BaseResponse {
 
 

+ 19 - 19
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetOrgPropertyResp.java

@@ -1,19 +1,19 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class GetOrgPropertyResp extends BaseResponse {
-
-	private static final long serialVersionUID = -2283981755144391579L;
-
-	private String value;
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class GetOrgPropertyResp extends BaseResponse {
+
+	private static final long serialVersionUID = -2283981755144391579L;
+
+	private String value;
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetOrgResp.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.basic.api.response;
 package cn.com.qmth.examcloud.core.basic.api.response;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
 import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
 import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
 
 
 public class GetOrgResp extends BaseResponse {
 public class GetOrgResp extends BaseResponse {
 
 

+ 32 - 32
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetOrgsResp.java

@@ -1,32 +1,32 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import java.util.List;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
-
-public class GetOrgsResp extends BaseResponse {
-
-	private static final long serialVersionUID = -8786805029980636744L;
-
-	private long next;
-
-	private List<OrgBean> orgBeanList;
-
-	public long getNext() {
-		return next;
-	}
-
-	public void setNext(long next) {
-		this.next = next;
-	}
-
-	public List<OrgBean> getOrgBeanList() {
-		return orgBeanList;
-	}
-
-	public void setOrgBeanList(List<OrgBean> orgBeanList) {
-		this.orgBeanList = orgBeanList;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class GetOrgsResp extends BaseResponse {
+
+	private static final long serialVersionUID = -8786805029980636744L;
+
+	private long next;
+
+	private List<OrgBean> orgBeanList;
+
+	public long getNext() {
+		return next;
+	}
+
+	public void setNext(long next) {
+		this.next = next;
+	}
+
+	public List<OrgBean> getOrgBeanList() {
+		return orgBeanList;
+	}
+
+	public void setOrgBeanList(List<OrgBean> orgBeanList) {
+		this.orgBeanList = orgBeanList;
+	}
+
+}

+ 21 - 21
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetPrivilegeListResp.java

@@ -1,21 +1,21 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import java.util.List;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class GetPrivilegeListResp extends BaseResponse {
-
-	private static final long serialVersionUID = -2085836838190278368L;
-
-	private List<String> privilegeCodeList;
-
-	public List<String> getPrivilegeCodeList() {
-		return privilegeCodeList;
-	}
-
-	public void setPrivilegeCodeList(List<String> privilegeCodeList) {
-		this.privilegeCodeList = privilegeCodeList;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class GetPrivilegeListResp extends BaseResponse {
+
+	private static final long serialVersionUID = -2085836838190278368L;
+
+	private List<String> privilegeCodeList;
+
+	public List<String> getPrivilegeCodeList() {
+		return privilegeCodeList;
+	}
+
+	public void setPrivilegeCodeList(List<String> privilegeCodeList) {
+		this.privilegeCodeList = privilegeCodeList;
+	}
+
+}

+ 34 - 34
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetStudentFaceResp.java

@@ -1,34 +1,34 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-import cn.com.qmth.examcloud.core.basic.api.bean.FacesetBean;
-import cn.com.qmth.examcloud.core.basic.api.bean.StudentFaceBean;
-
-public class GetStudentFaceResp extends BaseResponse {
-
-	/**
-	 * 属性注释
-	 */
-	private static final long serialVersionUID = 5710676102629966716L;
-
-	private StudentFaceBean studentFaceBean;
-
-	private FacesetBean facesetBean;
-
-	public StudentFaceBean getStudentFaceBean() {
-		return studentFaceBean;
-	}
-
-	public void setStudentFaceBean(StudentFaceBean studentFaceBean) {
-		this.studentFaceBean = studentFaceBean;
-	}
-
-	public FacesetBean getFacesetBean() {
-		return facesetBean;
-	}
-
-	public void setFacesetBean(FacesetBean facesetBean) {
-		this.facesetBean = facesetBean;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.core.basic.api.bean.FacesetBean;
+import cn.com.qmth.examcloud.core.basic.api.bean.StudentFaceBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class GetStudentFaceResp extends BaseResponse {
+
+	/**
+	 * 属性注释
+	 */
+	private static final long serialVersionUID = 5710676102629966716L;
+
+	private StudentFaceBean studentFaceBean;
+
+	private FacesetBean facesetBean;
+
+	public StudentFaceBean getStudentFaceBean() {
+		return studentFaceBean;
+	}
+
+	public void setStudentFaceBean(StudentFaceBean studentFaceBean) {
+		this.studentFaceBean = studentFaceBean;
+	}
+
+	public FacesetBean getFacesetBean() {
+		return facesetBean;
+	}
+
+	public void setFacesetBean(FacesetBean facesetBean) {
+		this.facesetBean = facesetBean;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetStudentResp.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.basic.api.response;
 package cn.com.qmth.examcloud.core.basic.api.response;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
 import cn.com.qmth.examcloud.core.basic.api.bean.StudentBean;
 import cn.com.qmth.examcloud.core.basic.api.bean.StudentBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
 
 
 public class GetStudentResp extends BaseResponse {
 public class GetStudentResp extends BaseResponse {
 
 

+ 29 - 29
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetSysConfigResp.java

@@ -1,29 +1,29 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class GetSysConfigResp extends BaseResponse {
-
-	private static final long serialVersionUID = -8592124313710003551L;
-
-	private String key;
-
-	private String value;
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class GetSysConfigResp extends BaseResponse {
+
+	private static final long serialVersionUID = -8592124313710003551L;
+
+	private String key;
+
+	private String value;
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetThirdPartyAccessInfoResp.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.basic.api.response;
 package cn.com.qmth.examcloud.core.basic.api.response;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
 import cn.com.qmth.examcloud.core.basic.api.bean.ThirdPartyAccessBean;
 import cn.com.qmth.examcloud.core.basic.api.bean.ThirdPartyAccessBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
 
 
 public class GetThirdPartyAccessInfoResp extends BaseResponse {
 public class GetThirdPartyAccessInfoResp extends BaseResponse {
 
 

+ 22 - 22
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetUsableFacesetListResp.java

@@ -1,22 +1,22 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import java.util.List;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-import cn.com.qmth.examcloud.core.basic.api.bean.FacesetBean;
-
-public class GetUsableFacesetListResp extends BaseResponse {
-
-	private static final long serialVersionUID = 1540591806637296939L;
-
-	private List<FacesetBean> facesetBeanList;
-
-	public List<FacesetBean> getFacesetBeanList() {
-		return facesetBeanList;
-	}
-
-	public void setFacesetBeanList(List<FacesetBean> facesetBeanList) {
-		this.facesetBeanList = facesetBeanList;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.core.basic.api.bean.FacesetBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class GetUsableFacesetListResp extends BaseResponse {
+
+	private static final long serialVersionUID = 1540591806637296939L;
+
+	private List<FacesetBean> facesetBeanList;
+
+	public List<FacesetBean> getFacesetBeanList() {
+		return facesetBeanList;
+	}
+
+	public void setFacesetBeanList(List<FacesetBean> facesetBeanList) {
+		this.facesetBeanList = facesetBeanList;
+	}
+
+}

+ 32 - 32
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetUserListResp.java

@@ -1,32 +1,32 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import java.util.List;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-import cn.com.qmth.examcloud.core.basic.api.bean.UserBean;
-
-public class GetUserListResp extends BaseResponse {
-
-	private static final long serialVersionUID = -2236372532342357905L;
-
-	private long next;
-
-	private List<UserBean> userBeanList;
-
-	public long getNext() {
-		return next;
-	}
-
-	public void setNext(long next) {
-		this.next = next;
-	}
-
-	public List<UserBean> getUserBeanList() {
-		return userBeanList;
-	}
-
-	public void setUserBeanList(List<UserBean> userBeanList) {
-		this.userBeanList = userBeanList;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.core.basic.api.bean.UserBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class GetUserListResp extends BaseResponse {
+
+	private static final long serialVersionUID = -2236372532342357905L;
+
+	private long next;
+
+	private List<UserBean> userBeanList;
+
+	public long getNext() {
+		return next;
+	}
+
+	public void setNext(long next) {
+		this.next = next;
+	}
+
+	public List<UserBean> getUserBeanList() {
+		return userBeanList;
+	}
+
+	public void setUserBeanList(List<UserBean> userBeanList) {
+		this.userBeanList = userBeanList;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetUserResp.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.basic.api.response;
 package cn.com.qmth.examcloud.core.basic.api.response;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
 import cn.com.qmth.examcloud.core.basic.api.bean.UserBean;
 import cn.com.qmth.examcloud.core.basic.api.bean.UserBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
 
 
 public class GetUserResp extends BaseResponse {
 public class GetUserResp extends BaseResponse {
 
 

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetXxxResp.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.core.basic.api.response;
 package cn.com.qmth.examcloud.core.basic.api.response;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
 
 
 /**
 /**
  * @author WANGWEI
  * @author WANGWEI

+ 20 - 20
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/LoginResp.java

@@ -1,20 +1,20 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-import cn.com.qmth.examcloud.commons.web.security.bean.User;
-
-public class LoginResp extends BaseResponse {
-
-	private static final long serialVersionUID = 528886162978052908L;
-
-	private User user;
-
-	public User getUser() {
-		return user;
-	}
-
-	public void setUser(User user) {
-		this.user = user;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+import cn.com.qmth.examcloud.web.security.bean.User;
+
+public class LoginResp extends BaseResponse {
+
+	private static final long serialVersionUID = 528886162978052908L;
+
+	private User user;
+
+	public User getUser() {
+		return user;
+	}
+
+	public void setUser(User user) {
+		this.user = user;
+	}
+
+}

+ 1 - 1
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SaveCourseResp.java

@@ -1,7 +1,7 @@
 package cn.com.qmth.examcloud.core.basic.api.response;
 package cn.com.qmth.examcloud.core.basic.api.response;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
 import cn.com.qmth.examcloud.core.basic.api.bean.CourseBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
 
 
 public class SaveCourseResp extends BaseResponse {
 public class SaveCourseResp extends BaseResponse {
 
 

+ 20 - 20
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SaveRoleResp.java

@@ -1,20 +1,20 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-import cn.com.qmth.examcloud.core.basic.api.bean.RoleBean;
-
-public class SaveRoleResp extends BaseResponse {
-
-	private static final long serialVersionUID = -3697515955413916061L;
-
-	private RoleBean roleBean;
-
-	public RoleBean getRoleBean() {
-		return roleBean;
-	}
-
-	public void setRoleBean(RoleBean roleBean) {
-		this.roleBean = roleBean;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.core.basic.api.bean.RoleBean;
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class SaveRoleResp extends BaseResponse {
+
+	private static final long serialVersionUID = -3697515955413916061L;
+
+	private RoleBean roleBean;
+
+	public RoleBean getRoleBean() {
+		return roleBean;
+	}
+
+	public void setRoleBean(RoleBean roleBean) {
+		this.roleBean = roleBean;
+	}
+
+}

+ 29 - 29
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SaveStudentFaceResp.java

@@ -1,29 +1,29 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年7月18日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class SaveStudentFaceResp extends BaseResponse {
-
-	/**
-	 * 属性注释
-	 */
-	private static final long serialVersionUID = 731016458089573829L;
-
-	private Long id;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年7月18日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class SaveStudentFaceResp extends BaseResponse {
+
+	/**
+	 * 属性注释
+	 */
+	private static final long serialVersionUID = 731016458089573829L;
+
+	private Long id;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+}

+ 59 - 59
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SaveStudentResp.java

@@ -1,59 +1,59 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年6月29日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class SaveStudentResp extends BaseResponse {
-
-	/**
-	 * 属性注释
-	 */
-	private static final long serialVersionUID = 2263704597882102664L;
-
-	private Long studentId;
-
-	private Long rootOrgId;
-
-	private Long orgId;
-
-	private String orgName;
-
-	public Long getStudentId() {
-		return studentId;
-	}
-
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年6月29日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class SaveStudentResp extends BaseResponse {
+
+	/**
+	 * 属性注释
+	 */
+	private static final long serialVersionUID = 2263704597882102664L;
+
+	private Long studentId;
+
+	private Long rootOrgId;
+
+	private Long orgId;
+
+	private String orgName;
+
+	public Long getStudentId() {
+		return studentId;
+	}
+
+	public void setStudentId(Long studentId) {
+		this.studentId = studentId;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+}

+ 29 - 29
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SetSysConfigResp.java

@@ -1,29 +1,29 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class SetSysConfigResp extends BaseResponse {
-
-	private static final long serialVersionUID = -8345402842873364242L;
-
-	private String key;
-
-	private String value;
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class SetSysConfigResp extends BaseResponse {
+
+	private static final long serialVersionUID = -8345402842873364242L;
+
+	private String key;
+
+	private String value;
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}

+ 21 - 21
examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/UnbindStudentCodeResp.java

@@ -1,21 +1,21 @@
-package cn.com.qmth.examcloud.core.basic.api.response;
-
-import java.util.List;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class UnbindStudentCodeResp extends BaseResponse {
-
-	private static final long serialVersionUID = 4719566334495559584L;
-
-	private List<Long> studentIdList;
-
-	public List<Long> getStudentIdList() {
-		return studentIdList;
-	}
-
-	public void setStudentIdList(List<Long> studentIdList) {
-		this.studentIdList = studentIdList;
-	}
-
-}
+package cn.com.qmth.examcloud.core.basic.api.response;
+
+import java.util.List;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseResponse;
+
+public class UnbindStudentCodeResp extends BaseResponse {
+
+	private static final long serialVersionUID = 4719566334495559584L;
+
+	private List<Long> studentIdList;
+
+	public List<Long> getStudentIdList() {
+		return studentIdList;
+	}
+
+	public void setStudentIdList(List<Long> studentIdList) {
+		this.studentIdList = studentIdList;
+	}
+
+}

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

@@ -1,6 +1,6 @@
 package cn.com.qmth.examcloud.examwork.api.client;
 package cn.com.qmth.examcloud.examwork.api.client;
 
 
-import cn.com.qmth.examcloud.commons.web.support.CloudClientSupport;
+import cn.com.qmth.examcloud.web.support.CloudClientSupport;
 
 
 /**
 /**
  * @author WANGWEI
  * @author WANGWEI

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

@@ -1,131 +1,131 @@
-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.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
-import cn.com.qmth.examcloud.examwork.api.request.CountExamStudentReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamCourseListReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamCoursePaperTypeListReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamListReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamOrgListReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentPropertyValueListReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetOngoingExamListReq;
-import cn.com.qmth.examcloud.examwork.api.request.LockExamStudentsReq;
-import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
-import cn.com.qmth.examcloud.examwork.api.request.SetExamPropertyReq;
-import cn.com.qmth.examcloud.examwork.api.request.UnlockExamStudentsReq;
-import cn.com.qmth.examcloud.examwork.api.response.CountExamStudentResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamCourseListResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamCoursePaperTypeListResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamListResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamOrgListResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentPropertyValueListResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetOngoingExamListResp;
-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;
-
-/**
- * @author chenken
- * @date 2018年5月3日 上午9:18:19
- * @company QMTH
- * @description ExamClient.java
- */
-@Service
-public class ExamCloudServiceClient extends BasicCloudClientSupport implements ExamCloudService {
-
-	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);
-	}
-
-	@Override
-	public GetExamResp getExam(GetExamReq req) {
-		return post("exam/getExam", req, GetExamResp.class);
-	}
-
-	@Override
-	public SetExamPropertyResp setExamProperty(SetExamPropertyReq req) {
-		return post("exam/setExamProperty", req, SetExamPropertyResp.class);
-	}
-
-	@Override
-	public GetExamPropertyResp getExamProperty(GetExamPropertyReq req) {
-		return post("exam/getExamProperty", req, GetExamPropertyResp.class);
-	}
-
-	@Override
-	public GetOngoingExamListResp getOngoingExamList(GetOngoingExamListReq req) {
-		return post("exam/getOngoingExamList", req, GetOngoingExamListResp.class);
-	}
-
-	@Override
-	public LockExamStudentsResp lockExamStudents(LockExamStudentsReq req) {
-		return post("exam/lockExamStudents", req, LockExamStudentsResp.class);
-	}
-
-	@Override
-	public UnlockExamStudentsResp unlockExamStudents(UnlockExamStudentsReq req) {
-		return post("exam/unlockExamStudents", req, UnlockExamStudentsResp.class);
-	}
-
-	@Override
-	public GetExamListResp getExamList(GetExamListReq req) {
-		return post("exam/getExamList", req, GetExamListResp.class);
-	}
-
-	@Override
-	public GetExamCourseListResp getExamCourseList(GetExamCourseListReq req) {
-		return post("exam/getExamCourseList", req, GetExamCourseListResp.class);
-	}
-
-	@Override
-	public GetExamCoursePaperTypeListResp getExamCoursePaperTypeList(
-			GetExamCoursePaperTypeListReq req) {
-		return post("exam/getExamCoursePaperTypeList", req, GetExamCoursePaperTypeListResp.class);
-	}
-
-	@Override
-	public CountExamStudentResp countExamStudent(CountExamStudentReq req) {
-		return post("exam/countExamStudent", req, CountExamStudentResp.class);
-	}
-
-	@Override
-	public GetExamOrgListResp getExamOrgList(GetExamOrgListReq req) {
-		return post("exam/getExamOrgList", req, GetExamOrgListResp.class);
-	}
-
-	@Override
-	public GetExamStudentPropertyValueListResp getExamStudentPropertyValueList(
-			GetExamStudentPropertyValueListReq req) {
-		return post("exam/getExamStudentPropertyValueList", req,
-				GetExamStudentPropertyValueListResp.class);
-	}
-
-}
+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;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamCourseListReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamCoursePaperTypeListReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamListReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamOrgListReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentPropertyValueListReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetOngoingExamListReq;
+import cn.com.qmth.examcloud.examwork.api.request.LockExamStudentsReq;
+import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
+import cn.com.qmth.examcloud.examwork.api.request.SetExamPropertyReq;
+import cn.com.qmth.examcloud.examwork.api.request.UnlockExamStudentsReq;
+import cn.com.qmth.examcloud.examwork.api.response.CountExamStudentResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamCourseListResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamCoursePaperTypeListResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamListResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamOrgListResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentPropertyValueListResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetOngoingExamListResp;
+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
+ * @date 2018年5月3日 上午9:18:19
+ * @company QMTH
+ * @description ExamClient.java
+ */
+@Service
+public class ExamCloudServiceClient extends BasicCloudClientSupport implements ExamCloudService {
+
+	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);
+	}
+
+	@Override
+	public GetExamResp getExam(GetExamReq req) {
+		return post("exam/getExam", req, GetExamResp.class);
+	}
+
+	@Override
+	public SetExamPropertyResp setExamProperty(SetExamPropertyReq req) {
+		return post("exam/setExamProperty", req, SetExamPropertyResp.class);
+	}
+
+	@Override
+	public GetExamPropertyResp getExamProperty(GetExamPropertyReq req) {
+		return post("exam/getExamProperty", req, GetExamPropertyResp.class);
+	}
+
+	@Override
+	public GetOngoingExamListResp getOngoingExamList(GetOngoingExamListReq req) {
+		return post("exam/getOngoingExamList", req, GetOngoingExamListResp.class);
+	}
+
+	@Override
+	public LockExamStudentsResp lockExamStudents(LockExamStudentsReq req) {
+		return post("exam/lockExamStudents", req, LockExamStudentsResp.class);
+	}
+
+	@Override
+	public UnlockExamStudentsResp unlockExamStudents(UnlockExamStudentsReq req) {
+		return post("exam/unlockExamStudents", req, UnlockExamStudentsResp.class);
+	}
+
+	@Override
+	public GetExamListResp getExamList(GetExamListReq req) {
+		return post("exam/getExamList", req, GetExamListResp.class);
+	}
+
+	@Override
+	public GetExamCourseListResp getExamCourseList(GetExamCourseListReq req) {
+		return post("exam/getExamCourseList", req, GetExamCourseListResp.class);
+	}
+
+	@Override
+	public GetExamCoursePaperTypeListResp getExamCoursePaperTypeList(
+			GetExamCoursePaperTypeListReq req) {
+		return post("exam/getExamCoursePaperTypeList", req, GetExamCoursePaperTypeListResp.class);
+	}
+
+	@Override
+	public CountExamStudentResp countExamStudent(CountExamStudentReq req) {
+		return post("exam/countExamStudent", req, CountExamStudentResp.class);
+	}
+
+	@Override
+	public GetExamOrgListResp getExamOrgList(GetExamOrgListReq req) {
+		return post("exam/getExamOrgList", req, GetExamOrgListResp.class);
+	}
+
+	@Override
+	public GetExamStudentPropertyValueListResp getExamStudentPropertyValueList(
+			GetExamStudentPropertyValueListReq req) {
+		return post("exam/getExamStudentPropertyValueList", req,
+				GetExamStudentPropertyValueListResp.class);
+	}
+
+}

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

@@ -4,7 +4,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.client.RestTemplate;
 
 
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
 import cn.com.qmth.examcloud.examwork.api.request.CopyExamStudentsReq;
 import cn.com.qmth.examcloud.examwork.api.request.CopyExamStudentsReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentPageReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentPageReq;
@@ -14,6 +13,7 @@ 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.GetExamStudentPageResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
+import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 
 @Service
 @Service
 public class ExamStudentCloudServiceClient extends BasicCloudClientSupport
 public class ExamStudentCloudServiceClient extends BasicCloudClientSupport

+ 155 - 155
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/ExamCloudService.java

@@ -1,155 +1,155 @@
-package cn.com.qmth.examcloud.examwork.api;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-import cn.com.qmth.examcloud.examwork.api.request.CountExamStudentReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamCourseListReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamCoursePaperTypeListReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamListReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamOrgListReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentPropertyValueListReq;
-import cn.com.qmth.examcloud.examwork.api.request.GetOngoingExamListReq;
-import cn.com.qmth.examcloud.examwork.api.request.LockExamStudentsReq;
-import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
-import cn.com.qmth.examcloud.examwork.api.request.SetExamPropertyReq;
-import cn.com.qmth.examcloud.examwork.api.request.UnlockExamStudentsReq;
-import cn.com.qmth.examcloud.examwork.api.response.CountExamStudentResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamCourseListResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamCoursePaperTypeListResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamListResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamOrgListResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentPropertyValueListResp;
-import cn.com.qmth.examcloud.examwork.api.response.GetOngoingExamListResp;
-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;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年8月6日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface ExamCloudService extends CloudService {
-
-	/**
-	 * 保存考试
-	 * 
-	 * @param exam
-	 */
-	SaveExamResp saveExam(SaveExamReq req);
-
-	/**
-	 * 查询考试
-	 * 
-	 * @param name
-	 * @return
-	 */
-	GetExamResp getExam(GetExamReq req);
-
-	/**
-	 * 设置考试属性配置
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	SetExamPropertyResp setExamProperty(SetExamPropertyReq req);
-
-	/**
-	 * 获取考试属性配置
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetExamPropertyResp getExamProperty(GetExamPropertyReq req);
-
-	/**
-	 * 获取正在进行的考试
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetOngoingExamListResp getOngoingExamList(GetOngoingExamListReq req);
-
-	/**
-	 * 锁定考生
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	LockExamStudentsResp lockExamStudents(LockExamStudentsReq req);
-
-	/**
-	 * 解锁考生
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	UnlockExamStudentsResp unlockExamStudents(UnlockExamStudentsReq req);
-
-	/**
-	 * 查询考试
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetExamListResp getExamList(GetExamListReq req);
-
-	/**
-	 * 查询考试的课程集合
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetExamCourseListResp getExamCourseList(GetExamCourseListReq req);
-
-	/**
-	 * 查询考试课程的试卷类型集
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetExamCoursePaperTypeListResp getExamCoursePaperTypeList(GetExamCoursePaperTypeListReq req);
-
-	/**
-	 * 统计考生数量
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	CountExamStudentResp countExamStudent(CountExamStudentReq req);
-
-	/**
-	 * 获取考试机构列表
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetExamOrgListResp getExamOrgList(GetExamOrgListReq req);
-
-	/**
-	 * 获取考生属性值集合
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	GetExamStudentPropertyValueListResp getExamStudentPropertyValueList(
-			GetExamStudentPropertyValueListReq req);
-
-}
+package cn.com.qmth.examcloud.examwork.api;
+
+import cn.com.qmth.examcloud.examwork.api.request.CountExamStudentReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamCourseListReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamCoursePaperTypeListReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamListReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamOrgListReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentPropertyValueListReq;
+import cn.com.qmth.examcloud.examwork.api.request.GetOngoingExamListReq;
+import cn.com.qmth.examcloud.examwork.api.request.LockExamStudentsReq;
+import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
+import cn.com.qmth.examcloud.examwork.api.request.SetExamPropertyReq;
+import cn.com.qmth.examcloud.examwork.api.request.UnlockExamStudentsReq;
+import cn.com.qmth.examcloud.examwork.api.response.CountExamStudentResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamCourseListResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamCoursePaperTypeListResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamListResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamOrgListResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentPropertyValueListResp;
+import cn.com.qmth.examcloud.examwork.api.response.GetOngoingExamListResp;
+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.cloud.api.CloudService;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年8月6日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public interface ExamCloudService extends CloudService {
+
+	/**
+	 * 保存考试
+	 * 
+	 * @param exam
+	 */
+	SaveExamResp saveExam(SaveExamReq req);
+
+	/**
+	 * 查询考试
+	 * 
+	 * @param name
+	 * @return
+	 */
+	GetExamResp getExam(GetExamReq req);
+
+	/**
+	 * 设置考试属性配置
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	SetExamPropertyResp setExamProperty(SetExamPropertyReq req);
+
+	/**
+	 * 获取考试属性配置
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamPropertyResp getExamProperty(GetExamPropertyReq req);
+
+	/**
+	 * 获取正在进行的考试
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetOngoingExamListResp getOngoingExamList(GetOngoingExamListReq req);
+
+	/**
+	 * 锁定考生
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	LockExamStudentsResp lockExamStudents(LockExamStudentsReq req);
+
+	/**
+	 * 解锁考生
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	UnlockExamStudentsResp unlockExamStudents(UnlockExamStudentsReq req);
+
+	/**
+	 * 查询考试
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamListResp getExamList(GetExamListReq req);
+
+	/**
+	 * 查询考试的课程集合
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamCourseListResp getExamCourseList(GetExamCourseListReq req);
+
+	/**
+	 * 查询考试课程的试卷类型集
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamCoursePaperTypeListResp getExamCoursePaperTypeList(GetExamCoursePaperTypeListReq req);
+
+	/**
+	 * 统计考生数量
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	CountExamStudentResp countExamStudent(CountExamStudentReq req);
+
+	/**
+	 * 获取考试机构列表
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamOrgListResp getExamOrgList(GetExamOrgListReq req);
+
+	/**
+	 * 获取考生属性值集合
+	 *
+	 * @author WANGWEI
+	 * @param req
+	 * @return
+	 */
+	GetExamStudentPropertyValueListResp getExamStudentPropertyValueList(
+			GetExamStudentPropertyValueListReq req);
+
+}

+ 1 - 1
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/ExamStudentCloudService.java

@@ -1,6 +1,5 @@
 package cn.com.qmth.examcloud.examwork.api;
 package cn.com.qmth.examcloud.examwork.api;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
 import cn.com.qmth.examcloud.examwork.api.request.CopyExamStudentsReq;
 import cn.com.qmth.examcloud.examwork.api.request.CopyExamStudentsReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentPageReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentPageReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamStudentReq;
@@ -9,6 +8,7 @@ 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.GetExamStudentPageResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
+import cn.com.qmth.examcloud.web.cloud.api.CloudService;
 
 
 /**
 /**
  * 考生信息服务
  * 考生信息服务

+ 1 - 1
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamBean.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.examwork.api.bean;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
 
 
 /**
 /**
  * 类注释
  * 类注释

+ 69 - 69
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamCourseRelationBean.java

@@ -1,69 +1,69 @@
-package cn.com.qmth.examcloud.examwork.api.bean;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-
-public class ExamCourseRelationBean implements JsonSerializable {
-
-	private static final long serialVersionUID = 757531976286006550L;
-
-	private Long examId;
-
-	private Long courseId;
-
-	private String courseName;
-
-	private String courseCode;
-
-	private String courseLevel;
-
-	private Boolean courseEnable;
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public Long getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(Long courseId) {
-		this.courseId = courseId;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public String getCourseLevel() {
-		return courseLevel;
-	}
-
-	public void setCourseLevel(String courseLevel) {
-		this.courseLevel = courseLevel;
-	}
-
-	public Boolean getCourseEnable() {
-		return courseEnable;
-	}
-
-	public void setCourseEnable(Boolean courseEnable) {
-		this.courseEnable = courseEnable;
-	}
-
-}
+package cn.com.qmth.examcloud.examwork.api.bean;
+
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
+
+public class ExamCourseRelationBean implements JsonSerializable {
+
+	private static final long serialVersionUID = 757531976286006550L;
+
+	private Long examId;
+
+	private Long courseId;
+
+	private String courseName;
+
+	private String courseCode;
+
+	private String courseLevel;
+
+	private Boolean courseEnable;
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public Long getCourseId() {
+		return courseId;
+	}
+
+	public void setCourseId(Long courseId) {
+		this.courseId = courseId;
+	}
+
+	public String getCourseName() {
+		return courseName;
+	}
+
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+
+	public String getCourseCode() {
+		return courseCode;
+	}
+
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+
+	public String getCourseLevel() {
+		return courseLevel;
+	}
+
+	public void setCourseLevel(String courseLevel) {
+		this.courseLevel = courseLevel;
+	}
+
+	public Boolean getCourseEnable() {
+		return courseEnable;
+	}
+
+	public void setCourseEnable(Boolean courseEnable) {
+		this.courseEnable = courseEnable;
+	}
+
+}

+ 46 - 46
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamPaperTypeRelation.java

@@ -1,46 +1,46 @@
-package cn.com.qmth.examcloud.examwork.api.bean;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年11月23日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class ExamPaperTypeRelation implements JsonSerializable {
-
-	private static final long serialVersionUID = 949820967079339911L;
-
-	private Long examId;
-
-	private Long courseId;
-
-	private String paperType;
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public Long getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(Long courseId) {
-		this.courseId = courseId;
-	}
-
-	public String getPaperType() {
-		return paperType;
-	}
-
-	public void setPaperType(String paperType) {
-		this.paperType = paperType;
-	}
-
-}
+package cn.com.qmth.examcloud.examwork.api.bean;
+
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年11月23日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class ExamPaperTypeRelation implements JsonSerializable {
+
+	private static final long serialVersionUID = 949820967079339911L;
+
+	private Long examId;
+
+	private Long courseId;
+
+	private String paperType;
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public Long getCourseId() {
+		return courseId;
+	}
+
+	public void setCourseId(Long courseId) {
+		this.courseId = courseId;
+	}
+
+	public String getPaperType() {
+		return paperType;
+	}
+
+	public void setPaperType(String paperType) {
+		this.paperType = paperType;
+	}
+
+}

+ 1 - 1
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamSpecialSettingsBean.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.examwork.api.bean;
 
 
 import java.util.Date;
 import java.util.Date;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
 
 
 /**
 /**
  * 考试--特殊设置
  * 考试--特殊设置

+ 278 - 278
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/bean/ExamStudentBean.java

@@ -1,278 +1,278 @@
-package cn.com.qmth.examcloud.examwork.api.bean;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
-
-public class ExamStudentBean implements JsonSerializable {
-	private static final long serialVersionUID = 2079003980099252759L;
-
-	private Long id;
-
-	/**
-	 * 学生ID
-	 */
-	private Long studentId;
-
-	/**
-	 * 机构ID
-	 */
-	private Long orgId;
-
-	/**
-	 * 机构名称
-	 */
-	private String orgName;
-
-	/**
-	 * 机构编码
-	 */
-	private String orgCode;
-
-	/**
-	 * 顶级机构ID
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 考试ID
-	 */
-	private Long examId;
-
-	/**
-	 * 考试名称
-	 */
-	private String examName;
-
-	/**
-	 * 学生姓名
-	 */
-	private String studentName;
-
-	/**
-	 * 学生学号
-	 */
-	private String studentCode;
-
-	/**
-	 * 学生身份证号
-	 */
-	private String identityNumber;
-
-	/**
-	 * 考试课程名称
-	 */
-	private String courseName;
-
-	/**
-	 * 考试课程code
-	 */
-	private String courseCode;
-
-	/**
-	 * 考试课程level
-	 */
-	private String courseLevel;
-
-	/**
-	 * 试卷类型
-	 */
-	private String paperType;
-
-	/**
-	 * 专业名称
-	 */
-	private String specialtyName;
-
-	/**
-	 * 课程ID
-	 */
-	private Long courseId;
-
-	/**
-	 * 年级
-	 */
-	private String grade;
-
-	/**
-	 * 备注
-	 */
-	private String remark;
-
-	/**
-	 * 考点
-	 */
-	private String examSite;
-
-	/**
-	 * 信息采集人
-	 */
-	private String infoCollector;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public String getExamName() {
-		return examName;
-	}
-
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-
-	public String getStudentName() {
-		return studentName;
-	}
-
-	public void setStudentName(String studentName) {
-		this.studentName = studentName;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public String getCourseLevel() {
-		return courseLevel;
-	}
-
-	public void setCourseLevel(String courseLevel) {
-		this.courseLevel = courseLevel;
-	}
-
-	public String getPaperType() {
-		return paperType;
-	}
-
-	public void setPaperType(String paperType) {
-		this.paperType = paperType;
-	}
-
-	public Long getStudentId() {
-		return studentId;
-	}
-
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-	public String getOrgCode() {
-		return orgCode;
-	}
-
-	public void setOrgCode(String orgCode) {
-		this.orgCode = orgCode;
-	}
-
-	public String getSpecialtyName() {
-		return specialtyName;
-	}
-
-	public void setSpecialtyName(String specialtyName) {
-		this.specialtyName = specialtyName;
-	}
-
-	public Long getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(Long courseId) {
-		this.courseId = courseId;
-	}
-
-	public String getGrade() {
-		return grade;
-	}
-
-	public void setGrade(String grade) {
-		this.grade = grade;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getExamSite() {
-		return examSite;
-	}
-
-	public void setExamSite(String examSite) {
-		this.examSite = examSite;
-	}
-
-	public String getInfoCollector() {
-		return infoCollector;
-	}
-
-	public void setInfoCollector(String infoCollector) {
-		this.infoCollector = infoCollector;
-	}
-
-}
+package cn.com.qmth.examcloud.examwork.api.bean;
+
+import cn.com.qmth.examcloud.web.cloud.api.JsonSerializable;
+
+public class ExamStudentBean implements JsonSerializable {
+	private static final long serialVersionUID = 2079003980099252759L;
+
+	private Long id;
+
+	/**
+	 * 学生ID
+	 */
+	private Long studentId;
+
+	/**
+	 * 机构ID
+	 */
+	private Long orgId;
+
+	/**
+	 * 机构名称
+	 */
+	private String orgName;
+
+	/**
+	 * 机构编码
+	 */
+	private String orgCode;
+
+	/**
+	 * 顶级机构ID
+	 */
+	private Long rootOrgId;
+
+	/**
+	 * 考试ID
+	 */
+	private Long examId;
+
+	/**
+	 * 考试名称
+	 */
+	private String examName;
+
+	/**
+	 * 学生姓名
+	 */
+	private String studentName;
+
+	/**
+	 * 学生学号
+	 */
+	private String studentCode;
+
+	/**
+	 * 学生身份证号
+	 */
+	private String identityNumber;
+
+	/**
+	 * 考试课程名称
+	 */
+	private String courseName;
+
+	/**
+	 * 考试课程code
+	 */
+	private String courseCode;
+
+	/**
+	 * 考试课程level
+	 */
+	private String courseLevel;
+
+	/**
+	 * 试卷类型
+	 */
+	private String paperType;
+
+	/**
+	 * 专业名称
+	 */
+	private String specialtyName;
+
+	/**
+	 * 课程ID
+	 */
+	private Long courseId;
+
+	/**
+	 * 年级
+	 */
+	private String grade;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+
+	/**
+	 * 考点
+	 */
+	private String examSite;
+
+	/**
+	 * 信息采集人
+	 */
+	private String infoCollector;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public String getExamName() {
+		return examName;
+	}
+
+	public void setExamName(String examName) {
+		this.examName = examName;
+	}
+
+	public String getStudentName() {
+		return studentName;
+	}
+
+	public void setStudentName(String studentName) {
+		this.studentName = studentName;
+	}
+
+	public String getStudentCode() {
+		return studentCode;
+	}
+
+	public void setStudentCode(String studentCode) {
+		this.studentCode = studentCode;
+	}
+
+	public String getIdentityNumber() {
+		return identityNumber;
+	}
+
+	public void setIdentityNumber(String identityNumber) {
+		this.identityNumber = identityNumber;
+	}
+
+	public String getCourseName() {
+		return courseName;
+	}
+
+	public void setCourseName(String courseName) {
+		this.courseName = courseName;
+	}
+
+	public String getCourseCode() {
+		return courseCode;
+	}
+
+	public void setCourseCode(String courseCode) {
+		this.courseCode = courseCode;
+	}
+
+	public String getCourseLevel() {
+		return courseLevel;
+	}
+
+	public void setCourseLevel(String courseLevel) {
+		this.courseLevel = courseLevel;
+	}
+
+	public String getPaperType() {
+		return paperType;
+	}
+
+	public void setPaperType(String paperType) {
+		this.paperType = paperType;
+	}
+
+	public Long getStudentId() {
+		return studentId;
+	}
+
+	public void setStudentId(Long studentId) {
+		this.studentId = studentId;
+	}
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getSpecialtyName() {
+		return specialtyName;
+	}
+
+	public void setSpecialtyName(String specialtyName) {
+		this.specialtyName = specialtyName;
+	}
+
+	public Long getCourseId() {
+		return courseId;
+	}
+
+	public void setCourseId(Long courseId) {
+		this.courseId = courseId;
+	}
+
+	public String getGrade() {
+		return grade;
+	}
+
+	public void setGrade(String grade) {
+		this.grade = grade;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public String getExamSite() {
+		return examSite;
+	}
+
+	public void setExamSite(String examSite) {
+		this.examSite = examSite;
+	}
+
+	public String getInfoCollector() {
+		return infoCollector;
+	}
+
+	public void setInfoCollector(String infoCollector) {
+		this.infoCollector = infoCollector;
+	}
+
+}

+ 51 - 51
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/CopyExamStudentsReq.java

@@ -1,51 +1,51 @@
-package cn.com.qmth.examcloud.examwork.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class CopyExamStudentsReq extends BaseRequest {
-
-	/**
-	 * 属性注释
-	 */
-	private static final long serialVersionUID = -3889415294884515605L;
-
-	/**
-	 * copy from
-	 */
-	private Long examId1;
-
-	/**
-	 * copy to
-	 */
-	private Long examId2;
-
-	/**
-	 * 考试ID开始值
-	 */
-	private Long start;
-
-	public Long getExamId1() {
-		return examId1;
-	}
-
-	public void setExamId1(Long examId1) {
-		this.examId1 = examId1;
-	}
-
-	public Long getExamId2() {
-		return examId2;
-	}
-
-	public void setExamId2(Long examId2) {
-		this.examId2 = examId2;
-	}
-
-	public Long getStart() {
-		return start;
-	}
-
-	public void setStart(Long start) {
-		this.start = start;
-	}
-
-}
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class CopyExamStudentsReq extends BaseRequest {
+
+	/**
+	 * 属性注释
+	 */
+	private static final long serialVersionUID = -3889415294884515605L;
+
+	/**
+	 * copy from
+	 */
+	private Long examId1;
+
+	/**
+	 * copy to
+	 */
+	private Long examId2;
+
+	/**
+	 * 考试ID开始值
+	 */
+	private Long start;
+
+	public Long getExamId1() {
+		return examId1;
+	}
+
+	public void setExamId1(Long examId1) {
+		this.examId1 = examId1;
+	}
+
+	public Long getExamId2() {
+		return examId2;
+	}
+
+	public void setExamId2(Long examId2) {
+		this.examId2 = examId2;
+	}
+
+	public Long getStart() {
+		return start;
+	}
+
+	public void setStart(Long start) {
+		this.start = start;
+	}
+
+}

+ 131 - 131
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/CountExamStudentReq.java

@@ -1,131 +1,131 @@
-package cn.com.qmth.examcloud.examwork.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年11月23日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class CountExamStudentReq extends BaseRequest {
-
-	private static final long serialVersionUID = -5375705291595906118L;
-
-	private Long examId;
-
-	private Long courseId;
-
-	private Long orgId;
-
-	private String paperType;
-
-	private String examSite;
-
-	/**
-	 * 扩展属性1
-	 */
-	private String ext1;
-
-	/**
-	 * 扩展属性2
-	 */
-	private String ext2;
-
-	/**
-	 * 扩展属性3
-	 */
-	private String ext3;
-
-	/**
-	 * 扩展属性4
-	 */
-	private String ext4;
-
-	/**
-	 * 扩展属性5
-	 */
-	private String ext5;
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public Long getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(Long courseId) {
-		this.courseId = courseId;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getPaperType() {
-		return paperType;
-	}
-
-	public void setPaperType(String paperType) {
-		this.paperType = paperType;
-	}
-
-	public String getExamSite() {
-		return examSite;
-	}
-
-	public void setExamSite(String examSite) {
-		this.examSite = examSite;
-	}
-
-	public String getExt1() {
-		return ext1;
-	}
-
-	public void setExt1(String ext1) {
-		this.ext1 = ext1;
-	}
-
-	public String getExt2() {
-		return ext2;
-	}
-
-	public void setExt2(String ext2) {
-		this.ext2 = ext2;
-	}
-
-	public String getExt3() {
-		return ext3;
-	}
-
-	public void setExt3(String ext3) {
-		this.ext3 = ext3;
-	}
-
-	public String getExt4() {
-		return ext4;
-	}
-
-	public void setExt4(String ext4) {
-		this.ext4 = ext4;
-	}
-
-	public String getExt5() {
-		return ext5;
-	}
-
-	public void setExt5(String ext5) {
-		this.ext5 = ext5;
-	}
-
-}
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+/**
+ * 类注释
+ *
+ * @author WANGWEI
+ * @date 2018年11月23日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public class CountExamStudentReq extends BaseRequest {
+
+	private static final long serialVersionUID = -5375705291595906118L;
+
+	private Long examId;
+
+	private Long courseId;
+
+	private Long orgId;
+
+	private String paperType;
+
+	private String examSite;
+
+	/**
+	 * 扩展属性1
+	 */
+	private String ext1;
+
+	/**
+	 * 扩展属性2
+	 */
+	private String ext2;
+
+	/**
+	 * 扩展属性3
+	 */
+	private String ext3;
+
+	/**
+	 * 扩展属性4
+	 */
+	private String ext4;
+
+	/**
+	 * 扩展属性5
+	 */
+	private String ext5;
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public Long getCourseId() {
+		return courseId;
+	}
+
+	public void setCourseId(Long courseId) {
+		this.courseId = courseId;
+	}
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public String getPaperType() {
+		return paperType;
+	}
+
+	public void setPaperType(String paperType) {
+		this.paperType = paperType;
+	}
+
+	public String getExamSite() {
+		return examSite;
+	}
+
+	public void setExamSite(String examSite) {
+		this.examSite = examSite;
+	}
+
+	public String getExt1() {
+		return ext1;
+	}
+
+	public void setExt1(String ext1) {
+		this.ext1 = ext1;
+	}
+
+	public String getExt2() {
+		return ext2;
+	}
+
+	public void setExt2(String ext2) {
+		this.ext2 = ext2;
+	}
+
+	public String getExt3() {
+		return ext3;
+	}
+
+	public void setExt3(String ext3) {
+		this.ext3 = ext3;
+	}
+
+	public String getExt4() {
+		return ext4;
+	}
+
+	public void setExt4(String ext4) {
+		this.ext4 = ext4;
+	}
+
+	public String getExt5() {
+		return ext5;
+	}
+
+	public void setExt5(String ext5) {
+		this.ext5 = ext5;
+	}
+
+}

+ 49 - 49
examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/GetExamCourseListReq.java

@@ -1,49 +1,49 @@
-package cn.com.qmth.examcloud.examwork.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class GetExamCourseListReq extends BaseRequest {
-
-	private static final long serialVersionUID = 3931835759483816611L;
-
-	private Long rootOrgId;
-
-	private Long examId;
-
-	private Long start;
-
-	private Boolean courseEnable;
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public Long getStart() {
-		return start;
-	}
-
-	public void setStart(Long start) {
-		this.start = start;
-	}
-
-	public Boolean getCourseEnable() {
-		return courseEnable;
-	}
-
-	public void setCourseEnable(Boolean courseEnable) {
-		this.courseEnable = courseEnable;
-	}
-
-}
+package cn.com.qmth.examcloud.examwork.api.request;
+
+import cn.com.qmth.examcloud.web.cloud.api.BaseRequest;
+
+public class GetExamCourseListReq extends BaseRequest {
+
+	private static final long serialVersionUID = 3931835759483816611L;
+
+	private Long rootOrgId;
+
+	private Long examId;
+
+	private Long start;
+
+	private Boolean courseEnable;
+
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Long examId) {
+		this.examId = examId;
+	}
+
+	public Long getStart() {
+		return start;
+	}
+
+	public void setStart(Long start) {
+		this.start = start;
+	}
+
+	public Boolean getCourseEnable() {
+		return courseEnable;
+	}
+
+	public void setCourseEnable(Boolean courseEnable) {
+		this.courseEnable = courseEnable;
+	}
+
+}

Some files were not shown because too many files changed in this diff