From 92c6c45e7776d14a174060eb75983ab5ac77cdf9 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Mon, 25 Nov 2024 23:48:04 +0800
Subject: [PATCH] chore:

---
 .../src/components/plugins/common/api-test.vue             | 6 ++++--
 packages/ui/certd-client/src/views/certd/access/common.tsx | 7 +++++++
 .../certd-client/src/views/certd/notification/common.tsx   | 7 +++++++
 .../src/controller/pipeline/handle-controller.ts           | 3 +--
 .../src/modules/basic/service/email-service.ts             | 4 ++++
 .../src/plugins/plugin-notification/qywx/index.ts          | 5 +++--
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/packages/ui/certd-client/src/components/plugins/common/api-test.vue b/packages/ui/certd-client/src/components/plugins/common/api-test.vue
index 23e3f60eb..8bda37d09 100644
--- a/packages/ui/certd-client/src/components/plugins/common/api-test.vue
+++ b/packages/ui/certd-client/src/components/plugins/common/api-test.vue
@@ -12,6 +12,7 @@
 <script setup lang="ts">
 import { ComponentPropsType, doRequest } from "/@/components/plugins/lib";
 import { ref, inject } from "vue";
+import { Form } from "ant-design-vue";
 
 defineOptions({
   name: "ApiTest"
@@ -19,7 +20,7 @@ defineOptions({
 
 const getScope: any = inject("get:scope");
 const getPluginType: any = inject("get:plugin:type");
-
+const formItemContext = Form.useInjectFormItemContext();
 const props = defineProps<{} & ComponentPropsType>();
 
 const emit = defineEmits<{
@@ -34,13 +35,14 @@ const doTest = async () => {
     return;
   }
 
+  formItemContext.onFieldChange();
+
   const { form } = getScope();
   const pluginType = getPluginType();
 
   message.value = "";
   hasError.value = false;
   loading.value = true;
-  debugger;
   try {
     const res = await doRequest(
       {
diff --git a/packages/ui/certd-client/src/views/certd/access/common.tsx b/packages/ui/certd-client/src/views/certd/access/common.tsx
index 5c6cbf828..d70858007 100644
--- a/packages/ui/certd-client/src/views/certd/access/common.tsx
+++ b/packages/ui/certd-client/src/views/certd/access/common.tsx
@@ -47,6 +47,13 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
       //eval
       useReference(column);
 
+      if (column.required) {
+        if (!column.rules) {
+          column.rules = [];
+        }
+        column.rules.push({ required: true, message: "此项必填" });
+      }
+
       //设置默认值
       if (column.value != null && get(form, key) == null) {
         set(form, key, column.value);
diff --git a/packages/ui/certd-client/src/views/certd/notification/common.tsx b/packages/ui/certd-client/src/views/certd/notification/common.tsx
index 508ef7f21..c1cb349cc 100644
--- a/packages/ui/certd-client/src/views/certd/notification/common.tsx
+++ b/packages/ui/certd-client/src/views/certd/notification/common.tsx
@@ -38,6 +38,13 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
       //eval
       useReference(column);
 
+      if (column.required) {
+        if (!column.rules) {
+          column.rules = [];
+        }
+        column.rules.push({ required: true, message: "此项必填" });
+      }
+
       //设置默认值
       if (column.value != null && get(form, key) == null) {
         set(form, key, column.value);
diff --git a/packages/ui/certd-server/src/controller/pipeline/handle-controller.ts b/packages/ui/certd-server/src/controller/pipeline/handle-controller.ts
index 56a857842..ddb06ed68 100644
--- a/packages/ui/certd-server/src/controller/pipeline/handle-controller.ts
+++ b/packages/ui/certd-server/src/controller/pipeline/handle-controller.ts
@@ -1,5 +1,5 @@
 import { ALL, Body, Controller, Inject, Post, Provide } from '@midwayjs/core';
-import { Constants } from '@certd/lib-server';
+import { BaseController, Constants } from '@certd/lib-server';
 import {
   AccessRequestHandleReq,
   ITaskPlugin,
@@ -10,7 +10,6 @@ import {
   PluginRequestHandleReq,
   TaskInstanceContext,
 } from '@certd/pipeline';
-import { BaseController } from '@certd/lib-server';
 import { AccessService } from '../../modules/pipeline/service/access-service.js';
 import { EmailService } from '../../modules/basic/service/email-service.js';
 import { AccessGetter } from '../../modules/pipeline/service/access-getter.js';
diff --git a/packages/ui/certd-server/src/modules/basic/service/email-service.ts b/packages/ui/certd-server/src/modules/basic/service/email-service.ts
index ff1a2c462..ff1002ee7 100644
--- a/packages/ui/certd-server/src/modules/basic/service/email-service.ts
+++ b/packages/ui/certd-server/src/modules/basic/service/email-service.ts
@@ -57,6 +57,10 @@ export class EmailService implements IEmailService {
   async send(email: EmailSend) {
     logger.info('sendEmail', email);
 
+    if (!email.receivers || email.receivers.length === 0) {
+      throw new Error('收件人不能为空');
+    }
+
     const emailConf = await getEmailSettings(this.sysSettingsService, this.settingsService);
 
     if (!emailConf.host && emailConf.usePlus == null) {
diff --git a/packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts b/packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts
index 1dba81003..8ce6b7f4e 100644
--- a/packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts
+++ b/packages/ui/certd-server/src/plugins/plugin-notification/qywx/index.ts
@@ -30,8 +30,9 @@ export class QywxNotification extends BaseNotification {
   mentionedList!: string[];
 
   async send(body: NotificationBody) {
-    console.log('send qywx');
-
+    if (!this.webhook) {
+      throw new Error('webhook地址不能为空');
+    }
     /**
      *
      *      "msgtype": "text",