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 ece87a32..57cbe9db 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts @@ -48,14 +48,15 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { email!: string; @TaskInput({ - title: "证书密码", + title: "PFX证书密码", component: { name: "input-password", vModel: "value", }, required: false, order: 100, - helper: "PFX、jks格式证书是否加密;jks必须设置密码,不传则默认123456", + // helper: "PFX、jks格式证书是否加密;jks必须设置密码,不传则默认123456", + helper: "PFX证书是否加密", }) pfxPassword!: string; @@ -150,7 +151,7 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { } this._result.pipelinePrivateVars.cert = cert; - if (cert.pfx == null || cert.der == null || cert.jks == null) { + if (cert.pfx == null || cert.der == null) { try { const converter = new CertConverter({ logger: this.logger }); const res = await converter.convert({ @@ -161,22 +162,24 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { const pfxBuffer = fs.readFileSync(res.pfxPath); cert.pfx = pfxBuffer.toString("base64"); fs.unlinkSync(res.pfxPath); + isNew = true; } if (res.derPath) { const derBuffer = fs.readFileSync(res.derPath); cert.der = derBuffer.toString("base64"); fs.unlinkSync(res.derPath); + isNew = true; } if (res.jksPath) { const jksBuffer = fs.readFileSync(res.jksPath); cert.jks = jksBuffer.toString("base64"); fs.unlinkSync(res.jksPath); + isNew = true; } this.logger.info("转换证书格式成功"); - isNew = true; } catch (e) { this.logger.error("转换证书格式失败", e); } 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 79d62cfe..9d9e2c3b 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/convert.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/convert.ts @@ -30,7 +30,7 @@ export class CertConverter { // 转der derPath = await this.convertDer(ctx); - jksPath = await this.convertJks(ctx, pfxPath, opts.pfxPassword); + // jksPath = await this.convertJks(ctx, pfxPath, opts.pfxPassword); }; await certReader.readCertFile({ logger: this.logger, handle }); diff --git a/packages/ui/Dockerfile b/packages/ui/Dockerfile index f11f22ea..2eb71680 100644 --- a/packages/ui/Dockerfile +++ b/packages/ui/Dockerfile @@ -13,7 +13,7 @@ RUN cd /workspace/certd-server && pnpm install && npm run build-on-docker FROM node:18-alpine RUN apk add --no-cache openssl -RUN apk add --no-cache openjdk11 +RUN #apk add --no-cache openjdk11-jdk WORKDIR /app/ COPY --from=builder /workspace/certd-server/ /app/ RUN chmod +x /app/tools/linux/* diff --git a/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts index 7a8bb3b1..a541f16c 100644 --- a/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-host/plugin/copy-to-local/index.ts @@ -67,14 +67,14 @@ export class CopyCertToLocalPlugin extends AbstractTaskPlugin { }) derPath!: string; - @TaskInput({ - title: 'jks证书保存路径', - helper: '用于java,路径要包含文件名,例如:tmp/cert.jks', - component: { - placeholder: 'tmp/cert.jks', - }, - rules: [{ type: 'filepath' }], - }) + // @TaskInput({ + // title: 'jks证书保存路径', + // helper: '用于java,路径要包含文件名,例如:tmp/cert.jks', + // component: { + // placeholder: 'tmp/cert.jks', + // }, + // rules: [{ type: 'filepath' }], + // }) jksPath!: string; @TaskInput({ diff --git a/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts b/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts index 0f9e8b0f..12c21bc8 100644 --- a/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts @@ -67,14 +67,14 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin { }) derPath!: string; - @TaskInput({ - title: 'jks证书保存路径', - helper: '需要有写入权限,路径要包含证书文件名,例如:/tmp/cert.jks', - component: { - placeholder: '/root/deploy/nginx/cert.jks', - }, - rules: [{ type: 'filepath' }], - }) + // @TaskInput({ + // title: 'jks证书保存路径', + // helper: '需要有写入权限,路径要包含证书文件名,例如:/tmp/cert.jks', + // component: { + // placeholder: '/root/deploy/nginx/cert.jks', + // }, + // rules: [{ type: 'filepath' }], + // }) jksPath!: string; @TaskInput({