升级sdk版本为2.8.8.BETA，并重命名包结构，以免产生误解

Author: binarywang

build/check-style.xml

@@ -99,7 +99,9 @@
  <property name="max" value="5"/>
  </module>
 
- <module name="Indentation"/>
+ <module name="Indentation">
+ <property name="basicOffset" value="2"/>
+ </module>
 
  <!--Checks that there is no whitespace before a token.-->
  <module name="NoWhitespaceBefore">

pom.xml

@@ -18,7 +18,7 @@
  <plugin.maven-compiler>3.1</plugin.maven-compiler>
 
  <!-- lib versions -->
- <weixin-java-tools.version>2.8.0</weixin-java-tools.version>
+ <weixin-java-tools.version>2.8.8.BETA</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>

src/main/java/com/github/config/MainConfiguration.java renamed to src/main/java/com/github/weixin/demo/config/MainConfiguration.java

@@ -1,4 +1,4 @@
-package com.github.config;
+package com.github.weixin.demo.config;
 
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;

src/main/java/com/github/config/MenuConfig.java renamed to src/main/java/com/github/weixin/demo/config/MenuConfig.java

@@ -1,6 +1,5 @@
-package com.github.config;
+package com.github.weixin.demo.config;
 
-import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.bean.menu.WxMenu;
 import me.chanjar.weixin.common.bean.menu.WxMenuButton;
 import me.chanjar.weixin.common.exception.WxErrorException;
