Commit Graph

1021 Commits

Author SHA1 Message Date
Binary Wang
d18921b36d release 2.4.4-beta 2016-12-19 10:24:01 +08:00
Binary Wang
a5b123f8c8 Merge branch 'master' into develop 2016-12-19 10:18:58 +08:00
Binary Wang
da5fe8bd9c ignore sonar files 2016-12-19 10:17:50 +08:00
Binary Wang
acfc4016c6 Update README.md 2016-12-19 10:16:07 +08:00
Binary Wang
b2d1a763d4 Merge pull request #100 from aimilin6688/develop
微信支付相关参数优化,不在默认强制使用配置中参数
2016-12-19 09:47:03 +08:00
aimilin6688
02679bb665 微信支付相关接口优化,支持自定义参数信息,不在默认使用配置信息 2016-12-16 19:40:32 +08:00
Jonk
dc821ff00e Merge pull request #10 from Wechat-Group/develop
同步
2016-12-16 18:37:30 +08:00
Binary Wang
4758440792 Update .travis.yml 2016-12-16 17:40:04 +08:00
Binary Wang
e4b37f9762 Update .travis.yml 2016-12-16 17:32:30 +08:00
Binary Wang
12329d0a8c Update .travis.yml 2016-12-16 17:27:19 +08:00
Binary Wang
5acee3dc24 Merge pull request #99 from johnnytung/develop
优化命名
2016-12-16 13:47:55 +08:00
dongfuqiang
a2106d30ec 优化属性命名。 2016-12-16 11:21:00 +08:00
dongfuqiang
52221e72fc 优化属性命名。 2016-12-16 11:15:24 +08:00
Binary Wang
4812697b36 消灭不规范代码(由sonatype检测出来的) 2016-12-15 16:41:26 +08:00
Binary Wang
1524de26e6 消灭不规范代码(由sonatype检测出来的) 2016-12-15 16:41:14 +08:00
Binary Wang
761c570cad 消灭不规范代码(由sonatype检测出来的) 2016-12-15 16:13:49 +08:00
Binary Wang
84a79a9760 ".equals()" should not be used to test the values of "Atomic" classes 2016-12-15 16:00:02 +08:00
Binary Wang
242ccc2a01 Merge branch 'master' into develop 2016-12-15 15:27:17 +08:00
Binary Wang
00421c4e6f 为接口请求增加日志输出 2016-12-15 15:26:12 +08:00
Binary Wang
b8a9795cf5 修复接口请求重试代码,避免无效等待 2016-12-15 15:23:29 +08:00
Keung
463b2e334c Merge pull request #3 from Wechat-Group/develop
Develop
2016-12-15 14:25:33 +08:00
Binary Wang
f6608075e9 Update README.md 2016-12-15 14:25:07 +08:00
Binary Wang
c0a325901a Merge pull request #97 from johnnytung/develop
实现部分硬件平台接口
2016-12-15 14:20:31 +08:00
dongfuqiang
575458d12b update 2016-12-15 14:11:39 +08:00
dongfuqiang
3e8b1a5dca update 2016-12-15 12:09:13 +08:00
dongfuqiang
a7c72f613a update 2016-12-14 16:29:50 +08:00
Binary Wang
5110eb5809 Merge pull request #96 from aimilin6688/develop
修复配置信息不能重复指定bug
2016-12-14 12:14:23 +08:00
aimilin6688
95d87231fa 修复config不能指定Bug 2016-12-14 12:10:47 +08:00
Jonk
7babecf5e0 Merge pull request #9 from Wechat-Group/develop
合并
2016-12-14 12:07:48 +08:00
aimilin6688
d18e11cc4e 回复版本 2016-12-14 12:07:01 +08:00
aimilin6688
28e7e454b9 修复支付配置信息不能重复设置BUG 2016-12-14 11:41:37 +08:00
Binary Wang
5224f342ed reformat code for PayService 2016-12-12 13:52:34 +08:00
Binary Wang
79bee7dbee Merge pull request #94 from aimilin6688/develop
元转分、分转元接口添加
2016-12-09 17:15:14 +08:00
aimilin6688
582ceb958c Merge branch 'develop' of https://github.com/aimilin6688/weixin-java-tools.git into develop 2016-12-09 17:05:11 +08:00
aimilin6688
fd9898eec9 接口中添加元转分,分转元方法,方便单位转换 2016-12-09 17:00:34 +08:00
aimilin6688
80034e5086 接口中添加元转分,分转元方法,方便单位转换 2016-12-09 17:00:16 +08:00
Binary Wang
f7db58a759 Merge pull request #93 from aimilin6688/develop
微信支付逻辑修改
2016-12-09 16:02:25 +08:00
aimilin
8bb70942c3 微信支付逻辑修改 2016-12-09 12:20:00 +08:00
Binary Wang
6b78c94ff3 Update README.md 2016-12-09 10:11:33 +08:00
Binary Wang
024878e9dd Merge pull request #92 from aimilin6688/develop
微信支付回掉功能优化
2016-12-09 10:00:33 +08:00
aimilin
41da9e15a6 微信订单支付回掉功能完善 2016-12-08 20:44:03 +08:00
Jonk
7a4ca6fc2d Merge pull request #8 from wechat-group/develop
更新
2016-12-07 17:30:47 +08:00
Binary Wang
64619c2192 更新注释,明确证书文件对象的含义 2016-12-05 17:47:25 +08:00
Keung
0d56d6c4ca Merge pull request #2 from wechat-group/develop
Develop
2016-12-05 12:35:42 +08:00
Binary Wang
fcf11c65e1 Update README.md 2016-12-02 14:10:49 +08:00
Binary Wang
4f0b905305 Update README.md 2016-12-02 13:47:17 +08:00
Binary Wang
0059226d70 Update README.md 2016-12-02 09:38:41 +08:00
Binary Wang
f69b15c595 Update README.md 2016-12-01 15:36:45 +08:00
Binary Wang
11020ea0f4 Update README.md 2016-12-01 15:35:25 +08:00
Binary Wang
f7d0a5d4c1 更改版本号为snapshot版本 2016-12-01 10:19:11 +08:00