From 66a9690dc958732e1b3c672d965db502296446f9 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 14 Nov 2024 00:12:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=BF=BD=E7=95=A5=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E8=AE=BE=E7=BD=AE=E4=B8=8D=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/sys/settings/api.ts             |  8 ++++
 .../src/views/sys/settings/email/index.vue    | 44 ++++++++++---------
 .../sys/settings/sys-settings-controller.ts   |  9 ++++
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/packages/ui/certd-client/src/views/sys/settings/api.ts b/packages/ui/certd-client/src/views/sys/settings/api.ts
index a24e390e..6463f931 100644
--- a/packages/ui/certd-client/src/views/sys/settings/api.ts
+++ b/packages/ui/certd-client/src/views/sys/settings/api.ts
@@ -53,6 +53,14 @@ export async function EmailSettingsGet() {
   });
 }
 
+export async function EmailSettingsSave(setting: any) {
+  return await request({
+    url: apiPrefix + "/saveEmailSettings",
+    method: "post",
+    data: setting
+  });
+}
+
 export async function stopOtherUserTimer() {
   return await request({
     url: apiPrefix + "/stopOtherUserTimer",
diff --git a/packages/ui/certd-client/src/views/sys/settings/email/index.vue b/packages/ui/certd-client/src/views/sys/settings/email/index.vue
index f06f724e..78c2b561 100644
--- a/packages/ui/certd-client/src/views/sys/settings/email/index.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/email/index.vue
@@ -8,16 +8,17 @@
     </template>
 
     <div class="flex-o">
-      <div v-if="!formState.usePlus" class="email-form">
-        <a-form
-          :model="formState"
-          name="basic"
-          :label-col="{ span: 8 }"
-          :wrapper-col="{ span: 16 }"
-          autocomplete="off"
-          @finish="onFinish"
-          @finish-failed="onFinishFailed"
-        >
+      <a-form
+        :model="formState"
+        name="basic"
+        :label-col="{ span: 8 }"
+        :wrapper-col="{ span: 16 }"
+        autocomplete="off"
+        class="email-form-box"
+        @finish="onFinish"
+        @finish-failed="onFinishFailed"
+      >
+        <div v-if="!formState.usePlus" class="email-form">
           <a-form-item label="使用自定义邮件服务器"> </a-form-item>
           <a-form-item label="SMTP域名" name="host" :rules="[{ required: true, message: '请输入smtp域名或ip' }]">
             <a-input v-model:value="formState.host" />
@@ -41,26 +42,24 @@
             <a-switch v-model:checked="formState.secure" />
             <div class="helper">ssl和非ssl的smtp端口是不一样的，注意修改端口</div>
           </a-form-item>
-          <a-form-item label="忽略证书校验" name="tls.rejectUnauthorized">
+          <a-form-item label="忽略证书校验" :name="['tls', 'rejectUnauthorized']">
             <a-switch v-model:checked="formState.tls.rejectUnauthorized" />
           </a-form-item>
 
           <a-form-item :wrapper-col="{ offset: 8, span: 16 }">
             <a-button type="primary" html-type="submit">保存</a-button>
           </a-form-item>
-        </a-form>
-      </div>
-      <div class="email-form">
-        <a-form :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }">
-          <a-form-item label="使用官方邮件服务器">
+        </div>
+        <div class="email-form">
+          <a-form-item label="使用官方邮件服务器" name="usePlus">
             <div class="flex-o">
               <a-switch v-model:checked="formState.usePlus" :disabled="!settingStore.isPlus" @change="onUsePlusChanged" />
               <vip-button class="ml-5" mode="button"></vip-button>
             </div>
             <div class="helper">使用官方邮箱服务器直接发邮件，免除繁琐的配置</div>
           </a-form-item>
-        </a-form>
-      </div>
+        </div>
+      </a-form>
     </div>
     <div class="email-form">
       <a-form :model="testFormState" name="basic" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }" autocomplete="off" @finish="onTestSend">
@@ -79,7 +78,7 @@
 <script setup lang="ts">
 import { reactive } from "vue";
 import * as api from "../api";
-import { SettingKeys } from "../api";
+import { EmailSettingsSave, SettingKeys } from "../api";
 import * as emailApi from "./api.email";
 import { notification } from "ant-design-vue";
 import { useSettingStore } from "/src/store/modules/settings";
@@ -122,7 +121,7 @@ load();
 
 const onFinish = async (form: any) => {
   console.log("Success:", form);
-  await api.SettingsSave(SettingKeys.SysEmail, form);
+  await api.EmailSettingsSave(form);
   notification.success({
     message: "保存成功"
   });
@@ -133,7 +132,7 @@ const onFinishFailed = (errorInfo: any) => {
 };
 
 async function onUsePlusChanged() {
-  await api.SettingsSave(SettingKeys.SysEmail, formState);
+  await api.EmailSettingsSave(formState);
 }
 
 interface TestFormState {
@@ -161,6 +160,9 @@ const settingStore = useSettingStore();
 
 <style lang="less">
 .page-setting-email {
+  .email-form-box {
+    display: flex;
+  }
   .email-form {
     width: 500px;
     margin: 20px;
diff --git a/packages/ui/certd-server/src/controller/sys/settings/sys-settings-controller.ts b/packages/ui/certd-server/src/controller/sys/settings/sys-settings-controller.ts
index 28fc10b6..e8a5f079 100644
--- a/packages/ui/certd-server/src/controller/sys/settings/sys-settings-controller.ts
+++ b/packages/ui/certd-server/src/controller/sys/settings/sys-settings-controller.ts
@@ -5,6 +5,7 @@ import { PipelineService } from '../../../modules/pipeline/service/pipeline-serv
 import { UserSettingsService } from '../../../modules/mine/service/user-settings-service.js';
 import { getEmailSettings } from '../../../modules/sys/settings/fix.js';
 import { http, logger } from '@certd/basic';
+import { merge } from 'lodash-es';
 
 /**
  */
@@ -77,6 +78,14 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
     return this.ok(conf);
   }
 
+  @Post('/saveEmailSettings', { summary: 'sys:settings:edit' })
+  async saveEmailSettings(@Body(ALL) body) {
+    const conf = await getEmailSettings(this.service, this.userSettingsService);
+    merge(conf, body);
+    await this.service.saveSetting(conf);
+    return this.ok(conf);
+  }
+
   @Post('/getSysSettings', { summary: 'sys:settings:edit' })
   async getSysSettings() {
     const publicSettings = await this.service.getPublicSettings();