...

examcloud-task-api-client/pom.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn.com.qmth.examcloud.task</groupId>
-		<artifactId>examcloud-task</artifactId>
-		<version>2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>examcloud-task-api-client</artifactId>
-
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.task</groupId>
-			<artifactId>examcloud-task-api</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-	</dependencies>
-</project>

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

@@ -1,75 +0,0 @@
-package cn.com.qmth.examcloud.task.api.client;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.task.api.DataSyncCloudService;
-import cn.com.qmth.examcloud.task.api.request.SyncCourseReq;
-import cn.com.qmth.examcloud.task.api.request.SyncExamReq;
-import cn.com.qmth.examcloud.task.api.request.SyncOrgReq;
-import cn.com.qmth.examcloud.task.api.request.SyncSpecialtyReq;
-import cn.com.qmth.examcloud.task.api.request.SyncStudentReq;
-import cn.com.qmth.examcloud.task.api.response.SyncCourseResp;
-import cn.com.qmth.examcloud.task.api.response.SyncExamResp;
-import cn.com.qmth.examcloud.task.api.response.SyncOrgResp;
-import cn.com.qmth.examcloud.task.api.response.SyncSpecialtyResp;
-import cn.com.qmth.examcloud.task.api.response.SyncStudentResp;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年8月2日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-@Service
-public class DataSyncCloudServiceClient extends TaskCloudClientSupport
-		implements
-			DataSyncCloudService {
-
-	private static final long serialVersionUID = -2880611326177571371L;
-
-	@Autowired
-	RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	public SyncCourseResp syncCourse(SyncCourseReq req) {
-		return post("dataSync/syncCourse", req, SyncCourseResp.class);
-	}
-
-	@Override
-	public SyncOrgResp syncOrg(SyncOrgReq req) {
-		return post("dataSync/syncOrg", req, SyncOrgResp.class);
-	}
-
-	@Override
-	public SyncStudentResp syncStudent(SyncStudentReq req) {
-		return post("dataSync/syncStudent", req, SyncStudentResp.class);
-	}
-
-	@Override
-	public SyncSpecialtyResp syncSpecialty(SyncSpecialtyReq req) {
-		return post("dataSync/syncSpecialty", req, SyncSpecialtyResp.class);
-	}
-
-	@Override
-	public SyncExamResp syncExam(SyncExamReq req) {
-		return post("dataSync/syncExam", req, SyncExamResp.class);
-	}
-
-}

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

@@ -1,16 +0,0 @@
-package cn.com.qmth.examcloud.task.api.client;
-
-import cn.com.qmth.examcloud.commons.web.support.CloudClientSupport;
-
-/**
- * @author WANGWEI
- *
- */
-public abstract class TaskCloudClientSupport extends CloudClientSupport {
-
-	@Override
-	public String getUrlPrefix() {
-		return "http://EXAMCLOUD-TASK/api/cloud/task";
-	}
-
-}

examcloud-task-api-provider/pom.xml

