merged #38

weixin4j-base/src/main/java/com/foxinmy/weixin4j/model/MediaUploadResult.java

@@ -1,12 +1,12 @@
 package com.foxinmy.weixin4j.model;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.alibaba.fastjson.annotation.JSONCreator;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.foxinmy.weixin4j.type.MediaType;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 媒体文件上传结果
  * 
@@ -22,14 +22,20 @@ public class MediaUploadResult implements Serializable {
 	private String mediaId;
 	private MediaType mediaType;
 	private Date createdAt;
+	/**
+	 * 新增的图片素材的图片URL
+	 */
+	private String url;
 
 	@JSONCreator
 	public MediaUploadResult(@JSONField(name = "media_id") String mediaId,
 			@JSONField(name = "type") MediaType mediaType,
-			@JSONField(name = "created_at") Date createdAt) {
+			@JSONField(name = "created_at") Date createdAt,
+			@JSONField(name = "url") String url) {
 		this.mediaId = mediaId;
 		this.mediaType = mediaType;
 		this.createdAt = createdAt;
+		this.url = url;
 	}
 
 	public String getMediaId() {
@@ -44,9 +50,13 @@ public class MediaUploadResult implements Serializable {
 		return createdAt;
 	}
 
+	public String getUrl() {
+		return url;
+	}
+
 	@Override
 	public String toString() {
-		return "MediaUploadResult [mediaId=" + mediaId + ", mediaType=" + mediaType
-				+ ", createdAt=" + createdAt + "]";
+		return "MediaUploadResult [mediaId=" + mediaId + ", mediaType="
+				+ mediaType + ", createdAt=" + createdAt + ", url=" + url + "]";
 	}
 }

weixin4j-base/src/main/java/com/foxinmy/weixin4j/util/Weixin4jSettings.java

@@ -60,8 +60,18 @@ public class Weixin4jSettings {
 	 */
 	public Weixin4jSettings(WeixinPayAccount weixinPayAccount,
 			String certificateFile) {
-		this.weixinPayAccount = weixinPayAccount;
+		this(weixinPayAccount);
 		this.certificateFile = certificateFile;
+	}
+
+	/**
+	 * 支付代理接口
+	 * 
+	 * @param weixinPayAccount
+	 *            商户信息
+	 */
+	public Weixin4jSettings(WeixinPayAccount weixinPayAccount) {
+		this.weixinPayAccount = weixinPayAccount;
 		this.weixinAccount = new WeixinAccount(weixinPayAccount.getId(),
 				weixinPayAccount.getSecret());
 	}