mas-server 2.0.1 → 2.0.3

package/package.json

@@ -1,49 +1,51 @@
-{
-  "name": "mas-server",
-  "version": "2.0.1",
-  "description": "一款基于express面向中小型项目的后端框架",
-  "main": "dist/index.js",
-  "typings": "src/index.ts",
-  "scripts": {
-    "testdev": "npx ts-node-dev --transpile-only ./test/scripts/run.ts --respawn",
-    "test": "npx ts-node ./test/scripts/beforeCreated.ts -end && npx ts-node ./test/scripts/run.ts",
-    "testmon": "npx nodemon ./test/scripts/run.ts",
-    "testTS": "npx nodemon ./test/test.ts",
-    "createSql": "npx ts-node ./test/scripts/createSqlForm.ts",
-    "createApi": "npx ts-node ./test/scripts/createApiFile.ts",
-    "createApis": "npx ts-node ./test/scripts/createApis.ts",
-    "init": "npx nodemon ./test/scripts/beforeCreated.ts -end",
-    "gsft": "npx nodemon ./test/scripts/getSqlFormType.ts"
-  },
-  "keywords": [],
-  "author": "tingxi8087",
-  "license": "ISC",
-  "dependencies": {
-    "@types/express": "^4.17.17",
-    "ansi-colors": "^4.1.3",
-    "axios": "^1.3.6",
-    "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",
-    "moment": "^2.29.4",
-    "mysql": "^2.18.1",
-    "nodemon": "^2.0.22",
-    "ts-node": "^10.9.1",
-    "ts-node-dev": "^2.0.0",
-    "typescript": "^5.0.4"
-  },
-  "_moduleAliases": {
-    "@": "src/",
-    "@@": "."
-  },
-  "devDependencies": {
-    "@types/cors": "^2.8.13",
-    "@types/express": "^4.17.17",
-    "@types/moment": "^2.13.0"
-  }
+{
+  "name": "mas-server",
+  "version": "2.0.3",
+  "description": "一款基于express面向中小型项目的后端框架",
+  "main": "dist/index.js",
+  "typings": "src/index.ts",
+  "scripts": {
+    "testdev": "npx ts-node-dev --transpile-only ./test/scripts/run.ts --respawn",
+    "test": "npx ts-node ./test/scripts/beforeCreated.ts -end && npx ts-node ./test/scripts/run.ts",
+    "testmon": "npx nodemon ./test/scripts/run.ts",
+    "testTS": "npx nodemon ./test/test.ts",
+    "createSql": "npx ts-node ./test/scripts/createSqlForm.ts",
+    "createApi": "npx ts-node ./test/scripts/createApiFile.ts",
+    "createApis": "npx ts-node ./test/scripts/createApis.ts",
+    "init": "npx nodemon ./test/scripts/beforeCreated.ts -end",
+    "gsft": "npx nodemon ./test/scripts/getSqlFormType.ts",
+    "build":"tsc",
+    "publish": "tsc && npm publish && cnpm sync cnpmcore"
+  },
+  "keywords": [],
+  "author": "tingxi8087",
+  "license": "ISC",
+  "dependencies": {
+    "@types/express": "^4.17.17",
+    "ansi-colors": "^4.1.3",
+    "axios": "^1.3.6",
+    "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",
+    "moment": "^2.29.4",
+    "mysql": "^2.18.1",
+    "nodemon": "^2.0.22",
+    "ts-node": "^10.9.1",
+    "ts-node-dev": "^2.0.0",
+    "typescript": "^5.0.4"
+  },
+  "_moduleAliases": {
+    "@": "src/",
+    "@@": "."
+  },
+  "devDependencies": {
+    "@types/cors": "^2.8.13",
+    "@types/express": "^4.17.17",
+    "@types/moment": "^2.13.0"
+  }
 }

package/src/index.ts

@@ -31,6 +31,7 @@ import {
 import type { createSqlFormType, sqlForm } from "masmysql";
 import apiDoc from "./utils/apiDoc";
 import { createToken, validToken } from "./utils/meaToken";
+import validType from "./utils/validType";
 
 // =================================================================
 export function getApp(
@@ -77,6 +78,7 @@ export function getApp(
   }
   // 数据效验
   app.use(validRouteData);
+  // 使用接口文档
   if (config.apidoc) {
     app.use("/apidoc", express.static(path.join(__dirname, "/apiDoc")));
     apiDoc(app);
@@ -121,6 +123,7 @@ export {
   massql,
   validToken,
   createToken,
+  validType
 };
 export type {
   masReq,

package/src/utils/meaToken.ts

@@ -1,4 +1,4 @@
-const { decode, isJSON, encode } = require("./mas-encrypt.min");
+const { decode, isJSON, encode } = require("./mas-encrypt.min.js");
 const getTimestamp = () => new Date().getTime();
 /**
  *

package/test/config/api.config.ts

@@ -1,3 +1,3 @@
-import { apiConfigType } from "@/index";
-     const apiConfig: apiConfigType = {"/api/curd/student/del":{"name":"删除数据","methods":"all","des":"","validFormat":{"id":Number}},"/api/curd/student/get":{"name":"得到数据","methods":"all","des":"","validFormat":null},"/api/curd/student/set":{"name":"修改或添加数据","methods":"all","des":"","validFormat":null},"/api/index":{"name":"默认接口","methods":"post","des":"一个默认接口","validFormat":{"arr":[{"name":String,"age":Number}]},"header":[{"name":"token","type":String,"des":"token密钥"}],"validFormatDes":[{"name":"arr","type":{"arr":[{"name":String,"age":Number}]},"des":"学生数组"},{"name":"arg1","type":Number,"des":"可选参数","optional":true}],"example":{"arr":[{"name":"小明","age":18}]},"resExample":{"status":1,"data":"hello mas!","msg":""}},"/api/per":{"name":"新建接口","methods":"all","des":"","validFormat":null},"/api/person/del":{"name":"新建接口","methods":"all","des":"","validFormat":{"arr":[String]}},"/api/person/get":{"name":"新建接口","methods":"all","des":""},"/api/person/set":{"name":"新建接口","methods":"all","des":""},"/api/test":{"name":"新建接口","methods":"all","des":"","validFormat":null},"/api/validtest/boolArr":{"name":"新建接口","methods":"all","des":"","validFormat":[{"name":String}]}};
+import { apiConfigType } from "@/index";
+     const apiConfig: apiConfigType = {"/api/curd/student/del":{"name":"删除数据","methods":"all","des":"","validFormat":{"id":Number}},"/api/curd/student/get":{"name":"得到数据","methods":"all","des":"","validFormat":null},"/api/curd/student/set":{"name":"修改或添加数据","methods":"all","des":"","validFormat":null},"/api/index":{"name":"默认接口","methods":"post","des":"一个默认接口","validFormat":{"arr":[{"name":String,"age":Number}]},"header":[{"name":"token","type":String,"des":"token密钥"}],"validFormatDes":[{"name":"arr","type":{"arr":[{"name":String,"age":Number}]},"des":"学生数组"},{"name":"arg1","type":Number,"des":"可选参数","optional":true}],"example":{"arr":[{"name":"小明","age":18}]},"resExample":{"status":1,"data":"hello mas!","msg":""}},"/api/per":{"name":"新建接口","methods":"all","des":"","validFormat":null},"/api/person/del":{"name":"新建接口","methods":"all","des":"","validFormat":{"arr":[String]}},"/api/person/get":{"name":"新建接口","methods":"all","des":""},"/api/person/set":{"name":"新建接口","methods":"all","des":""},"/api/test":{"name":"新建接口","methods":"all","des":"","validFormat":null},"/api/validtest/boolArr":{"name":"新建接口","methods":"all","des":"","validFormat":[{"name":String}]}};
      export default apiConfig;

package/test/config/config.ts

@@ -23,7 +23,7 @@ export default <configType>{
     host: "127.0.0.1",
     user: "root",
     password: "123456",
-    database: "test666",
+    database: "school",
     // database: "test",
     // password: "tx123456",
   },

package/test/src/sqlform.json

@@ -1 +1,12 @@
-{"student":["id","name","age","des","update_time","is_delete","create_time","@!student"],"test11":["id","name","age","create_time","is_delete","update_time","@!test11"],"test22":["id","name","age","create_time","update_time","is_delete","@!test22"],"testform":["id","testA","numB","create_time","update_time","is_delete","@!testform"]}
+{
+  "student": [
+    "name",
+    "age",
+    "des",
+    "create_time",
+    "update_time",
+    "is_delete",
+    "id",
+    "@!student"
+  ]
+}

package/test//345/276/205/345/274/200/345/217/221.md

@@ -5,8 +5,10 @@ masmysql引入 (massql set方法开发) 完成
 接口文档生成 完成
 快捷创建接口
 生成sql类型 完成
+错误处理
 特别说明：
 get请求和请求头的number参数会被转为string
 接口改名配置丢失
 数据效验只支持对象形式
-只能接收{}或[]
+只能接收{}或[]
+cookie管理