签名

src/main/java/cn/com/qmth/examcloud/web/aliyun/AliYunHttpRequest.java

@@ -1,45 +0,0 @@
-package cn.com.qmth.examcloud.web.aliyun;
-
-import java.util.Map;
-
-import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
-
-public class AliYunHttpRequest implements JsonSerializable {
-
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -3359164974369297063L;
-
-	private String accessUrl;
-
-	private String formUrl;
-
-	private Map<String, String> formParams;
-
-	public String getAccessUrl() {
-		return accessUrl;
-	}
-
-	public void setAccessUrl(String accessUrl) {
-		this.accessUrl = accessUrl;
-	}
-
-	public String getFormUrl() {
-		return formUrl;
-	}
-
-	public void setFormUrl(String formUrl) {
-		this.formUrl = formUrl;
-	}
-
-	public Map<String, String> getFormParams() {
-		return formParams;
-	}
-
-	public void setFormParams(Map<String, String> formParams) {
-		this.formParams = formParams;
-	}
-
-}

src/main/java/cn/com/qmth/examcloud/web/filestorage/impl/UpyunFileStorageImpl.java

@@ -18,7 +18,6 @@ import cn.com.qmth.examcloud.web.filestorage.FileStorageUtil;
 import cn.com.qmth.examcloud.web.filestorage.YunHttpRequest;
 import cn.com.qmth.examcloud.web.filestorage.YunPathInfo;
 import cn.com.qmth.examcloud.web.upyun.UpYunClient;
-import cn.com.qmth.examcloud.web.upyun.UpYunHttpRequest;
 import cn.com.qmth.examcloud.web.upyun.UpYunPathInfo;
 import cn.com.qmth.examcloud.web.upyun.UpyunPathEnvironmentInfo;
 import cn.com.qmth.examcloud.web.upyun.UpyunService;
