init

package.json

@@ -51,14 +51,12 @@
     "@types/mocha": "^2.2.44",
     "@types/mysql": "^2.15.2",
     "@types/node-fetch": "^1.6.7",
-    "@types/supertest": "^2.0.4",
     "chai": "^4.1.2",
     "coveralls": "^3.0.0",
     "mocha": "^4.0.1",
     "node-fetch": "^1.7.3",
     "nyc": "^11.3.0",
     "source-map-support": "^0.5.0",
-    "supertest": "^3.0.0",
     "ts-node": "^3.3.0",
     "typedoc": "^0.9.0",
     "typescript": "^2.6.2"

src/api/apiCleanCache.ts

@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from "express";
-import { cleanSchema } from "../business/schema";
+import { SchemaDAL } from "../business/schemaDAL";
 import { isArray, isString } from "util";
 
 /**
@@ -16,7 +16,7 @@ export function apiCleanCache(req: Request, res: Response, next: NextFunction) {
   let asyncFunc = async function() {
     if (isArray(databaseList)) {
       for (let database of databaseList) {
-        await cleanSchema(database);
+        await SchemaDAL.clean(database);
       }
     } else {
       return Promise.reject("Please input is array!");

src/api/apiExec.ts

@@ -1,29 +1,30 @@
 import { NextFunction, Request, Response } from "express";
-import { exec } from "../business/exec";
+import { ExecDAL } from "../business/execDAL";
 
 /**
  * 执行
- * 
+ *
  * @export
- * @param {Request} req 
- * @param {Response} res 
- * @param {NextFunction} next 
+ * @param {Request} req
+ * @param {Response} res
+ * @param {NextFunction} next
  */
 export function apiExec(req: Request, res: Response, next: NextFunction) {
   let list = req.body;
 
-  exec(list)
+  ExecDAL.exec(list)
     .then(() => {
       res.send({
         result: "success",
-        data: null,
+        data: null
       });
       next();
     })
     .catch(err => {
       res.send({
         result: "error",
-        msg: err
+        code: err.code,
+        msg: err.message
       });
       next();
     });

src/api/apiSave.ts

@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from "express";
-import { save } from "../business/save";
+import { SaveDAL } from "../business/saveDAL";
 
 /**
  * 保存
@@ -11,7 +11,7 @@ import { save } from "../business/save";
  */
 export function apiSave(req: Request, res: Response, next: NextFunction) {
   let list = req.body;
-  save(list)
+  SaveDAL.save(list)
     .then(result => {
       res.send({
         result: "success",

src/api/apiSelect.ts

@@ -1,5 +1,5 @@
 import { NextFunction, Request, Response } from "express";
-import { select } from "../business/select";
+import { SelectDAL } from "../business/selectDAL";
 
 /**
  * 查询
@@ -14,7 +14,7 @@ export function apiSelect(req: Request, res: Response, next: NextFunction) {
   let sql = req.body.sql;
   let where = req.body.where;
 
-  select(sql, where)
+  SelectDAL.select(sql, where)
     .then(result => {
       res.send({
         result: "success",

src/business/execDAL.ts

@@ -0,0 +1,28 @@
+import { Exec, ConnectionHelper, SaveType, Transaction } from "mysql-i";
+import { getConnection } from "../util/connectionHelper";
+
+export class ExecDAL {
+  /**
+   * 执行SQL（事务）
+   *
+   * @export
+   * @param {string[]} list - SQL数组
+   * @returns
+   */
+  public static async exec(list: string[]) {
+    let conn;
+    try {
+      conn = await getConnection();
+      await Transaction.begin(conn);
+      await Exec.execsSeq(conn, list);
+      await Transaction.commit(conn);
+    } catch (err) {
+      if (conn) {
+        await Transaction.rollback(conn);
+      }
+      throw err;
+    } finally {
+      await ConnectionHelper.close(conn);
+    }
+  }
+}

src/business/saveDAL.ts

@@ -0,0 +1,48 @@
+import { Save, ConnectionHelper, SaveType } from "mysql-i";
+import { getConnection } from "../util/connectionHelper";
+
+export class SaveDAL {
+  /**
+   * 保存多条数据(事务)
+   *
+   * @export
+   * @param {Array<any>} list
+   */
+  public static async save(list: Array<any>) {
+    list.map(m => {
+      switch ((m.saveType + "").toLowerCase()) {
+        case "2":
+        case "u":
+        case "update":
+          m.saveType = SaveType.update;
+          break;
+        case "3":
+        case "d":
+        case "delete":
+          m.saveType = SaveType.delete;
+          break;
+        case "4":
+        case "r":
+        case "replace":
+          m.saveType = SaveType.replace;
+          break;
+        case "1":
+        case "i":
+        case "insert":
+        default:
+          m.saveType = SaveType.insert;
+          break;
+      }
+
+      m.saveType = m.saveType;
+    });
+
+    let conn;
+    try {
+      conn = await getConnection();
+      await Save.savesSeqWithTran(conn, list);
+    } finally {
+      await ConnectionHelper.close(conn);
+    }
+  }
+}