diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts index 0c3d0357..66386d66 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts @@ -49,15 +49,14 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { email!: string; @TaskInput({ - title: "PFX证书密码", + title: "证书密码", component: { name: "input-password", vModel: "value", }, required: false, order: 100, - // helper: "PFX、jks格式证书是否加密;jks必须设置密码,不传则默认123456", - helper: "PFX证书是否加密", + helper: "PFX、jks格式证书是否加密;jks必须设置密码,不传则默认123456", }) pfxPassword!: string; diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/convert.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/convert.ts index 0a051dfb..9ba4b172 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/convert.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/convert.ts @@ -106,8 +106,8 @@ export class CertConverter { const p12Path = path.join(os.tmpdir(), "/certd/tmp/", randomStr + `_cert.p12`); const { tmpCrtPath, tmpKeyPath } = opts; let passwordArg = "-passout pass:"; - if (pfxPassword) { - passwordArg = `-password pass:${pfxPassword}`; + if (jksPassword) { + passwordArg = `-password pass:${jksPassword}`; } await this.exec(`openssl pkcs12 -export -in ${tmpCrtPath} -inkey ${tmpKeyPath} -out ${p12Path} -name certd ${passwordArg}`); @@ -117,7 +117,7 @@ export class CertConverter { fs.mkdirSync(dir, { recursive: true }); } await this.exec( - `keytool -importkeystore -srckeystore ${p12Path} -srcstoretype PKCS12 -srcstorepass "${pfxPassword}" -destkeystore ${jksPath} -deststoretype PKCS12 -deststorepass "${jksPassword}" ` + `keytool -importkeystore -srckeystore ${p12Path} -srcstoretype PKCS12 -srcstorepass "${jksPassword}" -destkeystore ${jksPath} -deststoretype PKCS12 -deststorepass "${jksPassword}" ` ); fs.unlinkSync(p12Path); return jksPath;