Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-rpc.git

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

@@ -1,28 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.api.client;
-
-import org.springframework.stereotype.Service;
-
-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 AbstractCloudClientSupport
-		implements
-			SysConfigCloudService {
-
-	private static final long serialVersionUID = -1572107451517177867L;
-
-	@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);
-	}
-
-}

examcloud-core-basic-api-client/src/main/java/cn/com/qmth/examcloud/core/basic/api/client/SystemPropertyCloudServiceClient.java

@@ -0,0 +1,28 @@
+package cn.com.qmth.examcloud.core.basic.api.client;
+
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.examcloud.core.basic.api.SystemPropertyCloudService;
+import cn.com.qmth.examcloud.core.basic.api.request.GetSystemPropertyReq;
+import cn.com.qmth.examcloud.core.basic.api.request.SetSystemPropertyReq;
+import cn.com.qmth.examcloud.core.basic.api.response.GetSystemPropertyResp;
+import cn.com.qmth.examcloud.core.basic.api.response.SetSystemPropertyResp;
+
+@Service
+public class SystemPropertyCloudServiceClient extends AbstractCloudClientSupport
+		implements
+			SystemPropertyCloudService {
+
+	private static final long serialVersionUID = -1572107451517177867L;
+
+	@Override
+	public SetSystemPropertyResp setSystemProperty(SetSystemPropertyReq req) {
+		return post("systemProperty/setSystemProperty", req, SetSystemPropertyResp.class);
+	}
+
+	@Override
+	public GetSystemPropertyResp getSystemProperty(GetSystemPropertyReq req) {
+		return post("systemProperty/getSystemProperty", req, GetSystemPropertyResp.class);
+	}
+
+}

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

@@ -1,22 +0,0 @@
-package cn.com.qmth.examcloud.core.basic.api;
-
-import cn.com.qmth.examcloud.api.commons.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);
-
-}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/SystemPropertyCloudService.java

@@ -0,0 +1,22 @@
+package cn.com.qmth.examcloud.core.basic.api;
+
+import cn.com.qmth.examcloud.api.commons.CloudService;
+import cn.com.qmth.examcloud.core.basic.api.request.GetSystemPropertyReq;
+import cn.com.qmth.examcloud.core.basic.api.request.SetSystemPropertyReq;
+import cn.com.qmth.examcloud.core.basic.api.response.GetSystemPropertyResp;
+import cn.com.qmth.examcloud.core.basic.api.response.SetSystemPropertyResp;
+
+/**
+ * 系统配置
+ *
+ * @author WANGWEI
+ * @date 2018年12月3日
+ * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
+ */
+public interface SystemPropertyCloudService extends CloudService {
+
+	SetSystemPropertyResp setSystemProperty(SetSystemPropertyReq req);
+
+	GetSystemPropertyResp getSystemProperty(GetSystemPropertyReq req);
+
+}

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetSysConfigReq.java → examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/GetSystemPropertyReq.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.core.basic.api.request;
 
 import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 
