dinegg 2.10.2 → 2.11.0

package/config/config.default.js

@@ -27,15 +27,7 @@ exports.default = () => {
     config.jwtLogin = {
         expires: 2000,
     };
-    config.sequelize = {
-        dialect: "mysql",
-        host: "127.0.0.1",
-        port: 3306,
-        database: "",
-        username: "",
-        password: "",
-        timezone: "+08:00",
-    };
+    config.sequelize = {};
     config.status_code = {
         20000: {
             code: 20000,
@@ -58,4 +50,4 @@ exports.default = () => {
     config.route_white_list = [];
     return config;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmRlZmF1bHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjb25maWcuZGVmYXVsdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFRQSxZQUFZLENBQUM7O0FBR2IsNkJBQTZCO0FBRTdCLGtCQUFlLEdBQUcsRUFBRTtJQUNsQixNQUFNLE1BQU0sR0FBRyxFQUFnQyxDQUFDO0lBT2hELE1BQU0sQ0FBQyxRQUFRLEdBQUc7UUFDaEIsSUFBSSxFQUFFLEtBQUs7UUFDWCxlQUFlLEVBQUUsQ0FBQyxHQUFHLENBQUM7S0FDdkIsQ0FBQztJQUVGLE1BQU0sQ0FBQyxJQUFJLEdBQUc7UUFDWixNQUFNLEVBQUUsR0FBRztRQUNYLFlBQVksRUFBRSx3Q0FBd0M7S0FDdkQsQ0FBQztJQUdGLE1BQU0sQ0FBQyxVQUFVLEdBQUc7UUFDbEIsU0FBUyxFQUFFLEtBQUs7UUFDaEIsU0FBUyxFQUFFLEtBQUs7S0FDakIsQ0FBQztJQUdGLE1BQU0sQ0FBQyxNQUFNLEdBQUc7UUFDZCxHQUFHLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUMsTUFBTSxDQUFDO1FBQ3BDLFVBQVUsRUFBRSxLQUFLO1FBQ2pCLFlBQVksRUFBRSxNQUFNO0tBRXJCLENBQUM7SUFDRixNQUFNLENBQUMsWUFBWSxHQUFHLEVBSXJCLENBQUE7SUFLRCxNQUFNLENBQUMsR0FBRyxHQUFHO1FBQ1gsTUFBTSxFQUFFLGdEQUFnRDtLQUN6RCxDQUFDO0lBRUYsTUFBTSxDQUFDLFFBQVEsR0FBRztRQUNoQixPQUFPLEVBQUUsSUFBSTtLQUNkLENBQUM7SUFHRixNQUFNLENBQUMsU0FBUyxHQUFHO1FBQ2pCLE9BQU8sRUFBRSxPQUFPO1FBQ2hCLElBQUksRUFBRSxXQUFXO1FBQ2pCLElBQUksRUFBRSxJQUFJO1FBQ1YsUUFBUSxFQUFFLEVBQUU7UUFDWixRQUFRLEVBQUUsRUFBRTtRQUNaLFFBQVEsRUFBRSxFQUFFO1FBQ1osUUFBUSxFQUFFLFFBQVE7S0FDbkIsQ0FBQztJQUdGLE1BQU0sQ0FBQyxXQUFXLEdBQUc7UUFDbkIsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLEtBQUs7WUFDWCxHQUFHLEVBQUUsU0FBUztZQUNkLElBQUksRUFBRSxJQUFJO1NBQ1g7UUFDRCxLQUFLLEVBQUU7WUFDTCxJQUFJLEVBQUUsS0FBSztZQUNYLEdBQUcsRUFBRSxPQUFPO1lBQ1osSUFBSSxFQUFFLElBQUk7WUFDVixRQUFRLEVBQUUsSUFBSTtTQUNmO1FBQ0QsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLEtBQUs7WUFDWCxHQUFHLEVBQUUsY0FBYztZQUNuQixJQUFJLEVBQUUsSUFBSTtZQUNWLFFBQVEsRUFBRSxJQUFJO1NBQ2Y7S0FDRixDQUFDO0lBRUYsTUFBTSxDQUFDLGdCQUFnQixHQUFHLEVBQUUsQ0FBQztJQUU3QixPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29uZmlnLmRlZmF1bHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJjb25maWcuZGVmYXVsdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFRQSxZQUFZLENBQUM7O0FBR2IsNkJBQTZCO0FBRTdCLGtCQUFlLEdBQUcsRUFBRTtJQUNsQixNQUFNLE1BQU0sR0FBRyxFQUFnQyxDQUFDO0lBTWhELE1BQU0sQ0FBQyxRQUFRLEdBQUc7UUFDaEIsSUFBSSxFQUFFLEtBQUs7UUFDWCxlQUFlLEVBQUUsQ0FBQyxHQUFHLENBQUM7S0FDdkIsQ0FBQztJQUVGLE1BQU0sQ0FBQyxJQUFJLEdBQUc7UUFDWixNQUFNLEVBQUUsR0FBRztRQUNYLFlBQVksRUFBRSx3Q0FBd0M7S0FDdkQsQ0FBQztJQUdGLE1BQU0sQ0FBQyxVQUFVLEdBQUc7UUFDbEIsU0FBUyxFQUFFLEtBQUs7UUFDaEIsU0FBUyxFQUFFLEtBQUs7S0FDakIsQ0FBQztJQUdGLE1BQU0sQ0FBQyxNQUFNLEdBQUc7UUFDZCxHQUFHLEVBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEVBQUUsTUFBTSxDQUFDO1FBQ3JDLFVBQVUsRUFBRSxLQUFLO1FBQ2pCLFlBQVksRUFBRSxNQUFNO0tBQ3JCLENBQUM7SUFDRixNQUFNLENBQUMsWUFBWSxHQUFHLEVBSXJCLENBQUM7SUFHRixNQUFNLENBQUMsR0FBRyxHQUFHO1FBQ1gsTUFBTSxFQUFFLGdEQUFnRDtLQUN6RCxDQUFDO0lBRUYsTUFBTSxDQUFDLFFBQVEsR0FBRztRQUNoQixPQUFPLEVBQUUsSUFBSTtLQUNkLENBQUM7SUFHRixNQUFNLENBQUMsU0FBUyxHQUFHLEVBQUUsQ0FBQztJQUd0QixNQUFNLENBQUMsV0FBVyxHQUFHO1FBQ25CLEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxLQUFLO1lBQ1gsR0FBRyxFQUFFLFNBQVM7WUFDZCxJQUFJLEVBQUUsSUFBSTtTQUNYO1FBQ0QsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLEtBQUs7WUFDWCxHQUFHLEVBQUUsT0FBTztZQUNaLElBQUksRUFBRSxJQUFJO1lBQ1YsUUFBUSxFQUFFLElBQUk7U0FDZjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxLQUFLO1lBQ1gsR0FBRyxFQUFFLGNBQWM7WUFDbkIsSUFBSSxFQUFFLElBQUk7WUFDVixRQUFRLEVBQUUsSUFBSTtTQUNmO0tBQ0YsQ0FBQztJQUVGLE1BQU0sQ0FBQyxnQkFBZ0IsR0FBRyxFQUFFLENBQUM7SUFFN0IsT0FBTyxNQUFNLENBQUM7QUFDaEIsQ0FBQyxDQUFDIn0=

package/config/plugin.js

@@ -13,5 +13,9 @@ exp.sequelize = {
     enable: true,
     package: "egg-sequelize",
 };
+exp.validate = {
+    enable: true,
+    package: "egg-validate",
+};
 exports.default = exp;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLFlBQVksQ0FBQzs7QUFVYixNQUFNLEdBQUcsR0FBRyxFQUFlLENBQUM7QUFDNUIsR0FBRyxDQUFDLElBQUksR0FBRztJQUNULE1BQU0sRUFBRSxJQUFJO0lBQ1osT0FBTyxFQUFFLFVBQVU7Q0FDcEIsQ0FBQztBQUVGLEdBQUcsQ0FBQyxHQUFHLEdBQUc7SUFDUixNQUFNLEVBQUUsSUFBSTtJQUNaLE9BQU8sRUFBRSxTQUFTO0NBQ25CLENBQUM7QUFFRixHQUFHLENBQUMsU0FBUyxHQUFHO0lBQ2QsTUFBTSxFQUFFLElBQUk7SUFDWixPQUFPLEVBQUUsZUFBZTtDQUN6QixDQUFDO0FBRUYsa0JBQWUsR0FBRyxDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2luLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsicGx1Z2luLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQVFBLFlBQVksQ0FBQzs7QUFVYixNQUFNLEdBQUcsR0FBRyxFQUFlLENBQUM7QUFDNUIsR0FBRyxDQUFDLElBQUksR0FBRztJQUNULE1BQU0sRUFBRSxJQUFJO0lBQ1osT0FBTyxFQUFFLFVBQVU7Q0FDcEIsQ0FBQztBQUVGLEdBQUcsQ0FBQyxHQUFHLEdBQUc7SUFDUixNQUFNLEVBQUUsSUFBSTtJQUNaLE9BQU8sRUFBRSxTQUFTO0NBQ25CLENBQUM7QUFFRixHQUFHLENBQUMsU0FBUyxHQUFHO0lBQ2QsTUFBTSxFQUFFLElBQUk7SUFDWixPQUFPLEVBQUUsZUFBZTtDQUN6QixDQUFDO0FBRUYsR0FBRyxDQUFDLFFBQVEsR0FBRztJQUNiLE1BQU0sRUFBRSxJQUFJO0lBQ1osT0FBTyxFQUFFLGNBQWM7Q0FDeEIsQ0FBQztBQUVGLGtCQUFlLEdBQUcsQ0FBQyJ9

package/index.d.ts

@@ -3,7 +3,7 @@
  * @Author: ding-cx
  * @Date: 2021-01-29 18:12:25
  * @LastEditors: ding
- * @LastEditTime: 2022-07-28 11:52:59
+ * @LastEditTime: 2022-08-19 10:08:32
  * @Description: file content
  */
 // {framework_root}/index.d.ts
@@ -15,6 +15,7 @@ import "egg-sequelize";
 import "egg-cors";
 import "egg-jwt";
 import "./lib/typings/shim.schedule";
+import "./lib/typings/shim.validate";
 
 // import "./typings/sequelize";//不需要自定义的sequelize类型定义了。
 

package/lib/typings/shim.validate.d.ts

@@ -0,0 +1,135 @@
+/*
+ * @copyright: ChengXuan
+ * @Author: ding
+ * @Date: 2022-08-19 10:06:04
+ * @LastEditors: ding
+ * @LastEditTime: 2022-08-19 11:02:40
+ * @Description: egg-validate 插件补充类型声明
+ *
+ */
+
+import { type } from "os";
+
+declare module "egg" {
+  interface Context {
+    // validate(rule: { [key: string]: TAttrValidateType }, data?: any): void;
+    // validate(rule: { [key: string]: any[] }, data?: any): void;
+    // validate(rule: { [key: string]: RegExp }, data?: any): void;
+    /**
+     *
+     * 参数验证插件
+     * - see https://github.com/node-modules/parameter#rule
+     *
+     * @param {IvalidateRules} rule
+     * @param {*} [data] 要验证的数据，默认是ctx.request.body
+     * @memberof Context
+     */
+    validate(rule: IvalidateRules, data?: any): void;
+  }
+
+  interface Application {
+    /** 参数对象验证器 */
+    validator: {
+      /** 添加规则 */
+      addRule: (type: string, check: RegExp | CheckHandlerFunc) => void;
+      /** app上验证，但不会抛出错误，而是返回错误 */
+      validate: (rules: IvalidateRules, data: any) => ValidateError[];
+    };
+  }
+}
+
+/** egg-validate 抛出的校验异常信息 */
+interface ValidateError {
+  code: string;
+  field?: string;
+  message: string;
+}
+
+/** 添加规则处理函数，返回字符串表示错误信息，不返回表示验证通过 */
+type CheckHandlerFunc = (rule: IvalidateRules, value: any) => string | void;
+
+/** 验证插件的验证规则
+ *
+ * - see https://github.com/node-modules/parameter#rule
+ */
+interface IvalidateRules {
+  [key: string]:
+    | {
+        type: TenumValidateDataType;
+        required?: boolean;
+        default?: any;
+        /** use addRules added rule use test field get the addRule name. */
+        test?: string;
+        widelyUndefined?: any;
+        convertType?: "int" | "number" | "string" | "boolean" | ((...args: any[]) => any);
+        /** for int integer number string password and array. approve it to limit. */
+        max?: number;
+        /** for int integer number string password and array. approve it to limit. */
+        min?: number;
+        /** for string email.*/
+        allowEmpty?: boolean;
+        /** for string email. equal to allowEmpty */
+        empty?: boolean;
+        /** for string. - A RegExp to check string's format. */
+        format?: RegExp;
+        /** for string. - Trim the string before check, default is false. */
+        trim?: boolean;
+        /** for password. - Compare field to check equal, default null, not check. */
+        compare?: string;
+        /** for enum. An array of data, value must be one on them. this rule is required.
+         */
+        values?: any[];
+
+        /**
+         * for object. An object that validate the properties ot the object.
+         *
+         * for array. It's array of object.  An object that validate the items of the array. Only work with itemType.
+         *
+         */
+        rule?: IvalidateRules | IvalidateRules[];
+        /** for array. The type of every item in this array. */
+        itemType?: TenumValidateDataType;
+      }
+    | TAttrValidateType
+    | any[]
+    | RegExp;
+}
+
+/** 数据类型 */
+type TenumValidateDataType =
+  | "int"
+  | "integer"
+  | "number"
+  | "string"
+  | "boolean"
+  | "bool"
+  | "date"
+  | "datetime"
+  | "dateTime"
+  | "id"
+  | "password"
+  | "email"
+  | "url"
+  | "enum"
+  | "object"
+  | "array";
+
+/** 简写的验证类型 省略写对象*/
+type TAttrValidateType =
+  | "int"
+  | "int?"
+  | "integer"
+  | "number"
+  | "string"
+  | "string?"
+  | "password"
+  | "boolean"
+  | "bool"
+  | "date"
+  | "dateTime"
+  | "id"
+  | "email"
+  | "url"
+  | "enum"
+  | "object"
+  | "array";

package/package.json

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