|
|
@@ -62,9 +62,7 @@ class WxpayV2{
|
|
|
'notify_url' => $this->config["NOTIFY_URL"], // 通知地址
|
|
|
'trade_type' => "JSAPI", // 交易类型
|
|
|
'openid' => $post["openid"],
|
|
|
-// 'signType' => Hash::ALGO_MD5,
|
|
|
];
|
|
|
-// $params["sign"] = self::getSign($params);
|
|
|
$result = $this->clientHttp("POST", $apiUrl, $params);
|
|
|
if(empty($result)){
|
|
|
if(empty($this->errorMsg)){
|
|
|
@@ -87,36 +85,16 @@ class WxpayV2{
|
|
|
}
|
|
|
//组装支付参数
|
|
|
$payInfo=array();
|
|
|
-// $data=$this->v2makeSign(["appId"=>$this->config["APPID"],"prepay_id"=>$resuleAr["prepay_id"]]);
|
|
|
-
|
|
|
- $info['appId'] = $this->config["APPID"];
|
|
|
- $info['timeStamp'] = time();
|
|
|
- $info['nonceStr'] = Formatter::nonce(); //生成随机数,下面有生成实例,统一下单接口需要
|
|
|
- $info["package"] = "prepay_id=".$resuleAr["prepay_id"];
|
|
|
- $info['signType'] = 'MD5';
|
|
|
- $info['paySign'] = $this->MakeSign2($info);
|
|
|
-
|
|
|
- return $info;
|
|
|
+ $payInfo['appId'] = $this->config["APPID"];
|
|
|
+ $payInfo['timeStamp'] = time();
|
|
|
+ $payInfo['nonceStr'] = Formatter::nonce();//生成随机数
|
|
|
+ $payInfo["package"] = "prepay_id=".$resuleAr["prepay_id"];
|
|
|
+ $payInfo['signType'] = 'MD5';
|
|
|
+ $payInfo['paySign'] = $this->v2makeSign($payInfo);
|
|
|
+ return $payInfo;
|
|
|
}
|
|
|
|
|
|
- public function v2makeSign($info){
|
|
|
- $params = [
|
|
|
- 'appId' => $info["appId"],
|
|
|
- 'timeStamp' => (string)Formatter::timestamp(),
|
|
|
- 'nonceStr' => Formatter::nonce(),
|
|
|
- 'package' => 'prepay_id='.$info["prepay_id"],
|
|
|
- ];
|
|
|
- var_dump(Formatter::queryStringLike(Formatter::ksort($params)));
|
|
|
- $params['paySign'] = Hash::sign(
|
|
|
- Hash::ALGO_MD5,//默认md5
|
|
|
- Formatter::queryStringLike(Formatter::ksort($params)),
|
|
|
- $this->config["ApiV2Key"],
|
|
|
- );
|
|
|
- $params['signType'] = Hash::ALGO_MD5;
|
|
|
- return $params;
|
|
|
- }
|
|
|
-
|
|
|
- public function MakeSign2($values) {
|
|
|
+ public function v2makeSign($values) {
|
|
|
//签名步骤一:按字典序排序参数
|
|
|
ksort($values);
|
|
|
$string = $this->ToUrlParams($values);
|
|
|
@@ -166,6 +144,26 @@ class WxpayV2{
|
|
|
]);
|
|
|
return $result;
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ // public function v2makeSign($info){
|
|
|
+// $params = [
|
|
|
+// 'appId' => $info["appId"],
|
|
|
+// 'timeStamp' => time(),
|
|
|
+// 'nonceStr' => Formatter::nonce(),
|
|
|
+// 'package' => "prepay_id=".$info["prepay_id"],
|
|
|
+// ];
|
|
|
+// var_dump(Formatter::queryStringLike(Formatter::ksort($params)));
|
|
|
+// $params['paySign'] = Hash::sign(
|
|
|
+// Hash::ALGO_MD5,//默认md5
|
|
|
+// Formatter::queryStringLike(Formatter::ksort($params)),
|
|
|
+// $this->config["ApiV2Key"],
|
|
|
+// );
|
|
|
+// $params['signType'] = Hash::ALGO_MD5;
|
|
|
+// return $params;
|
|
|
+// }
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 生成签名
|
|
|
* @param type $info
|