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

支付直连

See merge request quanshu/mp-server!825

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

@@ -77,7 +77,8 @@ public class AlipayCallBackController {
     //boolean AlipaySignature.rsaCheckV1(Map<String, String> params, String publicKey, String charset, String sign_type)
     boolean flag = false;
     try {
-      flag = AlipaySignature.rsaCheckV1 (params, aliPublicKey, "utf-8","RSA2");
+      LogUtil.info(logger, "publickey:" + aliPublicKey);
+      flag = AlipaySignature.rsaCheckV1 (params, aliPublicKey, "GBK","RSA2");
       if (!flag) {
         LogUtil.error(logger,"验签失败");
         responseWrite(response,"fail");