From 42445692117184a3293e63bef84a74cbb5984b0e Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 11 Oct 2024 02:54:42 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E9=82=AE=E7=AE=B1=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7=E6=97=A0=E9=9C=80=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=91=E4=BB=B6=E9=82=AE=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/run/docker-compose.yaml                |  2 +-
 .../src/system/settings/service/models.ts     | 20 ++++++++++++
 .../settings/service/sys-settings-service.ts  |  2 ++
 packages/ui/certd-client/index.html           |  6 ++--
 .../src/components/vip-button/index.vue       |  2 +-
 .../src/layout/layout-framework.vue           | 19 ++++++-----
 .../src/layout/layout-outside.vue             | 26 +++++++--------
 .../src/router/source/modules/certd.ts        | 20 ++++++------
 .../src/router/source/modules/sys.ts          | 11 +++++++
 .../src/views/certd/settings/api.ts           | 26 ---------------
 .../{certd => sys}/settings/api.email.ts      |  2 +-
 .../src/views/sys/settings/api.ts             | 10 +++++-
 .../{certd => sys}/settings/email-setting.vue | 14 +++-----
 packages/ui/certd-server/.env.commdev.yaml    |  3 +-
 .../modules/basic/service/email-service.ts    | 32 +++++++++++++------
 .../controller/sys-settings-controller.ts     | 21 +++++++++++-
 16 files changed, 130 insertions(+), 86 deletions(-)
 delete mode 100644 packages/ui/certd-client/src/views/certd/settings/api.ts
 rename packages/ui/certd-client/src/views/{certd => sys}/settings/api.email.ts (81%)
 rename packages/ui/certd-client/src/views/{certd => sys}/settings/email-setting.vue (93%)

diff --git a/docker/run/docker-compose.yaml b/docker/run/docker-compose.yaml
index f5498970..2d3196bd 100644
--- a/docker/run/docker-compose.yaml
+++ b/docker/run/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: '3.3' # 兼容旧版docker-compose
 services:
   certd:
-    # 镜像                                                  #  ↓↓↓↓↓ --- 镜像版本号，建议改成固定版本号
+    # 镜像                                                  #  ↓↓↓↓↓ ---- 镜像版本号，建议改成固定版本号
     image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
     container_name: certd # 容器名
     restart: unless-stopped # 自动重启
diff --git a/packages/libs/lib-server/src/system/settings/service/models.ts b/packages/libs/lib-server/src/system/settings/service/models.ts
index 6bfa1e85..8296349b 100644
--- a/packages/libs/lib-server/src/system/settings/service/models.ts
+++ b/packages/libs/lib-server/src/system/settings/service/models.ts
@@ -45,6 +45,26 @@ export class SysLicenseInfo extends BaseSettings {
   license?: string;
 }
 
+export class SysEmailConf extends BaseSettings {
+  static __title__ = '邮箱配置';
+  static __key__ = 'sys.email';
+  static __access__ = 'private';
+
+  host: string;
+  port: number;
+  auth: {
+    user: string;
+    pass: string;
+  };
+  secure: boolean; // use TLS
+  tls: {
+    // do not fail on invalid certs
+    rejectUnauthorized: boolean;
+  };
+  sender: string;
+  usePlus?: boolean;
+}
+
 export class SysSiteInfo extends BaseSettings {
   static __title__ = '站点信息';
   static __key__ = 'sys.site';
diff --git a/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts b/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts
index b026bbe7..021dd3c4 100644
--- a/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts
+++ b/packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts
@@ -83,6 +83,7 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
     let newSetting: T = new type();
     const savedSettings = await this.getSettingByKey(key);
     newSetting = _.merge(newSetting, savedSettings);
+    await this.saveSetting(newSetting);
     await this.cache.set(cacheKey, newSetting);
     return newSetting;
   }
