lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-05-06 05:37:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
635 Commits 3 Branches 51 Tags 19 MiB
52b2a378aa
Commit Graph

283 Commits

Author SHA1 Message Date
Daniel Qian
defd54b2b1 Merge branch 'develop' of https://github.com/binarywang/weixin-java-tools into binarywang-develop 
Conflicts:
	weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/http/MaterialUploadRequestExecutor.java
 2016-03-24 09:08:52 +08:00
fxdfxq
4979a16ae7 Update WxMpServiceImpl.java 
增加getJSSDKPayInfo返回字段code_url，用于微信扫码支付生成二维码图片使用
 2016-03-21 12:53:37 +08:00
Binary Wang
39c2f09008 修复上传永久素材报“Connection reset”错误的问题 2016-02-29 12:44:25 +08:00
ben
c61fcb26c6 替换回httpclient,将httpclient配置独立出来提供更多可配置项目 2016-02-23 18:12:49 +08:00
Liu Kai
5f75a03ede 修复微信退款接口的错误 
1. 修复微信退款接口的错误。
2. 格式化微信退款接口及微信支付JSSDK调用接口失败时抛出异常的msg。

Change-Id: Ib3b14965ea29ee518047535a75b81a4972b91271
Signed-off-by: Liu Kai <liukai@tinkers.com.cn>
 2016-01-30 15:25:02 +08:00
Liu Kai
2a6993713a 微信支付JSSDK及退款接口增加异常处理 
为解决接口调用端无法取到调用微信服务器的返回结果的问题，微信支付JSSDK及退款接口增加了异常处理。

Change-Id: I2fe5255edb416336b64bef84a4bac5ba51231d67
Signed-off-by: Liu Kai <liukai@tinkers.com.cn>
 2016-01-30 12:21:16 +08:00
Liu Kai
852017f7b4 增加微信退款接口以及修改几个卡券相关的接口 
1. 增加微信退款接口
2. 增加取得卡券详情接口
3. 修改取卡券签名接口的说明
4. 将卡券核销接口的返回值由Void改为String

Change-Id: I2bac2d090871a4988f7279a9794eca5722451cdd
Signed-off-by: Liu Kai <liukai@tinkers.com.cn>
 2016-01-29 17:30:14 +08:00
YuJian
54ced62f30 换用JoddGetRequestExecutor 
解决NoHttpResoponseException问题
 2016-01-11 21:17:46 +08:00
YuJian
779e36b1fa 新增卡券相关接口6个 
1. getCardApiTicket获得卡券的api_ticket
2. createCardApiSignature创建调用卡券api时的签名
3. decryptCardCode卡券code解码
4. queryCardCode卡券code查询
5. consumeCardCode卡券核销
6. markCardCode卡券mark接口
 2016-01-11 21:03:21 +08:00
