diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue index 26dd9b48..0a0719a9 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue @@ -298,7 +298,7 @@ import { FsIcon } from "@fast-crud/fast-crud"; import { useSettingStore } from "/@/store/settings"; import { useUserStore } from "/@/store/user"; import TaskShortcuts from "./component/shortcut/task-shortcuts.vue"; -import { eachSteps, findStep } from "../utils"; +import { eachSteps, findStep, eachStages } from "../utils"; import { usePluginStore } from "/@/store/plugin"; import { getCronNextTimes } from "/@/components/cron-editor/utils"; import { useCertViewer } from "/@/views/certd/pipeline/use"; @@ -381,6 +381,9 @@ export default defineComponent({ //取消历史记录查看模式 currentHistory.value = null; pipeline.value = cloneDeep(currentPipeline.value); + eachStages(pipeline.value.stages, item => { + item.status = null; + }); return; } currentHistory.value = history; diff --git a/packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts b/packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts index 536df2d4..534f2eff 100644 --- a/packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts +++ b/packages/ui/certd-server/src/controller/user/pipeline/handle-controller.ts @@ -15,6 +15,7 @@ import {EmailService} from '../../../modules/basic/service/email-service.js'; import {http, HttpRequestConfig, logger, mergeUtils, utils} from '@certd/basic'; import {NotificationService} from '../../../modules/pipeline/service/notification-service.js'; import {TaskServiceBuilder} from "../../../modules/pipeline/service/getter/task-service-getter.js"; +import { cloneDeep } from 'lodash-es'; @Provide() @Controller('/api/pi/handle') @@ -103,6 +104,7 @@ export class HandleController extends BaseController { const taskCtx: TaskInstanceContext = { pipeline: undefined, step: undefined, + define: cloneDeep( pluginDefine.define), lastStatus: undefined, http, download, diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts index d39f9f5c..72badb51 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/plugin/upload-to-aliyun/index.ts @@ -97,7 +97,12 @@ export class UploadCertToAliyun extends AbstractTaskPlugin { logger: this.logger, endpoint, }); - const certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt)) + let certName = "" + if (this.name){ + certName = this.appendTimeSuffix(this.name) + }else{ + certName = this.buildCertName(CertReader.getMainDomain(this.cert.crt)) + } this.aliyunCertId = await client.uploadCert({ name: certName, cert: this.cert,