perf: 优化成功后跳过的提示

packages/ui/certd-server/src/plugins/plugin-aliyun/access/aliyun-access.ts

@@ -11,8 +11,7 @@ export class AliyunAccess {
     component: {
       placeholder: 'accessKeyId',
     },
-    helper:
-      '注意：证书申请，需要dns解析权限；其他阿里云插件，也需要对应的权限，比如证书上传需要证书管理权限',
+    helper: '注意：证书申请，需要dns解析权限；其他阿里云插件，也需要对应的权限，比如证书上传需要证书管理权限',
     required: true,
   })
   accessKeyId = '';

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-ack-ingress/index.ts

@@ -1,4 +1,4 @@
-import { AbstractTaskPlugin, IAccessService, ILogger, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, utils } from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, utils } from '@certd/pipeline';
 // @ts-ignore
 import { ROAClient } from '@alicloud/pop-core';
 import { AliyunAccess } from '../../access/index.js';
@@ -106,13 +106,7 @@ export class DeployCertToAliyunAckIngressPlugin extends AbstractTaskPlugin {
   })
   accessId!: string;
 
-  accessService!: IAccessService;
-  logger!: ILogger;
-
-  async onInstance(): Promise<void> {
-    this.accessService = this.ctx.accessService;
-    this.logger = this.ctx.logger;
-  }
+  async onInstance(): Promise<void> {}
   async execute(): Promise<void> {
     console.log('开始部署证书到阿里云cdn');
     const { regionId, ingressClass, clusterId, isPrivateIpAddress, cert } = this;
@@ -121,7 +115,7 @@ export class DeployCertToAliyunAckIngressPlugin extends AbstractTaskPlugin {
     const kubeConfigStr = await this.getKubeConfig(client, clusterId, isPrivateIpAddress);
 
     this.logger.info('kubeconfig已成功获取');
-    const k8sClient = new K8sClient(kubeConfigStr,this.logger);
+    const k8sClient = new K8sClient(kubeConfigStr, this.logger);
     const ingressType = ingressClass || 'qcloud';
     if (ingressType === 'qcloud') {
       throw new Error('暂未实现');

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/deploy-to-cdn/index.ts

@@ -1,11 +1,4 @@
-import {
-  AbstractTaskPlugin,
-  IAccessService,
-  ILogger,
-  IsTaskPlugin, pluginGroups,
-  RunStrategy,
-  TaskInput,
-} from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
 import dayjs from 'dayjs';
 import Core from '@alicloud/pop-core';
 import RPCClient from '@alicloud/pop-core';
@@ -57,18 +50,10 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
   })
   accessId!: string;
 
-  accessService!: IAccessService;
-  logger!: ILogger;
-
-  async onInstance() {
-    this.accessService = this.ctx.accessService;
-    this.logger = this.ctx.logger;
-  }
+  async onInstance() {}
   async execute(): Promise<void> {
     console.log('开始部署证书到阿里云cdn');
-    const access = (await this.accessService.getById(
-      this.accessId
-    )) as AliyunAccess;
+    const access = (await this.accessService.getById(this.accessId)) as AliyunAccess;
     const client = this.getClient(access);
     const params = await this.buildParams();
     await this.doRequest(client, params);
@@ -85,8 +70,7 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
   }
 
   async buildParams() {
-    const CertName =
-      (this.certName ?? 'certd') + '-' + dayjs().format('YYYYMMDDHHmmss');
+    const CertName = (this.certName ?? 'certd') + '-' + dayjs().format('YYYYMMDDHHmmss');
     const cert: any = this.cert;
     return {
       RegionId: 'cn-hangzhou',
@@ -103,11 +87,7 @@ export class DeployCertToAliyunCDN extends AbstractTaskPlugin {
     const requestOption = {
       method: 'POST',
     };
-    const ret: any = await client.request(
-      'SetDomainServerCertificate',
-      params,
-      requestOption
-    );
+    const ret: any = await client.request('SetDomainServerCertificate', params, requestOption);
     this.checkRet(ret);
     this.logger.info('设置cdn证书成功:', ret.RequestId);
   }

packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts

@@ -1,8 +1,7 @@
-import { AbstractTaskPlugin, IAccessService, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline';
 import Core from '@alicloud/pop-core';
 import { AliyunAccess } from '../../access/index.js';
 import { appendTimeSuffix, checkRet, ZoneOptions } from '../../utils/index.js';
-import { Logger } from 'log4js';
 
 @IsTaskPlugin({
   name: 'uploadCertToAliyun',
@@ -26,8 +25,7 @@ export class UploadCertToAliyun extends AbstractTaskPlugin {
     title: '大区',
     value: 'cn-hangzhou',
     component: {
-      name: 'a-select',
-      mode: 'tags',
+      name: 'a-auto-complete',
       vModel: 'value',
       options: ZoneOptions,
     },
@@ -61,13 +59,7 @@ export class UploadCertToAliyun extends AbstractTaskPlugin {
   })
   aliyunCertId!: string;
 
-  accessService!: IAccessService;
-  logger!: Logger;
-
-  async onInstance() {
-    this.accessService = this.ctx.accessService;
-    this.logger = this.ctx.logger;
-  }
+  async onInstance() {}
 
   async execute(): Promise<void> {
     console.log('开始部署证书到阿里云cdn');

packages/ui/certd-server/src/plugins/plugin-cloudflare/plugins/plugin-deploy-to-cdn.ts

@@ -1,4 +1,4 @@
-import { AbstractTaskPlugin, IAccessService, ILogger, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
 import { CertInfo, CertReader } from '@certd/plugin-cert';
 
 @IsTaskPlugin({
@@ -28,8 +28,8 @@ export class CloudflareDeployToCDNPlugin extends AbstractTaskPlugin {
     title: '选择框',
     component: {
       //前端组件配置，具体配置见组件文档 https://www.antdv.com/components/select-cn
-      name: 'a-select',
-      mode: 'tags',
+      name: 'a-auto-complete',
+      vModel: 'value',
       options: [
         { value: '1', label: '选项1' },
         { value: '2', label: '选项2' },
@@ -71,13 +71,7 @@ export class CloudflareDeployToCDNPlugin extends AbstractTaskPlugin {
   })
   accessId!: string;
 
-  accessService!: IAccessService;
-  logger!: ILogger;
-
-  async onInstance() {
-    this.accessService = this.ctx.accessService;
-    this.logger = this.ctx.logger;
-  }
+  async onInstance() {}
   async execute(): Promise<void> {
     const { select, text, cert, accessId } = this;
     const certReader = new CertReader(cert);

packages/ui/certd-server/src/plugins/plugin-demo/plugins/plugin-test.ts

@@ -1,6 +1,5 @@
-import { AbstractTaskPlugin, IAccessService, ILogger, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
 import { CertInfo, CertReader } from '@certd/plugin-cert';
-import { K8sClient } from '@certd/lib-k8s';
 
 @IsTaskPlugin({
   name: 'demoTest',
@@ -28,8 +27,8 @@ export class DemoTestPlugin extends AbstractTaskPlugin {
     title: '选择框',
     component: {
       //前端组件配置，具体配置见组件文档 https://www.antdv.com/components/select-cn
-      name: 'a-select',
-      mode: 'tags',
+      name: 'a-auto-complete',
+      vModel: 'value',
       options: [
         { value: '1', label: '选项1' },
         { value: '2', label: '选项2' },
@@ -55,7 +54,7 @@ export class DemoTestPlugin extends AbstractTaskPlugin {
     component: {
       name: 'pi-output-selector',
     },
-    required: true,
+    // required: true,
   })
   cert!: CertInfo;
 
@@ -67,31 +66,33 @@ export class DemoTestPlugin extends AbstractTaskPlugin {
       name: 'pi-access-selector',
       type: 'demo', //固定授权类型
     },
-    rules: [{ required: true, message: '此项必填' }],
+    // rules: [{ required: true, message: '此项必填' }],
   })
   accessId!: string;
 
-  accessService!: IAccessService;
-  logger!: ILogger;
-
-  async onInstance() {
-    this.accessService = this.ctx.accessService;
-    this.logger = this.ctx.logger;
-  }
+  async onInstance() {}
   async execute(): Promise<void> {
     const { select, text, cert, accessId } = this;
-    const certReader = new CertReader(cert);
-    const access = await this.accessService.getById(accessId);
-    this.logger.debug('access', access);
-    this.logger.debug('certReader', certReader);
+
+    try {
+      const access = await this.accessService.getById(accessId);
+      this.logger.debug('access', access);
+    } catch (e) {
+      this.logger.error('获取授权失败', e);
+    }
+
+    try {
+      const certReader = new CertReader(cert);
+      this.logger.debug('certReader', certReader);
+    } catch (e) {
+      this.logger.error('读取crt失败', e);
+    }
+
     this.logger.info('DemoTestPlugin execute');
     this.logger.info('text:', text);
     this.logger.info('select:', select);
     this.logger.info('switch:', this.switch);
     this.logger.info('授权id:', accessId);
-    //TODO 这里实现你要部署的执行方法
-
-    new K8sClient('111', null);
   }
 }
 //TODO 这里实例化插件，进行注册

packages/ui/certd-server/src/plugins/plugin-host/plugin/host-shell-execute/index.ts

@@ -1,4 +1,4 @@
-import { AbstractTaskPlugin, IAccessService, ILogger, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
 import { SshClient } from '../../lib/ssh.js';
 
 @IsTaskPlugin({
@@ -34,12 +34,7 @@ export class HostShellExecutePlugin extends AbstractTaskPlugin {
   })
   script!: string;
 
-  accessService!: IAccessService;
-  logger!: ILogger;
-  async onInstance() {
-    this.accessService = this.ctx.accessService;
-    this.logger = this.ctx.logger;
-  }
+  async onInstance() {}
   async execute(): Promise<void> {
     const { script, accessId } = this;
     const connectConf = await this.accessService.getById(accessId);

packages/ui/certd-server/src/plugins/plugin-host/plugin/upload-to-host/index.ts

@@ -1,4 +1,4 @@
-import { AbstractTaskPlugin, IAccessService, ILogger, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline';
 import { SshClient } from '../../lib/ssh.js';
 import { CertInfo, CertReader } from '@certd/plugin-cert';
 import * as fs from 'fs';
@@ -86,13 +86,7 @@ export class UploadCertToHostPlugin extends AbstractTaskPlugin {
   })
   hostKeyPath!: string;
 
-  accessService!: IAccessService;
-  logger!: ILogger;
-
-  async onInstance() {
-    this.accessService = this.ctx.accessService;
-    this.logger = this.ctx.logger;
-  }
+  async onInstance() {}
 
   copyFile(srcFile: string, destFile: string) {
     const dir = destFile.substring(0, destFile.lastIndexOf('/'));

packages/ui/certd-server/src/plugins/plugin-other/access/index.ts

@@ -0,0 +1 @@
+export * from './k8s-access.js';

packages/ui/certd-server/src/plugins/plugin-other/access/k8s-access.ts

@@ -0,0 +1,19 @@
+import { IsAccess, AccessInput } from '@certd/pipeline';
+
+@IsAccess({
+  name: 'k8s',
+  title: 'k8s授权',
+  desc: '',
+})
+export class K8sAccess {
+  @AccessInput({
+    title: 'kubeconfig',
+    component: {
+      placeholder: 'kubeconfig',
+    },
+    required: true,
+  })
+  kubeconfig = '';
+}
+
+new K8sAccess();

packages/ui/certd-server/src/plugins/plugin-tencent/access/dnspod-access.ts

@@ -10,8 +10,7 @@ export class DnspodAccess {
     title: '端点',
     component: {
       placeholder: 'endpoint',
-      name: 'a-select',
-      mode: 'tags',
+      name: 'a-auto-complete',
       vModel: 'value',
       options: [
         { value: 'https://dnsapi.cn', label: '中国站' },

packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-cdn/index.ts

@@ -1,4 +1,4 @@
-import { AbstractTaskPlugin, IAccessService, ILogger, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput } from '@certd/pipeline';
 import tencentcloud from 'tencentcloud-sdk-nodejs';
 import { TencentAccess } from '../../access/index.js';
 import { CertInfo } from '@certd/plugin-cert';
@@ -59,14 +59,7 @@ export class DeployToCdnPlugin extends AbstractTaskPlugin {
   // })
   // endpoint!: string;
 
-  accessService!: IAccessService;
-
-  logger!: ILogger;
-
-  async onInstance() {
-    this.accessService = this.ctx.accessService;
-    this.logger = this.ctx.logger;
-  }
+  async onInstance() {}
 
   async execute(): Promise<void> {
     const accessProvider: TencentAccess = (await this.accessService.getById(this.accessId)) as TencentAccess;

packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-clb/index.ts

@@ -1,4 +1,4 @@
-import { AbstractTaskPlugin, IAccessService, ILogger, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, utils } from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, utils } from '@certd/pipeline';
 import tencentcloud from 'tencentcloud-sdk-nodejs';
 import { TencentAccess } from '../../access/index.js';
 import dayjs from 'dayjs';
@@ -17,10 +17,9 @@ import dayjs from 'dayjs';
 export class DeployToClbPlugin extends AbstractTaskPlugin {
   @TaskInput({
     title: '大区',
-    value: 'ap-guangzhou',
     component: {
-      name: 'a-select',
-      mode: 'tags',
+      name: 'a-auto-complete',
+      vModel: 'value',
       options: [
         { value: 'ap-guangzhou' },
         { value: 'ap-beijing' },
@@ -93,13 +92,7 @@ export class DeployToClbPlugin extends AbstractTaskPlugin {
   })
   accessId!: string;
 
-  accessService!: IAccessService;
-  logger!: ILogger;
-
-  async onInstance() {
-    this.accessService = this.ctx.accessService;
-    this.logger = this.ctx.logger;
-  }
+  async onInstance() {}
   async execute(): Promise<void> {
     const accessProvider = (await this.accessService.getById(this.accessId)) as TencentAccess;
     const client = this.getClient(accessProvider, this.region);

packages/ui/certd-server/src/plugins/plugin-tencent/plugin/deploy-to-tke-ingress/index.ts

@@ -1,8 +1,7 @@
-import { AbstractTaskPlugin, IAccessService, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, utils } from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, utils } from '@certd/pipeline';
 import tencentcloud from 'tencentcloud-sdk-nodejs';
 import { K8sClient } from '@certd/lib-k8s';
 import dayjs from 'dayjs';
-import { Logger } from 'log4js';
 
 @IsTaskPlugin({
   name: 'DeployCertToTencentTKEIngress',
@@ -38,8 +37,10 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin {
 
   @TaskInput({
     title: 'ingress类型',
+    value: 'qcloud',
     component: {
-      name: 'a-select',
+      name: 'a-auto-complete',
+      vModel: 'value',
       options: [{ value: 'qcloud' }, { value: 'nginx' }],
     },
     helper: '可选 qcloud / nginx',
@@ -89,12 +90,7 @@ export class DeployCertToTencentTKEIngressPlugin extends AbstractTaskPlugin {
   })
   cert!: any;
 
-  logger!: Logger;
-  accessService!: IAccessService;
-  async onInstance() {
-    this.accessService = this.ctx.accessService;
-    this.logger = this.ctx.logger;
-  }
+  async onInstance() {}
   async execute(): Promise<void> {
     const accessProvider = await this.accessService.getById(this.accessId);
     const tkeClient = this.getTkeClient(accessProvider, this.region);

packages/ui/certd-server/src/plugins/plugin-tencent/plugin/upload-to-tencent/index.ts

@@ -1,4 +1,4 @@
-import { AbstractTaskPlugin, IAccessService, ILogger, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline';
+import { AbstractTaskPlugin, IsTaskPlugin, pluginGroups, RunStrategy, TaskInput, TaskOutput } from '@certd/pipeline';
 import tencentcloud from 'tencentcloud-sdk-nodejs';
 import dayjs from 'dayjs';
 
@@ -43,13 +43,7 @@ export class UploadToTencentPlugin extends AbstractTaskPlugin {
   })
   tencentCertId?: string;
 
-  accessService!: IAccessService;
-  logger!: ILogger;
-
-  async onInstance() {
-    this.accessService = this.ctx.accessService;
-    this.logger = this.ctx.logger;
-  }
+  async onInstance() {}
 
   async execute(): Promise<void> {
     const { accessId, name, cert } = this;