diff --git a/packages/core/pipeline/src/core/executor.ts b/packages/core/pipeline/src/core/executor.ts index b6d19a5f4..6007f963d 100644 --- a/packages/core/pipeline/src/core/executor.ts +++ b/packages/core/pipeline/src/core/executor.ts @@ -389,6 +389,9 @@ export class Executor { }; await instance.setCtx(taskCtx); + if (!(instance instanceof AbstractTaskPlugin)) { + throw new Error(`插件类型错误:${step.type}不是AbstractTaskPlugin的实例`); + } await instance.onInstance(); const result = await instance.execute(); //执行结果处理 @@ -398,6 +401,7 @@ export class Executor { } //输出上下文变量到output context forEach(define.output, (item: any, key: any) => { + // @ts-ignore step.status!.output[key] = instance[key]; // const stepOutputKey = `step.${step.id}.${key}`; // this.runtime.context[stepOutputKey] = instance[key]; @@ -411,7 +415,8 @@ export class Executor { merge(vars, instance._result.pipelineVars); await this.pipelineContext.setObj("vars", vars); } - if (Object.keys(instance._result.pipelinePrivateVars).length > 0) { + // @ts-ignore + if (Object.keys(instance._result?.pipelinePrivateVars).length > 0) { // 判断 pipelineVars 有值时更新 let vars = await this.pipelineContext.getObj("privateVars"); vars = vars || {}; diff --git a/packages/libs/lib-server/src/system/basic/service/plus-service.ts b/packages/libs/lib-server/src/system/basic/service/plus-service.ts index ad5b9c1ad..5fadece9e 100644 --- a/packages/libs/lib-server/src/system/basic/service/plus-service.ts +++ b/packages/libs/lib-server/src/system/basic/service/plus-service.ts @@ -164,7 +164,7 @@ export class PlusService { baseURL: plusRequestService.getBaseURL(), method: "post", headers: { - Authorization: `Berear ${token}`, + Authorization: `Bearer ${token}`, }, }); const res = await http.request(config); @@ -173,4 +173,9 @@ export class PlusService { } return res.data; } + + async request(config: HttpRequestConfig) { + const plusRequestService = await this.getPlusRequestService(); + return await plusRequestService.request(config); + } } diff --git a/packages/ui/certd-client/src/layout/layout-basic.vue b/packages/ui/certd-client/src/layout/layout-basic.vue index 39a2f3f78..111de3101 100644 --- a/packages/ui/certd-client/src/layout/layout-basic.vue +++ b/packages/ui/certd-client/src/layout/layout-basic.vue @@ -108,10 +108,10 @@ const projectStore = useProjectStore();
+