@@ -23,12 +24,11 @@
<{{ email.sendEmail }}>
- 收件人{{ email.receiveEmail }}
+ 收件人{{ formateReceive(email.recipient) }}
{{ formatDetailDate(email.createTime) }}
-
@@ -87,7 +87,9 @@ import {cvtR2Url} from "@/utils/convert.js";
import {getIconByName} from "@/utils/icon-utils.js";
import {useSettingStore} from "@/store/setting.js";
import {sysEmailDelete} from "@/request/sys-email.js";
+import {useUiStore} from "@/store/ui.js";
+const uiStore = useUiStore();
const settingStore = useSettingStore();
const accountStore = useAccountStore();
const emailStore = useEmailStore();
@@ -96,10 +98,15 @@ const email = emailStore.contentData.email
const showPreview = ref(false)
const srcList = reactive([])
+
watch(() => accountStore.currentAccountId, () => {
handleBack()
})
+function openReply() {
+ uiStore.writerRef.openReply(email)
+}
+
function toMessage(message) {
return message ? JSON.parse(message).message : '';
}
@@ -119,10 +126,13 @@ function showImage(key) {
}
function isImage(filename) {
- return ['png', 'jpg', 'jpeg', 'bmp', 'gif'].includes(getExtName(filename))
+ return ['png', 'jpg', 'jpeg', 'bmp', 'gif','jfif'].includes(getExtName(filename))
}
-
+function formateReceive(recipient) {
+ recipient = JSON.parse(recipient)
+ return recipient.map(item => item.address).join(', ')
+}
function changeStar() {
if (email.isStar) {
@@ -194,7 +204,11 @@ const handleDelete = () => {
gap: 20px;
box-shadow: inset 0 -1px 0 0 rgba(100, 121, 143, 0.12);
font-size: 18px;
-
+ .star {
+ display: flex;
+ align-items: center;
+ min-width: 21px;
+ }
.icon {
cursor: pointer;
}
@@ -232,8 +246,7 @@ const handleDelete = () => {
.att {
margin-top: 30px;
margin-bottom: 30px;
- border: 1px solid #e4e7ed;
- box-shadow: var(--el-box-shadow-light);
+ border: 1px solid var(--el-border-color);
padding: 10px;
border-radius: 4px;
width: fit-content;
@@ -336,7 +349,11 @@ const handleDelete = () => {
.receive {
margin-bottom: 6px;
-
+ display: flex;
+ .receive-email {
+ max-width: 700px;
+ word-break: break-word;
+ }
span:nth-child(2) {
color: #585d69;
}
diff --git a/mail-vue/src/views/email/index.vue b/mail-vue/src/views/email/index.vue
index e04b36f..26c7176 100644
--- a/mail-vue/src/views/email/index.vue
+++ b/mail-vue/src/views/email/index.vue
@@ -64,6 +64,7 @@ function jumpContent(email) {
emailStore.contentData.email = email
emailStore.contentData.delType = 'logic'
emailStore.contentData.showStar = true
+ emailStore.contentData.showReply = true
router.push('/content')
}
diff --git a/mail-vue/src/views/login/index.vue b/mail-vue/src/views/login/index.vue
index 680836e..56af20e 100644
--- a/mail-vue/src/views/login/index.vue
+++ b/mail-vue/src/views/login/index.vue
@@ -90,7 +90,6 @@ import router from "@/router";
import {computed, nextTick, reactive, ref} from "vue";
import {login} from "@/request/login.js";
import {register} from "@/request/login.js";
-import {ElMessage} from 'element-plus'
import {isEmail} from "@/utils/verify-utils.js";
import {useSettingStore} from "@/store/setting.js";
import {useAccountStore} from "@/store/account.js";
@@ -328,7 +327,6 @@ function submitRegister() {
box-shadow: var(--el-box-shadow-light);
@media (max-width: 1024px) {
padding: 20px 18px;
- border-radius: 6px;
width: 384px;
margin-left: 18px;
}
diff --git a/mail-vue/src/views/role/index.vue b/mail-vue/src/views/role/index.vue
index de39a26..94d4265 100644
--- a/mail-vue/src/views/role/index.vue
+++ b/mail-vue/src/views/role/index.vue
@@ -96,7 +96,6 @@
import {Icon} from "@iconify/vue";
import {defineOptions, nextTick, reactive, ref} from "vue";
import {roleAdd, roleDelete, rolePermTree, roleRoleList, roleSet, roleSetDef} from "@/request/role.js";
-import {ElMessage, ElMessageBox} from "element-plus";
import loading from '@/components/loading/index.vue';
import {useRoleStore} from "@/store/role.js";
import {useUserStore} from "@/store/user.js";
diff --git a/mail-vue/src/views/send/index.vue b/mail-vue/src/views/send/index.vue
index cd03d30..39d37dc 100644
--- a/mail-vue/src/views/send/index.vue
+++ b/mail-vue/src/views/send/index.vue
@@ -58,6 +58,7 @@ function jumpContent(email) {
emailStore.contentData.email = email
emailStore.contentData.delType = 'logic'
emailStore.contentData.showStar = true
+ emailStore.contentData.showReply = true
router.push('/content')
}
diff --git a/mail-vue/src/views/setting/index.vue b/mail-vue/src/views/setting/index.vue
index d783624..c42403e 100644
--- a/mail-vue/src/views/setting/index.vue
+++ b/mail-vue/src/views/setting/index.vue
@@ -2,6 +2,23 @@
账户与密码
+
+
用户名
+
+
+
+
+ 保存
+
+
+
+ {{ userStore.user.name }}
+
+ 修改
+
+
+
+
邮箱
{{ userStore.user.email }}
@@ -9,7 +26,7 @@
@@ -23,11 +40,11 @@
-
-
-
- 保存
-
+
+
+
+ 保存
+
@@ -35,16 +52,60 @@
import {defineOptions} from "vue";
import {reactive, ref} from 'vue'
import {resetPassword, userDelete} from "@/request/my.js";
-import {ElMessage, ElMessageBox} from "element-plus";
import {useUserStore} from "@/store/user.js";
import router from "@/router/index.js";
+import {accountSetName} from "@/request/account.js";
+import {useAccountStore} from "@/store/account.js";
+
+const accountStore = useAccountStore()
const userStore = useUserStore();
const setPwdLoading = ref(false)
+const setNameShow = ref(false)
+const accountName = ref(null)
defineOptions({
name: 'setting'
})
+function showSetName() {
+ accountName.value = userStore.user.name
+ setNameShow.value = true
+}
+
+function setName() {
+
+ if (!accountName.value) {
+ ElMessage({
+ message: '用户名不能为空',
+ type: 'error',
+ plain: true,
+ })
+ return;
+ }
+
+ setNameShow.value = false
+ let name = accountName.value
+
+ if (name === userStore.user.name) {
+ return
+ }
+
+ userStore.user.name = accountName.value
+
+ accountSetName(userStore.user.accountId,name).then(() => {
+ ElMessage({
+ message: '修改成功',
+ type: 'success',
+ plain: true,
+ })
+
+ accountStore.changeUserAccountName = name
+
+ }).catch(() => {
+ userStore.user.name = name
+ })
+}
+
const pwdShow = ref(false)
const form = reactive({
password: '',
@@ -121,6 +182,10 @@ function submitPwd() {
.box {
padding: 40px 40px;
+ @media (max-width: 767px) {
+ padding: 30px 30px;
+ }
+
.update-pwd {
display: flex;
flex-direction: column;
@@ -134,8 +199,7 @@ function submitPwd() {
.pass {
font-size: 14px;
- display: flex;
- flex-direction: column;
+ display: grid;
gap: 20px;
margin-bottom: 40px;
@@ -143,12 +207,39 @@ function submitPwd() {
display: grid;
grid-template-columns: 50px 1fr;
gap: 140px;
- @media (max-width: 767px) {
- gap: 80px;
+ position: relative;
+ .user-name {
+ display: grid;
+ grid-template-columns: auto 1fr;
+ span:first-child {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
}
+
+ .edit-name-input {
+ position: absolute;
+ bottom: -6px;
+ .el-input {
+ width: min(200px,calc(100vw - 222px));
+ }
+ }
+
+ .edit-name {
+ color: #4dabff;
+ padding-left: 10px;
+ cursor: pointer;
+ }
+
+ @media (max-width: 767px) {
+ gap: 70px;
+ }
+
div:first-child {
font-weight: bold;
}
+
div:last-child {
overflow: hidden;
white-space: nowrap;
diff --git a/mail-vue/src/views/star/index.vue b/mail-vue/src/views/star/index.vue
index a64cc4c..1c0b15c 100644
--- a/mail-vue/src/views/star/index.vue
+++ b/mail-vue/src/views/star/index.vue
@@ -31,6 +31,7 @@ function jumpContent(email) {
emailStore.contentData.email = email
emailStore.contentData.delType = 'logic'
emailStore.contentData.showStar = true
+ emailStore.contentData.showReply = true
router.push('/content')
}
diff --git a/mail-vue/src/views/sys-email/index.vue b/mail-vue/src/views/sys-email/index.vue
index 291b78b..18f5e00 100644
--- a/mail-vue/src/views/sys-email/index.vue
+++ b/mail-vue/src/views/sys-email/index.vue
@@ -144,6 +144,7 @@ function jumpContent(email) {
emailStore.contentData.email = email
emailStore.contentData.delType = 'physics'
emailStore.contentData.showStar = false
+ emailStore.contentData.showReply = false
router.push('/content')
}
diff --git a/mail-vue/src/views/sys-setting/index.vue b/mail-vue/src/views/sys-setting/index.vue
index 57063cc..f8aae7f 100644
--- a/mail-vue/src/views/sys-setting/index.vue
+++ b/mail-vue/src/views/sys-setting/index.vue
@@ -299,7 +299,6 @@
-
-
+
+
diff --git a/mail-worker/src/api/account-api.js b/mail-worker/src/api/account-api.js
index b665bc1..ddd58f6 100644
--- a/mail-worker/src/api/account-api.js
+++ b/mail-worker/src/api/account-api.js
@@ -18,3 +18,7 @@ app.post('/account/add', async (c) => {
return c.json(result.ok(account));
});
+app.put('/account/setName', async (c) => {
+ await accountService.setName(c, await c.req.json(), userContext.getUserId(c));
+ return c.json(result.ok());
+});
diff --git a/mail-worker/src/api/analysis-api.js b/mail-worker/src/api/analysis-api.js
new file mode 100644
index 0000000..c8abc7a
--- /dev/null
+++ b/mail-worker/src/api/analysis-api.js
@@ -0,0 +1,8 @@
+import app from '../hono/hono';
+import analysisService from '../service/analysis-service';
+import result from '../model/result';
+
+app.get('/analysis/echarts', async (c) => {
+ const data = await analysisService.echarts(c);
+ return c.json(result.ok(data));
+})
diff --git a/mail-worker/src/api/init-api.js b/mail-worker/src/api/init-api.js
index a83feb2..f55518b 100644
--- a/mail-worker/src/api/init-api.js
+++ b/mail-worker/src/api/init-api.js
@@ -1,5 +1,5 @@
import app from '../hono/hono';
-import initService from '../service/init-service';
+import initService from '../init/init';
app.get('/init/:secret', (c) => {
return initService.init(c);
diff --git a/mail-worker/src/const/kv-const.js b/mail-worker/src/const/kv-const.js
index b58e18d..b013585 100644
--- a/mail-worker/src/const/kv-const.js
+++ b/mail-worker/src/const/kv-const.js
@@ -1,6 +1,7 @@
const KvConst = {
AUTH_INFO: 'auth-uid:',
SETTING: 'setting:',
+ SEND_DAY_COUNT: 'send_day_count:'
}
export default KvConst;
diff --git a/mail-worker/src/dao/analysis-dao.js b/mail-worker/src/dao/analysis-dao.js
new file mode 100644
index 0000000..10be7fe
--- /dev/null
+++ b/mail-worker/src/dao/analysis-dao.js
@@ -0,0 +1,104 @@
+const analysisDao = {
+ async numberCount(c) {
+ const { results } = await c.env.db.prepare(`
+ SELECT
+ e.receiveTotal,
+ e.sendTotal,
+ e.delReceiveTotal,
+ e.delSendTotal,
+ e.normalReceiveTotal,
+ e.normalSendTotal,
+ u.userTotal,
+ u.normalUserTotal,
+ u.delUserTotal,
+ a.accountTotal,
+ a.normalAccountTotal,
+ a.delAccountTotal
+ FROM
+ (
+ SELECT
+ SUM(CASE WHEN type = 0 THEN 1 ELSE 0 END) AS receiveTotal,
+ SUM(CASE WHEN type = 1 THEN 1 ELSE 0 END) AS sendTotal,
+ SUM(CASE WHEN type = 0 AND is_del = 1 THEN 1 ELSE 0 END) AS delReceiveTotal,
+ SUM(CASE WHEN type = 1 AND is_del = 1 THEN 1 ELSE 0 END) AS delSendTotal,
+ SUM(CASE WHEN type = 0 AND is_del = 0 THEN 1 ELSE 0 END) AS normalReceiveTotal,
+ SUM(CASE WHEN type = 1 AND is_del = 0 THEN 1 ELSE 0 END) AS normalSendTotal
+ FROM
+ email
+ ) e
+ CROSS JOIN (
+ SELECT
+ COUNT(*) AS userTotal,
+ SUM(CASE WHEN is_del = 1 THEN 1 ELSE 0 END) AS delUserTotal,
+ SUM(CASE WHEN is_del = 0 THEN 1 ELSE 0 END) AS normalUserTotal
+ FROM
+ user
+ ) u
+ CROSS JOIN (
+ SELECT
+ COUNT(*) AS accountTotal,
+ SUM(CASE WHEN is_del = 1 THEN 1 ELSE 0 END) AS delAccountTotal,
+ SUM(CASE WHEN is_del = 0 THEN 1 ELSE 0 END) AS normalAccountTotal
+ FROM
+ account
+ ) a
+ `).all();
+ return results[0];
+ },
+
+ async userDayCount(c) {
+ const { results } = await c.env.db.prepare(`
+ SELECT
+ DATE(create_time,'+8 hours') AS date,
+ COUNT(*) AS total
+ FROM
+ user
+ WHERE
+ DATE(create_time,'+8 hours') BETWEEN DATE('now', '-14 days', '+8 hours') AND DATE('now','-1 day','+8 hours')
+ GROUP BY
+ DATE(create_time,'+8 hours')
+ ORDER BY
+ date ASC
+ `).all();
+ return results;
+ },
+
+ async receiveDayCount(c) {
+ const { results } = await c.env.db.prepare(`
+ SELECT
+ DATE(create_time,'+8 hours') AS date,
+ COUNT(*) AS total
+ FROM
+ email
+ WHERE
+ DATE(create_time,'+8 hours') BETWEEN DATE('now', '-14 days', '+8 hours') AND DATE('now','-1 day','+8 hours')
+ AND type = 0
+ GROUP BY
+ DATE(create_time,'+8 hours')
+ ORDER BY
+ date ASC
+ `).all();
+ return results;
+ },
+
+ async sendDayCount(c) {
+ const { results } = await c.env.db.prepare(`
+ SELECT
+ DATE(create_time,'+8 hours') AS date,
+ COUNT(*) AS total
+ FROM
+ email
+ WHERE
+ DATE(create_time,'+8 hours') BETWEEN DATE('now', '-14 days', '+8 hours') AND DATE('now','-1 day','+8 hours')
+ AND type = 1
+ GROUP BY
+ DATE(create_time,'+8 hours')
+ ORDER BY
+ date ASC
+ `).all();
+ return results;
+ }
+
+};
+
+export default analysisDao;
diff --git a/mail-worker/src/email/email.js b/mail-worker/src/email/email.js
index f620af5..844c218 100644
--- a/mail-worker/src/email/email.js
+++ b/mail-worker/src/email/email.js
@@ -28,13 +28,20 @@ export async function email(message, env, ctx) {
const email = await PostalMime.parse(content);
+ console.warn(email)
+
const params = {
sendEmail: email.from.address,
name: email.from.name,
- receiveEmail: message.to,
subject: email.subject,
content: email.html,
text: email.text,
+ cc: email.cc ? JSON.stringify(email.cc) : '[]',
+ bcc:email.bcc ? JSON.stringify(email.bcc) : '[]',
+ recipient: JSON.stringify(email.to),
+ inReplyTo: email.inReplyTo,
+ relation: email.references,
+ messageId: email.messageId,
userId: account.userId,
accountId: account.accountId,
isDel: isDel.DELETE,
diff --git a/mail-worker/src/entity/account.js b/mail-worker/src/entity/account.js
index b138b53..96e2448 100644
--- a/mail-worker/src/entity/account.js
+++ b/mail-worker/src/entity/account.js
@@ -3,6 +3,7 @@ import { sql } from 'drizzle-orm';
export const account = sqliteTable('account', {
accountId: integer('account_id').primaryKey({ autoIncrement: true }),
email: text('email').notNull(),
+ name: text('name').notNull().default(''),
status: integer('status').default(0).notNull(),
latestEmailTime: text('latest_email_time'),
createTime: text('create_time').default(sql`CURRENT_TIMESTAMP`),
diff --git a/mail-worker/src/entity/email.js b/mail-worker/src/entity/email.js
index 3b58d4a..1aa9b75 100644
--- a/mail-worker/src/entity/email.js
+++ b/mail-worker/src/entity/email.js
@@ -4,12 +4,17 @@ export const email = sqliteTable('email', {
emailId: integer('email_id').primaryKey({ autoIncrement: true }),
sendEmail: text('send_email'),
name: text('name'),
- receiveEmail: text('receive_email').notNull(),
accountId: integer('account_id').notNull(),
userId: integer('user_id').notNull(),
subject: text('subject'),
text: text('text'),
content: text('content'),
+ cc: text('cc').default('[]'),
+ bcc: text('bcc').default('[]'),
+ recipient: text('recipient'),
+ inReplyTo: text('in_reply_to').default(''),
+ relation: text('relation').default(''),
+ messageId: text('message_id').default(''),
type: integer('type').default(0).notNull(),
status: integer('status').default(0).notNull(),
resendEmailId: text('resend_email_id'),
diff --git a/mail-worker/src/hono/webs.js b/mail-worker/src/hono/webs.js
index f883818..74ca656 100644
--- a/mail-worker/src/hono/webs.js
+++ b/mail-worker/src/hono/webs.js
@@ -15,4 +15,5 @@ import '../api/my-api';
import '../api/role-api'
import '../api/sys-email-api'
import '../api/init-api'
+import '../api/analysis-api'
export default app;
diff --git a/mail-worker/src/service/init-service.js b/mail-worker/src/init/init.js
similarity index 72%
rename from mail-worker/src/service/init-service.js
rename to mail-worker/src/init/init.js
index ed51d6f..92bff19 100644
--- a/mail-worker/src/service/init-service.js
+++ b/mail-worker/src/init/init.js
@@ -1,6 +1,6 @@
-import settingService from './setting-service';
-
-const initService = {
+import settingService from '../service/setting-service';
+import emailUtils from '../utils/email-utils';
+const init = {
async init(c) {
const secret = c.req.param('secret');
@@ -10,12 +10,53 @@ const initService = {
}
await this.intDB(c);
- await this.v1DB(c);
+ await this.v1_1DB(c);
+ await this.v1_2DB(c);
await settingService.refresh(c);
return c.text('初始化成功');
},
- async v1DB(c) {
+ async v1_2DB(c){
+
+ const ADD_COLUMN_SQL_LIST = [
+ `ALTER TABLE email ADD COLUMN recipient TEXT NOT NULL DEFAULT '[]';`,
+ `ALTER TABLE email ADD COLUMN cc TEXT NOT NULL DEFAULT '[]';`,
+ `ALTER TABLE email ADD COLUMN bcc TEXT NOT NULL DEFAULT '[]';`,
+ `ALTER TABLE email ADD COLUMN message_id TEXT NOT NULL DEFAULT '';`,
+ `ALTER TABLE email ADD COLUMN in_reply_to TEXT NOT NULL DEFAULT '';`,
+ `ALTER TABLE email ADD COLUMN relation TEXT NOT NULL DEFAULT '';`
+ ];
+
+ for (let sql of ADD_COLUMN_SQL_LIST) {
+ try {
+ await c.env.db.prepare(sql).run();
+ } catch (e) {
+ console.warn(`跳过字段添加，原因：${e.message}`);
+ }
+ }
+
+ await this.receiveEmailToRecipient(c);
+ await this.initAccountName(c);
+
+ try {
+ await c.env.db.prepare(`
+ INSERT INTO perm (perm_id, name, perm_key, pid, type, sort) VALUES
+ (31,'分析页', NULL, 0, 1, 2.1),
+ (32,'数据查看', 'analysis:query', 31, 2, 1)`).run();
+ } catch (e) {
+ console.warn(`跳过数据，原因：${e.message}`);
+ }
+
+ try {
+ await c.env.db.prepare(`CREATE UNIQUE INDEX IF NOT EXISTS idx_account_email ON account (email)`).run();
+ await c.env.db.prepare(`CREATE UNIQUE INDEX IF NOT EXISTS idx_user_email ON user (email)`).run();
+ } catch (e) {
+ console.warn(`跳过添加唯一邮箱索引，原因：${e.message}`);
+ }
+
+ },
+
+ async v1_1DB(c) {
// 添加字段
const ADD_COLUMN_SQL_LIST = [
`ALTER TABLE email ADD COLUMN type INTEGER NOT NULL DEFAULT 0;`,
@@ -81,7 +122,6 @@ const initService = {
(11, '用户删除', 'user:delete', 6, 2, 7),
(12, '用户收藏', 'user:star', 6, 2, 5),
(13, '权限控制', '', 0, 1, 5),
- (30, '身份添加', 'role:add', 13, 2, -1),
(14, '身份查看', 'role:query', 13, 2, 0),
(15, '身份修改', 'role:set', 13, 2, 1),
(16, '身份删除', 'role:delete', 13, 2, 2),
@@ -97,7 +137,8 @@ const initService = {
(26, '发件重置', 'user:reset-send', 6, 2, 6),
(27, '邮件列表', '', 0, 1, 4),
(28, '邮件查看', 'sys-email:query', 27, 2, 0),
- (29, '邮件删除', 'sys-email:delete', 27, 2, 0)
+ (29, '邮件删除', 'sys-email:delete', 27, 2, 0),
+ (30, '身份添加', 'role:add', 13, 2, -1)
`).run();
}
@@ -163,7 +204,6 @@ const initService = {
email_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
send_email TEXT,
name TEXT,
- receive_email TEXT NOT NULL,
account_id INTEGER NOT NULL,
user_id INTEGER NOT NULL,
subject TEXT,
@@ -247,7 +287,55 @@ const initService = {
SELECT 0, 0, 0, 1, 'Cloud 邮箱', 0, 1, 1
WHERE NOT EXISTS (SELECT 1 FROM setting)
`).run();
+ },
+
+ async receiveEmailToRecipient(c) {
+
+ const receiveEmailColumn = await c.env.db.prepare(`SELECT * FROM pragma_table_info('email') WHERE name = 'receive_email' limit 1`).first();
+
+ if (!receiveEmailColumn) {
+ return
+ }
+
+ const queryList = []
+ const {results} = await c.env.db.prepare('SELECT receive_email,email_id FROM email').all();
+ results.forEach(emailRow => {
+ const recipient = {}
+ recipient.address = emailRow.receive_email
+ recipient.name = ''
+ const recipientStr = JSON.stringify([recipient]);
+ const sql = c.env.db.prepare('UPDATE email SET recipient = ? WHERE email_id = ?').bind(recipientStr,emailRow.email_id);
+ queryList.push(sql)
+ })
+
+ queryList.push(c.env.db.prepare("ALTER TABLE email DROP COLUMN receive_email"));
+
+ await c.env.db.batch(queryList);
+ },
+
+
+ async initAccountName(c) {
+
+ const nameColumn = await c.env.db.prepare(`SELECT * FROM pragma_table_info('account') WHERE name = 'name' limit 1`).first();
+
+ if (nameColumn) {
+ return
+ }
+
+ const queryList = []
+
+ queryList.push(c.env.db.prepare(`ALTER TABLE account ADD COLUMN name TEXT NOT NULL DEFAULT ''`));
+
+ const {results} = await c.env.db.prepare(`SELECT account_id, email FROM account`).all();
+
+ results.forEach(accountRow => {
+ const name = emailUtils.getName(accountRow.email);
+ const sql = c.env.db.prepare('UPDATE account SET name = ? WHERE account_id = ?').bind(name,accountRow.account_id);
+ queryList.push(sql)
+ })
+
+ await c.env.db.batch(queryList);
}
};
-export default initService;
+export default init;
diff --git a/mail-worker/src/security/security.js b/mail-worker/src/security/security.js
index 100dfc7..2dbdbbc 100644
--- a/mail-worker/src/security/security.js
+++ b/mail-worker/src/security/security.js
@@ -65,7 +65,8 @@ const premKey = {
'sys-email:delete': ['/sys-email/delete'],
'setting:query': [],
'setting:set': ['/setting/set', '/setting/setBackground'],
- 'setting:clean': ['/setting/physicsDeleteAll']
+ 'setting:clean': ['/setting/physicsDeleteAll'],
+ 'analysis:query': ['/analysis/echarts']
};
app.use('*', async (c, next) => {
diff --git a/mail-worker/src/service/account-service.js b/mail-worker/src/service/account-service.js
index 6157bad..8039162 100644
--- a/mail-worker/src/service/account-service.js
+++ b/mail-worker/src/service/account-service.js
@@ -5,7 +5,7 @@ import userService from './user-service';
import emailService from './email-service';
import orm from '../entity/orm';
import account from '../entity/account';
-import { and, asc, eq, gt, inArray, count, like } from 'drizzle-orm';
+import { and, asc, eq, gt, inArray, count, sql } from 'drizzle-orm';
import { isDel } from '../const/entity-const';
import settingService from './setting-service';
import turnstileService from './turnstile-service';
@@ -33,7 +33,7 @@ const accountService = {
throw new BizError('不存在的邮箱域名');
}
- const accountRow = await this.selectByEmailIncludeDel(c, email);
+ const accountRow = await this.selectByEmailIncludeDelNoCase(c, email);
if (accountRow && accountRow.isDel === isDel.DELETE) {
throw new BizError('该邮箱已被注销');
@@ -55,9 +55,16 @@ const accountService = {
await turnstileService.verify(c, token);
}
- return orm(c).insert(account).values({ email: email, userId: userId }).returning().get();
+ return orm(c).insert(account).values({ email: email, userId: userId, name: emailUtils.getName(email) }).returning().get();
},
+ selectByEmailIncludeDelNoCase(c, email) {
+ return orm(c)
+ .select()
+ .from(account)
+ .where(sql`${account.email} COLLATE NOCASE = ${email}`)
+ .get();
+ },
selectByEmailIncludeDel(c, email) {
return orm(c).select().from(account).where(eq(account.email, email)).get();
},
@@ -170,6 +177,11 @@ const accountService = {
async restoreByUserId(c, userId) {
await orm(c).update(account).set({isDel: isDel.NORMAL}).where(eq(account.userId, userId)).run();
+ },
+
+ async setName(c, params, userId) {
+ const { name, accountId } = params
+ await orm(c).update(account).set({name}).where(and(eq(account.userId, userId),eq(account.accountId, accountId))).run();
}
};
diff --git a/mail-worker/src/service/analysis-service.js b/mail-worker/src/service/analysis-service.js
new file mode 100644
index 0000000..ad6b0e8
--- /dev/null
+++ b/mail-worker/src/service/analysis-service.js
@@ -0,0 +1,88 @@
+import analysisDao from '../dao/analysis-dao';
+import orm from '../entity/orm';
+import email from '../entity/email';
+import { desc, count, eq } from 'drizzle-orm';
+import { emailConst } from '../const/entity-const';
+import kvConst from '../const/kv-const';
+import dayjs from 'dayjs';
+import timezone from 'dayjs/plugin/timezone'
+import utc from 'dayjs/plugin/utc'
+dayjs.extend(utc)
+dayjs.extend(timezone)
+const analysisService = {
+
+ async echarts(c) {
+
+
+ const [
+ numberCount,
+ nameRatio,
+ sendEmailRatio,
+ userDayCountRaw,
+ receiveDayCountRaw,
+ sendDayCountRaw,
+ daySendTotalRaw
+ ] = await Promise.all([
+ analysisDao.numberCount(c),
+
+ orm(c)
+ .select({ name: email.name, total: count() })
+ .from(email)
+ .where(eq(email.type, emailConst.type.RECEIVE))
+ .groupBy(email.name)
+ .orderBy(desc(count()))
+ .limit(6),
+
+ orm(c)
+ .select({ email: email.sendEmail, total: count() })
+ .from(email)
+ .where(eq(email.type, emailConst.type.RECEIVE))
+ .groupBy(email.sendEmail)
+ .orderBy(desc(count()))
+ .limit(6),
+
+ analysisDao.userDayCount(c),
+ analysisDao.receiveDayCount(c),
+ analysisDao.sendDayCount(c),
+
+ c.env.kv.get(kvConst.SEND_DAY_COUNT + dayjs().format('YYYY-MM-DD')),
+ ]);
+
+
+ const userDayCount = this.filterEmptyDay(userDayCountRaw);
+ const receiveDayCount = this.filterEmptyDay(receiveDayCountRaw);
+ const sendDayCount = this.filterEmptyDay(sendDayCountRaw);
+
+ const daySendTotal = daySendTotalRaw || 0;
+
+ return {
+ numberCount,
+ userDayCount,
+ receiveRatio: {
+ nameRatio,
+ sendEmailRatio
+ },
+ emailDayCount: {
+ receiveDayCount,
+ sendDayCount
+ },
+ daySendTotal: Number(daySendTotal)
+ };
+ },
+
+ filterEmptyDay(data) {
+ const today = dayjs().tz('Asia/Shanghai').subtract(1, 'day');
+ const previousDays = Array.from({ length: 15 }, (_, i) => {
+ return today.subtract(i, 'day').format('YYYY-MM-DD');
+ }).reverse();
+
+ return previousDays.map(day => {
+ const index = data.findIndex(item => item.date === day)
+ const total = index > - 1 ? data[index].total : 0
+ return {date: day,total}
+ })
+
+ }
+}
+
+export default analysisService
diff --git a/mail-worker/src/service/email-service.js b/mail-worker/src/service/email-service.js
index 6d9834e..aa65b44 100644
--- a/mail-worker/src/service/email-service.js
+++ b/mail-worker/src/service/email-service.js
@@ -15,6 +15,9 @@ import roleService from './role-service';
import user from '../entity/user';
import account from '../entity/account';
import starService from './star-service';
+import dayjs from 'dayjs';
+import kvConst from '../const/kv-const';
+import constant from '../const/constant';
const emailService = {
@@ -146,11 +149,10 @@ const emailService = {
async send(c, params, userId) {
- let { accountId, name, receiveEmail, text, content, subject, attachments } = params;
+ let { accountId, name, sendType, emailId, receiveEmail, manyType, text, content, subject, attachments } = params;
const { resendTokens, r2Domain, send } = await settingService.query(c);
-
const { attDataList, html } = await attService.toImageUrlHtml(c, content, r2Domain);
if (attDataList.length > 0 && !r2Domain) {
@@ -173,13 +175,26 @@ const emailService = {
throw new BizError('邮箱发送功能已停用', 403);
}
+ if (attachments.length > 0 && manyType === 'divide') {
+ throw new BizError('分别发送暂时不支持附件');
+ }
+
const userRow = await userService.selectById(c, userId);
const roleRow = await roleService.selectById(c, userRow.type);
- if (userRow.sendCount >= roleRow.sendCount && c.env.admin !== userRow.email) {
- if (roleRow.sendType === 'day') throw new BizError('已到达每日发送数量限制', 403);
- if (roleRow.sendType === 'count') throw new BizError('已到达发送数量限制', 403);
+ if (c.env.admin !== userRow.email && roleRow.sendCount) {
+
+ if (userRow.sendCount >= roleRow.sendCount) {
+ if (roleRow.sendType === 'day') throw new BizError('已到达每日发送次数限制', 403);
+ if (roleRow.sendType === 'count') throw new BizError('已到达发送次数限制', 403);
+ }
+
+ if (userRow.sendCount + receiveEmail.length > roleRow.sendCount) {
+ if (roleRow.sendType === 'day') throw new BizError('剩余每日发送次数不足', 403);
+ if (roleRow.sendType === 'count') throw new BizError('剩余发送次数不足', 403);
+ }
+
}
@@ -203,53 +218,161 @@ const emailService = {
name = emailUtils.getName(accountRow.email);
}
+
+ let emailRow = {
+ messageId: null
+ };
+
+ if (sendType === 'reply') {
+
+ emailRow = await this.selectById(c, emailId);
+
+ if (!emailRow) {
+ throw new BizError('邮件不存在无法回复');
+ }
+
+ }
+
+ let resendResult = null;
+
const resend = new Resend(resendToken);
- const { data, error } = await resend.emails.send({
- from: `${name} <${accountRow.email}>`,
- to: [receiveEmail],
- subject: subject,
- text: text,
- html: html,
- attachments: attachments
- });
+ if (manyType === 'divide') {
+
+ let sendFormList = [];
+
+ receiveEmail.forEach(email => {
+ const sendForm = {
+ from: `${name} <${accountRow.email}>`,
+ to: [email],
+ subject: subject,
+ text: text,
+ html: html
+ };
+
+ if (sendType === 'reply') {
+ sendForm.headers = {
+ 'in-reply-to': emailRow.messageId,
+ 'references': emailRow.messageId
+ };
+ }
+
+ sendFormList.push(sendForm);
+ });
+
+ resendResult = await resend.batch.send(sendFormList);
+
+ } else {
+
+ const sendForm = {
+ from: `${name} <${accountRow.email}>`,
+ to: [...receiveEmail],
+ subject: subject,
+ text: text,
+ html: html,
+ attachments: attachments
+ };
+
+ if (sendType === 'reply') {
+ sendForm.headers = {
+ 'in-reply-to': emailRow.messageId,
+ 'references': emailRow.messageId
+ };
+ }
+
+ resendResult = await resend.emails.send(sendForm);
+
+ }
+
+ const { data, error } = resendResult;
+
if (error) {
console.error(error);
throw new BizError(error.message);
}
+
const emailData = {};
emailData.sendEmail = accountRow.email;
emailData.name = name;
emailData.subject = subject;
- emailData.receiveEmail = receiveEmail;
emailData.content = html;
emailData.text = text;
emailData.accountId = accountId;
emailData.type = emailConst.type.SEND;
emailData.userId = userId;
emailData.status = emailConst.status.SENT;
- emailData.resendEmailId = data.id;
- const emailRow = await orm(c).insert(email).values(emailData).returning().get();
+ const emailDataList = [];
- if (attDataList.length > 0) {
- await attService.saveArticleAtt(c, attDataList, userId, accountId, emailRow.emailId);
+ if (manyType === 'divide') {
+
+ receiveEmail.forEach((item, index) => {
+ const emailDataItem = { ...emailData };
+ emailDataItem.resendEmailId = data.data[index].id;
+ emailDataItem.recipient = JSON.stringify([{ address: item, name: '' }]);
+ emailDataList.push(emailDataItem);
+ });
+
+ } else {
+
+ emailData.resendEmailId = data.id;
+
+ const recipient = [];
+
+ receiveEmail.forEach(item => {
+ recipient.push({ address: item, name: '' });
+ });
+
+ emailData.recipient = JSON.stringify(recipient);
+
+ emailDataList.push(emailData);
}
+ if (sendType === 'reply') {
+ emailDataList.forEach(emailData => {
+ emailData.inReplyTo = emailRow.messageId;
+ emailData.relation = emailRow.messageId;
+ });
+ }
+
+
if (roleRow.sendCount) {
- await userService.incrUserService(c, 1, userId);
+ await userService.incrUserSendCount(c, receiveEmail.length, userId);
}
- if (attachments?.length > 0 && c.env.r2) {
- await attService.saveSendAtt(c, attachments, userId, accountId, emailRow.emailId);
+ const emailRowList = await Promise.all(
+ emailDataList.map(async (emailData) => {
+ const emailRow = await orm(c).insert(email).values(emailData).returning().get();
+
+ if (attDataList.length > 0) {
+ await attService.saveArticleAtt(c, attDataList, userId, accountId, emailRow.emailId);
+ }
+
+ if (attachments?.length > 0 && c.env.r2) {
+ await attService.saveSendAtt(c, attachments, userId, accountId, emailRow.emailId);
+ }
+
+ const attsList = await attService.selectByEmailIds(c, [emailRow.emailId]);
+ emailRow.attList = attsList;
+
+ return emailRow;
+ })
+ );
+
+ const dateStr = dayjs().format('YYYY-MM-DD');
+
+ let daySendTotal = await c.env.kv.get(kvConst.SEND_DAY_COUNT + dateStr);
+
+ if (!daySendTotal) {
+ await c.env.kv.put(kvConst.SEND_DAY_COUNT + dateStr, JSON.stringify(receiveEmail.length), { expirationTtl: 60 * 60 * 24 });
+ } else {
+ daySendTotal = Number(daySendTotal) + receiveEmail.length
+ await c.env.kv.put(kvConst.SEND_DAY_COUNT + dateStr, JSON.stringify(daySendTotal), { expirationTtl: 60 * 60 * 24 });
}
- const attsList = await attService.selectByEmailIds(c, [emailRow.emailId]);
- emailRow.attList = attsList;
-
- return emailRow;
+ return emailRowList;
},
selectById(c, emailId) {
@@ -398,7 +521,7 @@ const emailService = {
conditions.push(like(email.subject, `${subject}%`));
}
- conditions.push(ne(email.status, emailConst.status.SAVING))
+ conditions.push(ne(email.status, emailConst.status.SAVING));
const countConditions = [...conditions];
@@ -447,7 +570,10 @@ const emailService = {
},
async completeReceive(c, emailId) {
- await orm(c).update(email).set({ isDel: isDel.NORMAL, status: emailConst.status.RECEIVE }).where(eq(email.emailId, emailId)).run();
+ await orm(c).update(email).set({
+ isDel: isDel.NORMAL,
+ status: emailConst.status.RECEIVE
+ }).where(eq(email.emailId, emailId)).run();
}
};
diff --git a/mail-worker/src/service/login-service.js b/mail-worker/src/service/login-service.js
index b7eb8b6..f905d3f 100644
--- a/mail-worker/src/service/login-service.js
+++ b/mail-worker/src/service/login-service.js
@@ -38,7 +38,7 @@ const loginService = {
throw new BizError('非法邮箱域名');
}
- const accountRow = await accountService.selectByEmailIncludeDel(c, email);
+ const accountRow = await accountService.selectByEmailIncludeDelNoCase(c, email);
if (accountRow && accountRow.isDel === isDel.DELETE) {
throw new BizError('该邮箱已被注销');
@@ -60,7 +60,7 @@ const loginService = {
await userService.updateUserInfo(c, userId, true);
- await accountService.insert(c, { userId: userId, email });
+ await accountService.insert(c, { userId: userId, email, name: emailUtils.getName(email) });
},
async login(c, params) {
@@ -110,7 +110,6 @@ const loginService = {
}
-
await userService.updateUserInfo(c, userRow.userId);
await c.env.kv.put(KvConst.AUTH_INFO + userRow.userId, JSON.stringify(authInfo), { expirationTtl: constant.TOKEN_EXPIRE });
diff --git a/mail-worker/src/service/user-service.js b/mail-worker/src/service/user-service.js
index eebd06b..c4b729d 100644
--- a/mail-worker/src/service/user-service.js
+++ b/mail-worker/src/service/user-service.js
@@ -33,6 +33,7 @@ const userService = {
user.sendCount = userRow.sendCount;
user.email = userRow.email;
user.accountId = account.accountId;
+ user.name = account.name;
user.permKeys = permKeys;
user.role = roleRow
@@ -304,7 +305,7 @@ const userService = {
},
- async incrUserService(c, quantity, userId) {
+ async incrUserSendCount(c, quantity, userId) {
await orm(c).update(user).set({
sendCount: sql`${user.sendCount}
+
@@ -352,7 +353,7 @@ const userService = {
const userId = await userService.insert(c, { email, password: hash, salt, type });
- await accountService.insert(c, { userId: userId, email, type });
+ await accountService.insert(c, { userId: userId, email, type, name: emailUtils.getName(email) });
},
async resetDaySendCount(c) {