diff --git a/packages/core/pipeline/src/core/executor.ts b/packages/core/pipeline/src/core/executor.ts index fee6c98d..7c01dd48 100644 --- a/packages/core/pipeline/src/core/executor.ts +++ b/packages/core/pipeline/src/core/executor.ts @@ -295,6 +295,12 @@ export class Executor { const pluginConfig = await this.options.pluginConfigService.getPluginConfig(pluginName); //从outputContext读取输入参数 const input = cloneDeep(step.input); + const sysInput = pluginConfig.sysSetting?.input || {}; + //注入系统设置参数 + for (const sysInputKey in sysInput) { + input[sysInputKey] = sysInput[sysInputKey]; + } + Decorator.inject(define.input, instance, input, (item, key) => { if (item.component?.name === "output-selector") { const contextKey = input[key]; @@ -314,12 +320,6 @@ export class Executor { } }); - const sysInput = pluginConfig.sysSetting?.input || {}; - //注入系统设置参数 - for (const sysInputKey in sysInput) { - input[sysInputKey] = sysInput[sysInputKey]; - } - const newInputHash = hashUtils.md5(JSON.stringify(input)); step.status!.inputHash = newInputHash; //判断是否需要跳过 @@ -438,7 +438,7 @@ export class Executor { const runnableError = error as RunnableError; content = `流水线ID:${this.pipeline.id},运行ID:${this.runtime.id}\n\n`; for (const re of runnableError.errors) { - content += ` - ${re.runnable.title} 执行失败,错误详情:${re.e.message || re.e?.error?.message}\n\n`; + content += ` - ${re.runnable.title} 执行失败,错误详情:${re.e?.message || re.e?.error?.message}\n\n`; } } else { content = `流水线ID:${this.pipeline.id},运行ID:${this.runtime.id}\n\n${this.currentStatusMap?.currentStep?.title} 执行失败\n\n错误详情:${error.message}`; diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts index 39a1e552..6f6a58c4 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/index.ts @@ -320,7 +320,7 @@ export class CertApplyPlugin extends CertApplyBasePlugin { this.logger.info("当前正在使用 google EAB授权"); eab = await this.getAccess(this.eabAccessId); } else if (this.googleCommonEabAccessId) { - this.logger.info("当前正在使用 google公共EAB授权"); + this.logger.info("当前正在使用 google 公共EAB授权"); eab = await this.getAccess(this.googleCommonEabAccessId, true); } else { throw new Error("google需要配置EAB授权或服务账号授权");