From 1f7b9381e6881fc138a19fd3f1a64156e1dc67be Mon Sep 17 00:00:00 2001 From: eoao Date: Mon, 30 Jun 2025 22:44:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=AA=E5=8F=96=E9=82=AE=E7=AE=B1=E5=90=8D?= =?UTF-8?q?=E5=81=9A=E5=8F=91=E4=BB=B6=E5=90=8D=E9=98=B2=E6=AD=A2=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E7=A9=BA=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mail-worker/src/email/email.js | 4 +++- mail-worker/src/init/init.js | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mail-worker/src/email/email.js b/mail-worker/src/email/email.js index c3e8f94..7b6c3d6 100644 --- a/mail-worker/src/email/email.js +++ b/mail-worker/src/email/email.js @@ -45,13 +45,15 @@ export async function email(message, env, ctx) { const email = await PostalMime.parse(content); + console.log(email) + const toName = email.to.find(item => item.address === message.to)?.name || ''; const params = { toEmail: message.to, toName: toName, sendEmail: email.from.address, - name: email.from.name, + name: email.from.name || emailUtils.getName(email.from.address), subject: email.subject, content: email.html, text: email.text, diff --git a/mail-worker/src/init/init.js b/mail-worker/src/init/init.js index e522775..0114d59 100644 --- a/mail-worker/src/init/init.js +++ b/mail-worker/src/init/init.js @@ -1,5 +1,6 @@ import settingService from '../service/setting-service'; import emailUtils from '../utils/email-utils'; +import {emailConst} from "../const/entity-const"; const init = { async init(c) { @@ -13,10 +14,15 @@ const init = { await this.v1_1DB(c); await this.v1_2DB(c); await this.v1_3DB(c); + await this.v1_3_1DB(c); await settingService.refresh(c); return c.text('初始化成功'); }, + async v1_3_1DB(c) { + await c.env.db.prepare(`UPDATE email SET name = SUBSTR(send_email, 1, INSTR(send_email, '@') - 1) WHERE (name IS NULL OR name = '') AND type = ${emailConst.type.RECEIVE}`).run(); + }, + async v1_3DB(c) { const ADD_COLUMN_SQL_LIST = [