dinegg 3.5.1 → 3.5.3

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.
@@ -71,7 +71,7 @@ function verifyJwt(ctx, token) {
71
71
  return true;
72
72
  }
73
73
  catch (error) {
74
- ctx.logger.error(`token验证失败或已过期!%s`, error);
74
+ ctx.logger.error(`token验证失败或已过期!%s`, error.message);
75
75
  return false;
76
76
  }
77
77
  }
@@ -87,4 +87,4 @@ function isInWhiteList(ctx, route_white_list = []) {
87
87
  const { path } = ctx.request;
88
88
  return list.some((item) => path.substring(0, item.length) === item);
89
89
  }
90
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiand0TG9naW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJqd3RMb2dpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7R0FPRzs7QUFJSDs7Ozs7R0FLRztBQUNILGtCQUFlLENBQUMsT0FBaUMsRUFBTyxFQUFFO0lBQ3pELE9BQU8sS0FBSyxVQUFVLFFBQVEsQ0FBQyxHQUFZLEVBQUUsSUFBd0I7O1FBQ3BFLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFO1lBQ3BCLE9BQU8sSUFBSSxFQUFFLENBQUM7U0FDZDtRQUNELE1BQU0sS0FBSyxHQUNWLEdBQUcsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUM7WUFDMUIsR0FBRyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUM7YUFDeEIsTUFBQSxHQUFHLENBQUMsS0FBSywwQ0FBRSxZQUFZLENBQUE7YUFDdkIsTUFBQSxHQUFHLENBQUMsT0FBTyxDQUFDLEtBQUssMENBQUUsWUFBWSxDQUFBO1lBQy9CLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDO2FBQ2pDLE1BQUEsR0FBRyxDQUFDLE9BQU8sMENBQUUsWUFBWSxDQUFBLENBQUM7UUFFM0IsTUFBTSxHQUFHLEdBQXNCO1lBQzlCLElBQUksRUFBRSxJQUFJO1lBQ1YsR0FBRyxFQUFFLEVBQUU7WUFDUCxJQUFJLEVBQUUsS0FBSztZQUNYLE9BQU8sRUFBRSxFQUFFO1NBQ1gsQ0FBQztRQUNGLDRCQUE0QjtRQUM1QixJQUFJLE9BQU8sQ0FBQyxRQUFRLEVBQUU7WUFDckIsa0NBQWtDO1lBQ2xDLElBQUksYUFBYSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsY0FBYyxDQUFDLEVBQUU7Z0JBQy9DLE1BQU0sSUFBSSxFQUFFLENBQUM7Z0JBQ2IsT0FBTzthQUNQO1NBQ0Q7UUFFRCxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ1gsTUFBTSxHQUFHLEdBQUcsR0FBRyxDQUFDLEVBQUUsQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO1lBQzlELEdBQUcsQ0FBQyxNQUFNLEdBQUcsR0FBRyxDQUFDO1lBQ2pCLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3JCLEdBQUcsQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1lBQ2QsR0FBRyxDQUFDLElBQUksR0FBRyxLQUFLLENBQUMsQ0FBQywwQ0FBMEM7WUFDNUQsR0FBRyxDQUFDLElBQUksR0FBRyxHQUFHLENBQUM7WUFDZixPQUFPO1NBQ1A7UUFFRCxNQUFNLFdBQVcsR0FBRyxTQUFTLENBQUMsR0FBRyxFQUFFLEtBQWUsQ0FBQyxDQUFDO1FBQ3BELElBQUksQ0FBQyxXQUFXLEVBQUU7WUFDakIsR0FBRyxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUM7WUFDakIsR0FBRyxDQUFDLElBQUksR0FBRyxLQUFLLENBQUM7WUFDakIsR0FBRyxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLDRDQUE0QyxDQUFDLENBQUM7WUFDcEUsR0FBRyxDQUFDLElBQUksR0FBRyxHQUFHLENBQUM7WUFDZixPQUFPO1NBQ1A7UUFDRCxNQUFNLElBQUksRUFBRSxDQUFDO0lBQ2QsQ0FBQyxDQUFDO0FBQ0gsQ0FBQyxDQUFDO0FBRUYsU0FBUyxTQUFTLENBQUMsR0FBWSxFQUFFLEtBQWE7SUFDN0MsS0FBSyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZDLElBQUk7UUFDSCxVQUFVO1FBQ1YsSUFBSSxNQUFNLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEtBQWUsRUFBRSxHQUFHLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFvQyxDQUFDO1FBQy9HLHlFQUF5RTtRQUN6RSxHQUFHLENBQUMsYUFBYSxHQUFHLE1BQU0sQ0FBQztRQUMzQixHQUFHLENBQUMsUUFBUSxHQUFHLEtBQUssQ0FBQztRQUNyQixPQUFPLElBQUksQ0FBQztLQUNaO0lBQUMsT0FBTyxLQUFLLEVBQUU7UUFDZixHQUFHLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxrQkFBa0IsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUM1QyxPQUFPLEtBQUssQ0FBQztLQUNiO0FBQ0YsQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsU0FBUyxhQUFhLENBQUMsR0FBWSxFQUFFLG1CQUE2QixFQUFFO0lBQ25FLGlDQUFpQztJQUNqQyxNQUFNLElBQUksR0FBYSxnQkFBZ0IsSUFBSSxFQUFFLENBQUM7SUFDOUMsTUFBTSxFQUFFLElBQUksRUFBRSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUM7SUFDN0IsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLEtBQUssSUFBSSxDQUFDLENBQUM7QUFDckUsQ0FBQyJ9
90
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiand0TG9naW4uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJqd3RMb2dpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7Ozs7Ozs7R0FPRzs7QUFJSDs7Ozs7R0FLRztBQUNILGtCQUFlLENBQUMsT0FBaUMsRUFBTyxFQUFFO0lBQ3pELE9BQU8sS0FBSyxVQUFVLFFBQVEsQ0FBQyxHQUFZLEVBQUUsSUFBd0I7O1FBQ3BFLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFO1lBQ3BCLE9BQU8sSUFBSSxFQUFFLENBQUM7U0FDZDtRQUNELE1BQU0sS0FBSyxHQUNWLEdBQUcsQ0FBQyxHQUFHLENBQUMsaUJBQWlCLENBQUM7WUFDMUIsR0FBRyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUM7YUFDeEIsTUFBQSxHQUFHLENBQUMsS0FBSywwQ0FBRSxZQUFZLENBQUE7YUFDdkIsTUFBQSxHQUFHLENBQUMsT0FBTyxDQUFDLEtBQUssMENBQUUsWUFBWSxDQUFBO1lBQy9CLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDO2FBQ2pDLE1BQUEsR0FBRyxDQUFDLE9BQU8sMENBQUUsWUFBWSxDQUFBLENBQUM7UUFFM0IsTUFBTSxHQUFHLEdBQXNCO1lBQzlCLElBQUksRUFBRSxJQUFJO1lBQ1YsR0FBRyxFQUFFLEVBQUU7WUFDUCxJQUFJLEVBQUUsS0FBSztZQUNYLE9BQU8sRUFBRSxFQUFFO1NBQ1gsQ0FBQztRQUNGLDRCQUE0QjtRQUM1QixJQUFJLE9BQU8sQ0FBQyxRQUFRLEVBQUU7WUFDckIsa0NBQWtDO1lBQ2xDLElBQUksYUFBYSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsY0FBYyxDQUFDLEVBQUU7Z0JBQy9DLE1BQU0sSUFBSSxFQUFFLENBQUM7Z0JBQ2IsT0FBTzthQUNQO1NBQ0Q7UUFFRCxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ1gsTUFBTSxHQUFHLEdBQUcsR0FBRyxDQUFDLEVBQUUsQ0FBQyx5Q0FBeUMsQ0FBQyxDQUFDO1lBQzlELEdBQUcsQ0FBQyxNQUFNLEdBQUcsR0FBRyxDQUFDO1lBQ2pCLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ3JCLEdBQUcsQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO1lBQ2QsR0FBRyxDQUFDLElBQUksR0FBRyxLQUFLLENBQUMsQ0FBQywwQ0FBMEM7WUFDNUQsR0FBRyxDQUFDLElBQUksR0FBRyxHQUFHLENBQUM7WUFDZixPQUFPO1NBQ1A7UUFFRCxNQUFNLFdBQVcsR0FBRyxTQUFTLENBQUMsR0FBRyxFQUFFLEtBQWUsQ0FBQyxDQUFDO1FBQ3BELElBQUksQ0FBQyxXQUFXLEVBQUU7WUFDakIsR0FBRyxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUM7WUFDakIsR0FBRyxDQUFDLElBQUksR0FBRyxLQUFLLENBQUM7WUFDakIsR0FBRyxDQUFDLEdBQUcsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLDRDQUE0QyxDQUFDLENBQUM7WUFDcEUsR0FBRyxDQUFDLElBQUksR0FBRyxHQUFHLENBQUM7WUFDZixPQUFPO1NBQ1A7UUFDRCxNQUFNLElBQUksRUFBRSxDQUFDO0lBQ2QsQ0FBQyxDQUFDO0FBQ0gsQ0FBQyxDQUFDO0FBRUYsU0FBUyxTQUFTLENBQUMsR0FBWSxFQUFFLEtBQWE7SUFDN0MsS0FBSyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsV0FBVyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3ZDLElBQUk7UUFDSCxVQUFVO1FBQ1YsSUFBSSxNQUFNLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEtBQWUsRUFBRSxHQUFHLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFvQyxDQUFDO1FBQy9HLHlFQUF5RTtRQUN6RSxHQUFHLENBQUMsYUFBYSxHQUFHLE1BQU0sQ0FBQztRQUMzQixHQUFHLENBQUMsUUFBUSxHQUFHLEtBQUssQ0FBQztRQUNyQixPQUFPLElBQUksQ0FBQztLQUNaO0lBQUMsT0FBTyxLQUFTLEVBQUU7UUFDbkIsR0FBRyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsa0JBQWtCLEVBQUUsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3BELE9BQU8sS0FBSyxDQUFDO0tBQ2I7QUFDRixDQUFDO0FBRUQ7Ozs7O0dBS0c7QUFDSCxTQUFTLGFBQWEsQ0FBQyxHQUFZLEVBQUUsbUJBQTZCLEVBQUU7SUFDbkUsaUNBQWlDO0lBQ2pDLE1BQU0sSUFBSSxHQUFhLGdCQUFnQixJQUFJLEVBQUUsQ0FBQztJQUM5QyxNQUFNLEVBQUUsSUFBSSxFQUFFLEdBQUcsR0FBRyxDQUFDLE9BQU8sQ0FBQztJQUM3QixPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxJQUFJLENBQUMsQ0FBQztBQUNyRSxDQUFDIn0=
package/index.d.ts CHANGED
@@ -17,6 +17,15 @@ import "egg-jwt";
17
17
  import "./lib/typings/shim.schedule";
