From 2aefca3813a19dd28db3c55d963f17eb870e14bc Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Wed, 4 Dec 2024 12:36:17 +0800
Subject: [PATCH] chore:

---
 packages/core/pipeline/src/core/executor.ts   | 14 ++++++++++----
 .../src/views/certd/notification/api.ts       |  9 ++++++++-
 .../src/views/certd/notification/crud.tsx     |  4 ++--
 .../src/views/certd/notification/index.vue    |  4 ++--
 .../notification-selector/index.vue           |  4 ++--
 .../notification-selector/modal/index.vue     |  4 ++--
 .../views/certd/pipeline/certd-form/crud.tsx  |  7 +++----
 .../views/certd/pipeline/certd-form/index.vue | 19 ++++++++++++++++---
 .../src/views/certd/pipeline/crud.tsx         | 17 +++++++++++++----
 .../pipeline/notification-controller.ts       |  6 ++++++
 .../pipeline/service/notification-service.ts  | 18 ++++++++++++++++++
 .../pipeline/service/pipeline-service.ts      | 13 ++++++++++---
 12 files changed, 92 insertions(+), 27 deletions(-)

diff --git a/packages/core/pipeline/src/core/executor.ts b/packages/core/pipeline/src/core/executor.ts
index 79f066e2..d67d9ece 100644
--- a/packages/core/pipeline/src/core/executor.ts
+++ b/packages/core/pipeline/src/core/executor.ts
@@ -11,6 +11,10 @@ import { ICnameProxyService, IEmailService, IPluginConfigService, IUrlService }
 import { FileStore } from "./file-store.js";
 import { cloneDeep, forEach, merge } from "lodash-es";
 import { INotificationService, NotificationBody, NotificationContext, notificationRegistry } from "../notification/index.js";
