mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-06 03:58:04 +08:00
Merge branch 'v6' of https://github.com/zoujingli/ThinkAdmin into v6
This commit is contained in:
commit
cafdf3abdf
@ -54,11 +54,7 @@ class AlipayPaymentService extends PaymentService
|
||||
*/
|
||||
private function _trimCertHeader(string $content): string
|
||||
{
|
||||
$search = [
|
||||
'-----BEGIN PUBLIC KEY-----', '-----END PUBLIC KEY-----',
|
||||
'-----BEGIN RSA PRIVATE KEY-----', '-----END RSA PRIVATE KEY-----',
|
||||
];
|
||||
return preg_replace('/\s+/', '', str_replace(trim($content), $search, ''));
|
||||
return preg_replace(['/\s+/', '/-{5}.*?-{5}/'], '', $content);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user