cgserver 7.8.2113 → 7.9.2113

package/dist/lib/Database/MSSqlManager.js

@@ -1,43 +1,106 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+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 __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
 exports.GMSSqlMgr = exports.MssqlReturn = void 0;
-const mssql = require("mssql");
-const IServerConfig_1 = require("../Config/IServerConfig");
-const DBCache_1 = require("./Decorator/DBCache");
-class MssqlReturn {
-    error = null;
-    fields = null;
-    list = null;
-}
+var mssql = require("mssql");
+var IServerConfig_1 = require("../Config/IServerConfig");
+var DBCache_1 = require("./Decorator/DBCache");
+var MssqlReturn = /** @class */ (function () {
+    function MssqlReturn() {
+        this.error = null;
+        this.fields = null;
+        this.list = null;
+    }
+    return MssqlReturn;
+}());
 exports.MssqlReturn = MssqlReturn;
 exports.GMSSqlMgr = null;
-class MSSqlManager {
-    _init_cbs = [];
-    _pool = null;
-    get pool() {
-        return this._pool;
-    }
-    get isValid() {
-        return !!this._pool;
+var MSSqlManager = /** @class */ (function () {
+    function MSSqlManager() {
+        this._init_cbs = [];
+        this._pool = null;
     }
-    constructor() {
-    }
-    async init() {
-        if (this._pool
-            || !IServerConfig_1.GServerCfg.db.mssql
-            || !IServerConfig_1.GServerCfg.db.mssql.open) {
-            return;
-        }
-        this._pool = await mssql.connect(IServerConfig_1.GServerCfg.db.mssql);
-        console.log("mssql config=" + JSON.stringify(IServerConfig_1.GServerCfg.db.mssql));
-        //这个的初始化位置不能变，必须位于cbs前，pool后
-        await DBCache_1.GDBCache.init();
-        for (let i = 0; i < this._init_cbs.length; ++i) {
-            this._init_cbs[i]();
-        }
-    }
-    registerInitCb(cb) {
+    Object.defineProperty(MSSqlManager.prototype, "pool", {
+        get: function () {
+            return this._pool;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(MSSqlManager.prototype, "isValid", {
+        get: function () {
+            return !!this._pool;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    MSSqlManager.prototype.init = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _a, i;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        if (this._pool
+                            || !IServerConfig_1.GServerCfg.db.mssql
+                            || !IServerConfig_1.GServerCfg.db.mssql.open) {
+                            return [2 /*return*/];
+                        }
+                        _a = this;
+                        return [4 /*yield*/, mssql.connect(IServerConfig_1.GServerCfg.db.mssql)];
+                    case 1:
+                        _a._pool = _b.sent();
+                        console.log("mssql config=" + JSON.stringify(IServerConfig_1.GServerCfg.db.mssql));
+                        //这个的初始化位置不能变，必须位于cbs前，pool后
+                        return [4 /*yield*/, DBCache_1.GDBCache.init()];
+                    case 2:
+                        //这个的初始化位置不能变，必须位于cbs前，pool后
+                        _b.sent();
+                        for (i = 0; i < this._init_cbs.length; ++i) {
+                            this._init_cbs[i]();
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    MSSqlManager.prototype.registerInitCb = function (cb) {
         this._init_cbs.push(cb);
-    }
-}
+    };
+    return MSSqlManager;
+}());
 exports.GMSSqlMgr = new MSSqlManager();

package/dist/lib/Database/MongoBaseService.js

@@ -1,114 +1,293 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoBaseService = void 0;
-const MongoManager_1 = require("./MongoManager");
-class MongoBaseService {
-    _table = "";
-    get table() {
-        return this._table;
-    }
-    _inited = false;
-    get isInited() {
-        return this._inited;
-    }
-    get mongo() {
-        return MongoManager_1.GMongoMgr.mongo;
+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 __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
-    _t_type = null;
-    constructor(table, type) {
+};
+exports.__esModule = true;
+exports.MongoBaseService = void 0;
+var MongoManager_1 = require("./MongoManager");
+var MongoBaseService = /** @class */ (function () {
+    function MongoBaseService(table, type) {
+        this._table = "";
+        this._inited = false;
+        this._t_type = null;
         this._t_type = type;
         this._table = table;
     }
-    async getNextId() {
-        let id = await MongoManager_1.GMongoMgr.getAutoIds(this._table);
-        return id;
-    }
+    Object.defineProperty(MongoBaseService.prototype, "table", {
+        get: function () {
+            return this._table;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(MongoBaseService.prototype, "isInited", {
+        get: function () {
+            return this._inited;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(MongoBaseService.prototype, "mongo", {
+        get: function () {
+            return MongoManager_1.GMongoMgr.mongo;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    MongoBaseService.prototype.getNextId = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var id;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, MongoManager_1.GMongoMgr.getAutoIds(this._table)];
+                    case 1:
+                        id = _a.sent();
+                        return [2 /*return*/, id];
+                }
+            });
+        });
+    };
     /**
      * 没有id(非_id)的表不能使用该函数
      * @param id
      */
-    async getById(id) {
-        let rs = await MongoManager_1.GMongoMgr.findOne(this._table, null, { id: id });
-        return rs.one;
-    }
-    async get(proterty, where) {
-        let rs = await MongoManager_1.GMongoMgr.findOne(this._table, proterty, where);
-        return rs.one;
-    }
-    async countDocuments(where, options) {
-        let rs = await MongoManager_1.GMongoMgr.countDocuments(this._table, where);
-        return rs.count;
-    }
-    async gets(property, where, sort, skip = 0, limit = 0) {
-        let rs = await MongoManager_1.GMongoMgr.findMany(this._table, property, where, sort, skip, limit);
-        return rs.list;
-    }
-    async getRandoms(num, proterty, where) {
-        let rs = await MongoManager_1.GMongoMgr.simpleAggregate(this._table, proterty, where, null, num);
-        return rs.list;
-    }
-    async updateOne(model, where, upsert = false) {
-        let rs = await MongoManager_1.GMongoMgr.updateOne(this._table, model, where, upsert);
-        return rs;
-    }
-    async updateMany(model, where) {
-        let rs = await MongoManager_1.GMongoMgr.updateMany(this._table, model, where);
-        return rs;
-    }
-    async insert(model) {
-        let rs = await MongoManager_1.GMongoMgr.insertOne(this._table, model);
-        return rs;
-    }
-    async deleteOne(where) {
-        let rs = await MongoManager_1.GMongoMgr.deleteOne(this._table, where);
-        return rs;
-    }
-    async deleteMany(where) {
-        let rs = await MongoManager_1.GMongoMgr.deleteMany(this._table, where);
-        return rs;
-    }
-    async createIndex(index, options) {
-        let rs = await MongoManager_1.GMongoMgr.createIndex(this._table, index, options);
-        return rs;
-    }
-    aggregate(pipeline, options) {
-        let ret = MongoManager_1.GMongoMgr.aggregate(this._table, pipeline, options);
+    MongoBaseService.prototype.getById = function (id) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, MongoManager_1.GMongoMgr.findOne(this._table, null, { id: id })];
+                    case 1:
+                        rs = _a.sent();
+                        return [2 /*return*/, rs.one];
+                }
+            });
+        });
+    };
+    MongoBaseService.prototype.get = function (proterty, where) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, MongoManager_1.GMongoMgr.findOne(this._table, proterty, where)];
+                    case 1:
+                        rs = _a.sent();
+                        return [2 /*return*/, rs.one];
+                }
+            });
+        });
+    };
+    MongoBaseService.prototype.countDocuments = function (where, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, MongoManager_1.GMongoMgr.countDocuments(this._table, where)];
+                    case 1:
+                        rs = _a.sent();
+                        return [2 /*return*/, rs.count];
+                }
+            });
+        });
+    };
+    MongoBaseService.prototype.gets = function (property, where, sort, skip, limit) {
+        if (skip === void 0) { skip = 0; }
+        if (limit === void 0) { limit = 0; }
+        return __awaiter(this, void 0, void 0, function () {
+            var rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, MongoManager_1.GMongoMgr.findMany(this._table, property, where, sort, skip, limit)];
+                    case 1:
+                        rs = _a.sent();
+                        return [2 /*return*/, rs.list];
+                }
+            });
+        });
+    };
+    MongoBaseService.prototype.getRandoms = function (num, proterty, where) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, MongoManager_1.GMongoMgr.simpleAggregate(this._table, proterty, where, null, num)];
+                    case 1:
+                        rs = _a.sent();
+                        return [2 /*return*/, rs.list];
+                }
+            });
+        });
+    };
+    MongoBaseService.prototype.updateOne = function (model, where, upsert) {
+        if (upsert === void 0) { upsert = false; }
+        return __awaiter(this, void 0, void 0, function () {
+            var rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, MongoManager_1.GMongoMgr.updateOne(this._table, model, where, upsert)];
+                    case 1:
+                        rs = _a.sent();
+                        return [2 /*return*/, rs];
+                }
+            });
+        });
+    };
+    MongoBaseService.prototype.updateMany = function (model, where) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, MongoManager_1.GMongoMgr.updateMany(this._table, model, where)];
+                    case 1:
+                        rs = _a.sent();
+                        return [2 /*return*/, rs];
+                }
+            });
+        });
+    };
+    MongoBaseService.prototype.insert = function (model) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, MongoManager_1.GMongoMgr.insertOne(this._table, model)];
+                    case 1:
+                        rs = _a.sent();
+                        return [2 /*return*/, rs];
+                }
+            });
+        });
+    };
+    MongoBaseService.prototype.deleteOne = function (where) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, MongoManager_1.GMongoMgr.deleteOne(this._table, where)];
+                    case 1:
+                        rs = _a.sent();
+                        return [2 /*return*/, rs];
+                }
+            });
+        });
+    };
+    MongoBaseService.prototype.deleteMany = function (where) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, MongoManager_1.GMongoMgr.deleteMany(this._table, where)];
+                    case 1:
+                        rs = _a.sent();
+                        return [2 /*return*/, rs];
+                }
+            });
+        });
+    };
+    MongoBaseService.prototype.createIndex = function (index, options) {
+        return __awaiter(this, void 0, void 0, function () {
+            var rs;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, MongoManager_1.GMongoMgr.createIndex(this._table, index, options)];
+                    case 1:
+                        rs = _a.sent();
+                        return [2 /*return*/, rs];
+                }
+            });
+        });
+    };
+    MongoBaseService.prototype.aggregate = function (pipeline, options) {
+        var ret = MongoManager_1.GMongoMgr.aggregate(this._table, pipeline, options);
         return ret;
-    }
+    };
     /**
      * 仅仅支持一级
      * @param array 数据名称 比如 items
      * @param where 数组内赛选条件 比如 "items.id":1
      * @param pre_match 数组上一级赛选条件 比如 "user_id":1
      */
