...

examcloud-exchange-inner-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.exchange</groupId>
-		<artifactId>examcloud-exchange</artifactId>
-		<version>2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>examcloud-exchange-inner-api-client</artifactId>
-
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.exchange</groupId>
-			<artifactId>examcloud-exchange-inner-api</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-	</dependencies>
-</project>

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

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

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

@@ -1,52 +0,0 @@
-package cn.com.qmth.examcloud.exchange.inner.api.client;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import cn.com.qmth.examcloud.commons.web.redis.RedisClient;
-import cn.com.qmth.examcloud.exchange.inner.api.SendSmsCloudService;
-import cn.com.qmth.examcloud.exchange.inner.api.request.CheckSmsCodeReq;
-import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq;
-import cn.com.qmth.examcloud.exchange.inner.api.response.CheckIdentifyingCodeResp;
-import cn.com.qmth.examcloud.exchange.inner.api.response.SendSmsResp;
-
-/**
- * 
- * @author chenken
- * @date 2018年7月3日 下午4:01:56
- * @company QMTH
- * @description SendSmsServiceClient.java
- */
-@Service
-public class SendSmsServiceClient extends ExchangeCloudClientSupport implements SendSmsCloudService {
-
-	private static final long serialVersionUID = -2880611326177571371L;
-
-	@Autowired
-	RestTemplate restTemplate;
-
-	@Autowired
-	private RedisClient redisClient;
-
-	@Override
-	protected RedisClient getRedisClient() {
-		return redisClient;
-	}
-
-	@Override
-	protected RestTemplate getRestTemplate() {
-		return restTemplate;
-	}
-
-	@Override
-	public SendSmsResp sendIdentifyingCode(SendSmsReq sendSmsReq) {
-		return post("/sendSms/sendIdentifyingCode", sendSmsReq, SendSmsResp.class);
-	}
-
-	@Override
-	public CheckIdentifyingCodeResp checkIdentifyingCode(CheckSmsCodeReq checkSmsCodeReq) {
-		return post("/sendSms/checkIdentifyingCode", checkSmsCodeReq,
-				CheckIdentifyingCodeResp.class);
-	}
-}

examcloud-exchange-inner-api-provider/pom.xml

@@ -10,7 +10,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>cn.com.qmth.examcloud.exchange</groupId>
+			<groupId>cn.com.qmth.examcloud.rmi</groupId>
 			<artifactId>examcloud-exchange-inner-api</artifactId>
 			<version>${examcloud.version}</version>
 		</dependency>

examcloud-exchange-inner-api/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.exchange</groupId>
-		<artifactId>examcloud-exchange</artifactId>
-		<version>2.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>examcloud-exchange-inner-api</artifactId>
-
-	<dependencies>
-		<dependency>
-			<groupId>cn.com.qmth.examcloud.commons</groupId>
-			<artifactId>examcloud-commons-web</artifactId>
-			<version>${examcloud.version}</version>
-		</dependency>
-	</dependencies>
-</project>

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/SendSmsCloudService.java

@@ -1,30 +0,0 @@
-package cn.com.qmth.examcloud.exchange.inner.api;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.CloudService;
-import cn.com.qmth.examcloud.exchange.inner.api.request.CheckSmsCodeReq;
-import cn.com.qmth.examcloud.exchange.inner.api.request.SendSmsReq;
-import cn.com.qmth.examcloud.exchange.inner.api.response.CheckIdentifyingCodeResp;
-import cn.com.qmth.examcloud.exchange.inner.api.response.SendSmsResp;
-
-/**
- * 短信发送
- * @author  	chenken
- * @date    	2018年7月3日 下午3:32:52
- * @company 	QMTH
- * @description SendSmsCloudService.java
- */
-public interface SendSmsCloudService extends CloudService{
-	
-	/**
-	 * 发送验证码
-	 */
-	public SendSmsResp sendIdentifyingCode(SendSmsReq sendSmsReq);
-	
-	/**
-	 * 校验验证码
-	 * @param phone
-	 * @param code
-	 */
-	public CheckIdentifyingCodeResp checkIdentifyingCode(CheckSmsCodeReq checkSmsCodeReq);
-	
-}

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/request/CheckSmsCodeReq.java

@@ -1,31 +0,0 @@
-package cn.com.qmth.examcloud.exchange.inner.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class CheckSmsCodeReq  extends BaseRequest{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -5177345026766086276L;
-
-	private String phone;
-	
-	private String code;
-
-	public String getPhone() {
-		return phone;
-	}
-
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-}

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/request/SendSmsReq.java