+export type SysInfo = {
+  //系统标题
+  title?: string;
+};
 
 export type ExecutorOptions = {
   pipeline: Pipeline;
@@ -25,6 +29,7 @@ export type ExecutorOptions = {
   fileRootDir?: string;
   user: UserInfo;
   baseURL?: string;
+  sysInfo?: SysInfo;
 };
 
 export class Executor {
@@ -368,17 +373,18 @@ export class Executor {
     let subject = "";
     let content = "";
     const errorMessage = error?.message;
+    const sysTitle = this.options.sysInfo?.title || "Certd";
     if (when === "start") {
-      subject = `【Certd】开始执行，${this.pipeline.title}【${this.pipeline.id}】`;
+      subject = `【${sysTitle}】开始执行，${this.pipeline.title}【${this.pipeline.id}】`;
       content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}`;
     } else if (when === "success") {
-      subject = `【Certd】执行成功，${this.pipeline.title}【${this.pipeline.id}】`;
+      subject = `【${sysTitle}】执行成功，${this.pipeline.title}【${this.pipeline.id}】`;
       content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}`;
     } else if (when === "turnToSuccess") {
-      subject = `【Certd】执行成功（失败转成功），${this.pipeline.title}【${this.pipeline.id}】`;
+      subject = `【${sysTitle}】执行成功（失败转成功），${this.pipeline.title}【${this.pipeline.id}】`;
       content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}`;
     } else if (when === "error") {
-      subject = `【Certd】执行失败，${this.pipeline.title}【${this.pipeline.id}】`;
+      subject = `【${sysTitle}】执行失败，${this.pipeline.title}【${this.pipeline.id}】`;
       content = `流水线ID:${this.pipeline.id}，运行ID:${this.runtime.id}\n错误详情:${error.message}`;
     } else {
       return;
diff --git a/packages/ui/certd-client/src/views/certd/notification/api.ts b/packages/ui/certd-client/src/views/certd/notification/api.ts
index 459b07e9..9544440b 100644
--- a/packages/ui/certd-client/src/views/certd/notification/api.ts
+++ b/packages/ui/certd-client/src/views/certd/notification/api.ts
@@ -1,6 +1,6 @@
 import { request } from "/src/api/service";
 
-export function createApi() {
+export function createNotificationApi() {
   const apiPrefix = "/pi/notification";
   return {
     async GetList(query: any) {
@@ -94,6 +94,13 @@ export function createApi() {
         method: "post",
         params: { type }
       });
+    },
+    async GetOrCreateDefault(param: { email: any }) {
+      return await request({
+        url: apiPrefix + "/getOrCreateDefault",
+        method: "post",
+        data: param
+      });
     }
   };
 }
diff --git a/packages/ui/certd-client/src/views/certd/notification/crud.tsx b/packages/ui/certd-client/src/views/certd/notification/crud.tsx
index 8e7b615b..ae2d1d27 100644
--- a/packages/ui/certd-client/src/views/certd/notification/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/notification/crud.tsx
@@ -1,8 +1,8 @@
 import { ref } from "vue";
 import { getCommonColumnDefine } from "./common";
 import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
-import { createApi } from "/@/views/certd/notification/api";
-const api = createApi();
+import { createNotificationApi } from "/@/views/certd/notification/api";
+const api = createNotificationApi();
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
     return await api.GetList(query);
diff --git a/packages/ui/certd-client/src/views/certd/notification/index.vue b/packages/ui/certd-client/src/views/certd/notification/index.vue
index a0b8e6ec..64ff6182 100644
--- a/packages/ui/certd-client/src/views/certd/notification/index.vue
+++ b/packages/ui/certd-client/src/views/certd/notification/index.vue
@@ -14,12 +14,12 @@
 import { defineComponent, onActivated, onMounted } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
-import { createApi } from "./api";
+import { createNotificationApi } from "./api";
 
 export default defineComponent({
   name: "NotificationManager",
   setup() {
-    const api = createApi();
+    const api = createNotificationApi();
     const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });
 
     // 页面打开后获取列表数据
diff --git a/packages/ui/certd-client/src/views/certd/notification/notification-selector/index.vue b/packages/ui/certd-client/src/views/certd/notification/notification-selector/index.vue
index 7d9d02e1..f6297f5c 100644
--- a/packages/ui/certd-client/src/views/certd/notification/notification-selector/index.vue
+++ b/packages/ui/certd-client/src/views/certd/notification/notification-selector/index.vue
@@ -41,7 +41,7 @@
 
 <script lang="tsx" setup>
 import { inject, ref, Ref, watch } from "vue";
-import { createApi } from "../api";
+import { createNotificationApi } from "../api";
 import { message } from "ant-design-vue";
 import { dict } from "@fast-crud/fast-crud";
 import createCrudOptions from "../crud";
@@ -64,7 +64,7 @@ const onChange = async (value: number) => {
 
 const emit = defineEmits(["update:modelValue", "selectedChange", "change"]);
 
-const api = createApi();
+const api = createNotificationApi();
 
 // const types = ref({});
 // async function loadNotificationTypes() {
diff --git a/packages/ui/certd-client/src/views/certd/notification/notification-selector/modal/index.vue b/packages/ui/certd-client/src/views/certd/notification/notification-selector/modal/index.vue
index 89349511..1a7a73a3 100644
--- a/packages/ui/certd-client/src/views/certd/notification/notification-selector/modal/index.vue
+++ b/packages/ui/certd-client/src/views/certd/notification/notification-selector/modal/index.vue
@@ -8,7 +8,7 @@
 import { defineComponent, onMounted, watch } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
-import { createApi } from "../../api";
+import { createNotificationApi } from "../../api";
 
 export default defineComponent({
   name: "CertNotificationModal",
@@ -17,7 +17,7 @@ export default defineComponent({
   },
   emits: ["update:modelValue"],
   setup(props, ctx) {
-    const api = createApi();
+    const api = createNotificationApi();
     const context: any = { props, ctx, api };
     const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context });
     onMounted(() => {
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx
index af92f0ae..babcea0b 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx
@@ -1,16 +1,15 @@
 import { compute, CreateCrudOptionsRet, dict } from "@fast-crud/fast-crud";
-import { PluginGroup } from "@certd/pipeline";
 import { useReference } from "/@/use/use-refrence";
 import _, { merge } from "lodash-es";
 import { useUserStore } from "/@/store/modules/user";
 import { useSettingStore } from "/@/store/modules/settings";
 import * as api from "../api.plugin";
-import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
-export default function (certPluginGroup: PluginGroup, formWrapperRef: any): CreateCrudOptionsRet {
+
+export default function (certPlugins: any[], formWrapperRef: any): CreateCrudOptionsRet {
   const inputs: any = {};
   const userStore = useUserStore();
   const settingStore = useSettingStore();
-  for (const plugin of certPluginGroup.plugins) {
+  for (const plugin of certPlugins) {
     for (const inputKey in plugin.input) {
       if (inputs[inputKey]) {
         inputs[inputKey].form.show = true;
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/index.vue
index c60a8e77..515c980a 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/certd-form/index.vue
+++ b/packages/ui/certd-client/src/views/certd/pipeline/certd-form/index.vue
@@ -9,6 +9,8 @@ import { ref } from "vue";
 import * as _ from "lodash-es";
 import * as api from "../api.plugin";
 import { PluginGroup, PluginGroups } from "/@/views/certd/pipeline/pipeline/type";
+import { GetPluginDefine } from "../api.plugin";
+import { createNotificationApi } from "/@/views/certd/notification/api";
 export default {
   name: "PiCertdForm",
   setup(props: any, ctx: any) {
@@ -19,17 +21,28 @@ export default {
       const pluginGroups: { [key: string]: PluginGroup } = await api.GetGroups({});
       const certPluginGroup = pluginGroups.cert;
 
+      const certPlugins = [];
+      for (const plugin of certPluginGroup.plugins) {
+        const detail: any = await api.GetPluginDefine(plugin.name);
+        certPlugins.push(detail);
+      }
+
       // 自定义表单配置
       const { buildFormOptions } = useColumns();
       //使用crudOptions结构来构建自定义表单配置
-      let { crudOptions } = createCrudOptions(certPluginGroup, formWrapperRef);
+      let { crudOptions } = createCrudOptions(certPlugins, formWrapperRef);
 
       const formOptions = buildFormOptions(
         _.merge(crudOptions, {
           form: {
-            doSubmit({ form }: any) {
+            async doSubmit({ form }: any) {
               // 创建certd 的pipeline
-              doSubmitRef.value({ form });
+              await doSubmitRef.value({ form });
+
+              if (form.email) {
+                const notificationApi = createNotificationApi();
+                await notificationApi.GetOrCreateDefault({ email: form.email });
+              }
             }
           }
         }) as any
diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
index 25a2ba67..ac1d06fa 100644
--- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
+++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx
@@ -14,7 +14,7 @@ import * as _ from "lodash-es";
 import { useModal } from "/@/use/use-modal";
 import CertView from "./cert-view.vue";
 import { eachStages } from "./utils";
-import { createApi as createNotificationApi } from "../notification/api";
+import { createNotificationApi as createNotificationApi } from "../notification/api";
 export default function ({ crudExpose, context: { certdFormRef, groupDictRef, selectedRowKeys } }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const router = useRouter();
   const { t } = useI18n();
@@ -173,9 +173,9 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
   const downloadCert = async (row: any) => {
     const files = await api.GetFiles(row.id);
     model.success({
-      title: "文件下载",
+      title: "点击链接下载",
       maskClosable: true,
-      okText: "↑↑↑ 点击上面链接下载",
+      okText: "关闭",
       content: () => {
         const children = [];
         for (const file of files) {
@@ -191,7 +191,16 @@ export default function ({ crudExpose, context: { certdFormRef, groupDictRef, se
           );
         }
 
-        return <div class={"mt-3"}>{children}</div>;
+        if (children.length === 0) {
+          return <div>暂无文件下载</div>;
+        }
+
+        return (
+          <div class={"mt-3"}>
+            <h3>点击链接下载</h3>
+            <div> {children}</div>
+          </div>
+        );
       }
     });
   };
diff --git a/packages/ui/certd-server/src/controller/pipeline/notification-controller.ts b/packages/ui/certd-server/src/controller/pipeline/notification-controller.ts
index 3ffe5ee4..18db5c49 100644
--- a/packages/ui/certd-server/src/controller/pipeline/notification-controller.ts
+++ b/packages/ui/certd-server/src/controller/pipeline/notification-controller.ts
@@ -141,6 +141,12 @@ export class NotificationController extends CrudController<NotificationService>
     return this.ok(res);
   }
 
+  @Post('/getOrCreateDefault', { summary: Constants.per.authOnly })
+  async getOrCreateDefault(@Body('email') email: string) {
+    const res = await this.service.getOrCreateDefault(email, this.getUserId());
+    return this.ok(res);
+  }
+
   @Post('/options', { summary: Constants.per.authOnly })
   async options() {
     const res = await this.service.list({
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts
index 102fc2b6..f5904913 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts
@@ -106,4 +106,22 @@ export class NotificationService extends BaseService<NotificationEntity> {
       }
     );
   }
+
+  async getOrCreateDefault(email: string, userId: any) {
+    const defaultConfig = await this.getDefault(userId);
+    if (defaultConfig) {
+      return defaultConfig;
+    }
+    const setting = {
+      receivers: [email],
+    };
+    const res = await this.repository.save({
+      userId,
+      type: 'email',
+      name: '邮件通知',
+      setting: JSON.stringify(setting),
+      isDefault: true,
+    });
+    return this.buildNotificationInstanceConfig(res);
+  }
 }
diff --git a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
index 7d005949..c437fbcc 100644
--- a/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
+++ b/packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts
@@ -1,10 +1,10 @@
 import { Config, Inject, Provide, Scope, ScopeEnum, sleep } from '@midwayjs/core';
 import { InjectEntityModel } from '@midwayjs/typeorm';
 import { In, MoreThan, Repository } from 'typeorm';
-import { BaseService, NeedVIPException, PageReq, SysPublicSettings, SysSettingsService } from '@certd/lib-server';
+import { BaseService, NeedVIPException, PageReq, SysPublicSettings, SysSettingsService, SysSiteInfo } from '@certd/lib-server';
 import { PipelineEntity } from '../entity/pipeline.js';
 import { PipelineDetail } from '../entity/vo/pipeline-detail.js';
-import { Executor, Pipeline, ResultType, RunHistory, UserInfo } from '@certd/pipeline';
+import { Executor, Pipeline, ResultType, RunHistory, SysInfo, UserInfo } from '@certd/pipeline';
 import { AccessService } from './access-service.js';
 import { DbStorage } from './db-storage.js';
 import { StorageService } from './storage-service.js';
@@ -21,7 +21,7 @@ import { CnameProxyService } from './cname-proxy-service.js';
 import { PluginConfigGetter } from '../../plugin/service/plugin-config-getter.js';
 import dayjs from 'dayjs';
 import { DbAdapter } from '../../db/index.js';
-import { isPlus } from '@certd/plus-core';
+import { isComm, isPlus } from '@certd/plus-core';
 import { logger } from '@certd/basic';
 import { UrlService } from './url-service.js';
 import { NotificationService } from './notification-service.js';
@@ -391,9 +391,15 @@ export class PipelineService extends BaseService<PipelineEntity> {
       id: userId,
       role: userIsAdmin ? 'admin' : 'user',
     };
+
     const accessGetter = new AccessGetter(userId, this.accessService.getById.bind(this.accessService));
     const cnameProxyService = new CnameProxyService(userId, this.cnameRecordService.getWithAccessByDomain.bind(this.cnameRecordService));
     const notificationGetter = new NotificationGetter(userId, this.notificationService);
+    const sysInfo: SysInfo = {};
+    if (isComm()) {
+      const siteInfo = await this.sysSettingsService.getSetting<SysSiteInfo>(SysSiteInfo);
+      sysInfo.title = siteInfo.title;
+    }
     const executor = new Executor({
       user,
       pipeline,
@@ -406,6 +412,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
       urlService: this.urlService,
       notificationService: notificationGetter,
       fileRootDir: this.certdConfig.fileRootDir,
+      sysInfo,
     });
     try {
       runningTasks.set(historyId, executor);