支付宝参数合并调整

extend/AliPay/AliPay.php

@@ -27,11 +27,18 @@ class AliPay {
      * @param $options ['returnUrl'] 用于web支付返回地址
      */
     public function __construct($options = null) {
-        $this->appId = isset ($options['appId']) ? $options['appId'] : config('ali_app_id');
+        /*$this->appId = isset ($options['appId']) ? $options['appId'] : config('ali_app_id');
         $this->rsaPrivateKey = isset ($options['private_key_path']) ? $options['private_key_path'] : config('private_key');
         $this->signType = isset ($options['sign_type']) ? $options['sign_type'] : config('ali_sign_type');
         $this->notifyUrl = isset ($options['notify_url']) ? $options['notify_url'] : config('notify_url');
-        $this->alipayrsaPublicKey = isset ($options['ali_public_key_path']) ? $options['ali_public_key_path'] : config('ali_public_key');
+        $this->alipayrsaPublicKey = isset ($options['ali_public_key_path']) ? $options['ali_public_key_path'] : config('ali_public_key');*/
+        $epayConfig = get_addon_config('epay');
+        $alipayConfig = isset($epayConfig['alipay']) ? $epayConfig['alipay'] : [];
+        $this->appId = isset ($options['appId']) ? $options['appId'] : $alipayConfig['app_id'];
+        $this->rsaPrivateKey = isset ($options['private_key_path']) ? $options['private_key_path'] : $alipayConfig['private_key'];
+        $this->signType = isset ($options['sign_type']) ? $options['sign_type'] : 'RSA2';
+        $this->notifyUrl = isset ($options['notify_url']) ? $options['notify_url'] : $alipayConfig['notify_url'];
+        $this->alipayrsaPublicKey = isset ($options['ali_public_key_path']) ? $options['ali_public_key_path'] : $alipayConfig['ali_public_key'];
 //        $this->returnUrl = isset ($options ['returnUrl']) ? $options ['returnUrl'] : C('ALI_PAY')['returnUrl'];
     }
 
@@ -253,9 +260,9 @@ class AliPay {
         $alipayConfig->setSignType("RSA2");
         $alipayConfig->setEncryptKey("");
         $alipayConfig->setFormat("json");
-        $alipayConfig->setAppCertPath('../extend/AliPay/cert/appCertPublicKey.crt');//"<-- 请填写您的应用公钥证书文件路径，例如：/foo/appCertPublicKey_2019051064521003.crt -->"
-        $alipayConfig->setAlipayPublicCertPath('../extend/AliPay/cert/alipayCertPublicKey.crt');//"<-- 请填写您的支付宝公钥证书文件路径，例如：/foo/alipayCertPublicKey_RSA2.crt -->"
-        $alipayConfig->setRootCertPath('../extend/AliPay/cert/alipayRootCert.crt');//"<-- 请填写您的支付宝根证书文件路径，例如：/foo/alipayRootCert.crt -->"
+        $alipayConfig->setAppCertPath('../addons/epay/certs/appCertPublicKey.crt');//"<-- 请填写您的应用公钥证书文件路径，例如：/foo/appCertPublicKey_2019051064521003.crt -->"
+        $alipayConfig->setAlipayPublicCertPath('../addons/epay/certs/alipayCertPublicKey.crt');//"<-- 请填写您的支付宝公钥证书文件路径，例如：/foo/alipayCertPublicKey_RSA2.crt -->"
+        $alipayConfig->setRootCertPath('../addons/epay/certs/alipayRootCert.crt');//"<-- 请填写您的支付宝根证书文件路径，例如：/foo/alipayRootCert.crt -->"
         $alipayClient = new AopCertClient($alipayConfig);
         $alipayClient->isCheckAlipayPublicCert = true;
         $request = new AlipayFundTransUniTransferRequest();