@@ -1,85 +0,0 @@
-package cn.com.qmth.examcloud.exchange.inner.api.request;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseRequest;
-
-public class SendSmsReq extends BaseRequest{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 8002846980120664036L;
-	
-	/**
-	 * 手机号码 
-	 */
-	private String phone;
-	/**
-	 * 验证码
-	 */
-	private String code;
-	/**
-	 * 签名
-	 */
-	private String sign;
-	/**
-	 * 模板code
-	 */
-	private String templateCode;
-	/**
-	 * 允许请求的间隔时间
-	 */
-	private Integer intervalSeconds;
-	/**
-	 * 验证码有效时间   秒
-	 */
-	private Integer effectiveTime;
-
-	public String getPhone() {
-		return phone;
-	}
-
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getTemplateCode() {
-		return templateCode;
-	}
-
-	public void setTemplateCode(String templateCode) {
-		this.templateCode = templateCode;
-	}
-
-	public String getSign() {
-		return sign;
-	}
-
-	public void setSign(String sign) {
-		this.sign = sign;
-	}
-
-	public Integer getEffectiveTime() {
-		return effectiveTime;
-	}
-
-	public void setEffectiveTime(Integer effectiveTime) {
-		this.effectiveTime = effectiveTime;
-	}
-
-	public Integer getIntervalSeconds() {
-		return intervalSeconds;
-	}
-
-	public void setIntervalSeconds(Integer intervalSeconds) {
-		this.intervalSeconds = intervalSeconds;
-	}
-	
-}

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/response/CheckIdentifyingCodeResp.java

@@ -1,32 +0,0 @@
-package cn.com.qmth.examcloud.exchange.inner.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class CheckIdentifyingCodeResp extends BaseResponse{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -4183375914566275064L;
-
-	private String returnMsg;
-	
-	private Boolean success;
-
-	public String getReturnMsg() {
-		return returnMsg;
-	}
-
-	public void setReturnMsg(String returnMsg) {
-		this.returnMsg = returnMsg;
-	}
-
-	public Boolean getSuccess() {
-		return success;
-	}
-
-	public void setSuccess(Boolean success) {
-		this.success = success;
-	}
-	
-}

examcloud-exchange-inner-api/src/main/java/cn/com/qmth/examcloud/exchange/inner/api/response/SendSmsResp.java

@@ -1,32 +0,0 @@
-package cn.com.qmth.examcloud.exchange.inner.api.response;
-
-import cn.com.qmth.examcloud.commons.web.cloud.api.BaseResponse;
-
-public class SendSmsResp extends BaseResponse{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -7527034551594325879L;
-
-	private boolean success;
-	
-	private String returnMsg;
-	
-	public boolean isSuccess() {
-		return success;
-	}
-
-	public void setSuccess(boolean success) {
-		this.success = success;
-	}
-
-	public String getReturnMsg() {
-		return returnMsg;
-	}
-
-	public void setReturnMsg(String returnMsg) {
-		this.returnMsg = returnMsg;
-	}
-
-}

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/swufe/StudentInfoController.java

@@ -20,6 +20,7 @@ import cn.com.qmth.examcloud.core.basic.api.request.InsertOrUpdateStudentReq;
 import cn.com.qmth.examcloud.core.basic.api.response.InsertOrUpdateStudentResp;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
@@ -62,7 +63,8 @@ public class StudentInfoController extends ControllerSupport {
 			GetExamResp resp = examCloudService.getExam(req);
 
 			Long examId = resp.getId();
-			String examName = resp.getName();
+			ExamBean examBean = resp.getExamBean();
+			String examName = examBean.getName();
 
 			InsertOrUpdateStudentReq saveStudentReq = new InsertOrUpdateStudentReq();
 			saveStudentReq.setIdentityNumber(cur.getIdentityNumber());

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/provider/sydx/StudentExamInfoController.java

@@ -25,6 +25,7 @@ import cn.com.qmth.examcloud.core.basic.api.request.InsertOrUpdateStudentReq;
 import cn.com.qmth.examcloud.core.basic.api.response.InsertOrUpdateStudentResp;
 import cn.com.qmth.examcloud.examwork.api.ExamCloudService;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
@@ -99,7 +100,8 @@ public class StudentExamInfoController extends ControllerSupport {
 		}
 
 		Long examId = resp.getId();
-		String examName = resp.getName();
+		ExamBean examBean = resp.getExamBean();
+		String examName = examBean.getName();
 		List<OutletExamStudent> examStudentList = examStudentImportDTO.getExamStudentList();
 
 		List<Long> examStudentIdList = Lists.newArrayList();

examcloud-exchange-outer-service/pom.xml

@@ -16,12 +16,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>