-    async getsInArray(array, where, pre_match) {
-        let agg = this.aggregate();
-        if (pre_match) {
-            agg = agg.match(pre_match);
-        }
-        agg = agg.unwind("$" + array);
-        if (where) {
-            agg = agg.match(where);
-        }
-        let all = await agg.toArray();
-        let items = [];
-        for (let i = 0; i < all.length; ++i) {
-            items.push(all[i][array]);
-        }
-        return items;
-    }
+    MongoBaseService.prototype.getsInArray = function (array, where, pre_match) {
+        return __awaiter(this, void 0, void 0, function () {
+            var agg, all, items, i;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        agg = this.aggregate();
+                        if (pre_match) {
+                            agg = agg.match(pre_match);
+                        }
+                        agg = agg.unwind("$" + array);
+                        if (where) {
+                            agg = agg.match(where);
+                        }
+                        return [4 /*yield*/, agg.toArray()];
+                    case 1:
+                        all = _a.sent();
+                        items = [];
+                        for (i = 0; i < all.length; ++i) {
+                            items.push(all[i][array]);
+                        }
+                        return [2 /*return*/, items];
+                }
+            });
+        });
+    };
     /**
      * 仅仅支持一级
      * @param array 数据名称 比如 items
      * @param where 数组内赛选条件 比如 "items.id":1
      * @param pre_match 数组上一级赛选条件 比如 "user_id":1
      */
-    async getInArray(array, where, pre_match) {
-        let items = await this.getsInArray(array, where, pre_match);
-        if (items.length <= 0) {
-            return null;
-        }
-        return items[0];
-    }
-}
+    MongoBaseService.prototype.getInArray = function (array, where, pre_match) {
+        return __awaiter(this, void 0, void 0, function () {
+            var items;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getsInArray(array, where, pre_match)];
+                    case 1:
+                        items = _a.sent();
+                        if (items.length <= 0) {
+                            return [2 /*return*/, null];
+                        }
+                        return [2 /*return*/, items[0]];
+                }
+            });
+        });
+    };
+    return MongoBaseService;
+}());
 exports.MongoBaseService = MongoBaseService;