dinegg 2.7.3 → 2.8.0

package/app.js

@@ -52,10 +52,10 @@ class AppBoot {
     async serverDidReady() {
         const inst = this.inst;
         inst && (await moduleAppHooks(inst, "serverDidReady"));
-        this.app.logger.info("[dinegg app] 应用基本路径： %j", this.app.config.baseDir);
+        this.app.logger.info("[dinegg-app] 应用基本路径： %j", this.app.config.baseDir);
     }
     async beforeClose() {
-        this.app.logger.info("[dinegg app] 应用关闭");
+        this.app.logger.info("[dinegg-app] 应用关闭");
         const inst = this.inst;
         inst && (await moduleAppHooks(inst, "beforeClose"));
     }

package/index.d.ts

@@ -3,7 +3,7 @@
  * @Author: ding-cx
  * @Date: 2021-01-29 18:12:25
  * @LastEditors: ding-cx
- * @LastEditTime: 2021-12-13 09:30:46
+ * @LastEditTime: 2022-03-28 13:46:33
  * @Description: file content
  */
 // {framework_root}/index.d.ts
@@ -15,8 +15,6 @@ import "egg-sequelize";
 import "egg-cors";
 import "egg-jwt";
 
-import * as ControllerDecoratorType from "./lib/core/ControllerDecorator";
-
 // import "./typings/sequelize";//不需要自定义的sequelize类型定义了。
 
 // ts 这里可以理解成导入一个类。并将这个类的类型提取给ts作为自定义type。然后这个type就可以放在interface上，或者提供给其他interface等。
@@ -24,6 +22,13 @@ import * as ControllerDecoratorType from "./lib/core/ControllerDecorator";
 // type ExtendContextType = typeof ExtendContext;
 interface ExtendContextType {}
 
+/* 装饰器的声明 */
+import * as ControllerDecoratorType from "./lib/core/decorator/ControllerDecorator";
+import * as ServiceDecoratorType from "./lib/core/decorator/serviceDecorator";
+
+/** 装饰器方法函数签名 */
+type decoratorMethodSign = (path: string, middlewares?: ((ctx: Context, next: () => Promise<void>) => Promise<void>)[]) => (target, name, descriptor) => {};
+
 declare module "egg" {
   // 跟插件一样拓展 egg ...
 
@@ -248,12 +253,40 @@ declare module "egg" {
     /** 批量删除 */
     batchDelete(): void;
   }
+  
+  const ServiceDecorator: ServiceDecorator;
+
+  /** service 装饰器 */
+  interface ServiceDecorator {
+    /**  类装饰器，与inject配合注入其他servcie */
+    service: () => (target) => void;
+    /** 属性装饰器 注入其他 service 类到本属性
+     * - @inject() 直接调用，使用属性名（首字母替换为大写作为类名注入）
+     * - @inject('className') 传入类名，使用该类名查询容器对应名称的类进行注入，与属性名解耦
+     * - @inject(Class) 传入类（即构造函数），使用该类手动实例化 **传入类时当心循环引用js模块的问题**
+     */
+    inject: (className?: string | Function) => (target: any, propertyName: string) => void;
+  }
+
+  /** note module中添加egg属性 使用const 定义为属性，同时同名使用interface定义类型，若没有const则外部提示类型声明作为值使用的错误！！！*/
 
-  /** note module中添加egg属性 */
   /** 控制器的路由装饰器 */
-  const ControllerDecorator = ControllerDecoratorType;
-  
-  interface ControllerDecorator extends ControllerDecoratorType {}
+  const ControllerDecorator: ControllerDecorator;
+
+  /** 服务的装饰器 */
+
+  interface ControllerDecorator {
+    /** 在router.js中执行，绑定装饰器提供的路由 */
+    bindRouter(Application): void;
+    /** 绑定控制器方法到get路由 */
+    get: decoratorMethodSign;
+    /** 绑定控制器方法到post路由 */
+    post: decoratorMethodSign;
+    /** 绑定控制器方法到put路由 */
+    put: decoratorMethodSign;
+    /** 绑定控制器方法到del路由 */
+    del: decoratorMethodSign;
+  }
 }
 
 // 将 Egg 整个 export 出去

package/lib/core/DingAgentWorkerLoader.js

@@ -21,7 +21,6 @@ class DingAppWorkerLoader extends egg.AgentWorkerLoader {
         else {
             match = ["modules/**/task", "modules/**/schedule"];
         }
-        console.log(match);
         let taskFilesDirs = globby.sync(match, {
             cwd: path.join(this.options.baseDir, "app"),
             onlyDirectories: true,
@@ -72,4 +71,4 @@ class DingAppWorkerLoader extends egg.AgentWorkerLoader {
     }
 }
 exports.default = DingAppWorkerLoader;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGluZ0FnZW50V29ya2VyTG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRGluZ0FnZW50V29ya2VyTG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBU0EsMkJBQTJCO0FBQzNCLDZCQUE2QjtBQUM3Qix5QkFBeUI7QUFFekIsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBRWpDLE1BQXFCLG1CQUFvQixTQUFRLEdBQUcsQ0FBQyxpQkFBaUI7SUFFcEUsc0JBQXNCOztRQUNwQixNQUFNLGtCQUFrQixHQUFhLENBQUEsTUFBQSxNQUFBLElBQUksQ0FBQyxNQUFNLDBDQUFFLE9BQU8sMENBQUUsT0FBTyxLQUFJLEVBQUUsQ0FBQztRQUN6RSxJQUFJLEtBQUssR0FBYSxFQUFFLENBQUM7UUFFekIsSUFBSSxrQkFBa0IsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBR2pDLE1BQU0sTUFBTSxHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDM0MsT0FBTyxVQUFVLEdBQUcsSUFBSSxHQUFHLFVBQVUsQ0FBQTtZQUN2QyxDQUFDLENBQUMsQ0FBQTtZQUNGLE1BQU0sTUFBTSxHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDM0MsT0FBTyxVQUFVLEdBQUcsSUFBSSxHQUFHLGNBQWMsQ0FBQTtZQUMzQyxDQUFDLENBQUMsQ0FBQTtZQUNGLEtBQUssR0FBRyxDQUFDLEdBQUcsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQUFDLENBQUE7U0FDL0I7YUFBTTtZQUNMLEtBQUssR0FBRyxDQUFDLGlCQUFpQixFQUFFLHFCQUFxQixDQUFDLENBQUM7U0FDcEQ7UUFDRCxPQUFPLENBQUMsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBRW5CLElBQUksYUFBYSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFO1lBQ3JDLEdBQUcsRUFBRSxJ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGluZ0FnZW50V29ya2VyTG9hZGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiRGluZ0FnZW50V29ya2VyTG9hZGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBU0EsMkJBQTJCO0FBQzNCLDZCQUE2QjtBQUM3Qix5QkFBeUI7QUFFekIsTUFBTSxNQUFNLEdBQUcsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0FBRWpDLE1BQXFCLG1CQUFvQixTQUFRLEdBQUcsQ0FBQyxpQkFBaUI7SUFFcEUsc0JBQXNCOztRQUNwQixNQUFNLGtCQUFrQixHQUFhLENBQUEsTUFBQSxNQUFBLElBQUksQ0FBQyxNQUFNLDBDQUFFLE9BQU8sMENBQUUsT0FBTyxLQUFJLEVBQUUsQ0FBQztRQUN6RSxJQUFJLEtBQUssR0FBYSxFQUFFLENBQUM7UUFFekIsSUFBSSxrQkFBa0IsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBR2pDLE1BQU0sTUFBTSxHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDM0MsT0FBTyxVQUFVLEdBQUcsSUFBSSxHQUFHLFVBQVUsQ0FBQTtZQUN2QyxDQUFDLENBQUMsQ0FBQTtZQUNGLE1BQU0sTUFBTSxHQUFHLGtCQUFrQixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDM0MsT0FBTyxVQUFVLEdBQUcsSUFBSSxHQUFHLGNBQWMsQ0FBQTtZQUMzQyxDQUFDLENBQUMsQ0FBQTtZQUNGLEtBQUssR0FBRyxDQUFDLEdBQUcsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQUFDLENBQUE7U0FDL0I7YUFBTTtZQUNMLEtBQUssR0FBRyxDQUFDLGlCQUFpQixFQUFFLHFCQUFxQixDQUFDLENBQUM7U0FDcEQ7UUFFRCxJQUFJLGFBQWEsR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRTtZQUNyQyxHQUFHLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9B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

package/lib/core/DingAppWorkerLoader.js

@@ -152,6 +152,30 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
             return new bootClass(this.app);
         });
     }
