Merge branch 'dev' into 'mp-server-test'

支付直连

See merge request quanshu/mp-server!827

mp-admin/src/main/java/com/qs/mp/web/controller/api/callback/AlipayCallBackController.java

@@ -71,11 +71,11 @@ public class AlipayCallBackController {
         valueStr =  (i==values.length-1)?valueStr + values [i]:valueStr + values[i] + ",";
       }
       //乱码解决，这段代码在出现乱码时使用。
-      try {
+      /*try {
         valueStr = new String(valueStr.getBytes("ISO-8859-1"), "utf-8");
       } catch (UnsupportedEncodingException e) {
         e.printStackTrace();
-      }
+      }*/
       params.put (name,valueStr);
     }
     //切记alipaypublickey是支付宝的公钥，请去open.alipay.com对应应用下查看。
@@ -83,7 +83,7 @@ public class AlipayCallBackController {
     boolean flag = false;
     try {
       LogUtil.info(logger, "publickey:" + aliPublicKey);
-      flag = AlipaySignature.rsaCheckV1 (params, aliPublicKey, "GBK","RSA2");
+      flag = AlipaySignature.rsaCheckV1 (params, aliPublicKey, "UTF-8","RSA2");
       if (!flag) {
         LogUtil.error(logger,"验签失败");
         responseWrite(response,"fail");

mp-service/src/main/java/com/qs/mp/pay/service/impl/WalletServiceImpl.java

@@ -125,7 +125,7 @@ public class WalletServiceImpl implements IWalletService {
   @Override
   public JSONObject directAliPay(BizTypeEnum bizType, String bizId, String openId, int money, String orderRemark) {
     if (null == alipayClient) {
-      alipayClient = new DefaultAlipayClient(aliServerUrl, aliAppId, aliPrivateKey, "json", "GBK", aliPublicKey, "RSA2");
+      alipayClient = new DefaultAlipayClient(aliServerUrl, aliAppId, aliPrivateKey, "json", "UTF-8", aliPublicKey, "RSA2");
     }
     Map<String, Object> params = new HashMap<String, Object>();
     params.put("out_trade_no", bizId);