fixed #53

weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java

@@ -166,12 +166,13 @@ public class MassApi extends MpApi {
 		if (tuple instanceof MpNews) {
 			MpNews _news = (MpNews) tuple;
 			List<MpArticle> _articles = _news.getArticles();
-			if (StringUtil.isBlank(_news.getMediaId())
-					&& (_articles == null || _articles.isEmpty())) {
-				throw new WeixinException(
-						"mass fail:mediaId or articles is required");
+			if (StringUtil.isBlank(_news.getMediaId())) {
+				if (_articles.isEmpty()) {
+					throw new WeixinException(
+							"mass fail:mediaId or articles is required");
+				}
+				tuple = new MpNews(uploadArticle(_articles));
 			}
-			tuple = new MpNews(uploadArticle(_articles));
 		}
 		String msgtype = tuple.getMessageType();
 		JSONObject obj = new JSONObject();

weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java

@@ -63,14 +63,14 @@ public class MediaApi extends MpApi {
 	}
 
 	/**
-	 * 上传图文消息内的图片获取URL
+	 * 上传图片获取URL
 	 * 请注意，本接口所上传的图片不占用公众号的素材库中图片数量的5000个的限制。图片仅支持jpg/png格式，大小必须在1MB以下。
 	 * 
 	 * @param is
 	 *            图片数据流
 	 * @param fileName
 	 *            文件名 为空时将自动生成
-	 * @return 图片URL 可用于后续群发中，放置到图文消息中
+	 * @return 图片URL 可用于群发消息中的图片链接和创建卡券logo链接
 	 * @throws WeixinException
 	 */
 	public String uploadImage(InputStream is, String fileName)

weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/api/PayOldApi.java

@@ -15,7 +15,6 @@ import java.security.cert.CertificateFactory;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.Map;
 
 import javax.net.ssl.KeyManagerFactory;
@@ -37,8 +36,8 @@ import com.foxinmy.weixin4j.mp.oldpayment.OrderV2;
 import com.foxinmy.weixin4j.mp.oldpayment.PayPackageV2;
 import com.foxinmy.weixin4j.mp.oldpayment.RefundRecordV2;
 import com.foxinmy.weixin4j.mp.oldpayment.RefundResultV2;
-import com.foxinmy.weixin4j.mp.oldpayment.WeixinOldPaymentSignature;
 import com.foxinmy.weixin4j.mp.oldpayment.WeixinOldPayAccount;
+import com.foxinmy.weixin4j.mp.oldpayment.WeixinOldPaymentSignature;
 import com.foxinmy.weixin4j.mp.token.WeixinTokenCreator;
 import com.foxinmy.weixin4j.payment.PayRequest;
 import com.foxinmy.weixin4j.sign.WeixinPaymentSignature;
@@ -476,7 +475,7 @@ public class PayOldApi extends MpApi {
 			billType = BillType.ALL;
 		}
 		String formatBillDate = DateUtil.fortmat2yyyyMMdd(billDate);
-		String fileName = String.format("%s_%s_%s.txt", formatBillDate,
+		String fileName = String.format("weixin4j_bill_%s_%s_%s.txt", formatBillDate,
 				billType.name().toLowerCase(), getPayAccount().getId());
 		File file = new File(String.format("%s/%s", billPath, fileName));
 		if (file.exists()) {
@@ -484,7 +483,7 @@ public class PayOldApi extends MpApi {
 		}
 		String downloadbill_uri = getRequestUri("downloadbill_old_uri");
 
-		Map<String, String> map = new LinkedHashMap<String, String>();
+		Map<String, String> map = new HashMap<String, String>();
 		map.put("spid", getPayAccount().getPartnerId());
 		map.put("trans_time", DateUtil.fortmat2yyyy_MM_dd(billDate));
 		map.put("stamp", DateUtil.timestamp2string());

weixin4j-mp/src/main/java/com/foxinmy/weixin4j/mp/message/TemplateMessage.java

@@ -52,9 +52,9 @@ public class TemplateMessage implements Serializable {
 	@JSONField(name = "data")
 	private Map<String, NameValue> content;
 
-	private final String HEAD_KEY = "first";
-	private final String TAIL_KEY = "remark";
-	private final String DEFAULT_COLOR = "#173177";
+	private final static String HEAD_KEY = "first";
+	private final static String TAIL_KEY = "remark";
+	private final static String DEFAULT_COLOR = "#173177";
 
 	@JSONCreator
 	public TemplateMessage(@JSONField(name = "toUser") String toUser,