@@ -95,6 +96,7 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
     const entity = await this.getByKey(key);
     if (entity) {
       entity.setting = JSON.stringify(bean);
+      entity.access = type.__access__;
       await this.repository.save(entity);
     } else {
       const newEntity = new SysSettingsEntity();
diff --git a/packages/ui/certd-client/index.html b/packages/ui/certd-client/index.html
index 7c99ff69..50b10d1a 100644
--- a/packages/ui/certd-client/index.html
+++ b/packages/ui/certd-client/index.html
@@ -15,9 +15,9 @@
             <div class="fs-bootstrap__loading"></div>
         </div>
         <div class="fs-bootstrap__footer">
-            <a href="https://github.com/certd/certd" target="_blank">
-                https://github.com/certd/certd
-            </a>
+<!--            <a href="https://github.com/certd/certd" target="_blank">-->
+<!--                https://github.com/certd/certd-->
+<!--            </a>-->
         </div>
     </div>
 
diff --git a/packages/ui/certd-client/src/components/vip-button/index.vue b/packages/ui/certd-client/src/components/vip-button/index.vue
index 42f97fc9..6f2e1436 100644
--- a/packages/ui/certd-client/src/components/vip-button/index.vue
+++ b/packages/ui/certd-client/src/components/vip-button/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout-vip isPlus" @click="openUpgrade">
+  <div v-if="!settingStore.isComm" class="layout-vip isPlus" @click="openUpgrade">
     <contextHolder />
     <fs-icon icon="mingcute:vip-1-line" :title="text.title" />
 
diff --git a/packages/ui/certd-client/src/layout/layout-framework.vue b/packages/ui/certd-client/src/layout/layout-framework.vue
index 141e3414..84f6aaf6 100644
--- a/packages/ui/certd-client/src/layout/layout-framework.vue
+++ b/packages/ui/certd-client/src/layout/layout-framework.vue
@@ -32,7 +32,7 @@
           <!--            Button-->
           <!--          </button>-->
           <fs-menu
-            v-if="settingStore?.siteEnv?.agent?.enabled === false"
+            v-if="settingStore?.siteEnv?.agent?.enabled === false || !settingStore.isComm"
             class="header-menu"
             mode="horizontal"
             :expand-selected="false"
@@ -67,19 +67,22 @@
       </a-layout-content>
       <a-layout-footer class="fs-framework-footer">
         <div>
-          <span>Powered by</span>
-          <a> handsfree.work </a>
+          <span v-if="!settingStore.isComm">
+            <span>Powered by</span>
+            <a> handsfree.work </a>
+          </span>
+
+          <template v-if="siteInfo.licenseTo">
+            <a-divider type="vertical" />
+            <a :href="siteInfo.licenseToUrl || ''">{{ siteInfo.licenseTo }}</a>
+          </template>
+
           <template v-if="siteInfo.icpNo">
             <a-divider type="vertical" />
             <span>
               <a href="https://beian.miit.gov.cn/" target="_blank">{{ siteInfo.icpNo }}</a>
             </span>
           </template>
-
-          <template v-if="siteInfo.licenseTo">
-            <a-divider type="vertical" />
-            <a :href="siteInfo.licenseToUrl || ''">{{ siteInfo.licenseTo }}</a>
-          </template>
         </div>
         <div>v{{ version }}</div>
 
diff --git a/packages/ui/certd-client/src/layout/layout-outside.vue b/packages/ui/certd-client/src/layout/layout-outside.vue
index 9324fd57..bd052429 100644
--- a/packages/ui/certd-client/src/layout/layout-outside.vue
+++ b/packages/ui/certd-client/src/layout/layout-outside.vue
@@ -13,26 +13,24 @@
         <router-view />
 
         <div class="footer">
-          <!--          <div class="links">-->
-          <!--            <a href="_self">帮助</a>-->
-          <!--            <a href="_self">隐私</a>-->
-          <!--            <a href="_self">条款</a>-->
-          <!--          </div>-->
           <div class="copyright">
-            <span>Copyright</span>
-            <span>&copy;</span>
-            <span>{{ envRef.COPYRIGHT_YEAR }}</span>
-            <span>
-              <a :href="envRef.COPYRIGHT_URL" target="_blank">{{ envRef.COPYRIGHT_NAME }}</a>
+            <span v-if="!settingStore.isComm">
+              <span>Copyright</span>
+              <span>&copy;</span>
+              <span>{{ envRef.COPYRIGHT_YEAR }}</span>
+              <span>
+                <a :href="envRef.COPYRIGHT_URL" target="_blank">{{ envRef.COPYRIGHT_NAME }}</a>
+              </span>
+            </span>
+
+            <span v-if="siteInfo.licenseTo">
+              <a-divider type="vertical" />
+              <a :href="siteInfo.licenseToUrl" target="_blank">{{ siteInfo.licenseTo }}</a>
             </span>
             <span v-if="siteInfo.icpNo">
               <a-divider type="vertical" />
               <a href="https://beian.miit.gov.cn/" target="_blank">{{ siteInfo.icpNo }}</a>
             </span>
-            <span v-if="siteInfo.licenseTo">
-              <a-divider type="vertical" />
-              <a :href="siteInfo.licenseToUrl" target="_blank">{{ siteInfo.licenseTo }}</a>
-            </span>
           </div>
         </div>
       </div>
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 8444bca0..94e47df3 100644
--- a/packages/ui/certd-client/src/router/source/modules/certd.ts
+++ b/packages/ui/certd-client/src/router/source/modules/certd.ts
@@ -56,16 +56,16 @@ export const certdResources = [
           auth: true
         }
       },
