From 96b3080c2d476eb4b0743337d517faab9cca67b9 Mon Sep 17 00:00:00 2001 From: "jy.hu" Date: Wed, 24 Dec 2014 00:00:03 +0800 Subject: [PATCH] WeixinException("-1","xxx")->WeixinException("xxx") --- pom.xml | 5 ++--- .../com/foxinmy/weixin4j/http/HttpRequest.java | 2 +- .../java/com/foxinmy/weixin4j/mp/api/MassApi.java | 4 ++-- .../java/com/foxinmy/weixin4j/mp/api/MediaApi.java | 6 +++--- .../com/foxinmy/weixin4j/mp/api/NotifyApi.java | 2 +- .../java/com/foxinmy/weixin4j/mp/api/PayApi.java | 8 ++++---- .../java/com/foxinmy/weixin4j/mp/api/QrApi.java | 6 +++--- .../java/com/foxinmy/weixin4j/mp/api/UserApi.java | 4 ++-- .../weixin4j/mp/payment/MicroPayPackage.java | 10 ++-------- .../foxinmy/weixin4j/mp/payment/PayPackage.java | 14 +++++++++++--- .../weixin4j/mp/payment/v2/PayPackageV2.java | 8 +------- .../weixin4j/mp/payment/v3/PayPackageV3.java | 9 ++------- .../java/com/foxinmy/weixin4j/qy/api/MediaApi.java | 4 ++-- 13 files changed, 36 insertions(+), 46 deletions(-) diff --git a/pom.xml b/pom.xml index 93a9d3df..41366489 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,9 @@ - + 4.0.0 com.foxinmy weixin4j - 1.1-SNAPSHOT + 1.1 pom weixin4j https://github.com/foxinmy/weixin4j diff --git a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpRequest.java b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpRequest.java index 2efe3eea..744b5814 100644 --- a/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpRequest.java +++ b/weixin4j-base/src/main/java/com/foxinmy/weixin4j/http/HttpRequest.java @@ -232,7 +232,7 @@ public class HttpRequest { throw new WeixinException(response.getAsString()); } } catch (IOException e) { - throw new WeixinException("-1", e.getMessage()); + throw new WeixinException(e.getMessage()); } finally { request.releaseConnection(); } diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java index 60d27773..287937e1 100644 --- a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java +++ b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/MassApi.java @@ -118,7 +118,7 @@ public class MassApi extends MpApi { } } if (!(box instanceof Massable)) { - throw new WeixinException("-1", String.format( + throw new WeixinException(String.format( "%s not implement Massable", box.getClass())); } String msgtype = box.getMediaType().name(); @@ -187,7 +187,7 @@ public class MassApi extends MpApi { } } if (!(box instanceof Massable)) { - throw new WeixinException("-1", String.format( + throw new WeixinException(String.format( "%s not implement Massable", box.getClass())); } String msgtype = box.getMediaType().name(); diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java index a7be08a0..aa71f5fb 100644 --- a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java +++ b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/MediaApi.java @@ -20,7 +20,7 @@ import com.foxinmy.weixin4j.util.FileUtil; import com.foxinmy.weixin4j.util.IOUtil; /** - * 媒体相关API + * 多媒体相关API * * @className MediaApi * @author jy.hu @@ -137,11 +137,11 @@ public class MediaApi extends MpApi { os = new FileOutputStream(file); os.write(datas); } else { - throw new WeixinException("-1", String.format( + throw new WeixinException(String.format( "create file fail:%s", file.getAbsolutePath())); } } catch (IOException e) { - throw new WeixinException("-1", e.getMessage()); + throw new WeixinException(e.getMessage()); } finally { try { if (os != null) { diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/NotifyApi.java b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/NotifyApi.java index 42139ae2..a06b2bed 100644 --- a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/NotifyApi.java +++ b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/NotifyApi.java @@ -45,7 +45,7 @@ public class NotifyApi extends MpApi { */ public JsonResult sendNotify(NotifyMessage notify) throws WeixinException { if (!(notify.getBox() instanceof Notifyable)) { - throw new WeixinException("-1", String.format( + throw new WeixinException(String.format( "%s not implement Notifyable", notify.getBox().getClass())); } String custom_notify_uri = getRequestUri("custom_notify_uri"); diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/PayApi.java b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/PayApi.java index 10d29206..fb6b8d0d 100644 --- a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/PayApi.java +++ b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/PayApi.java @@ -356,7 +356,7 @@ public class PayApi extends MpApi { weixinAccount.getMchId(), ca); response = request.post(refund_uri, param); } else { - throw new WeixinException("-1", String.format("unknown version:%d", + throw new WeixinException(String.format("unknown version:%d", version)); } return response.getAsObject(new TypeReference() { @@ -530,7 +530,7 @@ public class PayApi extends MpApi { String param = map2xml(map); response = request.post(downloadbill_uri, param); } else { - throw new WeixinException("-1", String.format("unknown version:%d", + throw new WeixinException(String.format("unknown version:%d", version)); } BufferedReader reader = null; @@ -556,7 +556,7 @@ public class PayApi extends MpApi { os = new FileOutputStream(file); wb.write(os); } catch (IOException e) { - throw new WeixinException("-1", e.getMessage()); + throw new WeixinException(e.getMessage()); } finally { try { if (reader != null) { @@ -606,7 +606,7 @@ public class PayApi extends MpApi { String param = map2xml(map); response = request.post(refundquery_uri, param); } else { - throw new WeixinException("-1", String.format("unknown version:%d", + throw new WeixinException(String.format("unknown version:%d", version)); } return RefundConverter.fromXML(response.getAsString()); diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/QrApi.java b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/QrApi.java index f16d46e7..7cb0b805 100644 --- a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/QrApi.java +++ b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/QrApi.java @@ -98,16 +98,16 @@ public class QrApi extends MpApi { byte[] datas = getQRData(parameter); OutputStream os = null; try { - boolean flag = file.createNewFile(); + boolean flag = file.exists() || file.createNewFile(); if (flag) { os = new FileOutputStream(file); os.write(datas); } else { - throw new WeixinException("-1", String.format( + throw new WeixinException(String.format( "create file fail:%s", file.getAbsolutePath())); } } catch (IOException e) { - throw new WeixinException("-1", e.getMessage()); + throw new WeixinException(e.getMessage()); } finally { try { if (os != null) { diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/UserApi.java b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/UserApi.java index c0b324b4..57ae327b 100644 --- a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/UserApi.java +++ b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/api/UserApi.java @@ -133,9 +133,9 @@ public class UserApi extends MpApi { * @see com.foxinmy.weixin4j.mp.model.Following */ public Following getFollowing(String nextOpenId) throws WeixinException { - String fllowing_uri = getRequestUri("following_uri"); + String following_uri = getRequestUri("following_uri"); Token token = tokenHolder.getToken(); - Response response = request.get(String.format(fllowing_uri, + Response response = request.get(String.format(following_uri, token.getAccessToken(), nextOpenId == null ? "" : nextOpenId)); Following following = response diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/MicroPayPackage.java b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/MicroPayPackage.java index c11e212b..01a7a5df 100644 --- a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/MicroPayPackage.java +++ b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/MicroPayPackage.java @@ -115,13 +115,7 @@ public class MicroPayPackage extends PayPackage { public String toString() { return "MicroPayPackage [appid=" + appid + ", mch_id=" + mch_id + ", device_info=" + device_info + ", nonce_str=" + nonce_str - + ", sign=" + sign + ", auth_code=" + auth_code - + ", getBody()=" + getBody() + ", getAttach()=" + getAttach() - + ", getOut_trade_no()=" + getOut_trade_no() - + ", getTotal_fee()=" + getTotal_fee() - + ", getSpbill_create_ip()=" + getSpbill_create_ip() - + ", getTime_start()=" + getTime_start() - + ", getTime_expire()=" + getTime_expire() - + ", getGoods_tag()=" + getGoods_tag() + "]"; + + ", sign=" + sign + ", auth_code=" + auth_code + ", " + + super.toString() + "]"; } } diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/PayPackage.java b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/PayPackage.java index fb1ace61..ef48e3d4 100644 --- a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/PayPackage.java +++ b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/PayPackage.java @@ -5,6 +5,14 @@ import java.util.Date; import com.foxinmy.weixin4j.util.DateUtil; +/** + * 订单信息 + * @className PayPackage + * @author jy + * @date 2014年12月18日 + * @since JDK 1.7 + * @see + */ public class PayPackage implements Serializable { private static final long serialVersionUID = 3450161267802545790L; @@ -126,10 +134,10 @@ public class PayPackage implements Serializable { @Override public String toString() { - return "PayPackage [body=" + body + ", attach=" + attach - + ", out_trade_no=" + out_trade_no + ", total_fee=" + total_fee + return "body=" + body + ", attach=" + attach + ", out_trade_no=" + + out_trade_no + ", total_fee=" + total_fee + ", spbill_create_ip=" + spbill_create_ip + ", time_start=" + time_start + ", time_expire=" + time_expire + ", goods_tag=" - + goods_tag + ", notify_url=" + notify_url + "]"; + + goods_tag + ", notify_url=" + notify_url; } } diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayPackageV2.java b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayPackageV2.java index 62d65313..18f2d08d 100644 --- a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayPackageV2.java +++ b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/v2/PayPackageV2.java @@ -135,12 +135,6 @@ public class PayPackageV2 extends PayPackage { return "PayPackageV2 [bank_type=" + bank_type + ", partner=" + partner + ", fee_type=" + fee_type + ", transport_fee=" + transport_fee + ", product_fee=" + product_fee + ", input_charset=" - + input_charset + ", goods_tag=" + getGoods_tag() - + ", getBank_type()=" + getBank_type() + ", getPartner()=" - + getPartner() + ", getFee_type()=" + getFee_type() - + ", getTransport_fee()=" + getTransport_fee() - + ", getProduct_fee()=" + getProduct_fee() - + ", getGoods_tag()=" + getGoods_tag() - + ", getInput_charset()=" + getInput_charset() + "]"; + + input_charset + ", " + super.toString() + "]"; } } diff --git a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PayPackageV3.java b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PayPackageV3.java index d6ba9a3f..295b1c39 100644 --- a/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PayPackageV3.java +++ b/weixin4j-mp/weixin4j-mp-api/src/main/java/com/foxinmy/weixin4j/mp/payment/v3/PayPackageV3.java @@ -146,12 +146,7 @@ public class PayPackageV3 extends PayPackage { return "PayPackageV3 [appid=" + appid + ", mch_id=" + mch_id + ", device_info=" + device_info + ", nonce_str=" + nonce_str + ", sign=" + sign + ", trade_type=" + trade_type + ", openid=" - + openid + ", product_id=" + product_id + ", getAppid()=" - + getAppid() + ", getMch_id()=" + getMch_id() - + ", getDevice_info()=" + getDevice_info() - + ", getNonce_str()=" + getNonce_str() + ", getSign()=" - + getSign() + ", getTrade_type()=" + getTrade_type() - + ", getOpenid()=" + getOpenid() + ", getProduct_id()=" - + getProduct_id() + "]"; + + openid + ", product_id=" + product_id + ", " + + super.toString() + "]"; } } diff --git a/weixin4j-qy/weixin4j-qy-api/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java b/weixin4j-qy/weixin4j-qy-api/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java index 91c6e6f8..859daff3 100644 --- a/weixin4j-qy/weixin4j-qy-api/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java +++ b/weixin4j-qy/weixin4j-qy-api/src/main/java/com/foxinmy/weixin4j/qy/api/MediaApi.java @@ -137,11 +137,11 @@ public class MediaApi extends QyApi { os = new FileOutputStream(file); os.write(datas); } else { - throw new WeixinException("-1", String.format( + throw new WeixinException(String.format( "create file fail:%s", file.getAbsolutePath())); } } catch (IOException e) { - throw new WeixinException("-1", e.getMessage()); + throw new WeixinException(e.getMessage()); } finally { try { if (os != null) {