cgserver 8.6.8 → 8.7.0

package/dist/lib/Framework/Database/MSSqlManager.js

@@ -1,43 +1,53 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: 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;
-}
-exports.MssqlReturn = MssqlReturn;
-exports.GMSSqlMgr = null;
-class MSSqlManager {
-    _init_cbs = [];
-    _pool = null;
-    get pool() {
-        return this._pool;
-    }
-    get isValid() {
-        return !!this._pool;
-    }
-    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) {
-        this._init_cbs.push(cb);
-    }
-}
-exports.GMSSqlMgr = new MSSqlManager();
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GMSSqlMgr = exports.MssqlReturn = exports.MSSqlConfig = void 0;
+const mssql = require("mssql");
+const DBCache_1 = require("./Decorator/DBCache");
+class MSSqlConfig {
+    open = false;
+    auto = false;
+    domain = '127.0.0.1';
+    port = 3306;
+    user = 'root';
+    password = 'root';
+    database = 'gameall';
+    charset = 'utf8mb4';
+}
+exports.MSSqlConfig = MSSqlConfig;
+class MssqlReturn {
+    error = null;
+    fields = null;
+    list = null;
+}
+exports.MssqlReturn = MssqlReturn;
+exports.GMSSqlMgr = null;
+class MSSqlManager {
+    _init_cbs = [];
+    _pool = null;
+    get pool() {
+        return this._pool;
+    }
+    get isValid() {
+        return !!this._pool;
+    }
+    constructor() {
+    }
+    async init(cfg) {
+        if (this._pool
+            || !cfg
+            || !cfg.open) {
+            return;
+        }
+        this._pool = await mssql.connect(cfg);
+        console.log("mssql config=" + JSON.stringify(cfg));
+        //这个的初始化位置不能变，必须位于cbs前，pool后
+        await DBCache_1.GDBCache.init();
+        for (let i = 0; i < this._init_cbs.length; ++i) {
+            this._init_cbs[i]();
+        }
+    }
+    registerInitCb(cb) {
+        this._init_cbs.push(cb);
+    }
+}
+exports.GMSSqlMgr = new MSSqlManager();

package/dist/lib/Framework/Database/MongoBaseService.js

@@ -1,117 +1,126 @@
-"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 mongoDb() {
-        return MongoManager_1.GMongoMgr.mongoDb;
-    }
-    _t_type = null;
-    constructor(table, type) {
-        this._t_type = type;
-        this._table = table;
-    }
-    async getNextId(key) {
-        if (!key) {
-            key = this._table;
-        }
-        let id = await MongoManager_1.GMongoMgr.getAutoIds(this._table);
-        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);
-        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;
-    }
-    /**
-     * 仅仅支持一级
-     * @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];
-    }
-}
-exports.MongoBaseService = MongoBaseService;
+"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 mongoDb() {
+        return MongoManager_1.GMongoMgr.mongoDb;
+    }
+    _t_type = null;
+    constructor(table, type) {
+        this._t_type = type;
+        this._table = table;
+    }
+    async getNextId(key) {
+        if (!key) {
+            key = this._table;
+        }
+        let id = await MongoManager_1.GMongoMgr.getAutoIds(this._table);
+        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(property, where) {
+        if (property) {
+            property = { projection: property };
+        }
+        let rs = await MongoManager_1.GMongoMgr.findOne(this._table, property, 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) {
+        if (property) {
+            property = { projection: property };
+        }
+        let rs = await MongoManager_1.GMongoMgr.findMany(this._table, property, where, sort, skip, limit);
+        return rs.list;
+    }
+    async getRandoms(num, property, where) {
+        if (property) {
+            property = { projection: property };
+        }
+        let rs = await MongoManager_1.GMongoMgr.simpleAggregate(this._table, property, 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);
+        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;
+    }
+    /**
+     * 仅仅支持一级
+     * @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];
+    }
+}
+exports.MongoBaseService = MongoBaseService;