升级sdk版本为2.6.0

Author: binarywang

pom.xml

@@ -18,7 +18,7 @@
  <plugin.maven-compiler>3.1</plugin.maven-compiler>
 
  <!-- lib versions -->
- <weixin-java-mp.version>2.4.5.BETA</weixin-java-mp.version>
+ <weixin-java-tools.version>2.6.0</weixin-java-tools.version>
  <junit.version>4.12</junit.version>
  <slf4j.version>1.7.21</slf4j.version>
  <spring.version>4.2.6.RELEASE</spring.version>
@@ -119,7 +119,13 @@
  <dependency>
  <groupId>com.github.binarywang</groupId>
  <artifactId>weixin-java-mp</artifactId>
- <version>${weixin-java-mp.version}</version>
+ <version>${weixin-java-tools.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.github.binarywang</groupId>
+ <artifactId>weixin-java-pay</artifactId>
+ <version>${weixin-java-tools.version}</version>
  </dependency>
 
  <!-- junit -->

src/main/java/com/github/config/MainConfig.java

@@ -1,5 +1,8 @@
 package com.github.config;
 
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -66,8 +69,15 @@ public WxMpConfigStorage wxMpConfigStorage() {
  configStorage.setSecret(this.appsecret);
  configStorage.setToken(this.token);
  configStorage.setAesKey(this.aesKey);
- configStorage.setPartnerId(this.partenerId);
- configStorage.setPartnerKey(this.partenerKey);
+ return configStorage;
+ }
+
+ @Bean
+ public WxPayConfig payConfig() {
+ WxPayConfig configStorage = new WxPayConfig();
+ configStorage.setAppId(this.appid);
+ configStorage.setMchId(this.partenerId);
+ configStorage.setMchKey(this.partenerKey);
  return configStorage;
  }
 
@@ -78,4 +88,11 @@ public WxMpService wxMpService() {
  return wxMpService;
  }
 
+ @Bean
+ public WxPayService payService() {
+ WxPayService payService = new WxPayServiceImpl();
+ payService.setConfig(payConfig());
+ return payService;
+ }
+
 }

src/main/java/com/github/controller/PaymentController.java

@@ -1,16 +1,16 @@
 package com.github.controller;
 
-import com.github.service.CoreService;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
+import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult;
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.github.binarywang.wxpay.util.SignUtils;
 import com.github.util.MD5Util;
 import com.github.util.ReturnModel;
 import com.github.util.Sha1Util;
 import com.github.util.XMLUtil;
 import com.google.gson.Gson;
 import me.chanjar.weixin.common.exception.WxErrorException;
-import me.chanjar.weixin.mp.api.WxMpConfigStorage;
-import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.pay.request.WxPayUnifiedOrderRequest;
-import me.chanjar.weixin.mp.bean.pay.result.WxPayUnifiedOrderResult;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -48,18 +48,15 @@
 @Controller
 @RequestMapping(value = "wxPay")
 public class PaymentController extends GenericController {
-
-
  //企业向个人转账微信API路径
  private static final String ENTERPRISE_PAY_URL = "https://api.mch.weixin.qq.com/mmpaymkttransfers/promotion/transfers";
  //apiclient_cert.p12证书存放路径
  private static final String CERTIFICATE_LOCATION = "";
+
  @Autowired
- protected WxMpConfigStorage configStorage;
- @Autowired
- protected WxMpService wxMpService;
+ protected WxPayConfig payConfig;
  @Autowired
- protected CoreService coreService;
+ protected WxPayService payService;
 
  /**
  * 用于返回预支付的结果 WxMpPrepayIdResult，一般不需要使用此接口
@@ -80,9 +77,8 @@ public void getPrepayId(HttpServletResponse response,
  payInfo.setSpbillCreateIp(request.getParameter("spbill_create_ip"));
  payInfo.setNotifyURL("");
  this.logger
- .info("PartnerKey is :" + this.configStorage.getPartnerKey());
- WxPayUnifiedOrderResult result = this.wxMpService.getPayService()
- .unifiedOrder(payInfo);
+ .info("PartnerKey is :" + this.payConfig.getMchKey());
+ WxPayUnifiedOrderResult result = this.payService.unifiedOrder(payInfo);
  this.logger.info(new Gson().toJson(result));
  renderString(response, result);
  }
@@ -109,8 +105,7 @@ public void getJSSDKPayInfo(HttpServletResponse response,
  prepayInfo.setNotifyURL("");
 
  try {
- Map<String, String> payInfo = this.wxMpService.getPayService()
- .getPayInfo(prepayInfo);
+ Map<String, String> payInfo = this.payService.getPayInfo(prepayInfo);
  returnModel.setResult(true);
  returnModel.setDatum(payInfo);
  renderString(response, returnModel);
@@ -134,8 +129,8 @@ public void getJSSDKCallbackData(HttpServletRequest request,
  try {
  synchronized (this) {
  Map<String, String> kvm = XMLUtil.parseRequestXmlToMap(request);
- if (this.wxMpService.getPayService().checkSign(kvm,
- configStorage.getPartnerKey())) {
+ if (SignUtils.checkSign(kvm,
+ this.payConfig.getMchKey())) {
  if (kvm.get("result_code").equals("SUCCESS")) {
  //TODO(user) 微信服务器通知此回调接口支付成功后，通知给业务系统做处理
  logger.info("out_trade_no: " + kvm.get("out_trade_no") + " pay SUCCESS!");
@@ -162,8 +157,8 @@ public void getJSSDKCallbackData(HttpServletRequest request,
  public void payToIndividual(HttpServletResponse response,
  HttpServletRequest request) {
  TreeMap<String, String> map = new TreeMap<String, String>();
- map.put("mch_appid", this.configStorage.getAppId());
- map.put("mchid", this.configStorage.getPartnerId());
+ map.put("mch_appid", this.payConfig.getAppId());
+ map.put("mchid", this.payConfig.getMchId());
  map.put("nonce_str", Sha1Util.getNonceStr());
  map.put("partner_trade_no", request.getParameter("partner_trade_no"));
  map.put("openid", request.getParameter("openid"));
@@ -173,7 +168,7 @@ public void payToIndividual(HttpServletResponse response,
  map.put("spbill_create_ip", request.getParameter("spbill_create_ip"));
  try {
  Map<String, String> returnMap = enterprisePay(map,
- this.configStorage.getPartnerKey(), CERTIFICATE_LOCATION,
+ this.payConfig.getMchKey(), CERTIFICATE_LOCATION,
  ENTERPRISE_PAY_URL);
  if ("SUCCESS".equals(returnMap.get("result_code").toUpperCase())
  && "SUCCESS"