From 6bff1dbe838f0ae866225bf6097dbb2d8888e1d5 Mon Sep 17 00:00:00 2001
From: lccsw <1127794702@qq.com>
Date: Wed, 10 Nov 2021 10:43:32 +0800
Subject: [PATCH] edit-third_party-alipay

---
 admin/config/alipay.php                 |  4 +++-
 common/third_party/alipaysdk/Alipay.php | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/admin/config/alipay.php b/admin/config/alipay.php
index dbea1eea..5c1e5e56 100644
--- a/admin/config/alipay.php
+++ b/admin/config/alipay.php
@@ -9,6 +9,8 @@ $config = [
     'default' => [
         'app_id' => '2021000118631895',
         'private_key' => 'MIIEpAIBAAKCAQEAk/KCpSBSJT8Ym6E2q8RhWXj6RHxP0orUOey/5pihXRj0UzQQiiB8pIb5TcB7G8bFSszhgao7DiObYnWUUvUpAGG8tL7aC+Td7JL11PR5Bv1e1HnymCrNWr/LrUAFBpmQ5480/BAX04SZh/RXRrYiM+L5JSRFwiiXaQ2lc9Q1oa+paKe6d19ZiHZ50JN9I9HLPmqchOLK+yIRRPyPoc0TOI7bz1kEW+U76/S+nE8RmSKq+LvDgWzgi4lIt1NXxfSU6z+MAtQHAF6TFeglquGnvFOHU/MkCPQ/+57n31L7DTEGsaLcUZfkipE70nlrYrJgE/jrqQLW4TsRPhJT2bUx4wIDAQABAoIBAHqCCeSqSttE0B+u8xJw3xuzrakgNwjkpLACdzV/lb79dvOe3UNDe3LRwYa8qDRr99rkpKc2Swh+O6DgNB4tm/IQ/K2+i9flgE7xslbQyZccH3ZaNKQEbV+ECihAJuk8KF1WnE1NFi20U13c2phXISNOA3jZ/Fm2Owpmnma3hmGHRbiXImsLhIDFl035Ekt605plriy6yvm6wyvdGGATQsXxDQ0CcOlWdgug7U+vyIc/afRC2kj/afVFqLFyUT2Xo1nTeedwTTSQ/rXRIurdLUVm75SDP1mdoAC+wMd/6LgY7byKPxlSslyaBm73o95feu7sV2dXhDipwThI+p1dQiECgYEA8wwk+l9Cxw5qZPtOXmLMUoqOtkESnZLIaFusm5Z0E1zdZhessVHQmWQ5RsVvYGYvcCG0ujTWNi6sq1fiPeZKnZj+r9Cy8UCQDssS3pV0jvy6ozKZvRMGzugQx3cPrmjwHO3Z6ycrtvz+la/H4VsWwdid8Tx1/KifHJq7XXQ3R/cCgYEAm9TuQOebvBA325rBJZnX6Ats6E9un9j5FRh7/j9CRHFFZmec79NX+306GH1j7WWO0g9nusQKysu9W54S37gIwta9h+46Hxq1bIqctDlL2SpgsZT8ZV8ejQePZwsaEaMh68u1yplPHuUWP4T+LEcH3X1E8l5KQ8Gg/B6aQXKRonUCgYEAqinKifDAFBWnr+OyzqplWzTfDgMpQWFPJqFoi9Yelp/h8mSI5+zcG0jsQPxiKh/g/qTan7P2diDfi2cQYz4k54oCZp27auVE9tZ+84+395RCJ5h5wsLbdWlMthpJxFZ8JgTxGY5nMMqYg7x6OPFJUZaTnh4yjR6Rp7k9jQSc36kCgYA5LQFWEyTS9ehozPk9QJs1aqvE+RAP2l5Z3Sfxe2hnEGB0WGP+or7PaX0dazR08CRc8oYOwstq6SJLMU6fgzjDtGLKMyBkNTqH3rvsbHFl9uSPg6iv0Ry2hiWZmzsvaXmSuKW09ldPcKKfH77apB1AqSvY+bup7KuSle/nP5Ar2QKBgQCbufjQ4I7Iej+KLz8/WVDIWa2to0tkQGxCUoVqxIxRQW8lHhRu5v9Y/gQ6d8dvx7rXb6V0VDf1joPFxnu3FwwMteMpQ8VrbH9vyqktSwCvU5t2dolcpv0MeePz9NPYdmz/MA/YIOmiUt0CVmca4q8WDNtJqjxShoIdbTH9oFXkeQ==',
-        'public_key' => 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk0FzytqTSTh3o8/Lbryi76MxKpOjJM4tho8HlzpOHFfPZ9JEnEQ+ddNcoSQaNfWJU3T73BDfNoaOZllWB13pvU3D/ZWGYkAJRLX4jT97Xvf9SYwyoEt5R2FTRQWBJT3N7sPX8NoM+dvEeqA9LgwY5Z6sIu9SxouPsfzCJSKjCmlcDoZJ1xjxusrqQF6gLkPW1loPFwx2xUQUFrGW4q1Yd8XwiqgljCqrLwi2tnZ3r5YOI1bIL589olUHf2KdNtH6KN7pC2+I5ovKEvuAZk7X6tPxYbxy5GSU1rWNhhNLpRL/RBTt+3dlqW/yadf/c3dHGVygSMo90KrG9uuOp/q5BQIDAQAB',
+        'appCertPath' => COMMPATH.'third_party/alipaysdk/cert/appCertPublicKey.crt',
+        'alipayCertPath' => COMMPATH.'third_party/alipaysdk/cert/alipayCertPublicKey.crt',
+        'rootCertPath' => COMMPATH.'third_party/alipaysdk/cert/alipayRootCert.crt'
     ]
 ];
