修改图标和权限*拦截邮件
This commit is contained in:
6524
mail-worker/package-lock.json
generated
6524
mail-worker/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -5,9 +5,8 @@
|
||||
"scripts": {
|
||||
"dev": "wrangler dev --config wrangler-dev.toml",
|
||||
"test": "wrangler deploy --config wrangler-test.toml",
|
||||
"deploy": "npm --prefix ../mail-vue run build && wrangler deploy",
|
||||
"start": "wrangler dev",
|
||||
"build": "npm --prefix ../mail-vue run build"
|
||||
"deploy": "wrangler deploy",
|
||||
"start": "wrangler dev"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@cloudflare/vitest-pool-workers": "^0.7.5",
|
||||
|
||||
4415
mail-worker/pnpm-lock.yaml
generated
Normal file
4415
mail-worker/pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -65,6 +65,11 @@ export async function email(message, env, ctx) {
|
||||
|
||||
banEmail = banEmail.split(',').filter(item => item !== '');
|
||||
|
||||
|
||||
if (banEmail.includes('*')) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (const item of banEmail) {
|
||||
|
||||
if (verifyUtils.isDomain(item)) {
|
||||
|
||||
@@ -23,7 +23,7 @@ const roleService = {
|
||||
|
||||
let roleRow = await orm(c).select().from(role).where(eq(role.name, name)).get();
|
||||
|
||||
const notEmailIndex = banEmail.findIndex(item => (!verifyUtils.isEmail(item) && !verifyUtils.isDomain(item)))
|
||||
const notEmailIndex = banEmail.findIndex(item => (!verifyUtils.isEmail(item) && !verifyUtils.isDomain(item)) && item !== "*");
|
||||
|
||||
if (notEmailIndex > -1) {
|
||||
throw new BizError(t('notEmail'));
|
||||
@@ -72,7 +72,7 @@ const roleService = {
|
||||
|
||||
delete params.isDefault
|
||||
|
||||
const notEmailIndex = banEmail.findIndex(item => (!verifyUtils.isEmail(item) && !verifyUtils.isDomain(item)))
|
||||
const notEmailIndex = banEmail.findIndex(item => (!verifyUtils.isEmail(item) && !verifyUtils.isDomain(item)) && item !== "*")
|
||||
|
||||
if (notEmailIndex > -1) {
|
||||
throw new BizError(t('notEmail'));
|
||||
|
||||
@@ -23,7 +23,7 @@ const settingService = {
|
||||
|
||||
async query(c) {
|
||||
|
||||
if (c.get('setting')) {
|
||||
if (c.get?.('setting')) {
|
||||
return c.get('setting')
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ const settingService = {
|
||||
|
||||
domainList = domainList.map(item => '@' + item);
|
||||
setting.domainList = domainList;
|
||||
c.set('setting', setting);
|
||||
c.set?.('setting', setting);
|
||||
return setting;
|
||||
},
|
||||
|
||||
|
||||
@@ -22,17 +22,8 @@ id = "2io01d4b299e481b9de060ece9e7785c"
|
||||
binding = "r2"
|
||||
bucket_name = "email"
|
||||
|
||||
[assets]
|
||||
binding = "assets"
|
||||
directory = "./dist"
|
||||
not_found_handling = "single-page-application"
|
||||
run_worker_first = true
|
||||
|
||||
[triggers]
|
||||
crons = ["0 16 * * *"]
|
||||
|
||||
[vars]
|
||||
orm_log = true
|
||||
orm_log = false
|
||||
domain = ["example.com", "example2.com", "example3.com", "example4.com"]
|
||||
admin = "admin@example.com"
|
||||
jwt_secret = "b7f29a1d-18e2-4d3b-941f-f6b2c97c02fd"
|
||||
|
||||
@@ -31,6 +31,9 @@ crons = ["0 16 * * *"] #定时任务每天晚上12点执行
|
||||
|
||||
#[vars]
|
||||
#orm_log = false
|
||||
#domain = [] #邮件域名可配置多个 示例: ["example1.com","example2.com"]
|
||||
#domain = [] #邮件域名可可配置多个 示例: ["example1.com","example2.com"]
|
||||
#admin = "" #管理员的邮箱 示例: admin@example.com
|
||||
#jwt_secret = "" #jwt令牌的密钥,随便填一串字符串
|
||||
|
||||
[build]
|
||||
command = "pnpm --prefix ../mail-vue install && pnpm --prefix ../mail-vue run build"
|
||||
|
||||
Reference in New Issue
Block a user