dinegg 3.8.0 → 3.8.2

package/index.d.ts

@@ -11,7 +11,6 @@
 import * as Egg from "egg";
 
 // 将该上层框架用到的插件 import 进来
-import "@diyaner/egg-sequelize";
 import "egg-cors";
 import "egg-jwt";
 import "./lib/typings/shim.schedule";
@@ -31,7 +30,7 @@ import AppCache from "./lib/core/AppCache";
 // ts 这里可以理解成导入一个类。并将这个类的类型提取给ts作为自定义type。然后这个type就可以放在interface上，或者提供给其他interface等。
 // context扩展声明，需先自定义type
 // type ExtendContextType = typeof ExtendContext;
-interface ExtendContextType {}
+interface ExtendContextType { }
 
 import { AbstractPermissionAccessControl } from "./decorator";
 import DineggAPIClient from "./lib/core/ClusterClient/DineggAPIClient";
@@ -144,7 +143,7 @@ declare module "egg" {
 		 * @return {*}  {IResponseBodyData}
 		 * @memberof Controller
 		 */
-		send(data: any, status?: number, msg?: string, errDetails?: string[]): IResponseBodyData;
+		protected send<T extends any>(data: T, status?: number, msg?: string, errDetails?: string[]): IResponseBodyData<T>;
 		/**
 		 *ctx发送成功的响应
 		 * - 不能在router中直接调用
@@ -152,7 +151,7 @@ declare module "egg" {
 		 * @param {*} data
 		 * @memberof Controller
 		 */
-		success(data: any): IResponseBodyData;
+		protected success<T extends any>(data: T): IResponseBodyData<T>;
 
 		/**
 		 *发送警告的响应，主体响应仍然是成功的，但是将携带一个弃用或变更之类的警告，提醒caller，该api将发生变化
@@ -162,7 +161,7 @@ declare module "egg" {
 		 * @return {*}  {IResponseBodyData}
 		 * @memberof Controller
 		 */
-		warning(data: any, msg?: string): IResponseBodyData;
+		protected warning<T extends any>(data: T, msg?: string): IResponseBodyData<T>;
 		/**
 		 *
 		 *ctx发送错误的响应
@@ -177,7 +176,7 @@ declare module "egg" {
 		 * @return {*}  {IResponseBodyData}
 		 * @memberof Controller
 		 */
-		error(msg: string, code?: number, errDetails?: stirng[]): IResponseBodyData;
+		protected error(msg: string, code?: number, errDetails?: stirng[]): IResponseBodyData<null>;
 		/**
 		 *
 		 *ctx发送错误的响应 设置响应码400，对浏览器前端更友好
@@ -192,12 +191,12 @@ declare module "egg" {
 		 * @return {*}  {IResponseBodyData}
 		 * @memberof Controller
 		 */
-		errorBy400(msg: string, code?: number, errDetails?: stirng[]): IResponseBodyData;
+		protected errorBy400(msg: string, code?: number, errDetails?: stirng[]): IResponseBodyData;
 	}
 
 	/** json 响应body规范 */
-	interface IResponseBodyData {
-		data: any;
+	interface IResponseBodyData<T extends any = any> {
+		data: T;
 		code: number;
 		msg: string | null;
 		details?: string[];

package/lib/core/controller/DineggController.d.ts

@@ -7,27 +7,27 @@ export default class DineggController extends Controller {
      * @param {number} [status=20000] 自定义的状态码
      * @param {string} [msg=""] 修改状态对应的msg信息。
      */
-    send(data: any, status?: number, msg?: string, errDetails?: string[]): IResponseBodyData;
+    send(data: any, status?: number, msg?: string, errDetails?: string[]): IResponseBodyData<any>;
     /**
      *发送成功的响应，携带数据
      *
      * @param {*} data
      */
-    success(data: any): IResponseBodyData;
+    success(data: any): IResponseBodyData<any>;
     /**
      *发送警告的响应，主体响应仍然是成功的，但是将携带一个弃用或变更之类的警告，提醒caller，该api将发生变化
      *
      * @param {*} data
      */
-    warning(data: any, msg?: string): IResponseBodyData;
+    warning(data: any, msg?: string): IResponseBodyData<any>;
     /**
      *发送失败的响应，携带msg信息
      *
      * @param {*} msg
      */
-    error(msg: any, code?: number, details?: string[]): IResponseBodyData;
+    error(msg: any, code?: number, details?: string[]): IResponseBodyData<any>;
     /**
      * 响应http status 为400的错误，对浏览器端更友好
      */
-    errorBy400(msg: any, code?: number, details?: string[]): IResponseBodyData;
+    errorBy400(msg: any, code?: number, details?: string[]): IResponseBodyData<any>;
 }

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "dinegg",
-  "version": "3.8.0",
+  "version": "3.8.2",
   "description": "egg framework dinegg.",
   "dependencies": {
+    "cluster-client": "^3.6.0",
     "egg": "3.21.0",
     "egg-cors": "^2.2.3",
     "egg-jwt": "^3.1.7",
     "egg-validate": "^2.0.2",
     "globby": "^11.0.2",
-    "reflect-metadata": "^0.1.13"
+    "reflect-metadata": "^0.1.13",
+    "sdk-base": "^4.2.1"
   },
   "devDependencies": {
     "@diyaner/egg-sequelize": "^6.35.1",