fix: 证书私钥 EC 指示

This commit is contained in:
net909
2025-11-04 20:42:52 +08:00
parent b58db855ca
commit ba418da84c
2 changed files with 7 additions and 6 deletions

View File

@@ -304,7 +304,9 @@ class Cert extends BaseController
}
}
$privatekey = CertHelper::ensureECPrivateKeyFormat($privatekey);
if ($certInfo['keytype'] == 'ECC') {
$privatekey = CertHelper::ensureECPrivateKeyFormat($privatekey);
}
$order = [
'aid' => 0,
@@ -369,7 +371,9 @@ class Cert extends BaseController
if ($certInfo['code'] == -1) return json($certInfo);
$domains = $certInfo['domains'];
$privatekey = CertHelper::ensureECPrivateKeyFormat($privatekey);
if ($certInfo['keytype'] == 'ECC') {
$privatekey = CertHelper::ensureECPrivateKeyFormat($privatekey);
}
$order = [
'aid' => 0,

View File

@@ -342,10 +342,7 @@ class CertOrderService
throw $e;
}
$this->order['issuer'] = $result['issuer'];
$private_key = CertHelper::ensureECPrivateKeyFormat($result['private_key']);
Db::name('cert_order')->where('id', $this->order['id'])->update(['fullchain' => $result['fullchain'], 'privatekey' => $private_key, 'issuer' => $result['issuer'], 'issuetime' => date('Y-m-d H:i:s', $result['validFrom']), 'expiretime' => date('Y-m-d H:i:s', $result['validTo'])]);
Db::name('cert_order')->where('id', $this->order['id'])->update(['fullchain' => $result['fullchain'], 'privatekey' => $result['private_key'], 'issuer' => $result['issuer'], 'issuetime' => date('Y-m-d H:i:s', $result['validFrom']), 'expiretime' => date('Y-m-d H:i:s', $result['validTo'])]);
$this->saveResult(3);
$this->resetRetry();
}