@befly-addon/admin 1.1.7 → 1.1.10

package/apis/email/send.ts

@@ -25,10 +25,10 @@ export default {
             return befly.tool.No('邮件插件未加载，请检查配置');
         }
 
-        const result = await (befly as any).addon_admin_email.sendAndLog({
-            adminId: ctx.user?.id || 0,
-            username: ctx.user?.username || '',
-            nickname: ctx.user?.nickname || '',
+        const startTime = Date.now();
+
+        // 发送邮件
+        const result = await (befly as any).addon_admin_email.send({
             to: ctx.body.to,
             subject: ctx.body.subject,
             html: ctx.body.isHtml ? ctx.body.content : undefined,
@@ -37,6 +37,29 @@ export default {
             bcc: ctx.body.bcc || undefined
         });
 
+        // 记录邮件发送日志
+        try {
+            await befly.db.insData({
+                table: 'addon_admin_email_log',
+                data: {
+                    adminId: ctx.user?.id || 0,
+                    username: ctx.user?.username || '',
+                    nickname: ctx.user?.nickname || '',
+                    toEmail: ctx.body.to,
+                    subject: ctx.body.subject,
+                    content: ctx.body.content,
+                    ccEmail: ctx.body.cc || '',
+                    bccEmail: ctx.body.bcc || '',
+                    sendTime: startTime,
+                    sendResult: result.success ? 1 : 0,
+                    messageId: result.messageId || '',
+                    failReason: result.error || ''
+                }
+            });
+        } catch (logError: any) {
+            befly.logger.error({ err: logError }, '记录邮件日志失败');
+        }
+
         if (result.success) {
             return befly.tool.Yes('发送成功', { messageId: result.messageId });
         }

package/libs/emailHelper.ts

@@ -0,0 +1,137 @@
+/**
+ * 邮件助手类
+ * 提供邮件发送功能，支持 SMTP 配置
+ */
+
+import nodemailer from 'nodemailer';
+
+import type { Transporter } from 'nodemailer';
+import type { BeflyContext } from 'befly/types/befly.js';
+
+/** 邮件配置 */
+export interface EmailConfig {
+    /** SMTP 服务器地址 */
+    host: string;
+    /** SMTP 端口 */
+    port: number;
+    /** 是否使用 SSL */
+    secure: boolean;
+    /** 发件人邮箱 */
+    user: string;
+    /** 邮箱密码或授权码 */
+    pass: string;
+    /** 发件人名称 */
+    fromName?: string;
+}
+
+/** 发送邮件参数 */
+export interface SendEmailOptions {
+    /** 收件人邮箱 */
+    to: string;
+    /** 邮件主题 */
+    subject: string;
+    /** 纯文本内容 */
+    text?: string;
+    /** HTML 内容 */
+    html?: string;
+    /** 抄送 */
+    cc?: string;
+    /** 密送 */
+    bcc?: string;
+}
+
+/** 发送结果 */
+export interface SendEmailResult {
+    success: boolean;
+    messageId?: string;
+    error?: string;
+}
+
+/**
+ * 邮件助手类
+ */
+export class EmailHelper {
+    private config: EmailConfig;
+    private transporter: Transporter | null = null;
+    private befly: BeflyContext;
+
+    constructor(befly: BeflyContext, config: EmailConfig) {
+        this.befly = befly;
+        this.config = config;
+
+        // 如果配置了邮箱，则创建 transporter
+        if (this.config.user && this.config.pass) {
+            this.transporter = nodemailer.createTransport({
+                host: this.config.host,
+                port: this.config.port,
+                secure: this.config.secure,
+                auth: {
+                    user: this.config.user,
+                    pass: this.config.pass
+                }
+            });
+        }
+    }
+
+    /**
+     * 发送邮件
+     */
+    async send(options: SendEmailOptions): Promise<SendEmailResult> {
+        if (!this.transporter) {
+            return {
+                success: false,
+                error: '邮件服务未配置，请检查 SMTP 配置'
+            };
+        }
+
+        const fromAddress = this.config.fromName ? `"${this.config.fromName}" <${this.config.user}>` : this.config.user;
+
+        try {
+            const info = await this.transporter.sendMail({
+                from: fromAddress,
+                to: options.to,
+                subject: options.subject,
+                text: options.text,
+                html: options.html,
+                cc: options.cc,
+                bcc: options.bcc
+            });
+
+            return {
+                success: true,
+                messageId: info.messageId
+            };
+        } catch (error: any) {
+            return {
+                success: false,
+                error: error.message || '发送失败'
+            };
+        }
+    }
+
+    /**
+     * 验证 SMTP 连接
+     */
+    async verify(): Promise<boolean> {
+        if (!this.transporter) {
+            return false;
+        }
+
+        try {
+            await this.transporter.verify();
+            return true;
+        } catch {
+            return false;
+        }
+    }
+
+    /**
+     * 获取当前配置（隐藏密码）
+     */
+    getConfig(): Omit<EmailConfig, 'pass'> & { pass: string } {
+        return {
+            ...this.config,
+            pass: this.config.pass ? '******' : ''
+        };
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@befly-addon/admin",
-    "version": "1.1.7",
+    "version": "1.1.10",
     "title": "管理后台",
     "description": "Befly - 管理后台功能组件",
     "type": "module",
@@ -21,6 +21,7 @@
     },
     "files": [
         "apis",
+        "libs",
         "plugins",
         "styles",
         "tables",
@@ -43,9 +44,9 @@
         "url": "https://github.com/chenbimo/befly.git",
         "directory": "packages/addon-admin"
     },
-    "gitHead": "22acaff4fd6df6a25093a497fe68ad1b551bc839",
+    "gitHead": "9b5f1999ae83f1f0842f763845ec9d3e80e01f19",
     "dependencies": {
-        "befly": "3.9.21",
+        "befly": "^3.9.23",
         "befly-shared": "^1.2.3",
         "nodemailer": "^7.0.11",
         "ua-parser-js": "^2.0.7"

package/plugins/email.ts

@@ -3,57 +3,12 @@
  * 提供邮件发送功能，支持 SMTP 配置
  */
 
-import nodemailer from 'nodemailer';
+import { EmailHelper } from '../libs/emailHelper.js';
 
-import type { Transporter } from 'nodemailer';
+import type { EmailConfig } from '../libs/emailHelper.js';
 import type { Plugin } from 'befly/types/plugin.js';
 import type { BeflyContext } from 'befly/types/befly.js';
 
-/** 邮件配置 */
-export interface EmailConfig {
-    /** SMTP 服务器地址 */
-    host: string;
-    /** SMTP 端口 */
-    port: number;
-    /** 是否使用 SSL */
-    secure: boolean;
-    /** 发件人邮箱 */
-    user: string;
-    /** 邮箱密码或授权码 */
-    pass: string;
-    /** 发件人名称 */
-    fromName?: string;
-}
-
-/** 发送邮件参数 */
-export interface SendEmailOptions {
-    /** 收件人邮箱 */
-    to: string;
-    /** 邮件主题 */
-    subject: string;
-    /** 纯文本内容 */
-    text?: string;
-    /** HTML 内容 */
-    html?: string;
-    /** 抄送 */
-    cc?: string;
-    /** 密送 */
-    bcc?: string;
-    /** 发送人ID */
-    adminId?: number;
-    /** 发送人账号 */
-    username?: string;
-    /** 发送人昵称 */
-    nickname?: string;
-}
-
-/** 发送结果 */
-export interface SendEmailResult {
-    success: boolean;
-    messageId?: string;
-    error?: string;
-}
-
 /** 默认配置 */
 const defaultConfig: EmailConfig = {
     host: 'smtp.qq.com',
@@ -64,128 +19,6 @@ const defaultConfig: EmailConfig = {
     fromName: 'Befly System'
 };
 
-/**
- * 邮件助手类
- */
-class EmailHelper {
-    private config: EmailConfig;
-    private transporter: Transporter | null = null;
-    private befly: BeflyContext;
-
-    constructor(befly: BeflyContext, config: EmailConfig) {
-        this.befly = befly;
-        this.config = config;
-
-        // 如果配置了邮箱，则创建 transporter
-        if (this.config.user && this.config.pass) {
-            this.transporter = nodemailer.createTransport({
-                host: this.config.host,
-                port: this.config.port,
-                secure: this.config.secure,
-                auth: {
-                    user: this.config.user,
-                    pass: this.config.pass
-                }
-            });
-        }
-    }
-
-    /**
-     * 发送邮件
-     */
-    async send(options: SendEmailOptions): Promise<SendEmailResult> {
-        if (!this.transporter) {
-            return {
-                success: false,
-                error: '邮件服务未配置，请检查 SMTP 配置'
-            };
-        }
-
-        const fromAddress = this.config.fromName ? `"${this.config.fromName}" <${this.config.user}>` : this.config.user;
-
-        try {
-            const info = await this.transporter.sendMail({
-                from: fromAddress,
-                to: options.to,
-                subject: options.subject,
-                text: options.text,
-                html: options.html,
-                cc: options.cc,
-                bcc: options.bcc
-            });
-
-            return {
-                success: true,
-                messageId: info.messageId
-            };
-        } catch (error: any) {
-            return {
-                success: false,
-                error: error.message || '发送失败'
-            };
-        }
-    }
-
-    /**
-     * 发送邮件并记录日志
-     */
-    async sendAndLog(options: SendEmailOptions): Promise<SendEmailResult> {
-        const startTime = Date.now();
-        const result = await this.send(options);
-
-        // 记录邮件发送日志
-        try {
-            await this.befly.db.insData({
-                table: 'addon_admin_email_log',
-                data: {
-                    adminId: options.adminId || 0,
-                    username: options.username || '',
-                    nickname: options.nickname || '',
-                    toEmail: options.to,
-                    subject: options.subject,
-                    content: options.html || options.text || '',
-                    ccEmail: options.cc || '',
-                    bccEmail: options.bcc || '',
-                    sendTime: startTime,
-                    sendResult: result.success ? 1 : 0,
-                    messageId: result.messageId || '',
-                    failReason: result.error || ''
-                }
-            });
-        } catch (logError: any) {
-            this.befly.logger.error({ err: logError }, '记录邮件日志失败');
-        }
-
-        return result;
-    }
-
-    /**
-     * 验证 SMTP 连接
-     */
-    async verify(): Promise<boolean> {
-        if (!this.transporter) {
-            return false;
-        }
-
-        try {
-            await this.transporter.verify();
-            return true;
-        } catch {
-            return false;
-        }
-    }
-
-    /**
-     * 获取当前配置（隐藏密码）
-     */
-    getConfig(): Omit<EmailConfig, 'pass'> & { pass: string } {
-        return {
-            ...this.config,
-            pass: this.config.pass ? '******' : ''
-        };
-    }
-}
-
 /**
  * 邮件插件
  */