18
18
  import "./lib/typings/shim.validate";
19
19
 
20
+ import "./typings/app/extend/application";
21
+ import "./typings/app/extend/context";
22
+ import "./typings/app/extend/helper";
23
+ import "./typings/app/middleware/index";
24
+ import "./typings/app/service/index";
25
+ import "./typings/config/index";
26
+ import "./typings/config/plugin";
27
+
28
+ import AppCache from "./lib/core/AppCache";
20
29
  // import "./typings/sequelize";//不需要自定义的sequelize类型定义了。
21
30
 
22
31
  // ts 这里可以理解成导入一个类。并将这个类的类型提取给ts作为自定义type。然后这个type就可以放在interface上,或者提供给其他interface等。
@@ -35,8 +44,6 @@ declare module "egg" {
35
44
 
36
45
  // context的扩展添加声明的写法。
37
46
  interface Context {
38
- /** 挂载egg原来的service在svs上 */
39
- svs: oIService;
40
47
  /**
41
48
  * 在ctx上抛出错误,具有特殊的isBizError标识,在中间件单独处理,直接响应给前端消息提示
42
49
  * - status 500
@@ -98,7 +105,6 @@ declare module "egg" {
98
105
  }
99
106
 
100
107
  interface Application {
101
-
102
108
  /** 外部实现的权限控制类挂载在app上,该类必须实现了抽象类 */
103
109
  PermissionAccessControl: typeof AbstractPermissionAccessControl;
104
110
  /** egg框架内的cluster方法 */
@@ -126,22 +132,6 @@ declare module "egg" {
126
132
  };
127
133
  }
128
134
 
129
- interface oIService {
130
- /** restful api的服务类 */
131
- restful: {
132
- /** 新增一条数据 */
133
- create<T>(Model: Egg.orm.defineModel<T>, data: T): Promise<Egg.orm.modelInstance<T>>;
134
- /** 获取一条数据 */
135
- show<T>(Model: Egg.orm.defineModel<T>, id: number | string): Promise<Egg.orm.modelInstance<T>>;
136
- /** 修改一条数据 */
137
- update<T>(id: number | string, updateData: object, Model: Egg.orm.defineModel<T>, primaryKey?: string): Promise<[number, number]>;
138
- /** 删除一条数据 */
139
- delete(id: number | string, Model: Egg.orm.defineModel<object>, primaryKey: string): Promise<number>;
140
- /** 删除多条数据 */
141
- batchDelete(idList: number[] | string[], Model: Egg.orm.defineModel<object>, primaryKey: string): Promise<number>;
142
- };
143
- }
144
-
145
135
  /** 为controller添加响应方法 */
146
136
  interface Controller {
147
137
  /**
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dinegg",
3
- "version": "3.5.1",
3
+ "version": "3.5.3",
4
4
  "description": "egg framework dinegg.",
5
5
  "dependencies": {
6
6
  "@diyaner/egg-sequelize": "^6.0.0",