dinegg 2.8.0 → 2.9.0

package/index.d.ts

@@ -3,7 +3,7 @@
  * @Author: ding-cx
  * @Date: 2021-01-29 18:12:25
  * @LastEditors: ding-cx
- * @LastEditTime: 2022-03-28 13:46:33
+ * @LastEditTime: 2022-03-28 16:12:34
  * @Description: file content
  */
 // {framework_root}/index.d.ts
@@ -253,19 +253,25 @@ declare module "egg" {
     /** 批量删除 */
     batchDelete(): void;
   }
-  
+
   const ServiceDecorator: ServiceDecorator;
 
   /** service 装饰器 */
   interface ServiceDecorator {
     /**  类装饰器，与inject配合注入其他servcie */
-    service: () => (target) => void;
+    // service: () => (target) => void;
     /** 属性装饰器 注入其他 service 类到本属性
      * - @inject() 直接调用，使用属性名（首字母替换为大写作为类名注入）
      * - @inject('className') 传入类名，使用该类名查询容器对应名称的类进行注入，与属性名解耦
      * - @inject(Class) 传入类（即构造函数），使用该类手动实例化 **传入类时当心循环引用js模块的问题**
      */
     inject: (className?: string | Function) => (target: any, propertyName: string) => void;
+    /** 属性装饰器 注入其他 service 类到本属性
+     * - @inject() 直接调用，使用属性名（首字母替换为大写作为类名注入）
+     * - @inject('className') 传入类名，使用该类名查询容器对应名称的类进行注入，与属性名解耦
+     * - @inject(Class) 传入类（即构造函数），使用该类手动实例化 **传入类时当心循环引用js模块的问题**
+     */
+    injectService: (className?: string | Function) => (target: any, propertyName: string) => void;
   }
 
   /** note module中添加egg属性 使用const 定义为属性，同时同名使用interface定义类型，若没有const则外部提示类型声明作为值使用的错误！！！*/

package/lib/core/Subscription/Subscription.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const egg_1 = require("egg");
+const serviceDecorator_1 = require("../decorator/serviceDecorator");
+class DineggSubscription extends egg_1.Subscription {
+    constructor(ctx) {
+        super(ctx);
+        serviceDecorator_1.bindInjectProperty.call(this);
+    }
+}
+exports.default = DineggSubscription;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3Vic2NyaXB0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiU3Vic2NyaXB0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBU0EsNkJBQW1DO0FBQ25DLG9FQUFtRTtBQUVuRSxNQUFxQixrQkFBbUIsU0FBUSxrQkFBWTtJQUMxRCxZQUFZLEdBQUc7UUFDYixLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDWCxxQ0FBa0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDaEMsQ0FBQztDQUNGO0FBTEQscUNBS0MifQ==

package/lib/core/controller/DineggController.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const egg_1 = require("egg");
+const serviceDecorator_1 = require("../decorator/serviceDecorator");
+class DineggController extends egg_1.Controller {
+    constructor(ctx) {
+        super(ctx);
+        serviceDecorator_1.bindInjectProperty.call(this);
+    }
+    success(data) {
+        this.ctx.send(data, 20000, "success");
+    }
+    error(msg) {
+        var _a;
+        const _msg = ((_a = this.ctx.body) === null || _a === void 0 ? void 0 : _a.msg) ? this.ctx.body.msg + "," + msg : msg;
+        this.ctx.send(null, 50000, _msg);
+    }
+}
+exports.default = DineggController;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGluZWdnQ29udHJvbGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkRpbmVnZ0NvbnRyb2xsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFRQSw2QkFBaUM7QUFDakMsb0VBQW1FO0FBRW5FLE1BQXFCLGdCQUFpQixTQUFRLGdCQUFVO0lBQ3RELFlBQVksR0FBRztRQUNiLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNYLHFDQUFrQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNoQyxDQUFDO0lBRUQsT0FBTyxDQUFDLElBQUk7UUFDVixJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFDO0lBQ3hDLENBQUM7SUFFRCxLQUFLLENBQUMsR0FBRzs7UUFDUCxNQUFNLElBQUksR0FBRyxDQUFBLE1BQUEsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLDBDQUFFLEdBQUcsRUFBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQztRQUN0RSxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ25DLENBQUM7Q0FDRjtBQWRELG1DQWNDIn0=