diff --git a/common/third_party/alipaysdk/Alipay.php b/common/third_party/alipaysdk/Alipay.php
index 12b94327..63cc8430 100644
--- a/common/third_party/alipaysdk/Alipay.php
+++ b/common/third_party/alipaysdk/Alipay.php
@@ -18,16 +18,16 @@ class Alipay{
         $this->ci = & get_instance();
         $this->ci->config->load('alipay');
         $params = $this->ci->config->item('default');
-        $alipayConfig = new AlipayConfig();
-        //$alipayConfig->setServerUrl("https://openapi.alipaydev.com/gateway.do");//测试
-        $alipayConfig->setServerUrl("https://openapi.alipay.com/gateway.do");
-        $alipayConfig->setAppId($params['app_id']);
-        $alipayConfig->setPrivateKey($params['private_key']);
-        $alipayConfig->setFormat("json");
-        $alipayConfig->setAlipayPublicKey($params['public_key']);
-        $alipayConfig->setCharset("UTF-8");
-        $alipayConfig->setSignType("RSA2");
-        $this->alipayClient = new AopClient($alipayConfig);
+        $this->alipayClient = new AopCertClient();
+        //$this->alipayClient->gatewayUrl = 'https://openapi.alipaydev.com/gateway.do'; //沙箱地址
+        $this->alipayClient->signType = 'RSA2';
+        $this->alipayClient->appId = $params['app_id'];
+        $this->alipayClient->rsaPrivateKey = $params['private_key'];
+        $this->alipayClient->alipayrsaPublicKey = $this->alipayClient->getPublicKey($params['alipayCertPath']);//调用getPublicKey从支付宝公钥证书中提取公钥
+        $this->alipayClient->isCheckAlipayPublicCert = true;//是否校验自动下载的支付宝公钥证书，如果开启校验要保证支付宝根证书在有效期内
+        $this->alipayClient->appCertSN = $this->alipayClient->getCertSN($params['appCertPath']);//调用getCertSN获取证书序列号
+        $this->alipayClient->alipayRootCertSN = $this->alipayClient->getRootCertSN($params['rootCertPath']);//调用getRootCertSN获取支付宝根证书序列号
+
     }
     /**
      * 单笔转账