-public class GetSysConfigReq extends BaseRequest {
+public class GetSystemPropertyReq extends BaseRequest {
 
 	private static final long serialVersionUID = 2737057867242610859L;
 

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SetSysConfigReq.java → examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/request/SetSystemPropertyReq.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.core.basic.api.request;
 
 import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 
-public class SetSysConfigReq extends BaseRequest {
+public class SetSystemPropertyReq extends BaseRequest {
 
 	private static final long serialVersionUID = -6852583351399210497L;
 

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetSysConfigResp.java → examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/GetSystemPropertyResp.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.core.basic.api.response;
 
 import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
 
-public class GetSysConfigResp extends BaseResponse {
+public class GetSystemPropertyResp extends BaseResponse {
 
 	private static final long serialVersionUID = -8592124313710003551L;
 

examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SetSysConfigResp.java → examcloud-core-basic-api/src/main/java/cn/com/qmth/examcloud/core/basic/api/response/SetSystemPropertyResp.java

@@ -2,7 +2,7 @@ package cn.com.qmth.examcloud.core.basic.api.response;
 
 import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
 
-public class SetSysConfigResp extends BaseResponse {
+public class SetSystemPropertyResp extends BaseResponse {
 
 	private static final long serialVersionUID = -8345402842873364242L;
 

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/request/SaveExamReq.java

@@ -3,6 +3,7 @@ package cn.com.qmth.examcloud.examwork.api.request;
 import java.util.Date;
 import java.util.Map;
 
+import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
 
 /**
@@ -16,9 +17,9 @@ public class SaveExamReq extends BaseRequest {
 	private static final long serialVersionUID = -5832266903859887508L;
 
 	/**
-	 * ID
+	 * 考试编码
 	 */
-	private Long id;
+	private String code;
 
 	/**
 	 * 机构ID
@@ -33,7 +34,7 @@ public class SaveExamReq extends BaseRequest {
 	/**
 	 * 考试类型
 	 */
-	private String examType;
+	private ExamType examType;
 
 	/**
 	 * 考试开始时间
@@ -67,12 +68,12 @@ public class SaveExamReq extends BaseRequest {
 
 	private Map<String, String> properties;
 
-	public Long getId() {
-		return id;
+	public String getCode() {
+		return code;
 	}
 
-	public void setId(Long id) {
-		this.id = id;
+	public void setCode(String code) {
+		this.code = code;
 	}
 
 	public Long getRootOrgId() {
@@ -91,11 +92,11 @@ public class SaveExamReq extends BaseRequest {
 		this.name = name;
 	}
 
-	public String getExamType() {
+	public ExamType getExamType() {
 		return examType;
 	}
 
-	public void setExamType(String examType) {
+	public void setExamType(ExamType examType) {
 		this.examType = examType;
 	}
 

examcloud-core-examwork-api/src/main/java/cn/com/qmth/examcloud/examwork/api/response/SaveExamResp.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.examwork.api.response;
 
 import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
+import cn.com.qmth.examcloud.examwork.api.bean.ExamBean;
 
 public class SaveExamResp extends BaseResponse {
 
@@ -8,6 +9,8 @@ public class SaveExamResp extends BaseResponse {
 
 	private Long examId;
 
+	private ExamBean examBean;
+
 	public Long getExamId() {
 		return examId;
 	}
@@ -16,4 +19,12 @@ public class SaveExamResp extends BaseResponse {
 		this.examId = examId;
 	}
 
+	public ExamBean getExamBean() {
+		return examBean;
+	}
+
+	public void setExamBean(ExamBean examBean) {
+		this.examBean = examBean;
+	}
+
 }

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

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.exchange.inner.api.client;
 
 import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import cn.com.qmth.examcloud.api.commons.exchange.FormRequest;
 import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
 
 /**
@@ -29,4 +30,8 @@ public abstract class AbstractCloudClientSupport extends CloudClientSupport {
 		return super.post(APP_NAME, requestMappingSuffix, body, responseType);
 	}
 
+	protected <T> T postForm(String requestMappingSuffix, FormRequest req, Class<T> responseType) {
+		return super.postForm(APP_NAME, requestMappingSuffix, req, responseType);
+	}
+
 }

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

@@ -1,18 +1,10 @@
 package cn.com.qmth.examcloud.exchange.inner.api.client;
 
-import java.io.File;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import com.google.common.collect.Maps;
 
 import cn.com.qmth.examcloud.exchange.inner.api.UpyunCloudService;
 import cn.com.qmth.examcloud.exchange.inner.api.request.PutFileReq;
 import cn.com.qmth.examcloud.exchange.inner.api.response.PutFileResp;
-import cn.com.qmth.examcloud.web.redis.RedisClient;
 
 /**
  * 类注释
@@ -30,16 +22,7 @@ public class UpyunCloudServiceClient extends AbstractCloudClientSupport
 
 	@Override
 	public PutFileResp putFile(PutFileReq req) {
-		Map<String, String> params = Maps.newHashMap();
-		params.put("siteId", req.getSiteId());
-		params.put("fileSuffix", req.getFileSuffix());
-		params.put("rootOrgId", String.valueOf(req.getRootOrgId()));
-		params.put("userId", String.valueOf(req.getUserId()));
-		params.put("filePath", req.getFilePath());
-
-		// return postForm("upyun/putFile", params, new File(req.getFilePath()),
-		// PutFileResp.class);
-		return null;
+		return postForm("upyun/putFile", req, PutFileResp.class);
 	}
 
 }

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

@@ -1,8 +1,6 @@
 package cn.com.qmth.examcloud.exchange.inner.api.request;
 
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-
-import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
+import cn.com.qmth.examcloud.api.commons.exchange.FormRequest;
 
 /**
  * 类注释
@@ -11,7 +9,7 @@ import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
  * @date 2018年11月27日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class PutFileReq extends BaseRequest {
+public class PutFileReq extends FormRequest {
 
 	private static final long serialVersionUID = 6724768358354616915L;
 
@@ -23,10 +21,6 @@ public class PutFileReq extends BaseRequest {
 
 	private String fileSuffix;
 
-	private String filePath;
-
-	private CommonsMultipartFile file;
-
 	public String getSiteId() {
 		return siteId;
 	}
@@ -59,20 +53,4 @@ public class PutFileReq extends BaseRequest {
 		this.fileSuffix = fileSuffix;
 	}
 
-	public String getFilePath() {
-		return filePath;
-	}
-
-	public void setFilePath(String filePath) {
-		this.filePath = filePath;
-	}
-
-	public CommonsMultipartFile getFile() {
-		return file;
-	}
-
-	public void setFile(CommonsMultipartFile file) {
-		this.file = file;
-	}
-
 }