From 25d5a99b3dd3fed128507ec549d7185fbd6fbf65 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Thu, 27 Oct 2022 09:26:32 +0800 Subject: [PATCH] refactor: pipeline edit view --- packages/core/pipeline/src/access/access-service.ts | 2 +- packages/core/pipeline/src/access/api.ts | 2 ++ packages/core/pipeline/src/access/registry.ts | 5 +++++ .../core/pipeline/src/plugin/plugins/deploy-to-cdn/index.ts | 2 +- packages/server/certd-client | 2 +- packages/server/certd-server | 2 +- 6 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 packages/core/pipeline/src/access/registry.ts diff --git a/packages/core/pipeline/src/access/access-service.ts b/packages/core/pipeline/src/access/access-service.ts index e47564506..b200c0e7f 100644 --- a/packages/core/pipeline/src/access/access-service.ts +++ b/packages/core/pipeline/src/access/access-service.ts @@ -1,5 +1,5 @@ import { AbstractAccess } from "./abstract-access"; export interface IAccessService { - getById(id: any): AbstractAccess; + getById(id: any): Promise; } diff --git a/packages/core/pipeline/src/access/api.ts b/packages/core/pipeline/src/access/api.ts index d8099a7b7..c9be5456c 100644 --- a/packages/core/pipeline/src/access/api.ts +++ b/packages/core/pipeline/src/access/api.ts @@ -1,5 +1,6 @@ import { Registrable } from "../registry"; import { FormItemProps } from "@fast-crud/fast-crud"; +import { accessRegistry } from "./registry"; export type AccessDefine = Registrable & { input: { @@ -9,5 +10,6 @@ export type AccessDefine = Registrable & { export function IsAccess(define: AccessDefine) { return function (target: any) { target.prototype.define = define; + accessRegistry.install(target); }; } diff --git a/packages/core/pipeline/src/access/registry.ts b/packages/core/pipeline/src/access/registry.ts new file mode 100644 index 000000000..2f4ad7b10 --- /dev/null +++ b/packages/core/pipeline/src/access/registry.ts @@ -0,0 +1,5 @@ +import { Registry } from "../registry"; +import { AbstractAccess } from "./abstract-access"; + +// @ts-ignore +export const accessRegistry = new Registry(); diff --git a/packages/core/pipeline/src/plugin/plugins/deploy-to-cdn/index.ts b/packages/core/pipeline/src/plugin/plugins/deploy-to-cdn/index.ts index 5f8505b39..c8eeeaf4e 100644 --- a/packages/core/pipeline/src/plugin/plugins/deploy-to-cdn/index.ts +++ b/packages/core/pipeline/src/plugin/plugins/deploy-to-cdn/index.ts @@ -52,7 +52,7 @@ export class DeployCertToAliyunCDN extends AbstractPlugin implements TaskPlugin async execute(input: TaskInput): Promise { console.log("开始部署证书到阿里云cdn"); - const access = this.accessService.getById(input.accessId) as AliyunAccess; + const access = (await this.accessService.getById(input.accessId)) as AliyunAccess; const client = this.getClient(access); const params = await this.buildParams(input); await this.doRequest(client, params); diff --git a/packages/server/certd-client b/packages/server/certd-client index c9bae7552..ae0676e9e 160000 --- a/packages/server/certd-client +++ b/packages/server/certd-client @@ -1 +1 @@ -Subproject commit c9bae7552e25828d9a29d5be71b518b082c71eed +Subproject commit ae0676e9e3e32a9359195a1f0ab4b83c941698c1 diff --git a/packages/server/certd-server b/packages/server/certd-server index cb01f4fdd..1f108c8ee 160000 --- a/packages/server/certd-server +++ b/packages/server/certd-server @@ -1 +1 @@ -Subproject commit cb01f4fddf910d81b44556c907acea54dc298d5d +Subproject commit 1f108c8ee8d455eb9d99cd9131bf5bdc474efc0a