8000 合并Develop,准备发布2.6.0版本 by binarywang · Pull Request #184 · binarywang/WxJava · GitHub
[go: up one dir, main page]

Skip to content

合并Develop,准备发布2.6.0版本 #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 74 commits into from
Apr 13, 2017
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
ddd4079
Merge pull request #11 from Wechat-Group/develop
aimilin6688 Dec 23, 2016
e296d23
minor updates
binarywang Feb 13, 2017
b938ef9
Merge branch 'master' into develop
binarywang Feb 13, 2017
b2b0460
update version to 2.6.0-SNAPSHOT
binarywang Feb 13, 2017
e2a1995
修复微信支付企业红包的问题:发送红包的返回结果中,没有签名,不需要进行签名检查。 #140
binarywang Feb 14, 2017
00c2aae
small update for a test method
binarywang Feb 19, 2017
9ac66af
Merge pull request #12 from Wechat-Group/develop
aimilin6688 Feb 21, 2017
29f054a
增加接收会员信息事件的事件类型常量
mgcnrx11 Feb 25, 2017
df59fa4
Merge pull request #145 from mgcnrx11/feat-newEventTypePR
binarywang Feb 25, 2017
70a4512
#123 支持微信支付的服务商功能
binarywang Mar 1, 2017
0f6b246
发布临时版本2.5.1.BETA
binarywang Mar 1, 2017
8a270c8
Merge branch 'master' into develop
binarywang Mar 4, 2017
eee954b
微信支付相关代码独立成一个子模块
binarywang Mar 5, 2017
710b0f6
微信支付相关代码独立成一个子模块
binarywang Mar 5, 2017
d50d58d
发布临时版本2.5.2.BETA
binarywang Mar 5, 2017
f3ac998
update pom
binarywang Mar 5, 2017
7340e03
将部分仅供测试代码使用的常量挪走
binarywang Mar 9, 2017
d9472e4
清理代码
binarywang Mar 10, 2017
4be0299
增加缺少的setter和getter方法
binarywang Mar 10, 2017
7ee9ac0
replace this.wxMpConfigStorage with this.getWxMpConfigStorage() #155
binarywang Mar 13, 2017
db85c19
replace this.wxMpConfigStorage with this.getWxMpConfigStorage() #155
binarywang Mar 13, 2017
edf558a
Merge pull request #14 from Wechat-Group/develop
aimilin6688 Mar 14, 2017
024d830
扫描支付 支持生成二维码URL字符串接口
aimilin6688 Mar 14, 2017
d40309e
Merge pull request #157 from aimilin6688/develop
binarywang Mar 14, 2017
b8c8d10
增加扫码支付回掉结果Bean
aimilin6688 Mar 14, 2017
5e72fb4
Merge pull request #158 from aimilin6688/develop
binarywang Mar 14, 2017
9d5f19c
修复菜单获取接口反序列化时subButtons为空的问题 #142
binarywang Mar 14, 2017
6ad58a8
发布临时测试版本 2.5.3.BETA
binarywang Mar 20, 2017
1649b30
remove junit
binarywang Mar 21, 2017
b4a454d
重构代码,去掉带来过多jar包依赖的xml-path,使用java自带的xpath来实现相应功能。
binarywang Mar 21, 2017
86cdb50
remove junit
binarywang Mar 21, 2017
6847a41
pull request (#163)
Mar 21, 2017
bf2b4ee
字符编码字符串用常量替换
binarywang Mar 21, 2017
9cdfaec
企业付款查询中mchId字段的特殊设置去掉
binarywang Mar 22, 2017
998445e
发布临时测试版本2.5.4.BETA
binarywang Mar 22, 2017
2df0f56
增加默认无参构造方法
binarywang Mar 22, 2017
db6e91a
remove something
binarywang Mar 22, 2017
8ec509a
修复企业付款查询的代码
binarywang Mar 22, 2017
13e4b14
fix some code
binarywang Mar 23, 2017
d35e094
add missing test
binarywang Mar 23, 2017
f63e934
add missing test
binarywang Mar 23, 2017
6945e7e
实现刷卡支付提交API #101
binarywang Mar 23, 2017
3f4cdb7
撤销订单API,并重构相关代码,简化开发 #101
binarywang Mar 24, 2017
9acb01c
add test for reverseOdrer method
binarywang Mar 24, 2017
9f2f2f8
update test
binarywang Mar 24, 2017
612beb2
发布临时测试版本2.5.5.BETA
binarywang Mar 24, 2017
3d3ab2b
修复模板消息的MsgID的问题 #165
binarywang Mar 24, 2017
d7d5b16
Merge branch 'master' into develop
binarywang Mar 24, 2017
96d72fe
增加微信支付转换短链接API #101
binarywang Mar 27, 2017
0418f17
增加微信支付 授权码查询OPENID接口API #101
binarywang Mar 27, 2017
29353ff
access_token缓存增加redis支持 (#169)
lly835 Mar 27, 2017
54ee287
群发预览消息格式中加入对towxname和touser的支持
binarywang Mar 27, 2017
4e05faf
fix
binarywang Mar 27, 2017
76892bd
完善修补javadoc
binarywang Mar 26, 2017
3ead031
支持企业号mpnews消息类型 #143
binarywang Mar 27, 2017
5d92da6
简化test
binarywang Mar 28, 2017
2d5fcb3
自定义菜单加入对小程序的支持 #170
binarywang Mar 28, 2017
60c82e9
去掉一些中文的常量命名
binarywang Mar 28, 2017
a4daf56
自定义菜单加入对小程序的支持 #170
binarywang Mar 28, 2017
aa49f96
adjust pom
binarywang Mar 29, 2017
490ba06
模板消息加入对小程序的支持 #172
binarywang Mar 30, 2017
e45a1ca
发布临时测试版本2.5.6.BETA
binarywang Mar 30, 2017
7ce46ed
fix a typo
binarywang Mar 30, 2017
89870bb
自定义菜单加入对小程序的支持 #170
binarywang Mar 30, 2017
66f04c4
发布临时测试版本2.5.7.BETA
binarywang Mar 31, 2017
bc0fbf7
规范统一openid的问题 #177
binarywang Apr 10, 2017
8947066
WxMpUserList里total类型改为long #176
binarywang Apr 10, 2017
0ff63ba
修复用户标签id类型不一致的问题 #175
binarywang Apr 10, 2017
bc28d0c
Merge branch 'master' into develop
binarywang Apr 12, 2017
68fbb2e
修复基于Redis的微信配置的bug
xusheng1987 Apr 12, 2017
da6cd44
修复支付结果通知缺失CDATA部分,导致微信重复发送通知
xusheng1987 Apr 12, 2017
e9c252a
Merge pull request #183 from xusheng1987/develop
binarywang Apr 12, 2017
c79f77c
更改版本号为2.6.0
binarywang Apr 13, 2017
7c32fcc
Rename CONTRIBUTION.md to contribution.md
binarywang Apr 13, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ allprojects {
apply plugin: 'maven'

group = 'com.github.binarywang'
version = '2.5.0'
version = '2.6.0-SNAPSHOT'
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-parent</artifactId>
<version>2.5.0</version>
<version>2.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WeiXin Java Tools - Parent</name>
<description>微信公众号、企业号上级POM</description>
Expand Down
2 changes: 1 addition & 1 deletion weixin-java-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-parent</artifactId>
<version>2.5.0</version>
<version>2.6.0-SNAPSHOT</version>
</parent>

<artifactId>weixin-java-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion weixin-java-cp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-parent</artifactId>
<version>2.5.0</version>
<version>2.6.0-SNAPSHOT</version>
</parent>

<artifactId>weixin-java-cp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion weixin-java-mp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-parent</artifactId>
<version>2.5.0</version>
<version>2.6.0-SNAPSHOT</version>
</parent>
<artifactId>weixin-java-mp</artifactId>
<name>WeiXin Java Tools - MP</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public interface WxMpPayService {
* </pre>
*
* @param transactionId 微信订单号
* @param outTradeNo 商户系统内部的订单号,当没提供transaction_id时需要传这个
* @param outTradeNo 商户系统内部的订单号,当没提供transactionId时需要传这个
*/
WxPayOrderQueryResult queryOrder(String transactionId, String outTradeNo) throws WxErrorException;

Expand All @@ -44,7 +44,7 @@ public interface WxMpPayService {
* 是否需要证书: 不需要。
* </pre>
*
* @param outTradeNo 商户系统内部的订单号,当没提供transaction_id时需要传这个。
* @param outTradeNo 商户系统内部的订单号
*/
WxPayOrderCloseResult closeOrder(String outTradeNo) throws WxErrorException;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ public WxPaySendRedpackResult sendRedpack(WxPaySendRedpackRequest request)
}
String responseContent = this.executeWithKey(url, request.toXML());
WxPaySendRedpackResult result = WxPaySendRedpackResult.fromXML(responseContent, WxPaySendRedpackResult.class);
this.checkResult(result);
//毋须校验,因为没有返回签名信息
// this.checkResult(result);
return result;
}

Expand Down Expand Up @@ -404,6 +405,7 @@ public File downloadBill(String billDate, String billType, String tarType, Strin

WxPayCommonResult result = WxPayBaseResult.fromXML(responseContent, WxPayCommonResult.class);
this.checkResult(result);
//TODO 待实现,暂时无测试帐号,无法调试
return null;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void testDeleteConditionalMenu() throws WxErrorException {
}

@Test
public void testCreateMenu2() throws WxErrorException {
public void testCreateMenu_by_json() throws WxErrorException {
String a = "{\n"
+ " \"menu\": {\n"
+ " \"button\": [\n"
Expand Down
2 changes: 1 addition & 1 deletion weixin-java-osgi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.github.binarywang</groupId>
<artifactId>weixin-java-parent</artifactId>
<version>2.5.0</version>
<version>2.6.0-SNAPSHOT</version>
</parent>

<artifactId>weixin-java-osgi</artifactId>
Expand Down
0