-      {
-        title: "邮箱设置",
-        name: "EmailSetting",
-        path: "/certd/settings/email",
-        component: "/certd/settings/email-setting.vue",
-        meta: {
-          icon: "ion:mail-outline",
-          auth: true
-        }
-      },
+      // {
+      //   title: "邮箱设置",
+      //   name: "EmailSetting",
+      //   path: "/certd/settings/email",
+      //   component: "/certd/settings/email-setting.vue",
+      //   meta: {
+      //     icon: "ion:mail-outline",
+      //     auth: true
+      //   }
+      // },
       {
         title: "账号信息",
         name: "UserProfile",
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 64f43c50..a155715d 100644
--- a/packages/ui/certd-client/src/router/source/modules/sys.ts
+++ b/packages/ui/certd-client/src/router/source/modules/sys.ts
@@ -77,6 +77,16 @@ export const sysResources = [
           permission: "sys:settings:view"
         }
       },
+      {
+        title: "邮箱设置",
+        name: "EmailSetting",
+        path: "/sys/settings/email",
+        component: "/sys/settings/email-setting.vue",
+        meta: {
+          icon: "ion:mail-outline",
+          auth: true
+        }
+      },
       {
         title: "站点个性化",
         name: "SiteSetting",
@@ -91,6 +101,7 @@ export const sysResources = [
           permission: "sys:settings:view"
         }
       },
+
       // {
       //   title: "商业版设置",
       //   name: "SysCommercial",