package/lib/core/decorator/serviceDecorator.js

@@ -1,38 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inject = exports.service = void 0;
+exports.bindInjectProperty = exports.injectService = exports.inject = exports.service = void 0;
 const propertyObjPropertyName = Symbol("#propertyObjBindPropertyName");
 function service() {
     return function decorator(constructor) {
         class resultClass extends constructor {
             constructor(...args) {
                 super(...args);
-                this[propertyObjPropertyName].forEach(({ className, propName }) => {
-                    Object.defineProperty(this, propName, {
-                        get() {
-                            if (typeof className === "string") {
-                                const ServiceClass = this.app._app._dineggServiceClasses[className];
-                                if (!ServiceClass) {
-                                    throw new Error(`属性 ${propName} 要注入的类 ${className} 未找到`);
-                                }
-                                if (!this[Symbol.for(propName)]) {
-                                    this[Symbol.for(propName)] = new ServiceClass(this.ctx);
-                                }
-                                return this[Symbol.for(propName)];
-                            }
-                            else if (className instanceof Function) {
-                                const ServiceClass = className;
-                                if (!this[Symbol.for(propName)]) {
-                                    this[Symbol.for(propName)] = new ServiceClass(this.ctx);
-                                }
-                                return this[Symbol.for(propName)];
-                            }
-                            else {
-                                throw Error(`属性 ${propName} 要实例化的类 ${className} 不是类名或类`);
-                            }
-                        },
-                    });
-                });
+                bindInjectProperty.call(this);
             }
         }
         resultClass[Symbol.for("#className")] = constructor.name;
@@ -41,13 +16,51 @@ function service() {
 }
 exports.service = service;
 function inject(className) {
-    return function decorator(propertyObj, propName) {
-        if (!propertyObj[propertyObjPropertyName]) {
-            propertyObj[propertyObjPropertyName] = [];
+    return function decorator(prototype, propName) {
+        if (!prototype[propertyObjPropertyName]) {
+            prototype[propertyObjPropertyName] = [];
         }
         className = className || propName.replace(propName[0], propName[0].toUpperCase());
-        propertyObj[propertyObjPropertyName].push({ className, propName });
+        prototype[propertyObjPropertyName].push({ className, propName });
     };
 }
 exports.inject = inject;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZURlY29yYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNlcnZpY2VEZWNvcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsTUFBTSx1QkFBdUIsR0FBRyxNQUFNLENBQUMsOEJBQThCLENBQUMsQ0FBQztBQUV2RSxTQUFnQixPQUFPO0lBQ3JCLE9BQU8sU0FBUyxTQUFTLENBQXlDLFdBQWM7UUFDOUUsTUFBTSxXQUFZLFNBQVEsV0FBVztZQUNuQyxZQUFZLEdBQUcsSUFBSTtnQkFDakIsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7Z0JBRWYsSUFBSSxDQUFDLHVCQUF1QixDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRTtvQkFDaEUsTUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFO3dCQUNwQyxHQUFHOzRCQUVELElBQUksT0FBTyxTQUFTLEtBQUssUUFBUSxFQUFFO2dDQUNqQyxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxTQUFTLENBQUMsQ0FBQztnQ0FDcEUsSUFBSSxDQUFDLFlBQVksRUFBRTtvQ0FDakIsTUFBTSxJQUFJLEtBQUssQ0FBQyxNQUFNLFFBQVEsVUFBVSxTQUFTLE1BQU0sQ0FBQyxDQUFDO2lDQUMxRDtnQ0FDRCxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRTtvQ0FDL0IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsR0FBRyxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7aUNBQ3pEO2dDQUNELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQzs2QkFDbkM7aUNBQU0sSUFBSSxTQUFTLFlBQVksUUFBUSxFQUFFO2dDQUV4QyxNQUFNLFlBQVksR0FBRyxTQUFTLENBQUM7Z0NBQy9CLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFO29DQUMvQixJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxHQUFHLElBQUksWUFBWSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztpQ0FDekQ7Z0NBQ0QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDOzZCQUNuQztpQ0FBTTtnQ0FDTCxNQUFNLEtBQUssQ0FBQyxNQUFNLFFBQVEsV0FBVyxTQUFTLFNBQVMsQ0FBQyxDQUFDOzZCQUMxRDt3QkFDSCxDQUFDO3FCQUNGLENBQUMsQ0FBQztnQkFDTCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUM7U0FDRjtRQUVELFdBQVcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQztRQUN6RCxPQUFPLFdBQVcsQ0FBQztJQUNyQixDQUFDLENBQUM7QUFDSixDQUFDO0FBdENELDBCQXNDQztBQVVELFNBQWdCLE1BQU0sQ0FBQyxTQUF3QztJQUM3RCxPQUFPLFNBQVMsU0FBUyxDQUFDLFdBQVcsRUFBRSxRQUFRO1FBQzdDLElBQUksQ0FBQyxXQUFXLENBQUMsdUJBQXVCLENBQUMsRUFBRTtZQUN6QyxXQUFXLENBQUMsdUJBQXVCLENBQUMsR0FBRyxFQUFFLENBQUM7U0FDM0M7UUFDRCxTQUFTLEdBQUcsU0FBUyxJQUFJLFFBQVEsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO1FBQ2xGLFdBQVcsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQ3JFLENBQUMsQ0FBQztBQUNKLENBQUM7QUFSRCx3QkFRQyJ9
+function injectService(...args) {
+    return inject(...args);
+}
+exports.injectService = injectService;
+function bindInjectProperty() {
+    if (!this[propertyObjPropertyName] || !Array.isArray(this[propertyObjPropertyName])) {
+        return;
+    }
+    this[propertyObjPropertyName].forEach(({ className, propName }) => {
+        Object.defineProperty(this, propName, {
+            get() {
+                if (typeof className === "string") {
+                    const app = this.app._app || this.app;
+                    const ServiceClass = app._dineggServiceClasses[className];
+                    if (!ServiceClass) {
+                        throw new Error(`属性 ${propName} 要注入的类 ${className} 未找到`);
+                    }
+                    if (!this.ctx[Symbol.for(className)]) {
+                        this.ctx[Symbol.for(className)] = new ServiceClass(this.ctx);
+                    }
+                    return this.ctx[Symbol.for(className)];
+                }
+                else if (className instanceof Function) {
+                    const ServiceClass = className;
+                    className = ServiceClass[Symbol.for("#className")] || ServiceClass.name;
+                    if (!this.ctx[Symbol.for(className)]) {
+                        this.ctx[Symbol.for(className)] = new ServiceClass(this.ctx);
+                    }
+                    return this.ctx[Symbol.for(className)];
+                }
+                else {
+                    throw Error(`属性 ${propName} 要实例化的类 ${className} 不是类名或类`);
+                }
+            },
+        });
+    });
+}
+exports.bindInjectProperty = bindInjectProperty;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZURlY29yYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNlcnZpY2VEZWNvcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsTUFBTSx1QkFBdUIsR0FBRyxNQUFNLENBQUMsOEJBQThCLENBQUMsQ0FBQztBQU12RSxTQUFnQixPQUFPO0lBQ3JCLE9BQU8sU0FBUyxTQUFTLENBQXlDLFdBQWM7UUFDOUUsTUFBTSxXQUFZLFNBQVEsV0FBVztZQUNuQyxZQUFZLEdBQUcsSUFBSTtnQkFDakIsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7Z0JBQ2Ysa0JBQWtCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ2hDLENBQUM7U0FDRjtRQUVELFdBQVcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQztRQUN6RCxPQUFPLFdBQVcsQ0FBQztJQUNyQixDQUFDLENBQUM7QUFDSixDQUFDO0FBWkQsMEJBWUM7QUFVRCxTQUFnQixNQUFNLENBQUMsU0FBNkI7SUFDbEQsT0FBTyxTQUFTLFNBQVMsQ0FBQyxTQUFTLEVBQUUsUUFBUTtRQUMzQyxJQUFJLENBQUMsU0FBUyxDQUFDLHVCQUF1QixDQUFDLEVBQUU7WUFDdkMsU0FBUyxDQUFDLHVCQUF1QixDQUFDLEdBQUcsRUFBRSxDQUFDO1NBQ3pDO1FBQ0QsU0FBUyxHQUFHLFNBQVMsSUFBSSxRQUFRLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBRSxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztRQUNsRixTQUFTLENBQUMsdUJBQXVCLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQztJQUNuRSxDQUFDLENBQUM7QUFDSixDQUFDO0FBUkQsd0JBUUM7QUFHRCxTQUFnQixhQUFhLENBQUMsR0FBRyxJQUFJO0lBQ25DLE9BQU8sTUFBTSxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7QUFDekIsQ0FBQztBQUZELHNDQUVDO0FBS0QsU0FBZ0Isa0JBQWtCO0lBQ2hDLElBQUksQ0FBQyxJQUFJLENBQUMsdUJBQXVCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLHVCQUF1QixDQUFDLENBQUMsRUFBRTtRQUNuRixPQUFPO0tBQ1I7SUFFRCxJQUFJLENBQUMsdUJBQXVCLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsRUFBRSxFQUFFO1FBQ2hFLE1BQU0sQ0FBQyxjQUFjLENBQUMsSUFBSSxFQUFFLFFBQVEsRUFBRTtZQUNwQyxHQUFHO2dCQUVELElBQUksT0FBTyxTQUFTLEtBQUssUUFBUSxFQUFFO29CQUNqQyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksSUFBSSxJQUFJLENBQUMsR0FBRyxDQUFDO29CQUN0QyxNQUFNLFlBQVksR0FBRyxHQUFHLENBQUMscUJBQXFCLENBQUMsU0FBUyxDQUFDLENBQUM7b0JBQzFELElBQUksQ0FBQyxZQUFZLEVBQUU7d0JBQ2pCLE1BQU0sSUFBSSxLQUFLLENBQUMsTUFBTSxRQUFRLFVBQVUsU0FBUyxNQUFNLENBQUMsQ0FBQztxQkFDMUQ7b0JBRUQsSUFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFO3dCQUNwQyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsR0FBRyxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7cUJBQzlEO29CQUNELE9BQU8sSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUM7aUJBQ3hDO3FCQUFNLElBQUksU0FBUyxZQUFZLFFBQVEsRUFBRTtvQkFFeEMsTUFBTSxZQUFZLEdBQUcsU0FBUyxDQUFDO29CQUMvQixTQUFTLEdBQUcsWUFBWSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUMsSUFBSSxZQUFZLENBQUMsSUFBSSxDQUFDO29CQUN4RSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUU7d0JBQ3BDLElBQUksQ0FBQyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxHQUFHLElBQUksWUFBWSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztxQkFDOUQ7b0JBQ0QsT0FBTyxJQUFJLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQztpQkFDeEM7cUJBQU07b0JBQ0wsTUFBTSxLQUFLLENBQUMsTUFBTSxRQUFRLFdBQVcsU0FBUyxTQUFTLENBQUMsQ0FBQztpQkFDMUQ7WUFDSCxDQUFDO1NBQ0YsQ0FBQyxDQUFDO0lBQ0wsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBbENELGdEQWtDQyJ9

package/lib/core/{DingAppWorkerLoader.js → loader/DingAppWorkerLoader.js}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const egg = require("egg");
 const path = require("path");
 const fs = require("fs");
-const dineggControllerInitializer_1 = require("./controller/dineggControllerInitializer");
+const dineggControllerInitializer_1 = require("../controller/dineggControllerInitializer");
 const globby = require("globby");
 class DingAppWorkerLoader extends egg.AppWorkerLoader {
     creadModuleServiceOptions(outOption = {}) {
@@ -202,4 +202,4 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
     }
 }
 exports.default = DingAppWorkerLoader;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DingAppWorkerLoader.js","sourceRoot":"","sources":["DingAppWorkerLoader.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DingAppWorkerLoader.js","sourceRoot":"","sources":["DingAppWorkerLoader.ts"],"names":[],"mappings":"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"}

package/lib/core/service/DineggService.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const egg_1 = require("egg");
+const serviceDecorator_1 = require("../decorator/serviceDecorator");
+class DineggService extends egg_1.Service {
+    constructor(ctx) {
+        super(ctx);
+        serviceDecorator_1.bindInjectProperty.call(this);
+    }
+}
+exports.default = DineggService;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGluZWdnU2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkRpbmVnZ1NlcnZpY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFRQSw2QkFBOEI7QUFDOUIsb0VBQW1FO0FBRW5FLE1BQXFCLGFBQWMsU0FBUSxhQUFPO0lBQ2hELFlBQVksR0FBRztRQUNiLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNYLHFDQUFrQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNoQyxDQUFDO0NBQ0Y7QUFMRCxnQ0FLQyJ9

package/lib/framework.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const egg = require("egg");
-const DingAppWorkerLoader_1 = require("./core/DingAppWorkerLoader");
-const DingAgentWorkerLoader_1 = require("./core/DingAgentWorkerLoader");
+const DingAppWorkerLoader_1 = require("./core/loader/DingAppWorkerLoader");
+const DingAgentWorkerLoader_1 = require("./core/loader/DingAgentWorkerLoader");
 const path = require("path");
 const Rest_1 = require("./core/controller/Rest");
 const Func_1 = require("./core/controller/Func");
-const Controller_1 = require("./core/controller/Controller");
+const DineggController_1 = require("./core/controller/DineggController");
+const DineggService_1 = require("./core/service/DineggService");
+const Subscription_1 = require("./core/Subscription/Subscription");
 const ControllerDecorator = require("./core/decorator/ControllerDecorator");
 const ServiceDecorator = require("./core/decorator/serviceDecorator");
 const EGG_PATH = Symbol.for("egg#eggPath");
@@ -34,8 +36,10 @@ exports.default = Object.assign(egg, {
     AgentWorkerLoader: DingAgentWorkerLoader_1.default,
     RestController: Rest_1.default,
     FuncController: Func_1.default,
-    Controller: Controller_1.default,
+    Controller: DineggController_1.default,
+    Service: DineggService_1.default,
+    Subscription: Subscription_1.default,
     ControllerDecorator,
     ServiceDecorator,
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJhbWV3b3JrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZnJhbWV3b3JrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLFlBQVksQ0FBQzs7QUFFYiwyQkFBMkI7QUFDM0Isb0VBQTZEO0FBQzdELHdFQUFpRTtBQUNqRSw2QkFBNkI7QUFFN0IsaURBQW9EO0FBQ3BELGlEQUFvRDtBQUNwRCw2REFBNEQ7QUFDNUQsNEVBQTRFO0FBQzVFLHNFQUFzRTtBQUV0RSxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0FBQzNDLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUM7QUFFNUMsTUFBTSxXQUFZLFNBQVEsR0FBRyxDQUFDLFdBQVc7SUFDdkMsSUFBSSxDQUFDLFFBQVEsQ0FBQztRQUNaLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBR0QsSUFBSSxDQUFDLFVBQVUsQ0FBQztRQUNkLE9BQU8sNkJBQW1CLENBQUM7SUFDN0IsQ0FBQztDQUNGO0FBRUQsTUFBTSxLQUFNLFNBQVEsR0FBRyxDQUFDLEtBQUs7SUFDM0IsSUFBSSxDQUFDLFFBQVEsQ0FBQztRQUNaLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBQ0QsSUFBSSxDQUFDLFVBQVUsQ0FBQztRQUNkLE9BQU8sK0JBQXFCLENBQUM7SUFDL0IsQ0FBQztDQUNGO0FBRUQsa0JBQWUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUU7SUFDaEMsV0FBVztJQUNYLEtBQUs7SUFDTCxlQUFlLEVBQUUsNkJBQW1CO0lBQ3BDLGlCQUFpQixFQUFFLCtCQUFxQjtJQUN4QyxjQUFjLEVBQWQsY0FBYztJQUNkLGNBQWMsRUFBZCxjQUFjO0lBQ2QsVUFBVSxFQUFFLG9CQUFnQjtJQUM1QixtQkFBbUI7SUFDbkIsZ0JBQWdCO0NBQ2pCLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJhbWV3b3JrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZnJhbWV3b3JrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLFlBQVksQ0FBQzs7QUFFYiwyQkFBMkI7QUFDM0IsMkVBQW9FO0FBQ3BFLCtFQUF3RTtBQUN4RSw2QkFBNkI7QUFFN0IsaURBQW9EO0FBQ3BELGlEQUFvRDtBQUNwRCx5RUFBa0U7QUFDbEUsZ0VBQXlEO0FBQ3pELG1FQUFrRTtBQUVsRSw0RUFBNEU7QUFDNUUsc0VBQXNFO0FBRXRFLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDM0MsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUU1QyxNQUFNLFdBQVksU0FBUSxHQUFHLENBQUMsV0FBVztJQUN2QyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ1osT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFHRCxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ2QsT0FBTyw2QkFBbUIsQ0FBQztJQUM3QixDQUFDO0NBQ0Y7QUFFRCxNQUFNLEtBQU0sU0FBUSxHQUFHLENBQUMsS0FBSztJQUMzQixJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ1osT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFDRCxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ2QsT0FBTywrQkFBcUIsQ0FBQztJQUMvQixDQUFDO0NBQ0Y7QUFFRCxrQkFBZSxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRTtJQUNoQyxXQUFXO0lBQ1gsS0FBSztJQUNMLGVBQWUsRUFBRSw2QkFBbUI7SUFDcEMsaUJBQWlCLEVBQUUsK0JBQXFCO0lBQ3hDLGNBQWMsRUFBZCxjQUFjO0lBQ2QsY0FBYyxFQUFkLGNBQWM7SUFDZCxVQUFVLEVBQUUsMEJBQWdCO0lBQzVCLE9BQU8sRUFBRSx1QkFBYTtJQUN0QixZQUFZLEVBQUUsc0JBQWtCO0lBQ2hDLG1CQUFtQjtJQUNuQixnQkFBZ0I7Q0FDakIsQ0FBQyxDQUFDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dinegg",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "description": "egg framework dinegg.",
   "dependencies": {
     "egg": "^2.31.0",

package/lib/core/controller/Controller.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const egg_1 = require("egg");
-class DineggController extends egg_1.Controller {
-    success(data) {
-        this.ctx.send(data, 20000, "success");
-    }
-    error(msg) {
-        var _a;
-        const _msg = ((_a = this.ctx.body) === null || _a === void 0 ? void 0 : _a.msg) ? this.ctx.body.msg + "," + msg : msg;
-        this.ctx.send(null, 50000, _msg);
-    }
-}
-exports.default = DineggController;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udHJvbGxlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkNvbnRyb2xsZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSw2QkFBaUM7QUFFakMsTUFBcUIsZ0JBQWlCLFNBQVEsZ0JBQVU7SUFFcEQsT0FBTyxDQUFDLElBQUk7UUFDUixJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFBO0lBQ3pDLENBQUM7SUFFRCxLQUFLLENBQUMsR0FBRzs7UUFDTCxNQUFNLElBQUksR0FBRyxDQUFBLE1BQUEsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLDBDQUFFLEdBQUcsRUFBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQztRQUN0RSxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO0lBQ3JDLENBQUM7Q0FDSjtBQVZELG1DQVVDIn0=