Merge branch 'feature/platfrom_aggregate_finance' of wmtx/platform into release

修改打款账号

ThinkPHP/Library/Vendor/Alipay2020/Fund.php

@@ -6,13 +6,13 @@ require_once "aop/request/AlipayFundTransOrderQueryRequest.php";
 require_once "aop/request/AlipayFundAccountQueryRequest.php";
 
 class Fund {
-    private $appCertPath = __DIR__ . "/cert/appCertPublicKey_2021001159678209.crt";
+    private $appCertPath = __DIR__ . "/cert/appCertPublicKey_2021001165628090.crt";
     private $alipayCertPath = __DIR__ . "/cert/alipayCertPublicKey_RSA2.crt";
     private $rootCertPath = __DIR__ . "/cert/alipayRootCert.crt";
     private $gatewayUrl = "https://openapi.alipay.com/gateway.do";
-    private $appId = "2021001159678209";
+    private $appId = "2021001165628090";
-    private $alipayUserId = '2088631242187552';
+    private $alipayUserId = '2088331082835421';  // pid
-    private $rsaPrivateKey = 'MIIEogIBAAKCAQEApuiUWwiE9apUAWLaX8SDYgt2oQnGCtT60dZvpMMHCuGR71HKCoLuCbgoZ3GUGhS9PByQZp/hNygEu6GzQwNTj5PiWMVrlfL7Xjkcpg+JbSiR3TUSJfYO2uLa+atJCQDNhsE6cfdcE4VHiSU5TK4ezBaIcYBPmzM6xKdQ6BblCM7fakTlVct+gvrE69M6XoyoM5VT6/lRwTIscWfwkyd/lps4jBwhuVMDboulk1BXQ2+daIQGqK4QQfQtC0bvREC+gwwmFaIfrw3dF/nOVEUEyhx4SFb7RzQv9mZx9HL4P4qCRvGl+jE5NE9hUWNz2pajR2cg7DxHDEMB0dSz8LRW9QIDAQABAoIBAADqDz38avYJi9JCH14c7ndQBsNVEV+n0QPrP8tQQi6eE7WS5h9uni0xdA81ARGvgWXd5jCZuZsavgPlG91HHGMR9VB1LGSy4wueFnkWZrNRYJMsoj/Q/D3Ytkhd1tWUyottbYuIRlnZBg5LROgVoBeQHAk7IbSA8FZ5cCkFTxXgQfOHd2yWJGkI1bz9MCTawT96fEBAowq2g28LsT44/EiJIGXY4hv7SOpZIIp9JZfmEDO9vOf5nkkZbsli0KPQPkTvly3p0YfMATqsxMLue1lwfHmueRMdk8p31aaz3c2aOVyvtyNae/UP3/O47HgAI9LXoAbzChlMi15o5YTyaxUCgYEA56ThYW4+9CB1Q+qFkz4KyarI4//AHyha/LELXpeRICidxDw6PQdfBi/75udbQDI0tISJjio+S8sKUlCWcHi/1/A8k0aZBN1rs9mTVQrN1zMbSgoYOHOIGE4147ig5vU6gjvpI/SPbeg3BLg3rd/3IOsDmh4HoVhSUINUwJ9dK2MCgYEAuHU5eeInSKeEPWMMqql+OxHnA7g/Z9RYJsuuXrNm8qsGDxJbJmVfBsa7Uo466hwr3OhMuk2ShensEzFYxDrURgADjAgVn7puzMUtHYMNcK06Se8g/Crq6UYM0OGaFfKVMgX8gq+eAdDZmX+WmdJBgakVLfjxlQ94ar5EGe+w/8cCgYB4TjyzsmNFvRnKJSIsn7tQk790Ep7AT+A5fuXNweAgmJeflDwW+B4VA5TLjnro82pGGtOqHyxths0chTgsv7m7N8zuHGtaiHjoVmbbcxoG20cgA/AiWXZkUTJRy9DdQp2Zh+4Eu35GcaUpcVeRmVErKoObZl9GH63YnOzGgb4MywKBgGebWHRQhfY2OX3tg7DcUQ3GyXZ6aAre58CqyT9iD2Igk9+lVNNlPxHkUFVXlFnpBu4nAOnoJnPXZ4WEQzK9RHwpB9UAuXylUBTub5/S+5qdgk8C5Qke5iGu+gXdohnPzuNxH1scX2jvsTmZw7KUubylh0LyQGeUb/Os+T2EN2wDAoGASbDD8hLDI64DpDp73XHbKbrdHaz7c9NkUsLD3FB6nmGQtAD8Gvuvd3PvhhBGz5O/ndUU0KSdZb4Yg3/3Qx4TWIJhobkXsNLkv+aPNxyjQBkFfJmXjsx2phsvjPNRICBeWlLKbB30SbZ6uCs6uypebSzIxdjT2riFmuuaJtsZJVM=';
+    private $rsaPrivateKey = 'MIIEowIBAAKCAQEAmDggf4zno5KmKKEv0gbKctXyceEylTbWgZhannFGDXBkVkUqKC1btcKOFRWteVcQDFFCAgMobiTxH4rpIopyoC3x66mAynTVQnEWYFCyc628ZMAJ6aXQMvYNmzJgDczX8YI9taXbOf2YtV3uLdSs6t3Qm/rCBfrn/wj30QNsUm1f8yqCiHVwZ3jTM3ygKCr4SU3XjTKa1IqlYvGgIHrNHmTwATxvNRXa9pDTvSFz/zdvFxveWBn9PDhiNVebgEDFq0Xtv//z78UzRC3T8vV7HfCvcuR/gH0bVhvTzK55VlXlANM8o06tGsOj1jpJUGjUeMe2yiH9bDO810zNuri9LwIDAQABAoIBADoZQh4s88S1FoJvc0cgnGjUTCM3Jw1YzurL8dqDtY8vlLxwzbRkC5sGVSCrE3k6x79LzHvkJKxVoUq+xFkQqsuEfc/K9INRsIwZicbdRh9s8nkp6x6o0RyCWZMg2RSrWMivQ0pvsYsixgSDg4Mup4lFfHfsb93EdIQdMikuu0uCKFcXLO8UTma7mBRLdOis11vaZv7ROVftEUww9MZHCh/AJl7S73RvwZwZHQ9H5Y7fJ8EFqARJmTDEwDaOUQUGVTVho85KIlvpQ9gYbwy9R+xbftBSra+/THTiYjcMPR06wbf0dQwSunsz/NK4guVIpjKD23hQI1XcTcvxl6qRvjECgYEA12oro1NV9U4wVdwbbGzonW3hyNIE8pNbs3AE4q8pJF8aTVVnQuicunrgfK1W88urrngMMx+byg4ZnxUmahcyU+fId+z6FZbfypij+lMRpF85oQ0bhcXn04dcJimMlNrV4i62GeVcKtaAvoVXNYOXeS7SHtZ2nI0f7ArHbdgpbgMCgYEAtOXtfm3+CmNrlbhyPXPjUbNY3q3Uo09X6R01zYSvIobl3hoVVsw+7zJIAAaCTLcRxiVhvK5QVdRi/ohUphu2YugJx8fzNw6zl0iR/B9dWpDplMFDn3VOuS5UBeIHDn1C/A8RO7VKmYpCSAyHZxaxg0sAsAqjn9pk0ClvFpshcmUCgYEAwxXL32Yher8M1zU3QMKBB9HzoMNS57y8V40jX4fyYpYeY9rsYZP4HIobs83n6XKSULc3lTUTCbIrUf79gybu1T4cNz/OXK7+jaQfHR0N5Sa4MjqEqmnIwbDcq1MFlel5uhVDpcAp8EHC5sgrarN6Aq18baEcWjsUpdg9NCWHn7ECgYAVcyodErfLzYwlPbC2Hra2qliAVwZesvrOlnsZuoD1zB8Xneon16IixMiK0DrFE/QUlbwoHldCRiPS4KGA7MpMogz+1nO9dI3RA3bj+WgdZA9+Zwg4sTU7egXWiL2jdzDpKHQ3q0CEQkOnvWyUybkUw2D6fth2DPRlRnR4rr5hjQKBgHxl/E/sWi8iTN1thUbWzs2Q/8Qt+CHiXnWEU1rraV/0OlE4wbYVyFxURuZHCNdpTyuj0LS28WanbjJsmceL//+hy5qcjSBFJ8UO4Mw8pwDM8SEfWbo/MHNV48ElovOXxLrKTuvQUR6duWkv73qZYOpPYr+Rl0ylHGvNsqsLY7LZ';
     
     public function transfer($aliAccount, $realName, $orderId, $amount, $title='') {
         

ThinkPHP/Library/Vendor/Alipay2020/cert/alipayCertPublicKey_RSA2.crt

@@ -1,19 +1,19 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+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
-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
+pTnUE7+3YJ6lxzTrdEAeL3Z6lY/YQJjW/ewrqfJBtducXeeTdoBlZLNLfAR/6ap4HtsUH33ftjzK
-a6dCWST29d2PVzE7cF48tOYvqc6TQj6wUoXBDV4iU4onX1JJbDA2mQcfOzplRRJh70OUqqnbyTig
+WA9JyiqKiAwqfNDJo/RjxPLCAwMFXmfoZdwgF7pib/I6Y4HkrU8RFcFEg+I/5DHbR6giaFflZ6n/
-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
+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
-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
+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
 -----END CERTIFICATE-----

ThinkPHP/Library/Vendor/Alipay2020/cert/appCertPublicKey_2021001165628090.crt

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEtDCCA5ygAwIBAgIQICAGGaaBO7FBxTQH7IscmDANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UE
+BhMCQ04xFjAUBgNVBAoMDUFudCBGaW5hbmNpYWwxIDAeBgNVBAsMF0NlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MTkwNwYDVQQDDDBBbnQgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IENs
+YXNzIDEgUjEwHhcNMjAwNjE5MDc1OTUwWhcNMjIwNjE5MDc1OTUwWjB8MQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwn56aP5bu66YeR6I+g6I+c572R57uc56eR5oqA5pyJ6ZmQ5YWs5Y+4MQ8wDQYDVQQL
+DAZBbGlwYXkxKjAoBgNVBAMMITIwODgzMzEwODI4MzU0MjEtMjAyMTAwMTE2NTYyODA5MDCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJg4IH+M56OSpiihL9IGynLV8nHhMpU21oGYWp5x
+Rg1wZFZFKigtW7XCjhUVrXlXEAxRQgIDKG4k8R+K6SKKcqAt8eupgMp01UJxFmBQsnOtvGTACeml
+0DL2DZsyYA3M1/GCPbWl2zn9mLVd7i3UrOrd0Jv6wgX65/8I99EDbFJtX/Mqgoh1cGd40zN8oCgq
++ElN140ymtSKpWLxoCB6zR5k8AE8bzUV2vaQ070hc/83bxcb3lgZ/Tw4YjVXm4BAxatF7b//8+/F
+M0Qt0/L1ex3wr3Lkf4B9G1Yb08yueVZV5QDTPKNOrRrDo9Y6SVBo1HjHtsoh/WwzvNdMzbq4vS8C
+AwEAAaOCASkwggElMB8GA1UdIwQYMBaAFHEH4gRhFuTl8mXrMQ/J4PQ8mtWRMB0GA1UdDgQWBBQc
+ZHMKu7te5Gjs21/AcjE6mO+x/TBABgNVHSAEOTA3MDUGB2CBHAFuAQEwKjAoBggrBgEFBQcCARYc
+aHR0cDovL2NhLmFsaXBheS5jb20vY3BzLnBkZjAOBgNVHQ8BAf8EBAMCBsAwLwYDVR0fBCgwJjAk
+oCKgIIYeaHR0cDovL2NhLmFsaXBheS5jb20vY3JsNDIuY3JsMGAGCCsGAQUFBwEBBFQwUjAoBggr
+BgEFBQcwAoYcaHR0cDovL2NhLmFsaXBheS5jb20vY2E2LmNlcjAmBggrBgEFBQcwAYYaaHR0cDov
+L2NhLmFsaXBheS5jb206ODM0MC8wDQYJKoZIhvcNAQELBQADggEBAGQL5J9FSNgCQ5vL2kIZYGvu
+1gsaqdcmlceVxP3yd9hBdVFDZ4sBCuiXkWhZZtiHeVgWklXEIj8rQuZ5KkDBzBa/qS6AadL3g108
+kQuEAlrIj7Gf9Nl9WD+mavASV1khI9297WKgWE70n59h9FDCkUL2jtLDSAcvOP3bk4aMNXjIFsWb
+7rrHsn4S4aGdRhunI9Gumlkp0Si/YHrvC2LoHd2NZbFGFKR5bGh/JIUFdlal0+fUZ1UMxlrHe1HZ
+NNMnQonmgovAsCfzkrhADofXT3X7bjruK0teffRk1imtzgjtjscxlVkZWSrnqIbZ03vpYSUn2Ioe
+Zs9+maCIK7pv5I8=
+-----END CERTIFICATE-----