ll

application/expand/controller/BaseAuth.php

@@ -239,7 +239,6 @@ class BaseAuth extends Controller
      */
     protected function getKey($apiCode='CHENSEN',$isVer=true){
         $companyAuth = $this->_getCompanyAuth($apiCode);
-print_r($companyAuth);exit;
         if(empty($companyAuth)){
             HelperService::returnJson(['code'=>400,'msg'=>"this apiAuth is empty",'data'=>[]]);
         }

application/expand/controller/WechatPay.php

@@ -37,13 +37,18 @@ class WechatPay extends BaseAuth
         if(!isset($this->_Account['Wechat_pay_appId'])
             || !isset($this->_Account['Wechat_pay_appsecret'])
             || !isset($this->_Account['Wechat_pay_key'])
-            || !isset($this->_Account['Wechat_pay_mchId']) ){
+            || !isset($this->_Account['Wechat_pay_mchId'])
+            || !isset($this->_Account['apiclientCert'])
+            || !isset($this->_Account['apiclientKey'])
+        ){
 
             HelperService::returnJson(['code'=>400,'msg'=>'WECHAT pay interface unauthorized access','data'=>$this->_Account]);
         }
 
         $this->_APPID = $this->_Account['Wechat_pay_appId'];
         $this->_APPSECRET = $this->_Account['Wechat_pay_appsecret'];
+        $this->_apiclientCert = $this->_Account['apiclientCert'];
+        $this->_apiclientKey = $this->_Account['apiclientKey'];
 
         $WechatPayTip = isset($this->_Account['Wechat_pay_tip'])
                 ?$this->_Account['Wechat_pay_tip']:"";
@@ -52,6 +57,8 @@ class WechatPay extends BaseAuth
         
         Config::set('WECHAT_APPID',$this->_APPID);
         Config::set('WECHAT_APPSECRET',$this->_APPSECRET);
+        Config::set('WECHAT_CERT',$this->_apiclientCert);
+        Config::set('WECHAT_KEY',$this->_apiclientKey);
         Config::set('WECHAT_TIP',$WechatPayTip);
         Config::set('WECHAT_MCHID',$this->_Account['Wechat_pay_mchId']);
         Config::set('WECHAT_SUB_MCHID',$WechatPaySubMchId);

application/index/service/wechat/WxPayPubHelper.php

@@ -215,10 +215,10 @@ class Common_util_pub
         //使用证书：cert 与 key 分别属于两个.pem文件
         //默认格式为PEM，可以注释
         curl_setopt($ch,CURLOPT_SSLCERTTYPE,'PEM');
-        curl_setopt($ch,CURLOPT_SSLCERT, WxPayConfig::$SSLCERT_PATH);
+        curl_setopt($ch,CURLOPT_SSLCERT, Config::get('WECHAT_CERT'));
         //默认格式为PEM，可以注释
         curl_setopt($ch,CURLOPT_SSLKEYTYPE,'PEM');
-        curl_setopt($ch,CURLOPT_SSLKEY, WxPayConfig::$SSLKEY_PATH);
+        curl_setopt($ch,CURLOPT_SSLKEY, Config::get('WECHAT_KEY'));
         //post提交方式
         curl_setopt($ch,CURLOPT_POST, true);
         curl_setopt($ch,CURLOPT_POSTFIELDS,$xml);
@@ -488,7 +488,6 @@ class Refund_pub extends Wxpay_client_pub
     function getResult()
     {
         $this->postXmlSSL();
-        echo 111;exit;
         $this->result = $this->xmlToArray($this->response);
         return $this->result;
     }