YuJian
980ad0b7bf WxMpInMemoryConfigStorage新增cardApiTicket的存储 2016-01-11 20:46:35 +08:00
YuJian
65c532e45b 增加卡券的FriendUserName字段 2016-01-11 20:46:35 +08:00
YuJian
89e092b04d 添加关于卡券事件推送的常量、XML消息字段 2016-01-11 20:46:35 +08:00
Daniel Qian
25eb592f26 fix: #172 based on PR #259 2016-01-10 10:34:25 +08:00
Daniel Qian
d759e6935e fix: #256, #172 CloseableHttpResponse 使用外没有关闭的问题 2016-01-07 18:07:31 +08:00
Daniel Qian
06e4dda310 微信支付计算精度问题 #248 2016-01-07 18:02:20 +08:00
ben
0619c3f01e 修改me.chanjar.weixin.mp.bean.WxMpXmlOutTransferCustomerServiceMessage 支持将消息转发到多客服(https://mp.weixin.qq.com/wiki/5/ae230189c9bd07a6b221f48619aeef35.html)中的两种方式 2015-12-29 10:10:45 +08:00
ben
c901067509 Merge branch 'develop' of https://github.com/chanjarster/weixin-java-tools into develop 2015-12-28 12:36:22 +08:00
ben
5778b42e1e XStreamTransformer 增加注册方法,来注册自定义的消息类型 2015-12-25 14:40:18 +08:00
Daniel Qian
72aab0d7b8 upgrade to 1.3.4-SNAPSHOT 2015-12-25 09:35:17 +08:00
Daniel Qian
03406f128f upgrade to 1.3.3 2015-12-25 09:27:35 +08:00
Daniel Qian
097fc091b1 Merge pull request #242 from videome/pay-result-bug 
Fix the bug that fails to query order due to sign error.
 2015-12-25 09:15:24 +08:00
Daniel Qian
1e67c3f47b Merge pull request #252 from SimonDolph/unionid 
add unionid
 2015-12-25 09:14:12 +08:00
SimonDolph
ed84f511c7 add unionid 2015-12-24 17:44:48 +08:00
Daniel Qian
05777c664a Merge pull request #249 from tianmu/master 
add conditional menu method
 2015-12-23 08:46:56 +08:00
Tianmu
6b522da559 change name: matchrule to matchRule 2015-12-22 10:45:15 +08:00
tianmu
b2e1cca6c2 change tab space 
change tab space 1 time
 2015-12-21 19:41:42 +08:00
Tianmu
34fda26e02 add conditional menu method 2015-12-21 16:00:18 +08:00
Daniel Qian
0388c8d9dc upgrade to 1.3.3-SNAPSHOT 2015-12-05 15:37:25 +08:00
Daniel Qian
780074f219 upgrade version 2015-12-03 12:47:38 +08:00
Daniel Qian
59bdad92f6 fix: java doc incorrectness 2015-12-03 12:45:52 +08:00
Kane Zhu
5594c8852d Fix the bug that fails to query order due to sign error. 2015-12-01 11:18:39 +08:00
Kane Zhu
b19dc7b0fb Improve error message of the failure of getting prepayid. 2015-11-28 21:49:32 +08:00
Daniel Qian
379aae95f1 issue #209 2015-11-25 08:46:59 +08:00
Daniel Qian
5f456eb521 issue #236 2015-11-24 13:10:47 +08:00
Kane Zhu
30f22896b1 Support sending redpack. 2015-11-17 19:39:59 +08:00
Daniel Qian
d0a452904a Merge pull request #216 from videome/develop 
Improve 'templateSend' method to check the response code to see if it…
 2015-10-23 15:16:37 +08:00
ukid
123e5ef973 票据验证方法 2015-10-23 14:33:32 +08:00
Kane Zhu
23c96d9076 Improve 'templateSend' method to check the response code to see if it's successful or not. 2015-10-22 18:51:31 +08:00
Daniel Qian
9363a67538 upgrade to 1.3.2-SNAPSHOT 2015-10-16 10:13:37 +08:00
Daniel Qian
5e7d1ebbbd upgrade to 1.3.1 2015-10-16 10:07:40 +08:00
Kane Zhu
cc3714c599 Improve prepay API to support all parameters. 2015-10-14 16:36:55 +08:00
Daniel Qian
fe8c70849a fix #211 上传素材时如果文件名是中文会乱码 2015-10-03 10:46:27 +08:00
Daniel Qian
c722496167 #204 2015-09-14 12:35:39 +08:00
Daniel Qian
a6db21fbc8 fix #207 2015-09-11 14:04:34 +08:00
Daniel Qian
9bbdc3b2a0 promote to 1.3.1-SNAPSHOT 2015-09-11 09:10:43 +08:00
Daniel Qian
8485af028a upgrade to 1.3.0 2015-09-11 09:05:15 +08:00
Daniel Qian
8935048040 Merge pull request #202 from alanchenup/f-url 
增加点击图文消息跳转链接
 2015-09-04 13:10:47 +08:00
alanchen
a645a28267 增加点击图文消息跳转链接 2015-09-03 17:54:51 +08:00
Daniel Qian
5630b865c2 issue #200 2015-08-26 08:42:00 +08:00
ukid
6ede883f71 format with spaces 2015-08-19 18:36:06 +08:00
ukid
ff67476c28 1.修改方法getJSSDKCallbackData中的类型错误 
2.修改支付签名字段名称，方便客户端直接调用支付
 2015-08-14 10:24:23 +08:00
Daniel Qian
4fd58a8f8e Merge pull request #186 from ssls/master 
公众号支持消息转发到多客服
 2015-08-04 16:41:11 +08:00
ssls
2942e1e85c 2015-08-04 16:33:39 +08:00
ssls
f252792e43 修改注释里的TEXT为TRANSFER_CUSTOMER_SERVICE 2015-08-04 16:17:07 +08:00
Daniel Qian
cf9ccbc54d fix: issue #128 2015-08-03 17:30:28 +08:00
ssls
ce109695e7 2015-08-03 17:09:44 +08:00
codepiano
4da11fcd74 使用java1.7新语法，改进序列化代码 2015-07-29 20:47:41 +08:00
codepiano
49a4ab6a6e 补充永久素材相关方法到接口中，优化接口参数 2015-07-27 22:28:05 +08:00
Daniel Qian
08338b0835 Merge pull request #142 from ukid/develop 
修改js分享所需参数，去掉jsapiTicket,增加appid
 2015-07-27 13:30:44 +08:00
Daniel Qian
c6d0f18a4c upgrade to 1.2.1-SNAPSHOT 2015-07-27 13:17:21 +08:00
Daniel Qian
871a34677d upgrade to 1.2.0 2015-07-27 13:12:27 +08:00
codepiano
d7d9734bf1 实现永久素材相关接口 2015-07-23 18:08:38 +08:00
liuwj
bc054d6259 将微信自带的一些常量修正为不区分大小写匹配 
比如框架定义的事件常量为click，但微信传递过来的却是CLICK
 2015-07-23 11:16:36 +08:00
liuwj
b9923b3ecf 将微信自带的一些常量修正为不区分大小写匹配 
比如框架定义的事件常量为click，但微信传递过来的却是CLICK
 2015-07-23 11:15:07 +08:00
ukid
f48a6f9c0e Merge commit '3853c7ee4050e67b9211c385147444100aa69ee5' into develop 
* commit '3853c7ee4050e67b9211c385147444100aa69ee5':
  upgrade to 1.1.9-SNAPSHOT
  upgrade to version 1.1.8
  个人信息缺少remark和groupId
 2015-07-21 17:10:23 +08:00
Daniel Qian
3853c7ee40 Merge pull request #170 from dwandw/develop 
个人信息缺少remark和groupId
 2015-07-20 08:57:55 +08:00
li.dai
d04d955cb6 Merge branch 'master' into develop 2015-07-18 10:31:27 +08:00
Daniel Qian
d162e31454 upgrade to 1.1.9-SNAPSHOT 2015-07-17 15:39:33 +08:00
Daniel Qian
42418a2d0d upgrade to version 1.1.8 2015-07-17 15:30:20 +08:00
ukid
7bb414fbe4 Merge commit '8d950286588c2784b75f88a72132ace4ef987c4d' into develop 
* commit '8d950286588c2784b75f88a72132ace4ef987c4d':
  fix: IDEA 导入的时候总是会将编译level变成5.0的问题
  #165 #167
  #165 MediaDownloadRequestExecutor出错后就没有办法下载了
  upgrade version 1.1.8-SNAPSHOT
  update
  upgrade to 1.1.7
 2015-07-14 18:02:39 +08:00
Daniel Qian
d3d61d753e #165 #167 2015-07-13 17:25:46 +08:00
li.dai
d42e84be68 个人信息缺少remark和groupId 2015-07-11 14:01:57 +08:00
Daniel Qian
f30211ce98 upgrade version 1.1.8-SNAPSHOT 2015-07-10 14:03:37 +08:00
Daniel Qian
1ade007250 upgrade to 1.1.7 2015-07-10 13:57:40 +08:00
ukid
a312760d32 Merge commit 'ee2cf21efc8cf43fa2334a23e7437f1ccd646fbe' into develop 
* commit 'ee2cf21efc8cf43fa2334a23e7437f1ccd646fbe':
  fix: issue #163
 2015-07-09 11:12:49 +08:00
Daniel Qian
ee2cf21efc fix: issue #163 2015-07-02 09:40:12 +08:00
ukid
49990279b7 Merge commit 'd707140d066f6648e7a2872ca3c0c8f866d4fac6' into develop 
* commit 'd707140d066f6648e7a2872ca3c0c8f866d4fac6':
  upgrade to 1.1.7-SNAPSHOT
  upgrade to 1.1.6
 2015-07-01 16:48:25 +08:00
Daniel Qian
d707140d06 upgrade to 1.1.7-SNAPSHOT 2015-06-26 16:40:07 +08:00
Daniel Qian
0491e23456 upgrade to 1.1.6 2015-06-26 16:38:08 +08:00
ukid
55f1d964bb Merge commit '4da9ea5dd5210674ccc3d20d470d337857182474' into develop 
* commit '4da9ea5dd5210674ccc3d20d470d337857182474':
  增加临时文件目录配置
  增加忽略eclipse本地配置文件目录
  fix README
 2015-06-17 13:10:10 +08:00
Daniel Qian
4da9ea5dd5 Merge pull request #155 from huansinho/master 
临时文件目录配置
 2015-06-15 13:04:50 +08:00
huansinho
f107bd2f44 增加临时文件目录配置 
在下载多媒体文件下载时可以指定临时文件目录。
 2015-06-14 02:37:31 +08:00
ukid
60731d229c Merge commit 'bb22974d6553dc85202bee5b027ccddde3a2e7b2' into develop 
* commit 'bb22974d6553dc85202bee5b027ccddde3a2e7b2':
  统一使用getHttpClient，使得可以复用httpClient
 2015-06-10 14:22:11 +08:00
darknesstm
622094bcdf 统一使用getHttpClient，使得可以复用httpClient 2015-06-03 15:39:06 +08:00
ukid
5bd2c489b7 Merge commit 'bd3fb69befd63826975b281bbe23d05622496219' into develop 
* commit 'bd3fb69befd63826975b281bbe23d05622496219':
  update to 1.1.6-SNAPSHOT
  update to 1.1.5
 2015-05-27 11:49:59 +08:00
Daniel Qian
bd3fb69bef update to 1.1.6-SNAPSHOT 2015-05-27 09:18:06 +08:00
Daniel Qian
72db0a2a76 update to 1.1.5 2015-05-27 09:15:57 +08:00
ukid
8eb028ffb4 添加读取支付回调内容接口 2015-05-22 11:20:43 +08:00
ukid
b27798209b 增加公众号支付信息查询接口 
修改部分注释
 2015-05-22 10:50:25 +08:00
ukid
b205b7bff2 修改js分享所需参数，去掉jsapiTicket,增加appid 2015-05-21 13:21:00 +08:00
Daniel Qian
29cc3f6558 format 2015-04-30 15:39:35 +08:00
oohusl
5aba724633 公众号支付 2015-04-29 20:34:26 +08:00
Daniel Qian
ffc0fc442d upgrade to 1.1.5-SNAPSHOT 2015-04-16 14:19:47 +08:00
Daniel Qian
669552e503 upgrade to 1.1.4 2015-04-16 14:15:43 +08:00
SimonDolph
37c8ebac2c 添加可自定义oauth2 redirectURI的方法 2015-04-01 17:14:37 +08:00
Daniel Qian
82016c02bf version prompt 2015-03-23 11:20:40 +08:00
Daniel Qian
dfd2ade23f prompt to stable version 2015-03-23 11:09:23 +08:00
Daniel Qian
b885d2a1a9 #111 的unit test code 2015-03-20 14:59:59 +08:00
Daniel Qian
913f49e470 删除没有用的测试用例 2015-03-20 14:24:50 +08:00
Daniel Qian
b648c55444 upgrade to 1.1.3-SNAPSHOT 2015-02-25 15:36:19 +08:00
Daniel Qian
316e54baaa upgrade to 1.1.2 2015-02-25 15:32:33 +08:00
Daniel Qian
978c51b90d issue #100 用户分析数据接口 2015-02-25 15:17:52 +08:00
Daniel Qian
fb10acf6fd issue #101 获取微信服务器IP地址 2015-02-25 14:37:15 +08:00
Daniel Qian
2a439a6690 issue #107 请给实体类加上Serializable 2015-02-10 14:11:23 +08:00
Daniel Qian
d2eb529ab2 issue #99 Wx*MessageRouter.isDuplicateMessage方法逻辑错误 2015-02-04 17:12:02 +08:00
Daniel Qian
95d8bd3c47 issue #99 Wx*MessageRouter.isDuplicateMessage方法逻辑错误 2015-02-04 11:49:01 +08:00
Daniel Qian
1e5e098775 issue #92 A bug in me.chanjar.weixin.mp.api.WxMpServiceImpl.java at line 449 2015-02-04 11:45:12 +08:00
Daniel Qian
3ae057af8f issue #95 获取关注者列表userList方法，当没有关注者时，报异常 2015-02-04 11:43:07 +08:00
Daniel Qian
5b49c63d14 issue #91 添加企业号JS_API的支持 2015-01-27 14:45:11 +08:00
Daniel Qian
6d383fa90e issue #90 WxMpUser添加sexId字段，和微信返回的性别字段保持一致 2015-01-27 13:34:14 +08:00
Daniel Qian
4dc297c5ed upgrade to 1.1.2-SNAPSHOT 2015-01-25 11:17:48 +08:00
Daniel Qian
239ef054ec prompt version to 1.1.1 2015-01-25 10:59:45 +08:00
Daniel Qian
15aff7f93c issue #88 修改createJsapiSignature方法签名，便于开发人员使用 2015-01-25 10:35:40 +08:00
Daniel Qian
1819b0e492 issue #87 WxMessageRouter、Rule提供setter方法，便于使用spring等依赖注入框架 2015-01-24 19:35:32 +08:00
Daniel Qian
b921490253 issue #86 handler, intercept方法签名添加throw WxException 2015-01-23 17:20:05 +08:00
Daniel Qian
8ec76bda59 issue #84 Wx*ConfigStorage在多线程环境下有visibility问题 2015-01-23 10:13:02 +08:00
Daniel Qian
4b8aa69cca issue #77 用matcher做新的猜数字游戏，代码更简单 2015-01-22 21:27:38 +08:00
Daniel Qian
36dad7b8d0 issue #77 添加自定义消息匹配器的支持 2015-01-22 20:37:26 +08:00
Daniel Qian
b00bf13bd7 refactor: 修改rule.service方法签名 2015-01-22 20:11:22 +08:00
Daniel Qian
ffe63e71eb 添加猜数字游戏的demo 2015-01-22 17:11:56 +08:00
Daniel Qian
3fbb260bf7 add tostring 2015-01-22 17:11:35 +08:00
Daniel Qian
bf4c825279 issue #76 2015-01-22 16:11:34 +08:00
Daniel Qian
7c3113eec8 upgrade to 1.1.1-SNAPSHOT 2015-01-22 14:44:12 +08:00
Daniel Qian
3003f68cf4 upgrade to 1.1.0 2015-01-22 14:42:41 +08:00
Daniel Qian
2427a1c395 upgrade to 1.1.0-SNAPSHOT 2015-01-22 14:15:27 +08:00
Daniel Qian
3216cb54dd issue #66 对去重逻辑做了一些调整 2015-01-22 14:06:15 +08:00
Daniel Qian
3ff9d260f2 issue #23 使用logback作为单元测试的log工具，并配置默认的log 2015-01-22 13:35:37 +08:00
Daniel Qian
6368ca6816 issue #69 添加Session的支持，添加测试用例 2015-01-22 12:36:51 +08:00
Daniel Qian
d18b66c38d issue #69 添加Session的支持 2015-01-21 22:25:56 +08:00
Daniel Qian
7184711301 refactor 2015-01-21 19:02:47 +08:00
Daniel Qian
4accbe6ec2 issue #69 添加Session的支持 2015-01-21 17:51:52 +08:00
Daniel Qian
8e1d58d565 remove author name 2015-01-21 15:15:57 +08:00
Daniel Qian
5ff2ab6436 issue #23 添加日志输出功能，使用了slf4j 2015-01-21 15:07:34 +08:00
Daniel Qian
e53c921d17 fix: WxMpServiceImpl中用ThreadLocal记录重试次数，这个是有问题的，因为在多线程（线程池）环境下ThreadLocal是不会被清0的 2015-01-21 14:37:18 +08:00
Daniel Qian
8c80ca25b6 modify 2015-01-21 09:28:25 +08:00
Daniel Qian
01cee5a3d9 refactor: modify method 2015-01-20 15:14:14 +08:00
Daniel Qian
4f292da60c issue #74 添加测试用例 2015-01-20 14:54:35 +08:00
Daniel Qian
d0825ca396 update 2015-01-20 14:31:52 +08:00
Daniel Qian
5c7448f212 针对AccessToken，jsapi ticket添加强制刷新的功能 2015-01-20 14:30:44 +08:00
Daniel Qian
ae99bcdb63 issue #74 2015-01-20 14:15:24 +08:00
Daniel Qian
1bca854b52 refactor: mp 调整access token刷新策略 2015-01-20 13:53:42 +08:00
Daniel Qian
cef8ac01e8 issue #74; 
git commit -m issue
 2015-01-20 12:01:33 +08:00
Daniel Qian
9fe73319d1 issue #66 2015-01-20 09:49:39 +08:00
Daniel Qian
85168a14aa issue #66 消息去重 2015-01-19 17:25:41 +08:00
Daniel Qian
3ba128f656 issue #71 2015-01-19 16:46:52 +08:00
Daniel Qian
f3ec0b1965 issue #71 替换掉JAXB，避免因OpenJDK造成无法deserialize xml的错误 2015-01-19 16:27:58 +08:00
Daniel Qian
eaa77bc7b3 remove backup file 2015-01-19 11:22:18 +08:00
Daniel Qian
72611b2654 upgrade to 1.0.7-SNAPSHOT 2014-12-30 09:45:20 +08:00
Daniel Qian
976655386d upgrade to 1.0.6 2014-12-30 09:38:40 +08:00
Daniel Qian
295a456190 原来的类名写错了 2014-12-30 09:37:38 +08:00