d64f5020c4 
					 
					
						
						
							
							Merge branch 'tianmu' into develop  
						
						 
						
						
						
						
					 
					
						2016-06-18 21:56:09 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						7057b8a960 
					 
					
						
						
							
							为WxError加入builder模式支持  
						
						 
						
						
						
						
					 
					
						2016-06-16 23:03:32 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5349da96f6 
					 
					
						
						
							
							修改了部分接口字符串拼接的模式,从 + 改为StringBuffer  
						
						 
						
						
						
						
					 
					
						2016-06-07 14:32:22 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ba54ff5004 
					 
					
						
						
							
							上传图文消息内的图片获取URL  
						
						 
						
						
						
						
					 
					
						2016-06-01 11:17:53 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						83e443b02f 
					 
					
						
						
							
							消息群发的预览接口  
						
						 
						
						
						
						
					 
					
						2016-06-01 10:39:10 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						902b6897a1 
					 
					
						
						
							
							群发接口响应 增加msgDataId字段 用于图文分析  
						
						 
						
						
						
						
					 
					
						2016-06-01 10:07:20 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						52e9b67c0f 
					 
					
						
						
							
							修复命名错误。data是datum的复数,datas是错误写法  
						
						 
						
						
						
						
					 
					
						2016-04-24 13:16:10 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2ec3c527c2 
					 
					
						
						
							
							替换hard code  
						
						 
						
						
						
						
					 
					
						2016-04-15 14:17:44 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cb78119cdd 
					 
					
						
						
							
							Merge branch 'develop-chan' into develop  
						
						 
						
						
						
						
					 
					
						2016-04-15 14:02:24 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b47c967ee2 
					 
					
						
						
							
							增加 换取二维码图片url地址的方法  
						
						 
						
						
						
						
					 
					
						2016-04-15 13:59:14 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						e57eb3f244 
					 
					
						
						
							
							Merge pull request  #296  from zexpp5/develop  
						
						 
						
						... 
						
						
						
						发送红包接口增加了详细的注释 
						
						
					 
					
						2016-04-15 08:31:24 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cfc15480de 
					 
					
						
						
							
							发送红包接口的入参是Map,注释中添加了所需必填参数的列表及描述.  
						
						 
						
						... 
						
						
						
						发送红包接口需要在配置文件test-config.xml中额外设置两个key,已在注释中说明 
						
						
					 
					
						2016-04-13 17:37:22 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						8e02ea23af 
					 
					
						
						
							
							卡券核销的API增加参数重载的方法,增强兼容性  
						
						 
						
						
						
						
					 
					
						2016-04-10 16:26:28 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						3e2ebb06f4 
					 
					
						
						
							
							Merge pull request  #292  from kareanyi/develop  
						
						 
						
						... 
						
						
						
						增加了获取图文素材中文章的封面图url 
						
						
					 
					
						2016-03-30 11:36:17 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						35697dafcf 
					 
					
						
						
							
							增加了获取图文素材中文章的封面图url  
						
						 
						
						
						
						
					 
					
						2016-03-28 14:54:57 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ccdbef3963 
					 
					
						
						
							
							Update WxMpServiceImpl.java  
						
						 
						
						... 
						
						
						
						1.对应WxMpService类修改getJSSDKPayInfo(Map<String, String> parameters)方法为getPayInfo(Map<String, String> parameters)方法
2.增加,1)扫码支付参数拼装方法:getNativePayInfo(String productId,String outTradeNo, double amt, String body,String ip, String callbackUrl)
2)原来的公众号支付参数拼装方法:getJsapiPayInfo(String openId,String outTradeNo, double amt, String body,String ip, String callbackUrl)
3.在getPayInfo(Map<String, String> parameters)方法中增加codeUrl参数判断,只有在NATIVE方式才返回codeUrl参数。 
						
						
					 
					
						2016-03-25 18:38:36 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ae50576bf7 
					 
					
						
						
							
							Update WxMpService.java  
						
						 
						
						... 
						
						
						
						增加NATIVE扫码支付类型,
1.将原来的getJSSDKPayInfo(String openId, String outTradeNo, double amt, String body, String tradeType, String ip, String notifyUrl)方法拆分为两个方法:1)拼装NATIVE发起支付请求需要的参数的方法 Map<String, String> getNativePayInfo(String productId, String outTradeNo, double amt, String body, String ip, String notifyUrl);
2) 拼装JSAPI发起支付请求需要的参数方法 Map<String, String> getJsapiPayInfo(String openId, String outTradeNo, double amt, String body, String ip, String notifyUrl);
2.修改getJSSDKPayInfo(Map<String, String> parameters)方式为getPayInfo(Map<String, String> parameters),适用上面两个方法调用。 
						
						
					 
					
						2016-03-25 18:24:19 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						4979a16ae7 
					 
					
						
						
							
							Update WxMpServiceImpl.java  
						
						 
						
						... 
						
						
						
						增加getJSSDKPayInfo返回字段code_url,用于微信扫码支付生成二维码图片使用 
						
						
					 
					
						2016-03-21 12:53:37 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						39c2f09008 
					 
					
						
						
							
							修复上传永久素材报“Connection reset”错误的问题  
						
						 
						
						
						
						
					 
					
						2016-02-29 12:44:25 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						c61fcb26c6 
					 
					
						
						
							
							替换回httpclient,将httpclient配置独立出来提供更多可配置项目  
						
						 
						
						
						
						
					 
					
						2016-02-23 18:12:49 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						2a6993713a 
					 
					
						
						
							
							微信支付JSSDK及退款接口增加异常处理  
						
						 
						
						... 
						
						
						
						为解决接口调用端无法取到调用微信服务器的返回结果的问题,微信支付JSSDK及退款接口增加了异常处理。
