From c0fc138a73b0745df30d1352fc4723423c638f21 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Wed, 29 May 2019 14:45:06 +0800
Subject: [PATCH] wx pay debug

---
 {weixin-cert => cert}/apiclient_cert.p12 | Bin
 {weixin-cert => cert}/apiclient_cert.pem |   0
 {weixin-cert => cert}/apiclient_key.pem  |   0
 {weixin-cert => cert}/证书使用说明.txt   |   0
 extend/payment/Weixin.php                |   5 ++---
 5 files changed, 2 insertions(+), 3 deletions(-)
 rename {weixin-cert => cert}/apiclient_cert.p12 (100%)
 rename {weixin-cert => cert}/apiclient_cert.pem (100%)
 rename {weixin-cert => cert}/apiclient_key.pem (100%)
 rename {weixin-cert => cert}/证书使用说明.txt (100%)

diff --git a/weixin-cert/apiclient_cert.p12 b/cert/apiclient_cert.p12
similarity index 100%
rename from weixin-cert/apiclient_cert.p12
rename to cert/apiclient_cert.p12
diff --git a/weixin-cert/apiclient_cert.pem b/cert/apiclient_cert.pem
similarity index 100%
rename from weixin-cert/apiclient_cert.pem
rename to cert/apiclient_cert.pem
diff --git a/weixin-cert/apiclient_key.pem b/cert/apiclient_key.pem
similarity index 100%
rename from weixin-cert/apiclient_key.pem
rename to cert/apiclient_key.pem
diff --git a/weixin-cert/证书使用说明.txt b/cert/证书使用说明.txt
similarity index 100%
rename from weixin-cert/证书使用说明.txt
rename to cert/证书使用说明.txt
diff --git a/extend/payment/Weixin.php b/extend/payment/Weixin.php
index 28b5b4c22..c816013e3 100755
--- a/extend/payment/Weixin.php
+++ b/extend/payment/Weixin.php
@@ -658,7 +658,6 @@ class Weixin
         } else { 
             $error = curl_errno($ch);
             curl_close($ch);
-            var_dump($error);
             return $error;
         }
     }
@@ -700,9 +699,9 @@ class Weixin
             //设置证书
             //使用证书：cert 与 key 分别属于两个.pem文件
             $options[CURLOPT_SSLCERTTYPE] = 'PEM';
-            $options[CURLOPT_SSLCERT] = ROOT.'weixin-cert/apiclient_cert.pem';
+            $options[CURLOPT_SSLCERT] = ROOT.'cert/apiclient_cert.pem';
             $options[CURLOPT_SSLKEYTYPE] = 'PEM';
-            $options[CURLOPT_SSLKEY] = ROOT.'weixin-cert/apiclient_key.pem';
+            $options[CURLOPT_SSLKEY] = ROOT.'cert/apiclient_key.pem';
         }
  
         $ch = curl_init($url);