@@ -82,12 +81,8 @@ public class UpyunFileStorageImpl implements FileStorage {
 
 	@Override
 	public YunHttpRequest getSignature(String siteId, FileStoragePathEnvInfo env, String md5) {
-		UpYunHttpRequest req=upyunService.buildUpYunHttpRequest(siteId, of(env), md5);
-		YunHttpRequest ret=new YunHttpRequest();
-		ret.setAccessUrl(req.getAccessUrl());
-		ret.setFormParams(req.getFormParams());
-		ret.setFormUrl(req.getFormUrl());
-		return ret;
+		YunHttpRequest req=upyunService.buildUpYunHttpRequest(siteId, of(env), md5);
+		return req;
 	}
 
 	@Override

src/main/java/cn/com/qmth/examcloud/web/upyun/UpYunClient.java

@@ -42,6 +42,7 @@ import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.JsonUtil;
 import cn.com.qmth.examcloud.commons.util.MD5;
+import cn.com.qmth.examcloud.web.filestorage.YunHttpRequest;
 
 /**
  * upyun client
@@ -134,7 +135,7 @@ public class UpYunClient {
 	 * @param filePath
 	 * @return
 	 */
-	public UpYunHttpRequest buildUpYunHttpRequest(String filePath) {
+	public YunHttpRequest buildUpYunHttpRequest(String filePath) {
 		return buildUpYunHttpRequest(filePath, "");
 	}
 
@@ -146,7 +147,7 @@ public class UpYunClient {
 	 * @param md5
 	 * @return
 	 */
-	public UpYunHttpRequest buildUpYunHttpRequest(String filePath, String md5) {
+	public YunHttpRequest buildUpYunHttpRequest(String filePath, String md5) {
 		String path = filePath.trim();
 		if (!path.startsWith(SEPARATOR)) {
 			path = SEPARATOR + path;
@@ -181,7 +182,7 @@ public class UpYunClient {
 
 		String accessUrl = this.domain + filePath;
 
-		UpYunHttpRequest request = new UpYunHttpRequest();
+		YunHttpRequest request = new YunHttpRequest();
 		request.setAccessUrl(accessUrl);
 		request.setFormParams(params);
 		request.setFormUrl(formUrl);

src/main/java/cn/com/qmth/examcloud/web/upyun/UpYunHttpRequest.java

@@ -1,41 +0,0 @@
-package cn.com.qmth.examcloud.web.upyun;
-
-import java.util.Map;
-
-import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
-
-public class UpYunHttpRequest implements JsonSerializable {
-
-	private static final long serialVersionUID = -1039684070963660489L;
-
-	private String accessUrl;
-
-	private String formUrl;
-
-	private Map<String, String> formParams;
-
-	public String getAccessUrl() {
-		return accessUrl;
-	}
-
-	public void setAccessUrl(String accessUrl) {
-		this.accessUrl = accessUrl;
-	}
-
-	public String getFormUrl() {
-		return formUrl;
-	}
-
-	public void setFormUrl(String formUrl) {
-		this.formUrl = formUrl;
-	}
-
-	public Map<String, String> getFormParams() {
-		return formParams;
-	}
-
-	public void setFormParams(Map<String, String> formParams) {
-		this.formParams = formParams;
-	}
-
-}

src/main/java/cn/com/qmth/examcloud/web/upyun/UpyunService.java

@@ -3,6 +3,8 @@ package cn.com.qmth.examcloud.web.upyun;
 import java.io.File;
 import java.io.InputStream;
 
+import cn.com.qmth.examcloud.web.filestorage.YunHttpRequest;
+
 /**
  * 又拍云 服务
  *
@@ -75,6 +77,6 @@ public interface UpyunService {
 	 * @param withMd5
 	 * @return
 	 */
-	UpYunHttpRequest buildUpYunHttpRequest(String siteId, UpyunPathEnvironmentInfo env, String md5);
+	YunHttpRequest buildUpYunHttpRequest(String siteId, UpyunPathEnvironmentInfo env, String md5);
 
 }

src/main/java/cn/com/qmth/examcloud/web/upyun/UpyunServiceImpl.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLog;
 import cn.com.qmth.examcloud.commons.logging.ExamCloudLogFactory;
 import cn.com.qmth.examcloud.commons.util.FreeMarkerUtil;
+import cn.com.qmth.examcloud.web.filestorage.YunHttpRequest;
 
 /**
  * 类注释
@@ -72,7 +73,7 @@ public class UpyunServiceImpl implements UpyunService {
 	}
 
 	@Override
-	public UpYunHttpRequest buildUpYunHttpRequest(String siteId, UpyunPathEnvironmentInfo env,
+	public YunHttpRequest buildUpYunHttpRequest(String siteId, UpyunPathEnvironmentInfo env,
 			String md5) {
 
 		env.setTimeMillis(String.valueOf(System.currentTimeMillis()));
@@ -81,7 +82,7 @@ public class UpyunServiceImpl implements UpyunService {
 		UpYunClient upYunClient = UpyunSiteManager.getUpYunClientByUpyunId(upyunSite.getUpyunId());
 
 		String path = FreeMarkerUtil.process(upyunSite.getPath(), env);
-		UpYunHttpRequest request = upYunClient.buildUpYunHttpRequest(path, md5);
+		YunHttpRequest request = upYunClient.buildUpYunHttpRequest(path, md5);
 		return request;
 	}
 

src/main/java/cn/com/qmth/examcloud/web/upyun/UpyunTest.java

@@ -20,6 +20,7 @@ import org.apache.http.util.EntityUtils;
 
 import cn.com.qmth.examcloud.commons.util.JsonUtil;
 import cn.com.qmth.examcloud.commons.util.MD5;
+import cn.com.qmth.examcloud.web.filestorage.YunHttpRequest;
 import cn.com.qmth.examcloud.web.support.SpringContextHolder;
 
 public class UpyunTest {
@@ -32,7 +33,7 @@ public class UpyunTest {
 		UpyunPathEnvironmentInfo env = new UpyunPathEnvironmentInfo();
 		env.setFileSuffix(".jpg");
 		env.setRootOrgId(String.valueOf(RandomUtils.nextLong()));
-		UpYunHttpRequest upYunSign = upyunService.buildUpYunHttpRequest("test", env, md5);
+		YunHttpRequest upYunSign = upyunService.buildUpYunHttpRequest("test", env, md5);
 		System.out.println("upYunSign: " + JsonUtil.toPrettyJson(upYunSign));
 
 		HttpPost httpPost = new HttpPost(upYunSign.getFormUrl());