Change-Id: I2fe5255edb416336b64bef84a4bac5ba51231d67
Signed-off-by: Liu Kai <liukai@tinkers.com.cn> 
						
						
					 
					
						2016-01-30 12:21:16 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						54ced62f30 
					 
					
						
						
							
							换用JoddGetRequestExecutor  
						
						 
						
						... 
						
						
						
						解决NoHttpResoponseException问题 
						
						
					 
					
						2016-01-11 21:17:46 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						980ad0b7bf 
					 
					
						
						
							
							WxMpInMemoryConfigStorage新增cardApiTicket的存储  
						
						 
						
						
						
						
					 
					
						2016-01-11 20:46:35 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						65c532e45b 
					 
					
						
						
							
							增加卡券的FriendUserName字段  
						
						 
						
						
						
						
					 
					
						2016-01-11 20:46:35 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						89e092b04d 
					 
					
						
						
							
							添加关于卡券事件推送的常量、XML消息字段  
						
						 
						
						
						
						
					 
					
						2016-01-11 20:46:35 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						25eb592f26 
					 
					
						
						
							
							fix :  #172  based on PR  #259  
						
						 
						
						
						
						
					 
					
						2016-01-10 10:34:25 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						d759e6935e 
					 
					
						
						
							
							fix :  #256 ,  #172  CloseableHttpResponse 使用外没有关闭的问题  
						
						 
						
						
						
						
					 
					
						2016-01-07 18:07:31 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						06e4dda310 
					 
					
						
						
							
							微信支付计算精度问题  #248  
						
						 
						
						
						
						
					 
					
						2016-01-07 18:02:20 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						0619c3f01e 
					 
					
						
						
							
							修改me.chanjar.weixin.mp.bean.WxMpXmlOutTransferCustomerServiceMessage 支持将消息转发到多客服( https://mp.weixin.qq.com/wiki/5/ae230189c9bd07a6b221f48619aeef35.html )中的两种方式  
						
						 
						
						
						
						
					 
					
						2015-12-29 10:10:45 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5778b42e1e 
					 
					
						
						
							
							XStreamTransformer 增加注册方法,来注册自定义的消息类型  
						
						 
						
						
						
						
					 
					
						2015-12-25 14:40:18 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						1e67c3f47b 
					 
					
						
						
							
							Merge pull request  #252  from SimonDolph/unionid  
						
						 
						
						... 
						
						
						
						add unionid 
						
						
					 
					
						2015-12-25 09:14:12 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						ed84f511c7 
					 
					
						
						
							
							add unionid  
						
						 
						
						
						
						
					 
					
						2015-12-24 17:44:48 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						6b522da559 
					 
					
						
						
							
							change name: matchrule to matchRule  
						
						 
						
						
						
						
					 
					
						2015-12-22 10:45:15 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b2e1cca6c2 
					 
					
						
						
							
							change tab space  
						
						 
						
						... 
						
						
						
						change tab space 1 time 
						
						
					 
					
						2015-12-21 19:41:42 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						34fda26e02 
					 
					
						
						
							
							add conditional menu method  
						
						 
						
						
						
						
					 
					
						2015-12-21 16:00:18 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						59bdad92f6 
					 
					
						
						
							
							fix: java doc incorrectness  
						
						 
						
						
						
						
					 
					
						2015-12-03 12:45:52 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5594c8852d 
					 
					
						
						
							
							Fix the bug that fails to query order due to sign error.  
						
						 
						
						
						
						
					 
					
						2015-12-01 11:18:39 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						b19dc7b0fb 
					 
					
						
						
							
							Improve error message of the failure of getting prepayid.  
						
						 
						
						
						
						
					 
					
						2015-11-28 21:49:32 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						379aae95f1 
					 
					
						
						
							
							issue  #209  
						
						 
						
						
						
						
					 
					
						2015-11-25 08:46:59 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						5f456eb521 
					 
					
						
						
							
							issue  #236  
						
						 
						
						
						
						
					 
					
						2015-11-24 13:10:47 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						30f22896b1 
					 
					
						
						
							
							Support sending redpack.  
						
						 
						
						
						
						
					 
					
						2015-11-17 19:39:59 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						123e5ef973 
					 
					
						
						
							
							票据验证方法  
						
						 
						
						
						
						
					 
					
						2015-10-23 14:33:32 +08:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
							
						
						cc3714c599 
					 
					
						
						
							
							Improve prepay API to support all parameters.  
						
						 
						
						
						
						
					 
					
						2015-10-14 16:36:55 +08:00