Merge remote-tracking branch 'origin/c_yuanren' into c_yuanren

src/main/java/com/izouma/weixin/web/WeiXinController.java

@@ -188,7 +188,7 @@ public class WeiXinController {
             total = (int) (cash * 100);
 
             //测试为一分
-            //total = 1;
+            total = 1;
 
             JSONObject attach = new JSONObject();
             attach.put("productId", productId);

src/main/java/com/izouma/weixin/wxpay/WXPay.java

@@ -134,7 +134,8 @@ public class WXPay {
         String signTypeInData = reqData.get(WXPayConstants.FIELD_SIGN_TYPE);
         WXPayConstants.SignType signType;
         if (signTypeInData == null) {
-            signType = WXPayConstants.SignType.MD5;
+            //signType = WXPayConstants.SignType.MD5;
+            signType = this.signType;//修改为默认类型
         } else {
             signTypeInData = signTypeInData.trim();
             if (signTypeInData.length() == 0) {