@@ -14,7 +14,7 @@
 			<version>${examcloud.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>cn.com.qmth.examcloud.task</groupId>
+			<groupId>cn.com.qmth.examcloud.rmi</groupId>
 			<artifactId>examcloud-task-api</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>

examcloud-task-api-provider/src/main/java/cn/com/qmth/examcloud/task/api/controller/ExamStudentImportController.java

@@ -37,6 +37,7 @@ import cn.com.qmth.examcloud.core.basic.api.bean.OrgBean;
 import cn.com.qmth.examcloud.core.basic.api.request.GetOrgReq;
 import cn.com.qmth.examcloud.core.basic.api.response.GetOrgResp;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
 import cn.com.qmth.examcloud.task.api.controller.bean.ExamStudentImportDomain;
@@ -159,7 +160,8 @@ public class ExamStudentImportController extends ControllerSupport {
 			req.setId(domain.getExamId());
 			req.setRootOrgId(domain.getRootOrgId());
 			GetExamResp examResp = examCloudService.getExam(req);
-			domain.setExamName(examResp.getName());
+			ExamBean examBean = examResp.getExamBean();
+			domain.setExamName(examBean.getName());
 
 			GetOrgReq getOrgReq = new GetOrgReq();
 			getOrgReq.setOrgId(domain.getRootOrgId());

examcloud-task-api/pom.xml

@@ -1,18 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>cn.com.qmth.examcloud.task</groupId>
-    <artifactId>examcloud-task</artifactId>
-    <version>2.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>examcloud-task-api</artifactId>
-  
-  <dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.commons</groupId>
-			<artifactId>examcloud-commons-web</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-  </dependencies>		
-  
-</project>

examcloud-task-api/src/main/java/cn/com/qmth/examcloud/task/api/DataSyncCloudService.java

@@ -1,69 +0,0 @@
-package cn.com.qmth.examcloud.task.api;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-import cn.com.qmth.examcloud.task.api.request.SyncCourseReq;
-import cn.com.qmth.examcloud.task.api.request.SyncExamReq;
-import cn.com.qmth.examcloud.task.api.request.SyncOrgReq;
-import cn.com.qmth.examcloud.task.api.request.SyncSpecialtyReq;
-import cn.com.qmth.examcloud.task.api.request.SyncStudentReq;
-import cn.com.qmth.examcloud.task.api.response.SyncCourseResp;
-import cn.com.qmth.examcloud.task.api.response.SyncExamResp;
-import cn.com.qmth.examcloud.task.api.response.SyncOrgResp;
-import cn.com.qmth.examcloud.task.api.response.SyncSpecialtyResp;
-import cn.com.qmth.examcloud.task.api.response.SyncStudentResp;
-
-/**
- * 数据同步接口
- *
- * @author WANGWEI
- * @date 2018年8月2日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public interface DataSyncCloudService 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
-	 */
-	SyncSpecialtyResp syncSpecialty(SyncSpecialtyReq req);
-
-	/**
-	 * 同步考试
-	 *
-	 * @author WANGWEI
-	 * @param req
-	 * @return
-	 */
-	SyncExamResp syncExam(SyncExamReq req);
-
-}

examcloud-task-api/src/main/java/cn/com/qmth/examcloud/task/api/request/SyncCourseReq.java

@@ -1,69 +0,0 @@
-package cn.com.qmth.examcloud.task.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class SyncCourseReq extends BaseRequest {
-
-	private static final long serialVersionUID = -1031140605770551820L;
-
-	private Long id;
-
-	private String code;
-
-	private String name;
-
-	private Long rootOrgId;
-
-	private String level;
-
-	private Boolean enable;
-
-	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 String getLevel() {
-		return level;
-	}
-
-	public void setLevel(String level) {
-		this.level = level;
-	}
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-}

examcloud-task-api/src/main/java/cn/com/qmth/examcloud/task/api/request/SyncExamReq.java

@@ -1,8 +0,0 @@
-package cn.com.qmth.examcloud.task.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class SyncExamReq extends BaseRequest {
-	private static final long serialVersionUID = -1174285249211340119L;
-
-}

examcloud-task-api/src/main/java/cn/com/qmth/examcloud/task/api/request/SyncOrgReq.java

@@ -1,69 +0,0 @@
-package cn.com.qmth.examcloud.task.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class SyncOrgReq extends BaseRequest {
-
-	private static final long serialVersionUID = -2104134978729044084L;
-
-	private Long id;
-
-	private Long rootId;
-
-	private Long parentId;
-
-	private Integer level;
-
-	private String name;
-
-	private Boolean enable;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getRootId() {
-		return rootId;
-	}
-
-	public void setRootId(Long rootId) {
-		this.rootId = rootId;
-	}
-
-	public Long getParentId() {
-		return parentId;
-	}
-
-	public void setParentId(Long parentId) {
-		this.parentId = parentId;
-	}
-
-	public Integer getLevel() {
-		return level;
-	}
-
-	public void setLevel(Integer level) {
-		this.level = level;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-}

examcloud-task-api/src/main/java/cn/com/qmth/examcloud/task/api/request/SyncSpecialtyReq.java

@@ -1,59 +0,0 @@
-package cn.com.qmth.examcloud.task.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class SyncSpecialtyReq extends BaseRequest {
-
-	private static final long serialVersionUID = 1668418232494824050L;
-
-	private Long id;
-
-	private String code;
-
-	private String name;
-
-	private Long rootOrgId;
-
-	private Boolean enable;
-
-	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 getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-}

examcloud-task-api/src/main/java/cn/com/qmth/examcloud/task/api/request/SyncStudentReq.java

@@ -1,165 +0,0 @@
-package cn.com.qmth.examcloud.task.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class SyncStudentReq extends BaseRequest {
-
-	private static final long serialVersionUID = -8613202479412809385L;
-
-	/**
-	 * 学生ID
-	 */
-	private Long id;
-
-	/**
-	 * 学生姓名
-	 */
-	private String name;
-
-	/**
-	 * 顶级机构ID
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 机构ID
-	 */
-	private Long orgId;
-
-	/**
-	 * 学习中心编码
-	 */
-	private String orgCode;
-
-	/**
-	 * 学习中心名称
-	 */
-	private String orgName;
-
-	/**
-	 * 学生code
-	 */
-	private String studentCode;
-
-	/**
-	 * 身份证号码
-	 */
-	private String identityNumber;
-
-	/**
-	 * 图片地址
-	 */
-	private String photoPath;
-
-	/**
-	 * 手机号码
-	 */
-	private String phoneNumber;
-
-	/**
-	 * 是否可用
-	 */
-	private Boolean enable;
-
-	/**
-	 * 安全手机号码(用于登录)
-	 */
-	private String securityPhone;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	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 Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getOrgCode() {
-		return orgCode;
-	}
-
-	public void setOrgCode(String orgCode) {
-		this.orgCode = orgCode;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-	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 getPhotoPath() {
-		return photoPath;
-	}
-
-	public void setPhotoPath(String photoPath) {
-		this.photoPath = photoPath;
-	}
-
-	public String getPhoneNumber() {
-		return phoneNumber;
-	}
-
-	public void setPhoneNumber(String phoneNumber) {
-		this.phoneNumber = phoneNumber;
-	}
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-	public String getSecurityPhone() {
-		return securityPhone;
-	}
-
-	public void setSecurityPhone(String securityPhone) {
-		this.securityPhone = securityPhone;
-	}
-
-}

examcloud-task-api/src/main/java/cn/com/qmth/examcloud/task/api/response/SyncCourseResp.java

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

examcloud-task-api/src/main/java/cn/com/qmth/examcloud/task/api/response/SyncExamResp.java

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

examcloud-task-api/src/main/java/cn/com/qmth/examcloud/task/api/response/SyncOrgResp.java

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

examcloud-task-api/src/main/java/cn/com/qmth/examcloud/task/api/response/SyncSpecialtyResp.java

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

examcloud-task-api/src/main/java/cn/com/qmth/examcloud/task/api/response/SyncStudentResp.java

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

examcloud-task-service/pom.xml

@@ -20,12 +20,12 @@
 		</dependency>
 
 		<dependency>
-			<groupId>cn.com.qmth.examcloud.core.basic</groupId>
+			<groupId>cn.com.qmth.examcloud.rmi</groupId>
 			<artifactId>examcloud-core-basic-api-client</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>cn.com.qmth.examcloud.core.examwork</groupId>
+			<groupId>cn.com.qmth.examcloud.rmi</groupId>
 			<artifactId>examcloud-core-examwork-api-client</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>