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

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

@@ -20,6 +20,6 @@ public interface UpyunCloudService extends CloudService {
 	 * @param req
 	 * @return
 	 */
-	public PutFileResp putFile(PutFileReq req);
+	PutFileResp putFile(PutFileReq req);
 
 }

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

@@ -1,5 +1,7 @@
 package cn.com.qmth.examcloud.exchange.inner.api.request;
 
+import org.springframework.web.multipart.MultipartFile;
+
 import cn.com.qmth.examcloud.api.commons.exchange.FormRequest;
 
 /**
@@ -21,6 +23,8 @@ public class PutFileReq extends FormRequest {
 
 	private String fileSuffix;
 
+	private MultipartFile file;
+
 	public String getSiteId() {
 		return siteId;
 	}
@@ -53,4 +57,12 @@ public class PutFileReq extends FormRequest {
 		this.fileSuffix = fileSuffix;
 	}
 
+	public MultipartFile getFile() {
+		return file;
+	}
+
+	public void setFile(MultipartFile file) {
+		this.file = file;
+	}
+
 }

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

@@ -15,6 +15,8 @@ public class PutFileResp extends BaseResponse {
 
 	private String url;
 
+	private String relativePath;
+
 	public String getUrl() {
 		return url;
 	}
@@ -23,4 +25,12 @@ public class PutFileResp extends BaseResponse {
 		this.url = url;
 	}
 
+	public String getRelativePath() {
+		return relativePath;
+	}
+
+	public void setRelativePath(String relativePath) {
+		this.relativePath = relativePath;
+	}
+
 }