diff --git a/packages/ui/certd-client/src/views/certd/settings/api.ts b/packages/ui/certd-client/src/views/certd/settings/api.ts
deleted file mode 100644
index fd29f071..00000000
--- a/packages/ui/certd-client/src/views/certd/settings/api.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { request } from "/@/api/service";
-const apiPrefix = "/user/settings";
-
-export const SettingKeys = {
-  Email: "email"
-};
-export async function SettingsGet(key: string) {
-  return await request({
-    url: apiPrefix + "/get",
-    method: "post",
-    params: {
-      key
-    }
-  });
-}
-
-export async function SettingsSave(key: string, setting: any) {
-  await request({
-    url: apiPrefix + "/save",
-    method: "post",
-    data: {
-      key,
-      setting: JSON.stringify(setting)
-    }
-  });
-}
diff --git a/packages/ui/certd-client/src/views/certd/settings/api.email.ts b/packages/ui/certd-client/src/views/sys/settings/api.email.ts
similarity index 81%
rename from packages/ui/certd-client/src/views/certd/settings/api.email.ts
rename to packages/ui/certd-client/src/views/sys/settings/api.email.ts
index ffda61c8..9ed21173 100644
--- a/packages/ui/certd-client/src/views/certd/settings/api.email.ts
+++ b/packages/ui/certd-client/src/views/sys/settings/api.email.ts
@@ -1,4 +1,4 @@
-import { request } from "/@/api/service";
+import { request } from "/src/api/service";
 const apiPrefix = "/basic/email";
 
 export async function TestSend(receiver: string) {
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 e0698b8a..20e0308b 100644
--- a/packages/ui/certd-client/src/views/sys/settings/api.ts
+++ b/packages/ui/certd-client/src/views/sys/settings/api.ts
@@ -4,7 +4,8 @@ const apiPrefix = "/sys/settings";
 
 export const SettingKeys = {
   SysPublic: "sys.public",
-  SysPrivate: "sys.private"
+  SysPrivate: "sys.private",
+  SysEmail: "sys.email"
 };
 export async function SettingsGet(key: string) {
   return await request({
@@ -27,6 +28,13 @@ export async function SettingsSave(key: string, setting: any) {
   });
 }
 
+export async function EmailSettingsGet() {
+  await request({
+    url: apiPrefix + "/getEmailSettings",
+    method: "post"
+  });
+}
+
 export async function PublicSettingsSave(setting: any) {
   await request({
     url: apiPrefix + "/savePublicSettings",
diff --git a/packages/ui/certd-client/src/views/certd/settings/email-setting.vue b/packages/ui/certd-client/src/views/sys/settings/email-setting.vue
similarity index 93%
rename from packages/ui/certd-client/src/views/certd/settings/email-setting.vue
rename to packages/ui/certd-client/src/views/sys/settings/email-setting.vue
index 4b6cf92f..41b8d5c3 100644
--- a/packages/ui/certd-client/src/views/certd/settings/email-setting.vue
+++ b/packages/ui/certd-client/src/views/sys/settings/email-setting.vue
@@ -82,7 +82,7 @@ import * as api from "./api";
 import { SettingKeys } from "./api";
 import * as emailApi from "./api.email";
 import { notification } from "ant-design-vue";
-import { useSettingStore } from "/@/store/modules/settings";
+import { useSettingStore } from "/src/store/modules/settings";
 
 defineOptions({
   name: "EmailSetting"
@@ -114,19 +114,15 @@ const formState = reactive<Partial<FormState>>({
 });
 
 async function load() {
-  const data: any = await api.SettingsGet(SettingKeys.Email);
-  if (!data?.setting) {
-    return;
-  }
-  const setting = JSON.parse(data.setting);
-  Object.assign(formState, setting);
+  const data: any = await api.EmailSettingsGet();
+  _.merge(formState, data);
 }
 
 load();
 
 const onFinish = async (form: any) => {
   console.log("Success:", form);
-  await api.SettingsSave(SettingKeys.Email, form);
+  await api.SettingsSave(SettingKeys.SysEmail, form);
   notification.success({
     message: "保存成功"
   });
@@ -137,7 +133,7 @@ const onFinishFailed = (errorInfo: any) => {
 };
 
 async function onUsePlusChanged() {
-  await api.SettingsSave(SettingKeys.Email, formState);
+  await api.SettingsSave(SettingKeys.SysEmail, formState);
 }
 
 interface TestFormState {
diff --git a/packages/ui/certd-server/.env.commdev.yaml b/packages/ui/certd-server/.env.commdev.yaml
index 3861ef7e..33b3b677 100644
--- a/packages/ui/certd-server/.env.commdev.yaml
+++ b/packages/ui/certd-server/.env.commdev.yaml
@@ -21,6 +21,7 @@ typeorm:
   dataSource:
     default:
       database: './data/db-comm.sqlite'
+
 plus:
   server:
     baseUrls: ['https://api.ai.handsfree.work', 'https://api.ai.docmirror.cn']
@@ -29,7 +30,7 @@ account:
   server:
     baseUrl: 'https://ai.handsfree.work/subject'
 
-
+#
 #plus:
 #  server:
 #    baseUrls: ['http://127.0.0.1:11007']
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 3663b9cc..cbca08f4 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
@@ -1,11 +1,11 @@
 import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
 import type { EmailSend } from '@certd/pipeline';
-import { IEmailService, isPlus } from '@certd/pipeline';
+import { IEmailService, isPlus, logger } from '@certd/pipeline';
 import nodemailer from 'nodemailer';
 import type SMTPConnection from 'nodemailer/lib/smtp-connection';
-import { logger } from '@certd/pipeline';
 import { UserSettingsService } from '../../mine/service/user-settings-service.js';
-import { PlusService } from '@certd/lib-server';
+import { PlusService, SysEmailConf, SysSettingsService } from '@certd/lib-server';
+import { merge } from 'lodash-es';
 
 export type EmailConfig = {
   host: string;
@@ -27,6 +27,9 @@ export type EmailConfig = {
 export class EmailService implements IEmailService {
   @Inject()
   settingsService: UserSettingsService;
+
+  @Inject()
+  sysSettingsService: SysSettingsService;
   @Inject()
   plusService: PlusService;
 
@@ -55,21 +58,30 @@ export class EmailService implements IEmailService {
   /**
    */
   async send(email: EmailSend) {
-    console.log('sendEmail', email);
+    logger.info('sendEmail', email);
 
-    const emailConfigEntity = await this.settingsService.getByKey('email', email.userId);
-    if (emailConfigEntity == null || !emailConfigEntity.setting) {
+    const emailConf = await this.sysSettingsService.getSetting<SysEmailConf>(SysEmailConf);
+    if (!emailConf.host && emailConf.usePlus != null) {
+      const emailConfigEntity = await this.settingsService.getByKey('email', 1);
+      if (emailConfigEntity) {
+        const emailConfig = JSON.parse(emailConfigEntity.setting) as EmailConfig;
+        merge(emailConf, emailConfig);
+        await this.sysSettingsService.saveSetting(emailConf);
+      }
+    }
+
+    if (!emailConf.host) {
       if (isPlus()) {
         //自动使用plus发邮件
         return await this.sendByPlus(email);
       }
-      throw new Error('email settings 未设置');
+      throw new Error('email settings 还未设置');
     }
-    const emailConfig = JSON.parse(emailConfigEntity.setting) as EmailConfig;
-    if (emailConfig.usePlus && isPlus()) {
+
+    if (emailConf.usePlus && isPlus()) {
       return await this.sendByPlus(email);
     }
-    await this.sendByCustom(emailConfig, email);
+    await this.sendByCustom(emailConf, email);
     logger.info('sendEmail complete: ', email);
   }
 
diff --git a/packages/ui/certd-server/src/modules/sys/settings/controller/sys-settings-controller.ts b/packages/ui/certd-server/src/modules/sys/settings/controller/sys-settings-controller.ts
index aae21627..aa136e41 100644
--- a/packages/ui/certd-server/src/modules/sys/settings/controller/sys-settings-controller.ts
+++ b/packages/ui/certd-server/src/modules/sys/settings/controller/sys-settings-controller.ts
@@ -1,10 +1,11 @@
 import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
-import { CrudController } from '@certd/lib-server';
+import { CrudController, SysEmailConf } from '@certd/lib-server';
 import { SysSettingsService } from '@certd/lib-server';
 import { SysSettingsEntity } from '../entity/sys-settings.js';
 import { SysPublicSettings } from '@certd/lib-server';
 import * as _ from 'lodash-es';
 import { PipelineService } from '../../../pipeline/service/pipeline-service.js';
+import { UserSettingsService } from '../../../mine/service/user-settings-service.js';
 
 /**
  */
@@ -14,6 +15,8 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
   @Inject()
   service: SysSettingsService;
   @Inject()
+  userSettingsService: UserSettingsService;
+  @Inject()
   pipelineService: PipelineService;
 
   getService() {
@@ -68,6 +71,22 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
     return this.ok(entity);
   }
 
+  // savePublicSettings
+  @Post('/getEmailSettings', { summary: 'sys:settings:edit' })
+  async getEmailSettings(@Body(ALL) body) {
+    let conf = await this.service.getSetting<SysEmailConf>(SysEmailConf);
+    if (!conf.host && conf.usePlus != null) {
+      //到userSetting里面去找
+      const adminEmailSetting = await this.userSettingsService.getByKey('email', 1);
+      if (adminEmailSetting) {
+        const setting = JSON.parse(adminEmailSetting.setting);
+        conf = _.merge(conf, setting);
+        await this.service.saveSetting(conf);
+      }
+    }
+    return this.ok(conf);
+  }
+
   // savePublicSettings
   @Post('/savePublicSettings', { summary: 'sys:settings:edit' })
   async savePublicSettings(@Body(ALL) body) {