mas-server 3.0.4 → 3.0.41

package/dist/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/utils/createRouter.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {

package/dist/utils/logs.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/dist/utils/quickSend.js

@@ -11,11 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = (req, res, next) => {
     // req.fields && (req.body = req.fields);
-    let right = true;
     res.return = (data_1, ...args_1) => __awaiter(void 0, [data_1, ...args_1], void 0, function* (data, status = 1, code = 200, msg = "") {
-        if (!right)
-            return;
-        right = false;
         if (data === null || data === undefined) {
             status = 0;
         }
@@ -28,5 +24,14 @@ exports.default = (req, res, next) => {
             data: data === null || data === undefined ? null : data,
         });
     });
+    res.reply = (data_1, ...args_1) => __awaiter(void 0, [data_1, ...args_1], void 0, function* (data, msg = "", code = 200) {
+        return yield res.return(data, data ? 1 : 0, code, msg);
+    });
+    res.success = (data_1, ...args_1) => __awaiter(void 0, [data_1, ...args_1], void 0, function* (data, msg = "成功") {
+        return yield res.return(data, 1, 200, msg);
+    });
+    res.fail = (data_1, ...args_1) => __awaiter(void 0, [data_1, ...args_1], void 0, function* (data, msg = "系统错误，请联系管理员") {
+        return yield res.return(data, 0, 200, msg);
+    });
     next();
 };

package/dist/utils/readApi.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = readFilesRecursively;
 const fs = __importStar(require("fs"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mas-server",
-  "version": "3.0.04",
+  "version": "3.0.41",
   "description": "一款基于express面向中小型项目的后端框架",
   "main": "dist/index.js",
   "typings": "src/index.ts",

package/src/typings/index.ts

@@ -66,7 +66,14 @@ export type ApiConfigTypeItem = {
 export type MasRes = Response & {
   /** 响应数据 */
   return: (data: any, status?: any, code?: number, msg?: string) => void;
+  /** token信息 */
   token?: { data: any; _permission: string[] };
+  /** 通用响应方法 */
+  reply: (data: any, msg?: string, code?: number) => Promise<void>;
+  /** 成功响应方法 */
+  success: (data: any, msg?: string) => Promise<void>;
+  /** 失败响应方法 */
+  fail: (data: any, msg?: string) => Promise<void>;
 };
 export type MasReq = Request & {
   body: any;

package/src/utils/quickSend.ts

@@ -1,9 +1,6 @@
 export default (req, res, next) => {
   // req.fields && (req.body = req.fields);
-  let right = true;
   res.return = async (data, status = 1, code = 200, msg = "") => {
-    if (!right) return;
-    right = false;
     if (data === null || data === undefined) {
       status = 0;
     }
@@ -15,5 +12,14 @@ export default (req, res, next) => {
       data: data === null || data === undefined ? null : data,
     });
   };
+  res.reply = async (data, msg = "", code = 200) => {
+    return await res.return(data, data ? 1 : 0, code, msg);
+  };
+  res.success = async (data, msg = "成功") => {
+    return await res.return(data, 1, 200, msg);
+  };
+  res.fail = async (data, msg = "系统错误，请联系管理员") => {
+    return await res.return(data, 0, 200, msg);
+  };
   next();
 };

package/test/main.ts

@@ -12,7 +12,7 @@ const app = getApp(
   },
   (eapp) => {
     eapp.use((req, res: MasRes, next) => {
-      console.log(req.path, "加工之前的111");
+      // console.log(req.path, "加工之前的111");
       next();
     });
   }

package/test/src/api/index.ts

@@ -4,5 +4,6 @@ export const config: ApiConfigTypeItem = {
   methods: "all",
 };
 export default async (req: MasReq, res: MasRes) => {
-  res.return("hello mas-server!");
+  res.success({}, "测试");
+  // res.return("hello mas-server!");
 };

package/test/src/apiDoc.ts

@@ -1,33 +1,34 @@
-// import type { Express } from "express";
-// import { MasReq, MasRes } from "@/index";
-// export default (app: Express) => {
-//   const router = JSON.stringify(state.Router, (key, value) => {
-//     if (typeof value === "function") {
-//       return value.toString().replace(/function\s+(\w+)\(\)\s+\{.*\}/, "$1");
-//     }
-//     return value;
-//   });
-//   const newRouter = JSON.parse(router);
-//   // 有的描述没有类型，尝试从validFormat里取
-//   for (const key in newRouter) {
-//     const item = newRouter[key];
-//     if (item.validFormat && item.validFormatDes) {
-//       for (const validFormatDesItem of item.validFormatDes) {
-//         if (
-//           !validFormatDesItem.type &&
-//           item.validFormat[validFormatDesItem.name]
-//         ) {
-//           validFormatDesItem.type = item.validFormat[validFormatDesItem.name];
-//         } else if (!validFormatDesItem.type) {
-//           validFormatDesItem.type = "String";
-//         }
-//       }
-//     }
-//   }
-//   app.post("/apidoc/router", (req: masReq, res: masRes) => {
-//     res.return(newRouter);
-//   });
-//   app.post("/apidoc/cn", (req: masReq, res: masRes) => {
-//     res.return(state.apiCN);
-//   });
-// };
+import type { Express } from "express";
+import { MasReq, MasRes } from "@/index";
+import { state } from "@/state";
+export default (app: Express) => {
+  const router = JSON.stringify(state.Router, (key, value) => {
+    if (typeof value === "function") {
+      return value.toString().replace(/function\s+(\w+)\(\)\s+\{.*\}/, "$1");
+    }
+    return value;
+  });
+  const newRouter = JSON.parse(router);
+  // 有的描述没有类型，尝试从validFormat里取
+  for (const key in newRouter) {
+    const item = newRouter[key];
+    if (item.validFormat && item.validFormatDes) {
+      for (const validFormatDesItem of item.validFormatDes) {
+        if (
+          !validFormatDesItem.type &&
+          item.validFormat[validFormatDesItem.name]
+        ) {
+          validFormatDesItem.type = item.validFormat[validFormatDesItem.name];
+        } else if (!validFormatDesItem.type) {
+          validFormatDesItem.type = "String";
+        }
+      }
+    }
+  }
+  app.post("/apidoc/router", (req: MasReq, res: MasRes) => {
+    res.return(newRouter);
+  });
+  app.post("/apidoc/cn", (req: MasReq, res: MasRes) => {
+    res.return(state.apiCN);
+  });
+};

package/test/src/debug.ts

@@ -2,4 +2,4 @@ import validType from "@/utils/validType";
 import axios from "axios";
 import * as sqlform from "./sqlform.json";
 import { createToken, getApiRouter } from "@/index";
-console.log(getApiRouter(), "路由信息");
+// console.log(getApiRouter(), "路由信息");