mas-server 2.0.0 → 2.0.1

package/dist/index.js

@@ -32,15 +32,15 @@ const express_1 = __importDefault(require("express"));
 const cors_1 = __importDefault(require("cors"));
 const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs"));
-const state_1 = require("@/state");
-const getLog_1 = __importDefault(require("@/utils/getLog"));
-const quickSend_1 = __importDefault(require("@/utils/quickSend"));
-const readApi_1 = __importDefault(require("@/utils/readApi"));
+const state_1 = require("./state");
+const getLog_1 = __importDefault(require("./utils/getLog"));
+const quickSend_1 = __importDefault(require("./utils/quickSend"));
+const readApi_1 = __importDefault(require("./utils/readApi"));
 exports.readApi = readApi_1.default;
-const validRouteData_1 = __importDefault(require("@/utils/validRouteData"));
-const getRouteByApiSrc_1 = __importDefault(require("@/utils/getRouteByApiSrc"));
+const validRouteData_1 = __importDefault(require("./utils/validRouteData"));
+const getRouteByApiSrc_1 = __importDefault(require("./utils/getRouteByApiSrc"));
 exports.getRouteByApiSrc = getRouteByApiSrc_1.default;
-const validToken_1 = __importDefault(require("@/utils/validToken"));
+const validToken_1 = __importDefault(require("./utils/validToken"));
 const ansi_colors_1 = __importDefault(require("ansi-colors"));
 const moment_1 = __importDefault(require("moment"));
 exports.moment = moment_1.default;