+    loadAllServiceClassToApp() {
+        const that = this;
+        function reduceControllerMethod(targetObj, serviceObj) {
+            if (Object.prototype.toString.call(serviceObj) !== "[object Object]") {
+                return;
+            }
+            const property = Object.keys(serviceObj);
+            property.forEach((item) => {
+                const ServiceClass = serviceObj[item];
+                if (ServiceClass instanceof Function) {
+                    const className = ServiceClass[Symbol.for("#className")] || ServiceClass.name;
+                    if (targetObj[className]) {
+                        that.options.logger.warn("[dinegg app worker loader service banding] 警告，service类名重复，绑定将被覆盖！%s", className);
+                    }
+                    targetObj[className] = ServiceClass;
+                    return;
+                }
+                reduceControllerMethod(targetObj, serviceObj[item]);
+            });
+        }
+        this.options.app._dineggServiceClasses = {};
+        reduceControllerMethod(this.options.app._dineggServiceClasses, this.options.app.mServiceClasses);
+        reduceControllerMethod(this.options.app._dineggServiceClasses, this.options.app.serviceClasses);
+    }
     loadConfig() {
         this.loadPlugin();
         super.loadConfig();
@@ -170,6 +194,7 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
         this.loadCustomApp();
         isEnableModule && this.loadService(this.creadModuleServiceOptions());
         isEnableModule ? this.loadService({ property: "svs" }) : this.loadService();
+        this.loadAllServiceClassToApp();
         this.loadMiddleware();
         isEnableModule ? this.loadController(this.createModuleControllerOption()) : this.loadController();
         this.loadRouter();
@@ -177,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/decorator/ControllerDecorator.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bindRouter = exports.del = exports.put = exports.post = exports.get = void 0;
+const route = Symbol.for("dinegg#Route");
+function createRoute(method = "get", path, middlewares) {
+    return function (target, name, descriptor) {
+        if (!descriptor.value[route]) {
+            descriptor.value[route] = [];
+        }
+        descriptor.value[route].push({ method: method, path, middlewares });
+    };
+}
+function get(path, middlewares) {
+    return createRoute("get", path, middlewares);
+}
+exports.get = get;
+function post(path, middlewares) {
+    return createRoute("post", path, middlewares);
+}
+exports.post = post;
+function put(path, middlewares) {
+    return createRoute("put", path, middlewares);
+}
+exports.put = put;
+function del(path, middlewares) {
+    return createRoute("del", path, middlewares);
+}
+exports.del = del;
+exports.default = {
+    get,
+    post,
+    del,
+    put,
+    bindRouter,
+};
+function reduceControllerMethod(router, controller) {
+    if (Object.prototype.toString.call(controller) !== "[object Object]") {
+        return;
+    }
+    const property = Object.keys(controller);
+    property.forEach((item) => {
+        if (controller[item] instanceof Function) {
+            const routeObjArr = controller[item][route];
+            if (routeObjArr && Array.isArray(routeObjArr)) {
+                for (const routeObj of routeObjArr) {
+                    if (routeObj.middlewares) {
+                        router[routeObj.method](routeObj.path, ...routeObj.middlewares, controller[item]);
+                    }
+                    else {
+                        router[routeObj.method](routeObj.path, controller[item]);
+                    }
+                }
+            }
+            return;
+        }
+        reduceControllerMethod(router, controller[item]);
+    });
+}
+function bindRouter(app) {
+    reduceControllerMethod(app.router, app.controller);
+}
+exports.bindRouter = bindRouter;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udHJvbGxlckRlY29yYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkNvbnRyb2xsZXJEZWNvcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQztBQU16QyxTQUFTLFdBQVcsQ0FBQyxTQUFzQixLQUFLLEVBQUUsSUFBWSxFQUFFLFdBQTZCO0lBRTNGLE9BQU8sVUFBVSxNQUFNLEVBQUUsSUFBWSxFQUFFLFVBQThCO1FBQ25FLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQzVCLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFDO1NBQzlCO1FBQ0QsVUFBVSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsQ0FBQyxDQUFDO0lBQ3RFLENBQUMsQ0FBQztBQUNKLENBQUM7QUFHRCxTQUFnQixHQUFHLENBQUMsSUFBWSxFQUFFLFdBQTZCO0lBQzdELE9BQU8sV0FBVyxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFDL0MsQ0FBQztBQUZELGtCQUVDO0FBR0QsU0FBZ0IsSUFBSSxDQUFDLElBQVksRUFBRSxXQUE2QjtJQUM5RCxPQUFPLFdBQVcsQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBQ2hELENBQUM7QUFGRCxvQkFFQztBQUVELFNBQWdCLEdBQUcsQ0FBQyxJQUFZLEVBQUUsV0FBNkI7SUFDN0QsT0FBTyxXQUFXLENBQUMsS0FBSyxFQUFFLElBQUksRUFBRSxXQUFXLENBQUMsQ0FBQztBQUMvQyxDQUFDO0FBRkQsa0JBRUM7QUFFRCxTQUFnQixHQUFHLENBQUMsSUFBWSxFQUFFLFdBQTZCO0lBQzdELE9BQU8sV0FBVyxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFDL0MsQ0FBQztBQUZELGtCQUVDO0FBRUQsa0JBQWU7SUFDYixHQUFHO0lBQ0gsSUFBSTtJQUNKLEdBQUc7SUFDSCxHQUFHO0lBQ0gsVUFBVTtDQUNYLENBQUM7QUFLRixTQUFTLHNCQUFzQixDQUFDLE1BQWMsRUFBRSxVQUFlO0lBQzdELElBQUksTUFBTSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLGlCQUFpQixFQUFFO1FBRXBFLE9BQU87S0FDUjtJQUNELE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7SUFHekMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFO1FBQ3hCLElBQUksVUFBVSxDQUFDLElBQUksQ0FBQyxZQUFZLFFBQVEsRUFBRTtZQUV4QyxNQUFNLFdBQVcsR0FBNEQsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQ3JHLElBQUksV0FBVyxJQUFJLEtBQUssQ0FBQyxPQUFPLENBQUMsV0FBVyxDQUFDLEVBQUU7Z0JBQzdDLEtBQUssTUFBTSxRQUFRLElBQUksV0FBVyxFQUFFO29CQUNsQyxJQUFJLFFBQVEsQ0FBQyxXQUFXLEVBQUU7d0JBQ3hCLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxHQUFHLFFBQVEsQ0FBQyxXQUFXLEVBQUUsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7cUJBQ25GO3lCQUFNO3dCQUNMLE1BQU0sQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsUUFBUSxDQUFDLElBQUksRUFBRSxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztxQkFDMUQ7aUJBQ0Y7YUFDRjtZQUNELE9BQU87U0FDUjtRQUNELHNCQUFzQixDQUFDLE1BQU0sRUFBRSxVQUFVLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztJQUNuRCxDQUFDLENBQUMsQ0FBQztBQUNMLENBQUM7QUFLRCxTQUFnQixVQUFVLENBQUMsR0FBZ0I7SUFDekMsc0JBQXNCLENBQUMsR0FBRyxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUM7QUFDckQsQ0FBQztBQUZELGdDQUVDIn0=

package/lib/core/decorator/serviceDecorator.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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} 不是类名或类`);
+                            }
+                        },
+                    });
+                });
+            }
+        }
+        resultClass[Symbol.for("#className")] = constructor.name;
+        return resultClass;
+    };
+}
+exports.service = service;
+function inject(className) {
+    return function decorator(propertyObj, propName) {
+        if (!propertyObj[propertyObjPropertyName]) {
+            propertyObj[propertyObjPropertyName] = [];
+        }
+        className = className || propName.replace(propName[0], propName[0].toUpperCase());
+        propertyObj[propertyObjPropertyName].push({ className, propName });
+    };
+}
+exports.inject = inject;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZURlY29yYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInNlcnZpY2VEZWNvcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsTUFBTSx1QkFBdUIsR0FBRyxNQUFNLENBQUMsOEJBQThCLENBQUMsQ0FBQztBQUV2RSxTQUFnQixPQUFPO0lBQ3JCLE9BQU8sU0FBUyxTQUFTLENBQXlDLFdBQWM7UUFDOUUsTUFBTSxXQUFZLFNBQVEsV0FBVztZQUNuQyxZQUFZLEdBQUcsSUFBSTtnQkFDakIsS0FBSyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUM7Z0JBRWYsSUFBSSxDQUFDLHVCQUF1QixDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsUUFBUSxFQUFFLEVBQUUsRUFBRTtvQkFDaEUsTUFBTSxDQUFDLGNBQWMsQ0FBQyxJQUFJLEVBQUUsUUFBUSxFQUFFO3dCQUNwQyxHQUFHOzRCQUVELElBQUksT0FBTyxTQUFTLEtBQUssUUFBUSxFQUFFO2dDQUNqQyxNQUFNLFlBQVksR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQyxTQUFTLENBQUMsQ0FBQztnQ0FDcEUsSUFBSSxDQUFDLFlBQVksRUFBRTtvQ0FDakIsTUFBTSxJQUFJLEtBQUssQ0FBQyxNQUFNLFFBQVEsVUFBVSxTQUFTLE1BQU0sQ0FBQyxDQUFDO2lDQUMxRDtnQ0FDRCxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRTtvQ0FDL0IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsR0FBRyxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7aUNBQ3pEO2dDQUNELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQzs2QkFDbkM7aUNBQU0sSUFBSSxTQUFTLFlBQVksUUFBUSxFQUFFO2dDQUV4QyxNQUFNLFlBQVksR0FBRyxTQUFTLENBQUM7Z0NBQy9CLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxFQUFFO29DQUMvQixJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxHQUFHLElBQUksWUFBWSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztpQ0FDekQ7Z0NBQ0QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDOzZCQUNuQztpQ0FBTTtnQ0FDTCxNQUFNLEtBQUssQ0FBQyxNQUFNLFFBQVEsV0FBVyxTQUFTLFNBQVMsQ0FBQyxDQUFDOzZCQUMxRDt3QkFDSCxDQUFDO3FCQUNGLENBQUMsQ0FBQztnQkFDTCxDQUFDLENBQUMsQ0FBQztZQUNMLENBQUM7U0FDRjtRQUVELFdBQVcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQztRQUN6RCxPQUFPLFdBQVcsQ0FBQztJQUNyQixDQUFDLENBQUM7QUFDSixDQUFDO0FBdENELDBCQXNDQztBQVVELFNBQWdCLE1BQU0sQ0FBQyxTQUF3QztJQUM3RCxPQUFPLFNBQVMsU0FBUyxDQUFDLFdBQVcsRUFBRSxRQUFRO1FBQzdDLElBQUksQ0FBQyxXQUFXLENBQUMsdUJBQXVCLENBQUMsRUFBRTtZQUN6QyxXQUFXLENBQUMsdUJBQXVCLENBQUMsR0FBRyxFQUFFLENBQUM7U0FDM0M7UUFDRCxTQUFTLEdBQUcsU0FBUyxJQUFJLFFBQVEsQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQyxDQUFDO1FBQ2xGLFdBQVcsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsQ0FBQyxDQUFDO0lBQ3JFLENBQUMsQ0FBQztBQUNKLENBQUM7QUFSRCx3QkFRQyJ9

package/lib/framework.js

@@ -7,7 +7,8 @@ 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 ControllerDecorator = require("./core/ControllerDecorator");
+const ControllerDecorator = require("./core/decorator/ControllerDecorator");
+const ServiceDecorator = require("./core/decorator/serviceDecorator");
 const EGG_PATH = Symbol.for("egg#eggPath");
 const EGG_LOADER = Symbol.for("egg#loader");
 class Application extends egg.Application {
@@ -34,6 +35,7 @@ exports.default = Object.assign(egg, {
     RestController: Rest_1.default,
     FuncController: Func_1.default,
     Controller: Controller_1.default,
-    ControllerDecorator
+    ControllerDecorator,
+    ServiceDecorator,
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJhbWV3b3JrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZnJhbWV3b3JrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLFlBQVksQ0FBQzs7QUFFYiwyQkFBMkI7QUFDM0Isb0VBQTZEO0FBQzdELHdFQUFpRTtBQUNqRSw2QkFBNkI7QUFFN0IsaURBQW9EO0FBQ3BELGlEQUFvRDtBQUNwRCw2REFBNEQ7QUFDNUQsa0VBQWlFO0FBSWpFLE1BQU0sUUFBUSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsYUFBYSxDQUFDLENBQUM7QUFDM0MsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQztBQUc1QyxNQUFNLFdBQVksU0FBUSxHQUFHLENBQUMsV0FBVztJQUN2QyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ1osT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFHRCxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ2QsT0FBTyw2QkFBbUIsQ0FBQztJQUM3QixDQUFDO0NBQ0Y7QUFFRCxNQUFNLEtBQU0sU0FBUSxHQUFHLENBQUMsS0FBSztJQUMzQixJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ1osT0FBTyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDO0lBQ2pDLENBQUM7SUFDRCxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQ2QsT0FBTywrQkFBcUIsQ0FBQztJQUMvQixDQUFDO0NBQ0Y7QUFJRCxrQkFBZSxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRTtJQUNoQyxXQUFXO0lBQ1gsS0FBSztJQUNMLGVBQWUsRUFBRSw2QkFBbUI7SUFDcEMsaUJBQWlCLEVBQUUsK0JBQXFCO0lBQ3hDLGNBQWMsRUFBZCxjQUFjO0lBQ2QsY0FBYyxFQUFkLGNBQWM7SUFDZCxVQUFVLEVBQUMsb0JBQWdCO0lBQzNCLG1CQUFtQjtDQUNwQixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZnJhbWV3b3JrLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZnJhbWV3b3JrLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLFlBQVksQ0FBQzs7QUFFYiwyQkFBMkI7QUFDM0Isb0VBQTZEO0FBQzdELHdFQUFpRTtBQUNqRSw2QkFBNkI7QUFFN0IsaURBQW9EO0FBQ3BELGlEQUFvRDtBQUNwRCw2REFBNEQ7QUFDNUQsNEVBQTRFO0FBQzVFLHNFQUFzRTtBQUV0RSxNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxDQUFDO0FBQzNDLE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUM7QUFFNUMsTUFBTSxXQUFZLFNBQVEsR0FBRyxDQUFDLFdBQVc7SUFDdkMsSUFBSSxDQUFDLFFBQVEsQ0FBQztRQUNaLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBR0QsSUFBSSxDQUFDLFVBQVUsQ0FBQztRQUNkLE9BQU8sNkJBQW1CLENBQUM7SUFDN0IsQ0FBQztDQUNGO0FBRUQsTUFBTSxLQUFNLFNBQVEsR0FBRyxDQUFDLEtBQUs7SUFDM0IsSUFBSSxDQUFDLFFBQVEsQ0FBQztRQUNaLE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNqQyxDQUFDO0lBQ0QsSUFBSSxDQUFDLFVBQVUsQ0FBQztRQUNkLE9BQU8sK0JBQXFCLENBQUM7SUFDL0IsQ0FBQztDQUNGO0FBRUQsa0JBQWUsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUU7SUFDaEMsV0FBVztJQUNYLEtBQUs7SUFDTCxlQUFlLEVBQUUsNkJBQW1CO0lBQ3BDLGlCQUFpQixFQUFFLCtCQUFxQjtJQUN4QyxjQUFjLEVBQWQsY0FBYztJQUNkLGNBQWMsRUFBZCxjQUFjO0lBQ2QsVUFBVSxFQUFFLG9CQUFnQjtJQUM1QixtQkFBbUI7SUFDbkIsZ0JBQWdCO0NBQ2pCLENBQUMsQ0FBQyJ9

package/package.json

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

package/lib/core/ControllerDecorator.js

@@ -1,65 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.bindRouter = exports.del = exports.put = exports.post = exports.get = void 0;
-const route = Symbol.for("dinegg#Route");
-function createRoute(method = "get", path, middlewares) {
-    return function (target, name, descriptor) {
-        if (descriptor.value[route]) {
-            descriptor.value[route].push({ method: method, path, middlewares });
-        }
-        else {
-            descriptor.value[route] = [{ method: method, path, middlewares }];
-        }
-    };
-}
-function get(path, middlewares) {
-    return createRoute("get", path, middlewares);
-}
-exports.get = get;
-function post(path, middlewares) {
-    return createRoute("post", path, middlewares);
-}
-exports.post = post;
-function put(path, middlewares) {
-    return createRoute("put", path, middlewares);
-}
-exports.put = put;
-function del(path, middlewares) {
-    return createRoute("del", path, middlewares);
-}
-exports.del = del;
-exports.default = {
-    get,
-    post,
-    del,
-    put,
-    bindRouter,
-};
-function reduceControllerMethod(router, controller) {
-    if (Object.prototype.toString.call(controller) !== "[object Object]") {
-        return;
-    }
-    const keys = Object.keys(controller);
-    keys.forEach((item) => {
-        if (controller[item] instanceof Function) {
-            const routeObjArr = controller[item][route];
-            if (routeObjArr && Array.isArray(routeObjArr)) {
-                for (const routeObj of routeObjArr) {
-                    if (routeObj.middlewares) {
-                        router[routeObj.method](routeObj.path, ...routeObj.middlewares, controller[item]);
-                    }
-                    else {
-                        router[routeObj.method](routeObj.path, controller[item]);
-                    }
-                }
-            }
-            return;
-        }
-        reduceControllerMethod(router, controller[item]);
-    });
-}
-function bindRouter(app) {
-    reduceControllerMethod(app.router, app.controller);
-}
-exports.bindRouter = bindRouter;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udHJvbGxlckRlY29yYXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIkNvbnRyb2xsZXJEZWNvcmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBVUEsTUFBTSxLQUFLLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxjQUFjLENBQUMsQ0FBQztBQUl6QyxTQUFTLFdBQVcsQ0FBQyxTQUFzQixLQUFLLEVBQUUsSUFBWSxFQUFFLFdBQTRFO0lBRTFJLE9BQU8sVUFBVSxNQUFNLEVBQUUsSUFBWSxFQUFFLFVBQThCO1FBQ25FLElBQUksVUFBVSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUMzQixVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQUM7U0FDckU7YUFBTTtZQUNMLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxDQUFDLENBQUM7U0FDbkU7SUFDSCxDQUFDLENBQUM7QUFDSixDQUFDO0FBR0QsU0FBZ0IsR0FBRyxDQUFDLElBQVksRUFBRSxXQUE0RTtJQUM1RyxPQUFPLFdBQVcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBQy9DLENBQUM7QUFGRCxrQkFFQztBQUdELFNBQWdCLElBQUksQ0FBQyxJQUFZLEVBQUUsV0FBNEU7SUFDN0csT0FBTyxXQUFXLENBQUMsTUFBTSxFQUFFLElBQUksRUFBRSxXQUFXLENBQUMsQ0FBQztBQUNoRCxDQUFDO0FBRkQsb0JBRUM7QUFFRCxTQUFnQixHQUFHLENBQUMsSUFBWSxFQUFFLFdBQTRFO0lBQzVHLE9BQU8sV0FBVyxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsV0FBVyxDQUFDLENBQUM7QUFDL0MsQ0FBQztBQUZELGtCQUVDO0FBRUQsU0FBZ0IsR0FBRyxDQUFDLElBQVksRUFBRSxXQUE0RTtJQUM1RyxPQUFPLFdBQVcsQ0FBQyxLQUFLLEVBQUUsSUFBSSxFQUFFLFdBQVcsQ0FBQyxDQUFDO0FBQy9DLENBQUM7QUFGRCxrQkFFQztBQUVELGtCQUFlO0lBQ2IsR0FBRztJQUNILElBQUk7SUFDSixHQUFHO0lBQ0gsR0FBRztJQUNILFVBQVU7Q0FDWCxDQUFDO0FBSUYsU0FBUyxzQkFBc0IsQ0FBQyxNQUFjLEVBQUUsVUFBZTtJQUM3RCxJQUFJLE1BQU0sQ0FBQyxTQUFTLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxVQUFVLENBQUMsS0FBSyxpQkFBaUIsRUFBRTtRQUVwRSxPQUFPO0tBQ1I7SUFDRCxNQUFNLElBQUksR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO0lBR3JDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUNwQixJQUFJLFVBQVUsQ0FBQyxJQUFJLENBQUMsWUFBWSxRQUFRLEVBQUU7WUFFeEMsTUFBTSxXQUFXLEdBQTRELFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUNyRyxJQUFJLFdBQVcsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFO2dCQUM3QyxLQUFLLE1BQU0sUUFBUSxJQUFJLFdBQVcsRUFBRTtvQkFDbEMsSUFBSSxRQUFRLENBQUMsV0FBVyxFQUFFO3dCQUN4QixNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsR0FBRyxRQUFRLENBQUMsV0FBVyxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO3FCQUNuRjt5QkFBTTt3QkFDTCxNQUFNLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7cUJBQzFEO2lCQUNGO2FBQ0Y7WUFDRCxPQUFPO1NBQ1I7UUFDRCxzQkFBc0IsQ0FBQyxNQUFNLEVBQUUsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7SUFDbkQsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBS0QsU0FBZ0IsVUFBVSxDQUFDLEdBQWdCO0lBQ3pDLHNCQUFzQixDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0FBQ3JELENBQUM7QUFGRCxnQ0FFQyJ9

package/lib/core/decorator.js

@@ -1,52 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.bindRouter = exports.post = exports.get = void 0;
-const route = Symbol.for("dinegg#Route");
-function get(path) {
-    return function (target, name, descriptor) {
-        if (descriptor.value[route]) {
-            descriptor.value[route].push({ method: "get", path, });
-        }
-        else {
-            descriptor.value[route] = [{ method: "get", path }];
-        }
-    };
-}
-exports.get = get;
-function post(path) {
-    return function (target, name, descriptor) {
-        if (descriptor.value[route]) {
-            descriptor.value[route].push({ method: "post", path, });
-        }
-        else {
-            descriptor.value[route] = [{ method: "post", path }];
-        }
-    };
-}
-exports.post = post;
-exports.default = {
-    get
-};
-function reduceControllerMethod(router, controller) {
-    if (Object.prototype.toString.call(controller) !== "[object Object]") {
-        return;
-    }
-    const keys = Object.keys(controller);
-    keys.forEach(item => {
-        if (controller[item] instanceof Function) {
-            const routeObjArr = controller[item][route];
-            if (routeObjArr && Array.isArray(routeObjArr)) {
-                for (const routeObj of routeObjArr) {
-                    router[routeObj.method](routeObj.path, controller[item]);
-                }
-            }
-            return;
-        }
-        reduceControllerMethod(router, controller[item]);
-    });
-}
-function bindRouter(app) {
-    reduceControllerMethod(app.router, app.controller);
-}
-exports.bindRouter = bindRouter;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVjb3JhdG9yLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiZGVjb3JhdG9yLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUVBLE1BQU0sS0FBSyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLENBQUE7QUFJeEMsU0FBZ0IsR0FBRyxDQUFDLElBQVk7SUFFNUIsT0FBTyxVQUFVLE1BQU0sRUFBRSxJQUFZLEVBQUUsVUFBOEI7UUFDakUsSUFBSSxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ3pCLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxJQUFJLEdBQUcsQ0FBQyxDQUFBO1NBQ3pEO2FBQU07WUFDSCxVQUFVLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7U0FDdEQ7SUFDTCxDQUFDLENBQUE7QUFDTCxDQUFDO0FBVEQsa0JBU0M7QUFJRCxTQUFnQixJQUFJLENBQUMsSUFBWTtJQUU3QixPQUFPLFVBQVUsTUFBTSxFQUFFLElBQVksRUFBRSxVQUE4QjtRQUNqRSxJQUFJLFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDekIsVUFBVSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLElBQUksR0FBRyxDQUFDLENBQUE7U0FDMUQ7YUFBTTtZQUNILFVBQVUsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQTtTQUN2RDtJQUNMLENBQUMsQ0FBQTtBQUNMLENBQUM7QUFURCxvQkFTQztBQUVELGtCQUFlO0lBQ1gsR0FBRztDQUNOLENBQUE7QUFRRCxTQUFTLHNCQUFzQixDQUFDLE1BQWMsRUFBRSxVQUFlO0lBQzNELElBQUksTUFBTSxDQUFDLFNBQVMsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxLQUFLLGlCQUFpQixFQUFFO1FBQ2xFLE9BQU87S0FDVjtJQUNELE1BQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUE7SUFHcEMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRTtRQUNoQixJQUFJLFVBQVUsQ0FBQyxJQUFJLENBQUMsWUFBWSxRQUFRLEVBQUU7WUFDdEMsTUFBTSxXQUFXLEdBQXVDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtZQUMvRSxJQUFJLFdBQVcsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxFQUFFO2dCQUMzQyxLQUFLLE1BQU0sUUFBUSxJQUFJLFdBQVcsRUFBRTtvQkFDaEMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxRQUFRLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO2lCQUMzRDthQUNKO1lBQ0QsT0FBTztTQUNWO1FBQ0Qsc0JBQXNCLENBQUMsTUFBTSxFQUFFLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFBO0lBQ3BELENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQztBQUtELFNBQWdCLFVBQVUsQ0FBQyxHQUFnQjtJQUN2QyxzQkFBc0IsQ0FBQyxHQUFHLENBQUMsTUFBTSxFQUFFLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQTtBQUN0RCxDQUFDO0FBRkQsZ0NBRUMifQ==