@befly-addon/admin 1.1.5 → 1.1.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,7 +1,11 @@
1
1
  export default {
2
2
  name: '获取邮件配置',
3
3
  handler: async (befly, ctx) => {
4
- const config = befly.email.getConfig();
4
+ if (!(befly as any).addon_admin_email) {
5
+ return befly.tool.No('邮件插件未加载,请检查配置');
6
+ }
7
+
8
+ const config = (befly as any).addon_admin_email.getConfig();
5
9
 
6
10
  return befly.tool.Yes('获取成功', {
7
11
  host: config.host,
@@ -21,7 +21,11 @@ export default {
21
21
  },
22
22
  required: ['to', 'subject', 'content'],
23
23
  handler: async (befly, ctx) => {
24
- const result = await befly.email.sendAndLog({
24
+ if (!(befly as any).addon_admin_email) {
25
+ return befly.tool.No('邮件插件未加载,请检查配置');
26
+ }
27
+
28
+ const result = await (befly as any).addon_admin_email.sendAndLog({
25
29
  adminId: ctx.user?.id || 0,
26
30
  username: ctx.user?.username || '',
27
31
  nickname: ctx.user?.nickname || '',
@@ -1,7 +1,11 @@
1
1
  export default {
2
2
  name: '验证邮件配置',
3
3
  handler: async (befly, ctx) => {
4
- const isValid = await befly.email.verify();
4
+ if (!(befly as any).addon_admin_email) {
5
+ return befly.tool.No('邮件插件未加载,请检查配置');
6
+ }
7
+
8
+ const isValid = await (befly as any).addon_admin_email.verify();
5
9
 
6
10
  if (isValid) {
7
11
  return befly.tool.Yes('邮件服务配置正常');
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@befly-addon/admin",
3
- "version": "1.1.5",
3
+ "version": "1.1.7",
4
4
  "title": "管理后台",
5
5
  "description": "Befly - 管理后台功能组件",
6
6
  "type": "module",
@@ -43,8 +43,9 @@
43
43
  "url": "https://github.com/chenbimo/befly.git",
44
44
  "directory": "packages/addon-admin"
45
45
  },
46
- "gitHead": "9f37fe1d7b660c79cbee174865b9d65b1a4ead22",
46
+ "gitHead": "22acaff4fd6df6a25093a497fe68ad1b551bc839",
47
47
  "dependencies": {
48
+ "befly": "3.9.21",
48
49
  "befly-shared": "^1.2.3",
49
50
  "nodemailer": "^7.0.11",
50
51
  "ua-parser-js": "^2.0.7"
package/plugins/email.ts CHANGED
@@ -6,8 +6,8 @@
6
6
  import nodemailer from 'nodemailer';
7
7
 
8
8
  import type { Transporter } from 'nodemailer';
9
- import type { Plugin } from 'befly-core/types/plugin.js';
10
- import type { BeflyContext } from 'befly-core/types/befly.js';
9
+ import type { Plugin } from 'befly/types/plugin.js';
10
+ import type { BeflyContext } from 'befly/types/befly.js';
11
11
 
12
12
  /** 邮件配置 */
13
13
  export interface EmailConfig {
@@ -21,15 +21,13 @@
21
21
  "type": "string",
22
22
  "min": 5,
23
23
  "max": 200,
24
- "required": true,
25
- "regex": "email"
24
+ "regexp": "@email"
26
25
  },
27
26
  "subject": {
28
27
  "name": "邮件主题",
29
28
  "type": "string",
30
29
  "min": 1,
31
- "max": 200,
32
- "required": true
30
+ "max": 200
33
31
  },
34
32
  "content": {
35
33
  "name": "邮件内容",
@@ -55,7 +55,7 @@
55
55
  "min": 0,
56
56
  "max": 1,
57
57
  "default": 1,
58
- "comment": "1成功 0失败"
58
+ "detail": "1成功 0失败"
59
59
  },
60
60
  "response": {
61
61
  "name": "响应内容",
@@ -22,7 +22,7 @@
22
22
  "type": "string",
23
23
  "max": 20,
24
24
  "default": "string",
25
- "comment": "string number boolean json"
25
+ "detail": "string number boolean json"
26
26
  },
27
27
  "group": {
28
28
  "name": "配置分组",
@@ -43,7 +43,7 @@
43
43
  "min": 0,
44
44
  "max": 1,
45
45
  "default": 0,
46
- "comment": "1是 0否"
46
+ "detail": "1是 0否"
47
47
  },
48
48
  "description": {
49
49
  "name": "描述说明",