package/dist/utils/apiDoc.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const state_1 = require("@/state");
+const state_1 = require("../state");
 exports.default = (app) => {
     const router = JSON.stringify(state_1.state.Router, (key, value) => {
         if (typeof value === "function") {

package/dist/utils/getLog.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const state_1 = require("@/state");
+const state_1 = require("../state");
 const moment_1 = __importDefault(require("moment"));
 exports.default = (req, res, next) => {
     const { config } = state_1.state;

package/dist/utils/validRouteData.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const state_1 = require("@/state");
+const state_1 = require("../state");
 const validType_1 = __importDefault(require("./validType"));
 exports.default = (req, res, next) => {
     const Router = state_1.state.Router;

package/dist/utils/validToken.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const state_1 = require("@/state");
+const state_1 = require("../state");
 const __1 = require("..");
 const masUtils_1 = require("./masUtils");
 exports.default = (req, res, next) => {

package/dist/utils/validType.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const masUtils_1 = require("@/utils/masUtils");
+const masUtils_1 = require("../utils/masUtils");
 const vliadBase = (obj, typeMapping) => {
     return (0, masUtils_1.getType)(obj) == typeMapping.name.toLowerCase();
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mas-server",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "一款基于express面向中小型项目的后端框架",
   "main": "dist/index.js",
   "typings": "src/index.ts",
@@ -25,6 +25,8 @@
     "cors": "^2.8.5",
     "express": "^4.18.2",
     "express-ip": "^1.0.4",
+    "fs-extra": "^11.1.1",
+    "glob": "^10.3.1",
     "mas-encrypt": "^1.0.0",
     "masmysql": "^2.0.4",
     "module-alias": "^2.2.2",

package/src/index.ts

@@ -4,14 +4,14 @@ import type { Express } from "express";
 import cors from "cors";
 import path from "path";
 import * as fs from "fs";
-import { state } from "@/state";
-import getLog from "@/utils/getLog";
-import quickSend from "@/utils/quickSend";
-import readApi from "@/utils/readApi";
-import validRouteData from "@/utils/validRouteData";
-import getRouteByApiSrc from "@/utils/getRouteByApiSrc";
-import validTokenUse from "@/utils/validToken";
-import type { masReq, masRes, apiConfigType, configType } from "@/typings";
+import { state } from "./state";
+import getLog from "./utils/getLog";
+import quickSend from "./utils/quickSend";
+import readApi from "./utils/readApi";
+import validRouteData from "./utils/validRouteData";
+import getRouteByApiSrc from "./utils/getRouteByApiSrc";
+import validTokenUse from "./utils/validToken";
+import type { masReq, masRes, apiConfigType, configType } from "./typings";
 import c from "ansi-colors";
 import moment from "moment";
 import "moment/locale/zh-cn";

package/src/utils/apiDoc.ts

@@ -1,4 +1,4 @@
-import { state } from "@/state";
+import { state } from "../state";
 import type { Express } from "express";
 import { masReq, masRes } from "..";
 export default (app: Express) => {

package/src/utils/getLog.ts

@@ -1,5 +1,5 @@
 import fs from "fs";
-import { state } from "@/state";
+import { state } from "../state";
 import moment from "moment";
 
 export default (req, res, next) => {

package/src/utils/getRouteByApiSrc.ts

@@ -1,6 +1,6 @@
 import readApi from "./readApi";
 import c from "ansi-colors";
-import { apiConfigType } from "@/typings";
+import { apiConfigType } from "../typings";
 
 export default function getRouteByApiSrc(
   apiSrc,

package/src/utils/validRouteData.ts

@@ -1,5 +1,5 @@
 import { apiConfigType, masReq, masRes } from "..";
-import { state } from "@/state";
+import { state } from "../state";
 import validType from "./validType";
 export default (req: masReq, res: masRes, next) => {
   const Router: apiConfigType = state.Router;

package/src/utils/validToken.ts

@@ -1,4 +1,4 @@
-import { state } from "@/state";
+import { state } from "../state";
 import { masReq, masRes, validToken } from "..";
 import { getType } from "./masUtils";
 

package/src/utils/validType.ts

@@ -1,4 +1,4 @@
-import { getType } from "@/utils/masUtils";
+import { getType } from "../utils/masUtils";
 
 type BasicTypeDescriptor =
   | StringConstructor

package/tsconfig.json

@@ -7,7 +7,7 @@
     "module": "commonjs",
     "moduleResolution": "node",
     "esModuleInterop": true,
-    "baseUrl": ".",
+    "baseUrl": "./",
 
     "rootDir": "src",
     "outDir": "dist",

package/dist/masmysql/checkSqlkey.js

@@ -1,67 +0,0 @@
-"use strict";
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const state_1 = __importDefault(require("./state"));
-const esaysql_1 = require("./esaysql");
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-/** 添加相关表名 */
-const replenishForm = (formName, key) => __awaiter(void 0, void 0, void 0, function* () {
-    // state.status = 0;
-    const replenishData = {
-        create_time: "`create_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP",
-        update_time: "`update_time` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP",
-        is_delete: "`is_delete` INT DEFAULT 0",
-    };
-    console.info(ansi_colors_1.default.yellow(`${formName}缺少字段${key}`));
-    yield (0, esaysql_1.sqlQuery)(`alter table ${formName} add ${replenishData[key]}`);
-    console.info(ansi_colors_1.default.yellow("已为您自动添加"));
-});
-/** 获取相关表名，并检查每个表是否含有 is_delete,create_time,update_time，没有则添加 */
-function checkSqlKey() {
-    return __awaiter(this, void 0, void 0, function* () {
-        let dbname = state_1.default.config.database;
-        // 获得数据库相关表名
-        let formName = (yield (0, esaysql_1.sqlQuery)(`select table_name 
-     from information_schema.tables 
-     where table_schema='${dbname}'`));
-        const sqlform = {};
-        formName = formName.map((item) => item["TABLE_NAME"]);
-        const listKeyArr = {};
-        // 获得相关表字段，并且没有
-        for (let item of formName) {
-            let listkey = yield (0, esaysql_1.sqlQuery)(`SELECT DATA_TYPE,COLUMN_NAME FROM information_schema.COLUMNS 
-       WHERE table_name = '${item}' AND  
-       \`TABLE_SCHEMA\`='${dbname}'`);
-            listKeyArr[item] = JSON.parse(JSON.stringify(listkey));
-            listkey = listkey.map((item) => item["COLUMN_NAME"]);
-            if (!listkey.includes("create_time")) {
-                yield replenishForm(item, "create_time");
-                listkey.push("create_time");
-            }
-            if (!listkey.includes("update_time")) {
-                yield replenishForm(item, "update_time");
-                listkey.push("update_time");
-            }
-            if (!listkey.includes("is_delete")) {
-                yield replenishForm(item, "is_delete");
-                listkey.push("is_delete");
-            }
-            sqlform[item] = listkey;
-        }
-        state_1.default.listKey = JSON.parse(JSON.stringify(listKeyArr));
-        state_1.default.sqlForm = Object.assign({}, sqlform);
-        return sqlform;
-    });
-}
-exports.default = checkSqlKey;

package/dist/masmysql/createSqlForm.js

@@ -1,44 +0,0 @@
-"use strict";
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const esaysql_1 = require("./esaysql");
-const state_1 = __importDefault(require("./state"));
-exports.default = (form) => __awaiter(void 0, void 0, void 0, function* () {
-    const formArr = Object.keys(state_1.default.sqlForm);
-    for (let k in form) {
-        let data = form[k];
-        if (formArr.includes(k.toLowerCase())) {
-            continue;
-        }
-        const sqldata = `CREATE TABLE ${k.toLowerCase()} 
-    (
-      \`id\` INT AUTO_INCREMENT PRIMARY KEY COMMENT '唯一主键',
-      ${data
-            .map((item) => `\`${item.key}\` ${item.type.toLowerCase() == "str"
-            ? `VARCHAR(${item.length || "100"})`
-            : item.type.toLowerCase() == "int"
-                ? "INT"
-                : item.type.toLowerCase() == "float"
-                    ? "FLOAT"
-                    : "VARCHAR(100)"} ${item.notNull ? "NOT NULL" : ""} COMMENT '${item.des || ""}'`)
-            .join(",")},
-      \`create_time\` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-      \`update_time\` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
-      \`is_delete\` INT DEFAULT 0 COMMENT '是否被删除'
-    )`;
-        yield (0, esaysql_1.sqlQuery)(sqldata, 1);
-        console.log(`尝试创建${k}表完成`);
-    }
-    console.log("创建表完成");
-});

package/dist/masmysql/esaysql.js

@@ -1,53 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sqlQuery = exports.sqlEnd = exports.sqlInit = void 0;
-const mysql = require("mysql");
-const state_1 = __importDefault(require("./state"));
-const ansi_colors_1 = __importDefault(require("ansi-colors"));
-function sqlInit(config) {
-    state_1.default.config = config;
-    state_1.default.connection = mysql.createConnection(config);
-    return new Promise((resolve, reject) => {
-        state_1.default.connection.connect(function (err) {
-            if (err) {
-                console.error("error connecting: " + err.stack);
-                throw Error("连接数据库失败！");
-            }
-            else {
-                resolve(true);
-            }
-        });
-    });
-}
-exports.sqlInit = sqlInit;
-function sqlEnd() {
-    state_1.default.connection.end();
-}
-exports.sqlEnd = sqlEnd;
-function sqlQuery(sqldata, details = 0) {
-    return new Promise((resolve, reject) => {
-        state_1.default.connection.query(sqldata, (error, sqlRes) => {
-            if (details) {
-                if (error) {
-                    reject(error);
-                    console.info(error);
-                }
-                else
-                    resolve(sqlRes);
-            }
-            if (!sqlRes) {
-                console.info(error, sqlRes);
-                console.info(ansi_colors_1.default.red("错误：数据库语句错误"));
-                resolve(undefined);
-            }
-            else if (Number.isInteger(sqlRes.affectedRows))
-                resolve(sqlRes.affectedRows);
-            else
-                resolve(JSON.parse(JSON.stringify(sqlRes)));
-        });
-    });
-}
-exports.sqlQuery = sqlQuery;

package/dist/masmysql/index.js

@@ -1,111 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : 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 __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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.massql = exports.createSqlForm = exports.checkSqlKey = exports.sqlQuery = exports.state = exports.sqlInit = exports.sqlEnd = exports.getsqlFormDataType = exports.getsqlFormData = void 0;
-const checkSqlkey_1 = __importDefault(require("./checkSqlkey"));
-exports.checkSqlKey = checkSqlkey_1.default;
-const createSqlForm_1 = __importDefault(require("./createSqlForm"));
-const esaysql_1 = require("./esaysql");
-Object.defineProperty(exports, "sqlEnd", { enumerable: true, get: function () { return esaysql_1.sqlEnd; } });
-Object.defineProperty(exports, "sqlInit", { enumerable: true, get: function () { return esaysql_1.sqlInit; } });
-Object.defineProperty(exports, "sqlQuery", { enumerable: true, get: function () { return esaysql_1.sqlQuery; } });
-const masSql_1 = __importDefault(require("./masSql"));
-exports.massql = masSql_1.default;
-const state_1 = __importDefault(require("./state"));
-exports.state = state_1.default;
-const fs = __importStar(require("fs"));
-/** 创建表名 */
-function createSqlForm(config, createForm) {
-    return __awaiter(this, void 0, void 0, function* () {
-        (0, esaysql_1.sqlInit)(config);
-        yield (0, checkSqlkey_1.default)();
-        yield (0, createSqlForm_1.default)(createForm);
-        (0, esaysql_1.sqlEnd)();
-    });
-}
-exports.createSqlForm = createSqlForm;
-function getsqlFormData(path) {
-    if (!state_1.default.sqlForm) {
-        throw Error("请先初始化数据库!");
-    }
-    const sqlForm = JSON.parse(JSON.stringify(state_1.default.sqlForm));
-    for (let k in sqlForm) {
-        sqlForm[k].push(`@!${k}`);
-    }
-    if (path) {
-        if (!path.includes(".json")) {
-            throw Error("写入路径错误");
-        }
-        if (fs.existsSync(path)) {
-            const data = require(path);
-            if (JSON.stringify(data) != JSON.stringify(sqlForm)) {
-                fs.writeFileSync(path, `${JSON.stringify(sqlForm)}`);
-            }
-        }
-        else {
-            fs.writeFileSync(path, `${JSON.stringify(sqlForm)}`);
-        }
-    }
-    return sqlForm;
-}
-exports.getsqlFormData = getsqlFormData;
-function getsqlFormDataType() {
-    if (!state_1.default.listKey) {
-        throw Error("请先初始化数据库!");
-    }
-    let tarr = { int: "number", float: "number" };
-    let btarr = { int: "Number", float: "Number" };
-    let nnn = { is_delete: "", update_time: "", create_time: "" };
-    let res = {};
-    for (let key in state_1.default.listKey) {
-        let typeObj = "{";
-        let typeData = "{";
-        for (let item of state_1.default.listKey[key]) {
-            if (nnn[item.COLUMN_NAME] === "")
-                continue;
-            typeObj += `${item.COLUMN_NAME}?:${tarr[item.DATA_TYPE] || "string"};`;
-            if (item.COLUMN_NAME === "id")
-                continue;
-            typeData += `${item.COLUMN_NAME}:${btarr[item.DATA_TYPE] || "String"},`;
-        }
-        typeData = typeData.slice(0, typeData.length - 1) + "}";
-        typeObj += "}";
-        res[key] = { typeData, typeObj };
-    }
-    return res;
-}
-exports.getsqlFormDataType = getsqlFormDataType;