@@ -9,6 +8,8 @@
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 
+import static me.chanjar.weixin.common.api.WxConsts.MenuButtonType;
+
 /**
  * Created by FirenzesEagle on 2016/6/1 0001.
  * Email:liumingbo2008@gmail.com
@@ -27,30 +28,30 @@ protected static WxMenu getMenu() {
 
 WxMenu menu = new WxMenu();
 WxMenuButton button1 = new WxMenuButton();
-button1.setType(WxConsts.BUTTON_VIEW);
+button1.setType(MenuButtonType.VIEW);
 button1.setName("买家订单");
 button1.setUrl(wxMpService.oauth2buildAuthorizationUrl("", "snsapi_base", ""));
 
 WxMenuButton button2 = new WxMenuButton();
 button2.setName("我是卖家");
 
 WxMenuButton button21 = new WxMenuButton();
-button21.setType(WxConsts.BUTTON_VIEW);
+button21.setType(MenuButtonType.VIEW);
 button21.setName("我的订单");
 button21.setUrl(wxMpService.oauth2buildAuthorizationUrl("", "snsapi_base", ""));
 
 WxMenuButton button22 = new WxMenuButton();
-button22.setType(WxConsts.BUTTON_VIEW);
+button22.setType(MenuButtonType.VIEW);
 button22.setName("收入统计");
 button22.setUrl(wxMpService.oauth2buildAuthorizationUrl("", "snsapi_base", ""));
 
 WxMenuButton button23 = new WxMenuButton();
-button23.setType(WxConsts.BUTTON_VIEW);
+button23.setType(MenuButtonType.VIEW);
 button23.setName("发布商品");
 button23.setUrl(wxMpService.oauth2buildAuthorizationUrl("", "snsapi_base", ""));
 
 WxMenuButton button24 = new WxMenuButton();
-button24.setType(WxConsts.BUTTON_VIEW);
+button24.setType(MenuButtonType.VIEW);
 button24.setName("商品管理");
 button24.setUrl(wxMpService.oauth2buildAuthorizationUrl("", "snsapi_base", ""));
 
@@ -60,7 +61,7 @@ protected static WxMenu getMenu() {
 button2.getSubButtons().add(button24);
 
 WxMenuButton button3 = new WxMenuButton();
-button3.setType(WxConsts.BUTTON_CLICK);
+button3.setType(MenuButtonType.CLICK);
 button3.setName("使用帮助");
 button3.setKey("help");
 

src/main/java/com/github/config/WxPayConfiguration.java renamed to src/main/java/com/github/weixin/demo/config/WxPayConfiguration.java

@@ -1,4 +1,4 @@
-package com.github.config;
+package com.github.weixin.demo.config;
 
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;
@@ -51,4 +51,4 @@ public WxPayService payService() {
 payService.setConfig(payConfig());
 return payService;
 }
-}
+}

src/main/java/com/github/controller/CoreController.java renamed to src/main/java/com/github/weixin/demo/controller/CoreController.java

@@ -1,16 +1,16 @@
-package com.github.controller;
+package com.github.weixin.demo.controller;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.github.weixin.demo.util.ReturnModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.github.service.CoreService;
-import com.github.util.ReturnModel;
+import com.github.weixin.demo.service.CoreService;
 
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpConfigStorage;

src/main/java/com/github/controller/GenericController.java renamed to src/main/java/com/github/weixin/demo/controller/GenericController.java

@@ -1,4 +1,4 @@
-package com.github.controller;
+package com.github.weixin.demo.controller;
 
 import com.google.gson.Gson;
 import org.slf4j.Logger;

src/main/java/com/github/controller/PaymentController.java renamed to src/main/java/com/github/weixin/demo/controller/PaymentController.java

@@ -1,4 +1,4 @@
-package com.github.controller;
+package com.github.weixin.demo.controller;
 
 import com.github.binarywang.wxpay.bean.request.WxEntPayRequest;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
@@ -8,9 +8,9 @@
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.util.SignUtils;
-import com.github.util.ReturnModel;
-import com.github.util.Sha1Util;
-import com.github.util.XMLUtil;
+import com.github.weixin.demo.util.ReturnModel;
+import com.github.weixin.demo.util.Sha1Util;
+import com.github.weixin.demo.util.XMLUtil;
 import com.google.gson.Gson;
 import me.chanjar.weixin.common.exception.WxErrorException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -107,7 +107,7 @@ public void getJSSDKCallbackData(HttpServletRequest request,
  try {
  synchronized (this) {
  Map<String, String> kvm = XMLUtil.parseRequestXmlToMap(request);
- if (SignUtils.checkSign(kvm, this.payConfig.getMchKey())) {
+ if (SignUtils.checkSign(kvm, null, this.payConfig.getMchKey())) {
  if (kvm.get("result_code").equals("SUCCESS")) {
  //TODO(user) 微信服务器通知此回调接口支付成功后，通知给业务系统做处理
  logger.info("out_trade_no: " + kvm.get("out_trade_no") + " pay SUCCESS!");

src/main/java/com/github/controller/TemplateMessageController.java renamed to src/main/java/com/github/weixin/demo/controller/TemplateMessageController.java

@@ -1,4 +1,4 @@
-package com.github.controller;
+package com.github.weixin.demo.controller;
 
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpConfigStorage;
@@ -32,7 +32,7 @@ public class TemplateMessageController extends GenericController {
  @RequestMapping(value = "notifyOrderPaySuccessTemplate")
  public void notifyOrderPaySuccessTemplate(HttpServletResponse response,
  HttpServletRequest request) {
- WxMpTemplateMessage orderPaySuccessTemplate = new WxMpTemplateMessage();
+ WxMpTemplateMessage orderPaySuccessTemplate = WxMpTemplateMessage.builder().build();
  orderPaySuccessTemplate.setToUser(request.getParameter("openid"));
  orderPaySuccessTemplate.setTemplateId("ENp7UwpOtlhvieebUvDm0mK4n0hTvbH0Me83HdBUvC0");
  orderPaySuccessTemplate.setUrl(request.getParameter("url"));
@@ -55,7 +55,7 @@ public void notifyOrderPaySuccessTemplate(HttpServletResponse response,
  @RequestMapping(value = "notifyOrderStatusUpdateTemplate")
  public void notifyOrderStatusUpdateTemplate(HttpServletResponse response,
  HttpServletRequest request) {
- WxMpTemplateMessage orderPaySuccessTemplate = new WxMpTemplateMessage();
+ WxMpTemplateMessage orderPaySuccessTemplate = WxMpTemplateMessage.builder().build();
  orderPaySuccessTemplate.setToUser(request.getParameter("openid"));
  orderPaySuccessTemplate.setTemplateId("X8ccwRF4EAx7VHFQGzi78Gl0C3GcpGpYgWk-HFFOWA0");
  orderPaySuccessTemplate.setUrl(request.getParameter("url"));

src/main/java/com/github/handler/AbstractHandler.java renamed to src/main/java/com/github/weixin/demo/handler/AbstractHandler.java

@@ -1,4 +1,4 @@
-package com.github.handler;
+package com.github.weixin.demo.handler;
 
 import com.google.gson.Gson;
 import me.chanjar.weixin.mp.api.WxMpMessageHandler;