lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-04-23 19:57:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore:

Browse Source
This commit is contained in:
xiaojunnuo
2024-10-11 03:40:24 +08:00
parent d8d9f9b99c
commit 3b1f3e8a3f
7 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/certd-server/src/modules/basic/service/email-service.ts
+4 -12
View File
@@ -4,8 +4,8 @@ import { IEmailService, isPlus, logger } from '@certd/pipeline';
import nodemailer from 'nodemailer';
import type SMTPConnection from 'nodemailer/lib/smtp-connection';
import { UserSettingsService } from '../../mine/service/user-settings-service.js';
import { PlusService, SysEmailConf, SysSettingsService } from '@certd/lib-server';
import { merge } from 'lodash-es';
import { PlusService, SysSettingsService } from '@certd/lib-server';
import { getEmailSettings } from '../../sys/settings/fix.js';
export type EmailConfig = {
host: string;
@@ -60,17 +60,9 @@ export class EmailService implements IEmailService {
async send(email: EmailSend) {
logger.info('sendEmail', email);
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);
}
}
const emailConf = await getEmailSettings(this.sysSettingsService, this.settingsService);
if (!emailConf.host) {
if (!emailConf.host && emailConf.usePlus == null) {
if (isPlus()) {
//自动使用plus发邮件
return await this.sendByPlus(email);
packages/ui/certd-server/src/modules/sys/settings/controller/sys-settings-controller.ts
+3 -13
View File
@@ -1,11 +1,10 @@
import { ALL, Body, Controller, Inject, Post, Provide, Query } from '@midwayjs/core';
import { CrudController, SysEmailConf } from '@certd/lib-server';
import { SysSettingsService } from '@certd/lib-server';
import { CrudController, SysPublicSettings, 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';
import { getEmailSettings } from '../fix.js';
/**
*/
@@ -74,16 +73,7 @@ export class SysSettingsController extends CrudController<SysSettingsService> {
// 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);
}
}
const conf = await getEmailSettings(this.service, this.userSettingsService);
return this.ok(conf);
}
packages/ui/certd-server/src/modules/sys/settings/fix.ts
+17
View File
@@ -0,0 +1,17 @@
import { SysEmailConf, SysSettingsService } from '@certd/lib-server';
import * as _ from 'lodash-es';
import { UserSettingsService } from '../../mine/service/user-settings-service.js';
export async function getEmailSettings(sysSettingService: SysSettingsService, userSettingsService: UserSettingsService): Promise<SysEmailConf> {
let conf = await sysSettingService.getSetting<SysEmailConf>(SysEmailConf);
if (!conf.host || conf.usePlus == null) {
//到userSetting里面去找
const adminEmailSetting = await userSettingsService.getByKey('email', 1);
if (adminEmailSetting) {
const setting = JSON.parse(adminEmailSetting.setting);
conf = _.merge(conf, setting);
await sysSettingService.saveSetting(conf);
}
}
return conf;
}