Skip to content

Commit d886704

Browse files
comeonccomeonc
committed
Merge branch 'develop' of github.com:Wechat-Group/weixin-java-tools into wechat-develop
* 'develop' of github.com:Wechat-Group/weixin-java-tools: (31 commits) xml代码优化 发布3.2.4.B测试版本 微信支付增加对账单下载返回原始字符串数据的downloadRawBill方法 微信支付模块配置中增加ifSaveApiData参数，可以选择是否保存接口请求信息到ThreadLocal中方便读取 update xstream to 1.4.10 binarywang#841 增加会员卡更新接口 binarywang#651 WxMpXmlMessage增加allFieldsMap属性， 用于存放所有xml属性和值。 增加xml解析工具类 binarywang#835 小程序模块增加微信运动数据解密方法 发布3.2.3.B测试版本 优化代码 优化代码，替换掉ToStringBuilder.reflectionToString相关代码 binarywang#833 小程序模块增加错误码 优化对账方法 调整test binarywang#821 查询企业付款结果接口的结果类增加payment_time属性 binarywang#830 修复微信支付退款通知解析代码在某些环境下可能会出现的乱码问题 尽量使用常量 binarywang#828 优化支付结果通知类的checkResult方法 binarywang#829 优化退款结果通知类的fromXML方法 ...
2 parents 111d670 + 0d7ea29 commit d886704

192 files changed

Lines changed: 2385 additions & 1023 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77
<groupId>com.github.binarywang</groupId>
88
<artifactId>weixin-java-parent</artifactId>
9-
<version>3.2.0</version>
9+
<version>3.2.4.B</version>
1010
<packaging>pom</packaging>
1111
<name>Weixin Java Tools - Parent</name>
1212
<description>微信开发Java SDK</description>
@@ -166,7 +166,7 @@
166166
<dependency>
167167
<groupId>com.thoughtworks.xstream</groupId>
168168
<artifactId>xstream</artifactId>
169-
<version>1.4.9</version>
169+
<version>1.4.10</version>
170170
</dependency>
171171
<!-- 由于guava较新的21.0版本需要jdk8，故而此处采用较低版本 -->
172172
<dependency>

‎weixin-java-common/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.github.binarywang</groupId>
99
<artifactId>weixin-java-parent</artifactId>
10-
<version>3.2.0</version>
10+
<version>3.2.4.B</version>
1111
</parent>
1212

1313
<artifactId>weixin-java-common</artifactId>
@@ -114,6 +114,11 @@
114114
<artifactId>assertj-guava</artifactId>
115115
<scope>test</scope>
116116
</dependency>
117+
<dependency>
118+
<groupId>org.dom4j</groupId>
119+
<artifactId>dom4j</artifactId>
120+
<version>2.0.0</version>
121+
</dependency>
117122
</dependencies>
118123

119124
<build>

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/WxCardApiSignature.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@
22

33
import java.io.Serializable;
44

5-
import org.apache.commons.lang3.builder.ToStringBuilder;
6-
import org.apache.commons.lang3.builder.ToStringStyle;
7-
85
import lombok.Data;
6+
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
97

108
/**
119
* 卡券Api签名.
@@ -37,6 +35,6 @@ public class WxCardApiSignature implements Serializable {
3735

3836
@Override
3937
public String toString() {
40-
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
38+
return WxGsonBuilder.create().toJson(this);
4139
}
4240
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenu.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
import java.util.ArrayList;
88
import java.util.List;
99

10-
import org.apache.commons.lang3.builder.ToStringBuilder;
11-
import org.apache.commons.lang3.builder.ToStringStyle;
12-
1310
import lombok.Data;
1411
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
1512

@@ -49,7 +46,7 @@ public String toJson() {
4946

5047
@Override
5148
public String toString() {
52-
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
49+
return this.toJson();
5350
}
5451

5552
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuButton.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
import java.util.ArrayList;
55
import java.util.List;
66

7-
import org.apache.commons.lang3.builder.ToStringBuilder;
8-
import org.apache.commons.lang3.builder.ToStringStyle;
9-
107
import com.google.gson.annotations.SerializedName;
118
import lombok.Data;
9+
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
1210

1311
/**
1412
* menu button.
@@ -83,7 +81,7 @@ public class WxMenuButton implements Serializable {
8381

8482
@Override
8583
public String toString() {
86-
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
84+
return WxGsonBuilder.create().toJson(this);
8785
}
8886

8987
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/menu/WxMenuRule.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import java.io.Serializable;
44

5-
import org.apache.commons.lang3.builder.ToStringBuilder;
6-
import org.apache.commons.lang3.builder.ToStringStyle;
7-
85
import com.google.gson.annotations.SerializedName;
96
import lombok.Data;
7+
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
108

119
/**
1210
* menu rule.
@@ -31,6 +29,6 @@ public class WxMenuRule implements Serializable {
3129

3230
@Override
3331
public String toString() {
34-
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
32+
return WxGsonBuilder.create().toJson(this);
3533
}
3634
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/bean/result/WxMediaUploadResult.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
import java.io.Serializable;
44

5-
import org.apache.commons.lang3.builder.ToStringBuilder;
6-
import org.apache.commons.lang3.builder.ToStringStyle;
7-
85
import lombok.Data;
96
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
107

@@ -28,7 +25,7 @@ public static WxMediaUploadResult fromJson(String json) {
2825

2926
@Override
3027
public String toString() {
31-
return ToStringBuilder.reflectionToString(this, ToStringStyle.JSON_STYLE);
28+
return WxGsonBuilder.create().toJson(this);
3229
}
3330

3431
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxCpErrorMsgEnum.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -794,8 +794,7 @@ public enum WxCpErrorMsgEnum {
794794
* 通过错误代码查找其中文含义.
795795
*/
796796
public static String findMsgByCode(int code) {
797-
WxCpErrorMsgEnum[] values = WxCpErrorMsgEnum.values();
798-
for (WxCpErrorMsgEnum value : values) {
797+
for (WxCpErrorMsgEnum value : WxCpErrorMsgEnum.values()) {
799798
if (value.code == code) {
800799
return value.msg;
801800
}

‎weixin-java-common/src/main/java/me/chanjar/weixin/common/error/WxError.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ public static WxError fromJson(String json, WxType type) {
6464
if (msg != null) {
6565
wxError.setErrorMsg(msg);
6666
}
67+
} else if (type == WxType.MiniApp) {
68+
final String msg = WxMaErrorMsgEnum.findMsgByCode(wxError.getErrorCode());
69+
if (msg != null) {
70+
wxError.setErrorMsg(msg);
71+
}
6772
}
6873

6974
return wxError;

0 commit comments

Comments
 (0)