diff --git a/packages/core/basic/src/utils/util.options.ts b/packages/core/basic/src/utils/util.options.ts index 96180e60..4689c9df 100644 --- a/packages/core/basic/src/utils/util.options.ts +++ b/packages/core/basic/src/utils/util.options.ts @@ -37,6 +37,8 @@ function buildGroupOptions(options: any[], inDomains: string[]) { } export const optionsUtils = { + //获取分组 groupByDomain, + //构建分组后的选项列表,常用 buildGroupOptions, }; diff --git a/packages/core/basic/src/utils/util.request.ts b/packages/core/basic/src/utils/util.request.ts index 9342d73a..5f119214 100644 --- a/packages/core/basic/src/utils/util.request.ts +++ b/packages/core/basic/src/utils/util.request.ts @@ -156,13 +156,13 @@ export function createAxiosService({ logger }: { logger: Logger }) { error.message = '请求错误'; break; case 401: - error.message = '未授权,请登录'; + error.message = '认证/登录失败'; break; case 403: error.message = '拒绝访问'; break; case 404: - error.message = `请求地址出错: ${error.response.config.url}`; + error.message = `请求地址出错`; break; case 408: error.message = '请求超时'; @@ -216,6 +216,7 @@ export type HttpRequestConfig = { logParams?: boolean; logRes?: boolean; httpProxy?: string; + returnResponse?: boolean; } & AxiosRequestConfig; export type HttpClient = { request(config: HttpRequestConfig): Promise>; diff --git a/packages/core/pipeline/src/core/executor.ts b/packages/core/pipeline/src/core/executor.ts index 874c525a..3f09b402 100644 --- a/packages/core/pipeline/src/core/executor.ts +++ b/packages/core/pipeline/src/core/executor.ts @@ -385,7 +385,7 @@ export class Executor { content = `流水线ID:${this.pipeline.id},运行ID:${this.runtime.id}`; } else if (when === "error") { subject = `执行失败,${this.pipeline.title}【${this.pipeline.id}】`; - content = `流水线ID:${this.pipeline.id},运行ID:${this.runtime.id}\n错误详情:${error.message}`; + content = `流水线ID:${this.pipeline.id},运行ID:${this.runtime.id}\n\n${this.currentStatusMap?.currentStep?.title} 执行失败\n\n错误详情:${error.message}`; } else { return; } diff --git a/packages/core/pipeline/src/core/run-history.ts b/packages/core/pipeline/src/core/run-history.ts index 1c271186..be7e1111 100644 --- a/packages/core/pipeline/src/core/run-history.ts +++ b/packages/core/pipeline/src/core/run-history.ts @@ -134,6 +134,7 @@ export class RunHistory { export class RunnableCollection { private collection: RunnableMap = {}; private pipeline!: Pipeline; + currentStep!: Step; constructor(pipeline?: Pipeline) { if (!pipeline) { return; @@ -193,5 +194,8 @@ export class RunnableCollection { add(runnable: Runnable) { this.collection[runnable.id] = runnable; + if (runnable.runnableType === "step") { + this.currentStep = runnable as Step; + } } }