perf: 优化证书申请成功通知发送方式

packages/ui/certd-client/src/views/certd/notification/api.ts

@@ -43,6 +43,21 @@ export function createApi() {
       });
     },
 
+    async SetDefault(id: number) {
+      return await request({
+        url: apiPrefix + "/setDefault",
+        method: "post",
+        params: { id }
+      });
+    },
+
+    async GetDefaultId() {
+      return await request({
+        url: apiPrefix + "/getDefaultId",
+        method: "post"
+      });
+    },
+
     async GetSimpleInfo(id: number) {
       return await request({
         url: apiPrefix + "/simpleInfo",

packages/ui/certd-client/src/views/certd/notification/common.tsx

@@ -2,6 +2,8 @@ import { ColumnCompositionProps, compute, dict } from "@fast-crud/fast-crud";
 import { computed, provide, ref, toRef } from "vue";
 import { useReference } from "/@/use/use-refrence";
 import { forEach, get, merge, set } from "lodash-es";
+import { Modal } from "ant-design-vue";
+import * as api from "/@/views/sys/cname/provider/api";
 
 export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
   provide("notificationApi", api);
@@ -141,6 +143,47 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
         width: 200
       }
     },
+    isDefault: {
+      title: "是否默认",
+      type: "dict-switch",
+      dict: dict({
+        data: [
+          { label: "是", value: true, color: "success" },
+          { label: "否", value: false, color: "default" }
+        ]
+      }),
+      form: {
+        value: false,
+        rules: [{ required: true, message: "请选择是否默认" }],
+        order: 999
+      },
+      column: {
+        align: "center",
+        width: 100,
+        component: {
+          name: "a-switch",
+          vModel: "checked",
+          disabled: compute(({ value }) => {
+            return value === true;
+          }),
+          on: {
+            change({ row }) {
+              Modal.confirm({
+                title: "提示",
+                content: "确定设置为默认通知？",
+                onOk: async () => {
+                  await api.SetDefault(row.id);
+                  await crudExpose.doRefresh();
+                },
+                onCancel: async () => {
+                  await crudExpose.doRefresh();
+                }
+              });
+            }
+          }
+        }
+      }
+    } as ColumnCompositionProps,
     test: {
       title: "测试",
       form: {
@@ -151,7 +194,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
           name: "api-test",
           action: "TestRequest"
         },
-        order: 999,
+        order: 990,
         col: {
           span: 24
         }

packages/ui/certd-client/src/views/certd/notification/notification-selector/index.vue

@@ -7,7 +7,7 @@
     <span v-else class="mlr-5 text-gray">{{ placeholder }}</span>
     <a-button class="ml-5" :disabled="disabled" :size="size" @click="chooseForm.open">选择</a-button>
     <a-form-item-rest v-if="chooseForm.show">
-      <a-modal v-model:open="chooseForm.show" title="选择通知渠道" width="900px" @ok="chooseForm.ok">
+      <a-modal v-model:open="chooseForm.show" title="选择通知渠道" width="905px" @ok="chooseForm.ok">
         <div style="height: 400px; position: relative">
           <cert-notification-modal v-model="selectedId"></cert-notification-modal>
         </div>
@@ -45,6 +45,10 @@ export default defineComponent({
     disabled: {
       type: Boolean,
       default: false
+    },
+    useDefault: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["update:modelValue", "selectedChange", "change"],
@@ -60,6 +64,15 @@ export default defineComponent({
       }
     }
 
+    async function loadDefault() {
+      const defId = await api.GetDefaultId();
+      if (defId) {
+        await emitValue(defId);
+      }
+    }
+
+    loadDefault();
+
     function clear() {
       if (props.disabled) {
         return;

packages/ui/certd-client/src/views/certd/notification/notification-selector/modal/crud.tsx

@@ -56,9 +56,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         show: false
       },
       form: {
-        wrapper: {
-          width: "1050px"
-        },
         labelCol: {
           //固定label宽度
           span: null,
@@ -72,7 +69,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
       },
       table: {
         scroll: {
-          x: 800
+          x: 700
         },
         rowSelection: {
           type: "radio",

packages/ui/certd-client/src/views/certd/pipeline/certd-form/crud.tsx

@@ -109,7 +109,8 @@ export default function (certPluginGroup: PluginGroup, formWrapperRef: any): Cre
           form: {
             component: {
               name: NotificationSelector,
-              vModel: "modelValue"
+              vModel: "modelValue",
+              useDefault: true
             },
             order: 101,
             helper: "建议设置，任务执行失败实时提醒"

packages/ui/certd-client/src/views/certd/settings/api.ts

@@ -0,0 +1,27 @@
+// @ts-ignore
+import { request } from "/@/api/service";
+import { SysPrivateSetting, SysPublicSetting } from "/@/api/modules/api.basic";
+const apiPrefix = "/user/settings";
+export type UserSettings = {
+  defaultNotification?: number;
+  defaultCron?: string;
+};
+
+export async function UserSettingsGet() {
+  const res = await request({
+    url: apiPrefix + "/getDefault",
+    method: "post"
+  });
+  if (!res) {
+    return {};
+  }
+  return res;
+}
+
+export async function UserSettingsSave(setting: any) {
+  return await request({
+    url: apiPrefix + "/saveDefault",
+    method: "post",
+    data: setting
+  });
+}

packages/ui/certd-client/src/views/certd/settings/index.vue

@@ -0,0 +1,74 @@
+<template>
+  <fs-page class="page-user-settings">
+    <template #header>
+      <div class="title">设置</div>
+    </template>
+    <div class="user-settings-form settings-form">
+      <a-form
+        :model="formState"
+        name="basic"
+        :label-col="{ span: 8 }"
+        :wrapper-col="{ span: 16 }"
+        autocomplete="off"
+        @finish="onFinish"
+        @finish-failed="onFinishFailed"
+      >
+        <a-form-item label="默认定时设置" name="defaultCron">
+          <notification-selector v-model="formState.defaultCron" />
+          <div class="helper">创建流水线时默认使用此定时时间</div>
+        </a-form-item>
+
+        <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
+          <a-button :loading="saveLoading" type="primary" html-type="submit">保存</a-button>
+        </a-form-item>
+      </a-form>
+    </div>
+  </fs-page>
+</template>
+
+<script setup lang="tsx">
+import { reactive, ref } from "vue";
+import * as api from "./api";
+import { UserSettings } from "./api";
+import { notification } from "ant-design-vue";
+import { merge } from "lodash-es";
+import NotificationSelector from "/@/views/certd/notification/notification-selector/index.vue";
+
+defineOptions({
+  name: "UserSettings"
+});
+
+const formState = reactive<Partial<UserSettings>>({});
+
+async function loadUserSettings() {
+  const data: any = await api.UserSettingsGet();
+  merge(formState, data);
+}
+
+const saveLoading = ref(false);
+loadUserSettings();
+const onFinish = async (form: any) => {
+  try {
+    saveLoading.value = true;
+    await api.UserSettingsSave(form);
+    notification.success({
+      message: "保存成功"
+    });
+  } finally {
+    saveLoading.value = false;
+  }
+};
+
+const onFinishFailed = (errorInfo: any) => {
+  // console.log("Failed:", errorInfo);
+};
+</script>
+
+<style lang="less">
+.page-user-settings {
+  .user-settings-form {
+    width: 500px;
+    margin: 20px;
+  }
+}
+</style>

packages/ui/certd-server/db/migration/v10014__notification_default.sql

@@ -0,0 +1 @@
+ALTER TABLE pi_notification ADD COLUMN is_default boolean DEFAULT (0);

packages/ui/certd-server/src/controller/pipeline/handle-controller.ts

@@ -69,7 +69,7 @@ export class HandleController extends BaseController {
     //   }
     // }
 
-    const notification = newNotification(body.typeName, input, {
+    const notification = await newNotification(body.typeName, input, {
       http,
       logger,
       utils,

packages/ui/certd-server/src/controller/pipeline/notification-controller.ts

@@ -1,5 +1,5 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { Constants, CrudController } from '@certd/lib-server';
+import { Constants, CrudController, ValidateException } from '@certd/lib-server';
 import { NotificationService } from '../../modules/pipeline/service/notification-service.js';
 import { AuthService } from '../../modules/sys/authority/service/auth-service.js';
 
@@ -84,8 +84,30 @@ export class NotificationController extends CrudController<NotificationService>
 
   @Post('/simpleInfo', { summary: Constants.per.authOnly })
   async simpleInfo(@Query('id') id: number) {
+    if (id === 0) {
+      //获取默认
+      const res = await this.service.getDefault(this.getUserId());
+      if (!res) {
+        throw new ValidateException('默认通知配置不存在');
+      }
+      const simple = await this.service.getSimpleInfo(res.id);
+      return this.ok(simple);
+    }
     await this.authService.checkEntityUserId(this.ctx, this.service, id);
     const res = await this.service.getSimpleInfo(id);
     return this.ok(res);
   }
+
+  @Post('/getDefaultId', { summary: Constants.per.authOnly })
+  async getDefaultId() {
+    const res = await this.service.getDefault(this.getUserId());
+    return this.ok(res?.id);
+  }
+
+  @Post('/setDefault', { summary: Constants.per.authOnly })
+  async setDefault(@Query('id') id: number) {
+    await this.service.checkUserId(id, this.getUserId());
+    const res = await this.service.setDefault(id, this.getUserId());
+    return this.ok(res);
+  }
 }

packages/ui/certd-server/src/modules/pipeline/entity/notification.ts

@@ -17,6 +17,9 @@ export class NotificationEntity {
   @Column({ name: 'setting', comment: '通知配置', length: 10240 })
   setting: string;
 
+  @Column({ name: 'is_default', comment: '是否默认' })
+  isDefault: boolean;
+
   @Column({
     name: 'create_time',
     comment: '创建时间',

packages/ui/certd-server/src/modules/pipeline/service/notification-getter.ts

@@ -1,14 +1,20 @@
 import { INotificationService } from '@certd/pipeline';
+import { NotificationService } from './notification-service.js';
 
 export class NotificationGetter implements INotificationService {
   userId: number;
-  getter: <T>(id: any, userId?: number) => Promise<T>;
-  constructor(userId: number, getter: (id: any, userId: number) => Promise<any>) {
+  notificationService: NotificationService;
+
+  constructor(userId: number, notificationService: NotificationService) {
     this.userId = userId;
-    this.getter = getter;
+    this.notificationService = notificationService;
   }
 
-  async getById<T = any>(id: any) {
-    return await this.getter<T>(id, this.userId);
+  async getDefault() {
+    return await this.notificationService.getDefault(this.userId);
+  }
+
+  async getById(id: any) {
+    return await this.notificationService.getById(id, this.userId);
   }
 }

packages/ui/certd-server/src/modules/pipeline/service/notification-service.ts

@@ -50,14 +50,60 @@ export class NotificationService extends BaseService<NotificationEntity> {
       },
     });
     if (!res) {
-      throw new ValidateException('通知配置不存在');
+      throw new ValidateException(`通知配置不存在<${id}>`);
     }
+    return this.buildNotificationInstanceConfig(res);
+  }
+
+  private buildNotificationInstanceConfig(res: NotificationEntity) {
     const setting = JSON.parse(res.setting);
     return {
       id: res.id,
       type: res.type,
+      name: res.name,
       userId: res.userId,
       setting,
     };
   }
+
+  async getDefault(userId: number): Promise<NotificationInstanceConfig> {
+    const res = await this.repository.findOne({
+      where: {
+        userId,
+      },
+      order: {
+        isDefault: 'DESC',
+      },
+    });
+    if (!res) {
+      throw new ValidateException('默认通知配置不存在');
+    }
+    return this.buildNotificationInstanceConfig(res);
+  }
+
+  async setDefault(id: number, userId: number) {
+    if (!id) {
+      throw new ValidateException('id不能为空');
+    }
+    if (!userId) {
+      throw new ValidateException('userId不能为空');
+    }
+    await this.repository.update(
+      {
+        userId,
+      },
+      {
+        isDefault: false,
+      }
+    );
+    await this.repository.update(
+      {
+        id,
+        userId,
+      },
+      {
+        isDefault: true,
+      }
+    );
+  }
 }

packages/ui/certd-server/src/modules/pipeline/service/pipeline-service.ts

@@ -393,7 +393,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
     };
     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.getById.bind(this.notificationService));
+    const notificationGetter = new NotificationGetter(userId, this.notificationService);
     const executor = new Executor({
       user,
       pipeline,

packages/ui/certd-server/src/plugins/plugin-notification/bark/index.ts

@@ -30,6 +30,18 @@ export class BarkNotification extends BaseNotification {
     helper: '你的bark服务地址+key',
   })
   webhook = '';
+
+  @NotificationInput({
+    title: '忽略证书校验',
+    value: false,
+    component: {
+      name: 'a-switch',
+      vModel: 'checked',
+    },
+    required: false,
+  })
+  skipSslVerify: boolean;
+
   async send(body: NotificationBody) {
     if (!this.webhook) {
       throw new Error('服务器地址不能为空');
@@ -47,6 +59,7 @@ export class BarkNotification extends BaseNotification {
         'Content-Type': 'application/json; charset=utf-8',
       },
       data: payload,
+      skipSslVerify: this.skipSslVerify,
     });
   }
 }

packages/ui/certd-server/src/plugins/plugin-notification/serverchan/index.ts

@@ -43,6 +43,17 @@ export class ServerChanNotification extends BaseNotification {
   })
   noip: boolean;
 
+  @NotificationInput({
+    title: '忽略证书校验',
+    value: false,
+    component: {
+      name: 'a-switch',
+      vModel: 'checked',
+    },
+    required: false,
+  })
+  skipSslVerify: boolean;
+
   async send(body: NotificationBody) {
     if (!this.sendKey) {
       throw new Error('sendKey不能为空');
@@ -54,6 +65,7 @@ export class ServerChanNotification extends BaseNotification {
         text: body.title,
         desp: body.content + '[查看详情](' + body.url + ')',
       },
+      skipSslVerify: this.skipSslVerify,
     });
   }
 }

packages/ui/certd-server/src/plugins/plugin-notification/vocechat/index.ts

@@ -49,6 +49,17 @@ export class VoceChatNotification extends BaseNotification {
   })
   targetId = '';
 
+  @NotificationInput({
+    title: '忽略证书校验',
+    value: false,
+    component: {
+      name: 'a-switch',
+      vModel: 'checked',
+    },
+    required: false,
+  })
+  skipSslVerify: boolean;
+
   async send(body: NotificationBody) {
     if (!this.apiKey) {
       throw new Error('API Key不能为空');
@@ -68,6 +79,7 @@ export class VoceChatNotification extends BaseNotification {
         'Content-Type': 'text/markdown',
       },
       data: `# ${body.title}\n\n${body.content}\n[查看详情](${body.url})`,
+      skipSslVerify: this.skipSslVerify,
     });
   }
 }

packages/ui/certd-server/src/plugins/plugin-notification/webhook/index.ts

@@ -82,6 +82,17 @@ export class WebhookNotification extends BaseNotification {
   })
   template = '';
 
+  @NotificationInput({
+    title: '忽略证书校验',
+    value: false,
+    component: {
+      name: 'a-switch',
+      vModel: 'checked',
+    },
+    required: false,
+  })
+  skipSslVerify: boolean;
+
   replaceTemplate(target: string, body: any, urlEncode = false) {
     let bodyStr = target;
     const keys = Object.keys(body);
@@ -143,6 +154,7 @@ export class WebhookNotification extends BaseNotification {
           ...headers,
         },
         data: data,
+        skipSslVerify: this.skipSslVerify,
       });
     } catch (e) {
       if (e.response?.data) {