diff --git a/packages/core/pipeline/src/core/executor.ts b/packages/core/pipeline/src/core/executor.ts index 3f09b402a..09878caea 100644 --- a/packages/core/pipeline/src/core/executor.ts +++ b/packages/core/pipeline/src/core/executor.ts @@ -92,13 +92,16 @@ export class Executor { await this.onChanged(this.runtime); }, 5000); - await this.runWithHistory(this.pipeline, "pipeline", async () => { + const result = await this.runWithHistory(this.pipeline, "pipeline", async () => { return await this.runStages(this.pipeline); }); - if (this.lastRuntime && this.lastRuntime.pipeline.status?.status === ResultType.error) { - await this.notification("turnToSuccess"); + if (result === ResultType.success) { + if (this.lastRuntime && this.lastRuntime.pipeline.status?.status === ResultType.error) { + await this.notification("turnToSuccess"); + } else { + await this.notification("success"); + } } - await this.notification("success"); } catch (e: any) { await this.notification("error", e); this.logger.error("pipeline 执行失败", e); @@ -336,7 +339,7 @@ export class Executor { instance.setCtx(taskCtx); await instance.onInstance(); - await instance.execute(); + const result = await instance.execute(); //执行结果处理 if (instance._result.clearLastStatus) { //是否需要清除所有状态 @@ -364,6 +367,8 @@ export class Executor { merge(vars, instance._result.pipelinePrivateVars); await this.pipelineContext.setObj("privateVars", vars); } + + return result; } async notification(when: NotificationWhen, error?: any) { diff --git a/packages/core/pipeline/src/plugin/api.ts b/packages/core/pipeline/src/plugin/api.ts index 742eb71c9..e303a1dd2 100644 --- a/packages/core/pipeline/src/plugin/api.ts +++ b/packages/core/pipeline/src/plugin/api.ts @@ -59,7 +59,7 @@ export type PluginDefine = Registrable & { export type ITaskPlugin = { onInstance(): Promise; - execute(): Promise; + execute(): Promise; onRequest(req: PluginRequestHandleReq): Promise; [key: string]: any; }; diff --git a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts index f8dcf1f31..96e8501f7 100644 --- a/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts +++ b/packages/plugins/plugin-cert/src/plugin/cert-plugin/base.ts @@ -120,10 +120,11 @@ export abstract class CertApplyBasePlugin extends AbstractTaskPlugin { abstract doCertApply(): Promise; - async execute(): Promise { + async execute(): Promise { const oldCert = await this.condition(); if (oldCert != null) { - return await this.output(oldCert, false); + await this.output(oldCert, false); + return "skip"; } const cert = await this.doCertApply(); if (cert != null) { @@ -258,6 +259,8 @@ cert.jks：jks格式证书文件，java服务器使用 inputChanged = oldInput !== thisInput; if (inputChanged) { + this.logger.info(`旧参数：${oldInput}`); + this.logger.info(`新参数：${thisInput}`); this.logger.info("输入参数变更，准备申请新证书"); return null; } diff --git a/packages/ui/certd-client/src/router/source/modules/certd.ts b/packages/ui/certd-client/src/router/source/modules/certd.ts index 9e730db56..38a6a4b22 100644 --- a/packages/ui/certd-client/src/router/source/modules/certd.ts +++ b/packages/ui/certd-client/src/router/source/modules/certd.ts @@ -1,3 +1,5 @@ +import { useSettingStore } from "/@/store/modules/settings"; + export const certdResources = [ { title: "证书自动化", @@ -44,6 +46,10 @@ export const certdResources = [ path: "/certd/monitor/site", component: "/certd/monitor/site/index.vue", meta: { + show: () => { + const settingStore = useSettingStore(); + return settingStore.isPlus; + }, icon: "ion:videocam-outline", auth: true } @@ -84,6 +90,10 @@ export const certdResources = [ path: "/certd/monitor/cert", component: "/certd/monitor/cert/index.vue", meta: { + show: () => { + const settingStore = useSettingStore(); + return settingStore.isPlus; + }, icon: "ion:shield-checkmark-outline", auth: true, isMenu: false @@ -130,6 +140,10 @@ export const certdResources = [ name: "SuiteProduct", path: "/certd/suite", meta: { + show: () => { + const settingStore = useSettingStore(); + return settingStore.isComm; + }, icon: "ion:cart-outline", auth: true }, @@ -140,6 +154,10 @@ export const certdResources = [ path: "/certd/suite/mine", component: "/certd/suite/mine/index.vue", meta: { + show: () => { + const settingStore = useSettingStore(); + return settingStore.isComm; + }, icon: "ion:gift-outline", auth: true } @@ -150,6 +168,10 @@ export const certdResources = [ path: "/certd/suite/buy", component: "/certd/suite/buy.vue", meta: { + show: () => { + const settingStore = useSettingStore(); + return settingStore.isComm; + }, icon: "ion:cart-outline", auth: true } @@ -160,11 +182,14 @@ export const certdResources = [ path: "/certd/trade", component: "/certd/trade/index.vue", meta: { + show: () => { + const settingStore = useSettingStore(); + return settingStore.isComm; + }, icon: "ion:bag-check-outline", auth: true } }, - { title: "支付返回", name: "PaymentReturn", diff --git a/packages/ui/certd-client/src/router/source/modules/sys.ts b/packages/ui/certd-client/src/router/source/modules/sys.ts index 814d04e30..a04fe25bd 100644 --- a/packages/ui/certd-client/src/router/source/modules/sys.ts +++ b/packages/ui/certd-client/src/router/source/modules/sys.ts @@ -176,6 +176,10 @@ export const sysResources = [ path: "/sys/suite/setting", component: "/sys/suite/setting/index.vue", meta: { + show: () => { + const settingStore = useSettingStore(); + return settingStore.isComm; + }, icon: "ion:cart", permission: "sys:settings:edit" } @@ -186,38 +190,14 @@ export const sysResources = [ path: "/sys/suite/trade", component: "/sys/suite/trade/index.vue", meta: { + show: () => { + const settingStore = useSettingStore(); + return settingStore.isComm; + }, icon: "ion:bag-check", permission: "sys:settings:edit" } } - - // { - // title: "商业版设置", - // name: "SysCommercial", - // meta: { - // icon: "ion:document-text-outline", - // permission: "sys:settings:view", - // show: () => { - // const settingStore = useSettingStore(); - // return settingStore.isComm; - // } - // }, - // children: [ - // { - // title: "套餐设置", - // name: "suite", - // path: "/sys/commercial/suite", - // meta: { - // icon: "ion:document-text-outline", - // permission: "sys:settings:view", - // show: () => { - // const settingStore = useSettingStore(); - // return settingStore.isComm; - // } - // } - // } - // ] - // } ] } ]; diff --git a/packages/ui/certd-client/src/views/certd/monitor/site/index.vue b/packages/ui/certd-client/src/views/certd/monitor/site/index.vue index f174e35c7..cd6c353d3 100644 --- a/packages/ui/certd-client/src/views/certd/monitor/site/index.vue +++ b/packages/ui/certd-client/src/views/certd/monitor/site/index.vue @@ -3,7 +3,7 @@