cgserver 10.0.4 → 10.0.6

package/README.md

@@ -1,3 +1,5 @@
+10.0.1-10.0.7
+1、一些列优化和bug修正
 10.0.0
 1、老项目切忌不要轻易升级
 2、老项目切忌不要轻易升级

package/dist/lib/Framework/Config/DbConfig.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbConfig = void 0;
-const MSSqlManager_1 = require("../Database/MSSqlManager");
-const MysqlManager_1 = require("../Database/MysqlManager");
-const RedisManager_1 = require("../Database/RedisManager");
+const MSSqlManager_1 = require("../Database/MSSql/MSSqlManager");
+const MysqlManager_1 = require("../Database/Mysql/MysqlManager");
+const RedisManager_1 = require("../Database/Redis/RedisManager");
 class DbConfig {
     redis = new RedisManager_1.RedisConfig();
     mongos = [];

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

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gMSSqlMgr = exports.MSSqlManager = 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;
+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.MSSqlManager = MSSqlManager;
+exports.gMSSqlMgr = new MSSqlManager();

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

@@ -42,7 +42,7 @@ class MongoBaseService {
      * @param id
      */
     async getById(id) {
-        let rs = await this.mongoDb.findOne(this._table, null, { id: id });
+        let rs = await this.mongoDb.findOne(this._table, { id: id });
         return rs.one;
     }
     async get(where = null, property = null) {

package/dist/lib/Framework/Database/Mongo/MongoManager.js

@@ -189,6 +189,9 @@ class MongoExt {
      * @param collection
      */
     async findOne(collection, where = {}, property = {}) {
+        if (!where) {
+            where = {};
+        }
         this._convertWhere(where);
         let rs = { errcode: null, one: null };
         if (!this._mongoDb) {
@@ -209,6 +212,9 @@ class MongoExt {
         return rs;
     }
     async findMany(collection, where = {}, property = {}, sort, skip = 0, limit = 0) {
+        if (!where) {
+            where = {};
+        }
         this._convertWhere(where);
         let rs = { errcode: null, list: null };
         if (!this._mongoDb) {

package/dist/lib/Framework/Database/Mysql/MysqlBaseService.js

@@ -0,0 +1,280 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MysqlBaseService = exports.BaseModel = void 0;
+const Log_1 = require("../../Logic/Log");
+const DBCache_1 = require("../Decorator/DBCache");
+const Property_1 = require("../Decorator/Property");
+const MysqlManager_1 = require("./MysqlManager");
+class BaseModel {
+}
+exports.BaseModel = BaseModel;
+class MysqlBaseService {
+    _table = "";
+    get table() {
+        return this._table;
+    }
+    get version() {
+        let table = this._t_type.prototype[Property_1.TableProperty.key];
+        return table.version;
+    }
+    _inited = false;
+    get isInited() {
+        return this._inited;
+    }
+    _t_type = null;
+    constructor(type) {
+        this._t_type = type;
+        if (MysqlManager_1.gMysqlMgr.isValid) {
+            this._init();
+        }
+        else {
+            MysqlManager_1.gMysqlMgr.registerInitCb(this._init.bind(this));
+        }
+    }
+    async _init() {
+        if (this._inited) {
+            return;
+        }
+        this._inited = true;
+        let table = this._t_type.prototype[Property_1.TableProperty.key];
+        if (!table || !table.table) {
+            throw new Error("数据表的类必须要具有Table装饰器");
+        }
+        this._table = "`" + table.table + "`";
+        if (!MysqlManager_1.gMysqlMgr.cfg.auto) {
+            //未开启自动创建数据表
+            return;
+        }
+        let droped = await this._checkDropTable(table.version);
+        if (!droped) {
+            Log_1.gLog.info("table(" + this._table + ")无需升级...");
+            //既然版本号没变，就快速返回
+            return;
+        }
+        let primary_key = null;
+        let sql = "create table if not exists " + this._table + " (";
+        for (let key in table.items) {
+            let item = table.items[key];
+            sql += "`" + key + "`" + " " + item.type;
+            if (item.type == Property_1.EPropertyType.Varchar
+                || item.type == Property_1.EPropertyType.Char
+                || item.type == Property_1.EPropertyType.NVarchar) {
+                sql += "(" + item.type_len + ")";
+            }
+            if (item.is_notnull) {
+                sql += " not null";
+            }
+            if (item.default != undefined && !item.is_primary) {
+                sql += " default \'" + item.default + "\'";
+            }
+            if (item.auto_increment) {
+                sql += " auto_increment";
+            }
+            if (item.is_primary) {
+                primary_key = key;
+            }
+            sql += ",";
+        }
+        if (primary_key) {
+            sql += "primary key (`" + primary_key + "`),";
+            sql += "unique key `" + primary_key + "_unique` (`" + primary_key + "`)";
+        }
+        else {
+            //去掉最后一个逗号
+            sql = sql.substr(0, sql.length - 1);
+        }
+        sql += ")";
+        sql += " engine=" + table.engine;
+        if (table.auto_increment != null) {
+            sql += " auto_increment=" + table.auto_increment;
+        }
+        sql += " default charset=" + table.charset;
+        if (table.comment) {
+            sql += " comment=\'" + table.comment + "\';";
+        }
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql);
+        if (sr.error) {
+            Log_1.gLog.error(sr.error);
+            throw Error("table(" + this._table + ")创建失败...");
+        }
+        else {
+            DBCache_1.gDbCache.setVersion(this.table, table.version);
+            Log_1.gLog.info("table(" + this._table + ")初始化成功...");
+            await this._onReCreated();
+        }
+    }
+    async _onReCreated() {
+    }
+    async _onDroped() {
+    }
+    async _checkDropTable(cur_version) {
+        let local_version = DBCache_1.gDbCache.getVersion(this._table);
+        if (local_version == cur_version) {
+            return false;
+        }
+        let sql = "drop table if exists " + this._table;
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql);
+        if (sr.error) {
+            Log_1.gLog.error(sr.error);
+            throw Error(sr.error);
+        }
+        else {
+            Log_1.gLog.info("table(" + this._table + ")删除成功...");
+            await this._onDroped();
+        }
+        return true;
+    }
+    /**
+     * 没有id的表不能使用该函数
+     * @param id
+     */
+    async getById(id) {
+        let tm = null;
+        let sr = await MysqlManager_1.gMysqlMgr.query("select * from " + this._table + " where id=? limit 1", [id]);
+        if (sr.error || sr.queryResult.length <= 0) {
+            return tm;
+        }
+        tm = sr.result[0];
+        return tm;
+    }
+    async get(proterty, where, args) {
+        let sql = "select ";
+        sql += proterty || "*";
+        sql += " from " + this._table;
+        if (where) {
+            sql += " where " + where;
+        }
+        sql += " limit 1";
+        let tm = null;
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
+        if (sr.queryResult && sr.queryResult.length > 0) {
+            tm = sr.queryResult[0];
+        }
+        return tm;
+    }
+    async getTotal(where, args) {
+        let sql = "select ";
+        sql += "count(*) as num";
+        sql += " from " + this._table;
+        if (where) {
+            sql += " where " + where;
+        }
+        let total = 0;
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
+        if (sr.queryResult && sr.queryResult.length > 0) {
+            total = sr.queryResult[0].num || 0;
+        }
+        return total;
+    }
+    async gets(proterty, where, args) {
+        let sql = "select ";
+        sql += proterty || "*";
+        sql += " from " + this._table;
+        if (where) {
+            sql += " where " + where;
+        }
+        let tms = null;
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
+        tms = sr.queryResult;
+        return tms;
+    }
+    async getCount(where, args) {
+        let sql = "select count(*) as num from " + this._table;
+        if (where) {
+            sql += " where " + where;
+        }
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
+        if (sr.error || sr.queryResult.length <= 0) {
+            return 0;
+        }
+        return sr.result[0]["num"] || 0;
+    }
+    async getRandoms(num, proterty, where, args) {
+        num = num || 5;
+        let sql = "select ";
+        sql += proterty || "*";
+        sql += " from " + this._table;
+        if (where) {
+            sql += " where " + where;
+        }
+        sql += " order by rand() limit ?";
+        args = args || [];
+        args.push(num);
+        let tms = null;
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
+        tms = sr.queryResult;
+        return tms;
+    }
+    async updateProperty(set, where, args, limit) {
+        let sql = "update " + this._table + " set ";
+        if (set) {
+            sql += set;
+        }
+        else {
+            sql += "?";
+        }
+        if (where) {
+            sql += " where " + where;
+        }
+        if (limit) {
+            sql += " limit " + limit;
+        }
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
+        return sr;
+    }
+    async update(model, where, args, limit) {
+        let sql = "update " + this._table + " set ?";
+        if (!where) {
+            where = " id=?";
+        }
+        sql += " where " + where;
+        let id = model["id"];
+        delete model["id"];
+        let u_m = JSON.parse(JSON.stringify(model));
+        if (!args) {
+            args = [u_m, id];
+        }
+        else {
+            args.unshift(u_m);
+        }
+        if (limit) {
+            sql += " limit " + limit;
+        }
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
+        if (id) {
+            model["id"] = id;
+        }
+        return sr;
+    }
+    async insert(model, ip) {
+        let table = model[Property_1.TableProperty.key];
+        let id_property = table.items["id"];
+        if (id_property) {
+            if (id_property.auto_increment) {
+                delete model["id"];
+            }
+        }
+        if (table.items["create_time"] && model["create_time"] <= 0) {
+            model["create_time"] = Date.now();
+        }
+        if (table.items["create_ip"] && ip) {
+            model["create_ip"] = ip;
+        }
+        let sql = "insert into " + this._table + " set ?";
+        //这步的做法是为了去掉model种的TableProperty.key(___table___)
+        model = JSON.parse(JSON.stringify(model));
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, [model]);
+        return sr;
+    }
+    async removeById(id) {
+        let sql = "delete from " + this._table + " where id=?";
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, [id]);
+        return sr;
+    }
+    async remove(where, args) {
+        let sql = "delete from " + this._table + " where " + where;
+        let sr = await MysqlManager_1.gMysqlMgr.query(sql, args);
+        return sr;
+    }
+}
+exports.MysqlBaseService = MysqlBaseService;

package/dist/lib/Framework/Database/Mysql/MysqlManager.js

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gMysqlMgr = exports.MysqlManager = exports.SqlReturns = exports.SqlReturn = exports.MysqlConfig = void 0;
+const Log_1 = require("../../Logic/Log");
+const _error_1 = require("../../Config/_error_");
+const mysql2 = require("mysql2/promise");
+const DBCache_1 = require("../Decorator/DBCache");
+class MysqlConfig {
+    open = false;
+    auto = false;
+    poolcfg = null;
+}
+exports.MysqlConfig = MysqlConfig;
+class SqlReturn {
+    error = null;
+    result = null;
+    fields = null;
+    get queryResult() {
+        return this.result;
+    }
+    get execResult() {
+        return this.result;
+    }
+}
+exports.SqlReturn = SqlReturn;
+class SqlReturns {
+    error = null;
+    srs = [];
+}
+exports.SqlReturns = SqlReturns;
+class MysqlManager {
+    _init_cbs = [];
+    _pool = null;
+    get isValid() {
+        return !!this._pool;
+    }
+    _cfg = null;
+    get cfg() {
+        return this._cfg;
+    }
+    constructor() {
+    }
+    async init(cfg) {
+        if (this._pool
+            || !cfg
+            || !cfg.open) {
+            return;
+        }
+        this._cfg = cfg;
+        this._pool = mysql2.createPool(cfg.poolcfg);
+        console.log("mysql config=" + JSON.stringify(cfg));
+        //这个的初始化位置不能变，必须位于cbs前，pool后
+        if (cfg.auto) {
+            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);
+    }
+    async query(sqlStr, values) {
+        let sr = new SqlReturn();
+        if (!this._pool) {
+            //表示没有开通数据库，不用记录错误日志
+            sr.error = _error_1.EErrorCode.No_Mysql;
+            Log_1.gLog.error(sr.error);
+            return sr;
+        }
+        try {
+            const [result, fields] = await this._pool.query(sqlStr, values);
+            sr.result = result;
+            sr.fields = fields;
+        }
+        catch (error) {
+            sr.error = _error_1.EErrorCode.No_Mysql;
+            Log_1.gLog.error(sr.error);
+            return sr;
+        }
+        return sr;
+    }
+    async transaction(sqls) {
+        let srs = new SqlReturns();
+        try {
+            await this._pool.beginTransaction();
+            for (let i = 0; i < sqls.length; ++i) {
+                let sql = sqls[i];
+                let sr = await this.query(sql.sql, sql.values);
+                if (sr.error) {
+                    srs.error = sr.error;
+                    await this._pool.rollback();
+                    return srs;
+                }
+            }
+            await this._pool.commit();
+        }
+        catch (err) {
+            srs.error = err;
+            Log_1.gLog.error(err);
+        }
+    }
+}
+exports.MysqlManager = MysqlManager;
+exports.gMysqlMgr = new MysqlManager();

package/dist/lib/Framework/Database/Redis/RedisManager.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.gRedisMgr = exports.RedisManager = exports.RedisConfig = void 0;
+const redis = require("redis");
+const Log_1 = require("../../Logic/Log");
+class RedisConfig {
+    open = false;
+    host = "127.0.0.1";
+    port = 6379;
+    database = 0;
+    password = null;
+}
+exports.RedisConfig = RedisConfig;
+class RedisManager {
+    _redis = null;
+    get redis() {
+        return this._redis;
+    }
+    _redisCfg = null;
+    async init(redisCfg) {
+        let p = new Promise((resolve) => {
+            if (!redisCfg || !redisCfg.open) {
+                resolve(null);
+                return;
+            }
+            if (this._redis) {
+                resolve(null);
+                return;
+            }
+            this._redisCfg = redisCfg;
+            Log_1.gLog.info("begin connect redis=" + JSON.stringify(redisCfg));
+            this._redis = redis.createClient(redisCfg);
+            this._redis.on("connect", () => {
+                this.onConnect();
+                resolve(null);
+            });
+            this._redis.on("end", this.onEnd.bind(this));
+            this._redis.on("error", this.onError.bind(this));
+        });
+        let ret = await p;
+        for (let key in this._redis) {
+            if (typeof this._redis[key] == "function") {
+                this[key] = this._redis[key].bind(this._redis);
+            }
+        }
+        return ret;
+    }
+    onConnect() {
+        Log_1.gLog.info("redis has connected!");
+    }
+    onEnd() {
+        this._redis = null;
+        this.init(this._redisCfg); //重连
+    }
+    onError(err) {
+        Log_1.gLog.info("Error connected=" + this._redis + ": " + err);
+    }
+}
+exports.RedisManager = RedisManager;
+exports.gRedisMgr = new RedisManager();

package/dist/lib/Framework/Service/MongoAccountService.js

@@ -86,7 +86,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
      * @param openid
      */
     async getByThird(unionid, openid) {
-        let am = await this.get(null, { unionid: unionid, openid: openid });
+        let am = await this.get({ unionid: unionid, openid: openid });
         return am;
     }
     /**
@@ -94,11 +94,11 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
      * @param unionid
      */
     async getByUnionid(unionid) {
-        let am = await this.get(null, { unionid: unionid });
+        let am = await this.get({ unionid: unionid });
         return am;
     }
     async getByPhone(phone) {
-        let am = await this.get(null, { phone: phone + "" });
+        let am = await this.get({ phone: phone + "" });
         return am;
     }
     /**
@@ -229,7 +229,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
         }
         account.login_time = Date.now();
         account.login_ip = ip;
-        this.updateOne({ login_time: account.login_time, login_ip: account.login_ip }, { id: account.id });
+        this.updateOne({ id: account.id }, { login_time: account.login_time, login_ip: account.login_ip });
         rs.account = account;
         return rs;
     }

package/dist/lib/Framework/Service/MysqlAccountService.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlAccountService = exports.MysqlAccountModel = void 0;
 const Property_1 = require("../Database/Decorator/Property");
-const MysqlBaseService_1 = require("../Database/MysqlBaseService");
+const MysqlBaseService_1 = require("../Database/Mysql/MysqlBaseService");
 const _error_1 = require("../Config/_error_");
 const MysqlUserService_1 = require("./MysqlUserService");
 const Table_1 = require("../Database/Decorator/Table");

package/dist/lib/Framework/Service/MysqlUserService.js

@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MysqlUserService = exports.GUserSer = exports.MysqlUserModel = void 0;
 const _ = require("underscore");
-const MysqlBaseService_1 = require("../Database/MysqlBaseService");
+const MysqlBaseService_1 = require("../Database/Mysql/MysqlBaseService");
 const PrimaryKey_1 = require("../Database/Decorator/PrimaryKey");
 const NotNull_1 = require("../Database/Decorator/NotNull");
 const Property_1 = require("../Database/Decorator/Property");

package/dist/lib/Framework/WebServer/Controller/MongoBaseUserController.js

@@ -7,7 +7,7 @@ const MongoCacheService_1 = require("../../Service/MongoCacheService");
 const ini_1 = require("../../Service/ini");
 const MongoUserService_1 = require("../../Service/MongoUserService");
 const CacheTool_1 = require("../../Logic/CacheTool");
-const RedisManager_1 = require("../../Database/RedisManager");
+const RedisManager_1 = require("../../Database/Redis/RedisManager");
 class MongoBaseUserController extends BaseController_1.BaseController {
     _user_session_id = "user_session_id";
     _self_user = null;
@@ -138,7 +138,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             cm.key = this._session_id;
             cm.data = user.id;
             cm.expireAt = Date.now() + time * 1000;
-            MongoCacheService_1.gMongoCacheSer.updateOne(cm, { key: cm.key }, true);
+            MongoCacheService_1.gMongoCacheSer.updateOne({ key: cm.key }, cm, true);
         }
         this._self_user = user;
     }

package/dist/lib/Framework/WebServer/Controller/MysqlBaseUserController.js

@@ -7,7 +7,7 @@ const FrameworkConfig_1 = require("../../Config/FrameworkConfig");
 const MongoCacheService_1 = require("../../Service/MongoCacheService");
 const ini_1 = require("../../Service/ini");
 const CacheTool_1 = require("../../Logic/CacheTool");
-const RedisManager_1 = require("../../Database/RedisManager");
+const RedisManager_1 = require("../../Database/Redis/RedisManager");
 class MysqlBaseUserController extends BaseController_1.BaseController {
     _user_session_id = "user_session_id";
     _self_user = null;
@@ -138,7 +138,7 @@ class MysqlBaseUserController extends BaseController_1.BaseController {
             cm.key = this._session_id;
             cm.data = user.id;
             cm.expireAt = Date.now() + time * 1000;
-            MongoCacheService_1.gMongoCacheSer.updateOne(cm, { key: cm.key }, true);
+            MongoCacheService_1.gMongoCacheSer.updateOne({ key: cm.key }, cm, true);
         }
         this._self_user = user;
     }

package/dist/lib/Framework/cgserver.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.gCgServer = exports.CgServer = void 0;
 const Core_1 = require("./Core/Core");
 const Config_1 = require("./Config/Config");
-const MSSqlManager_1 = require("./Database/MSSqlManager");
-const RedisManager_1 = require("./Database/RedisManager");
-const MysqlManager_1 = require("./Database/MysqlManager");
+const MSSqlManager_1 = require("./Database/MSSql/MSSqlManager");
+const MysqlManager_1 = require("./Database/Mysql/MysqlManager");
 const MongoManager_1 = require("./Database/Mongo/MongoManager");
 const Log_1 = require("./Logic/Log");
 const EventTool_1 = require("./Logic/EventTool");
+const RedisManager_1 = require("./Database/Redis/RedisManager");
 class CgServer {
     _webservers = [];
     get webServers() {

package/dist/lib/Framework/global.js

@@ -4,11 +4,10 @@ exports.global = void 0;
 const TriggerMgr_1 = require("./AI/TriggerMgr");
 const ByteTool_1 = require("./Core/ByteTool");
 const DBCache_1 = require("./Database/Decorator/DBCache");
-const MSSqlManager_1 = require("./Database/MSSqlManager");
+const MSSqlManager_1 = require("./Database/MSSql/MSSqlManager");
 const MongoManager_1 = require("./Database/Mongo/MongoManager");
 const MongoServiceManager_1 = require("./Database/Mongo/MongoServiceManager");
-const MysqlManager_1 = require("./Database/MysqlManager");
-const RedisManager_1 = require("./Database/RedisManager");
+const MysqlManager_1 = require("./Database/Mysql/MysqlManager");
 const CacheTool_1 = require("./Logic/CacheTool");
 const EventTool_1 = require("./Logic/EventTool");
 const HttpTool_1 = require("./Logic/HttpTool");
@@ -26,6 +25,7 @@ const WechatTool_1 = require("./ThirdParty/WechatTool");
 const ControllerManager_1 = require("./WebServer/Engine/ControllerManager");
 const cgserver_1 = require("./cgserver");
 const Core_1 = require("./Core/Core");
+const RedisManager_1 = require("./Database/Redis/RedisManager");
 /**
  * cg引擎的，全局对象
  */

package/dist/lib/Framework/index_export_.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.RedisConfig = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheModel = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.RedisManager = exports.SqlReturns = exports.SqlReturn = exports.MysqlBaseService = exports.MongoExt = exports.MongoManager = exports.MongoBaseModel = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.MongoServiceManager = void 0;
+exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.RedisManager = exports.RedisConfig = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheModel = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.SqlReturns = exports.SqlReturn = exports.MysqlBaseService = exports.MongoExt = exports.MongoManager = exports.MongoBaseModel = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.MongoServiceManager = void 0;
 exports.global = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.AlipayCallBack = exports.AlipayResult = exports.BaseMsg = exports.IWebSocket = void 0;
 var MongoServiceManager_1 = require("./Database/Mongo/MongoServiceManager");
 Object.defineProperty(exports, "MongoServiceManager", { enumerable: true, get: function () { return MongoServiceManager_1.MongoServiceManager; } });
@@ -45,19 +45,17 @@ Object.defineProperty(exports, "EPropertyType", { enumerable: true, get: functio
 ///数据库相关
 var MongoBaseService_1 = require("./Database/Mongo/MongoBaseService");
 Object.defineProperty(exports, "MongoBaseService", { enumerable: true, get: function () { return MongoBaseService_1.MongoBaseService; } });
-var MysqlBaseService_1 = require("./Database/MysqlBaseService");
+var MysqlBaseService_1 = require("./Database/Mysql/MysqlBaseService");
 Object.defineProperty(exports, "MysqlBaseModel", { enumerable: true, get: function () { return MysqlBaseService_1.BaseModel; } });
 var MongoManager_1 = require("./Database/Mongo/MongoManager");
 Object.defineProperty(exports, "MongoBaseModel", { enumerable: true, get: function () { return MongoManager_1.MongoBaseModel; } });
 Object.defineProperty(exports, "MongoManager", { enumerable: true, get: function () { return MongoManager_1.MongoManager; } });
 Object.defineProperty(exports, "MongoExt", { enumerable: true, get: function () { return MongoManager_1.MongoExt; } });
-var MysqlBaseService_2 = require("./Database/MysqlBaseService");
+var MysqlBaseService_2 = require("./Database/Mysql/MysqlBaseService");
 Object.defineProperty(exports, "MysqlBaseService", { enumerable: true, get: function () { return MysqlBaseService_2.MysqlBaseService; } });
-var MysqlManager_1 = require("./Database/MysqlManager");
+var MysqlManager_1 = require("./Database/Mysql/MysqlManager");
 Object.defineProperty(exports, "SqlReturn", { enumerable: true, get: function () { return MysqlManager_1.SqlReturn; } });
 Object.defineProperty(exports, "SqlReturns", { enumerable: true, get: function () { return MysqlManager_1.SqlReturns; } });
-var RedisManager_1 = require("./Database/RedisManager");
-Object.defineProperty(exports, "RedisManager", { enumerable: true, get: function () { return RedisManager_1.RedisManager; } });
 var ini_1 = require("./Service/ini");
 Object.defineProperty(exports, "ERoleGroup", { enumerable: true, get: function () { return ini_1.ERoleGroup; } });
 Object.defineProperty(exports, "EUserState", { enumerable: true, get: function () { return ini_1.EUserState; } });
@@ -78,14 +76,15 @@ var MongoCacheService_1 = require("./Service/MongoCacheService");
 Object.defineProperty(exports, "MongoCacheModel", { enumerable: true, get: function () { return MongoCacheService_1.MongoCacheModel; } });
 var DbConfig_1 = require("./Config/DbConfig");
 Object.defineProperty(exports, "DbConfig", { enumerable: true, get: function () { return DbConfig_1.DbConfig; } });
-var MSSqlManager_1 = require("./Database/MSSqlManager");
+var MSSqlManager_1 = require("./Database/MSSql/MSSqlManager");
 Object.defineProperty(exports, "MSSqlConfig", { enumerable: true, get: function () { return MSSqlManager_1.MSSqlConfig; } });
 var MongoManager_2 = require("./Database/Mongo/MongoManager");
 Object.defineProperty(exports, "MongoConfig", { enumerable: true, get: function () { return MongoManager_2.MongoConfig; } });
-var MysqlManager_2 = require("./Database/MysqlManager");
+var MysqlManager_2 = require("./Database/Mysql/MysqlManager");
 Object.defineProperty(exports, "MysqlConfig", { enumerable: true, get: function () { return MysqlManager_2.MysqlConfig; } });
-var RedisManager_2 = require("./Database/RedisManager");
-Object.defineProperty(exports, "RedisConfig", { enumerable: true, get: function () { return RedisManager_2.RedisConfig; } });
+var RedisManager_1 = require("./Database/Redis/RedisManager");
+Object.defineProperty(exports, "RedisConfig", { enumerable: true, get: function () { return RedisManager_1.RedisConfig; } });
+Object.defineProperty(exports, "RedisManager", { enumerable: true, get: function () { return RedisManager_1.RedisManager; } });
 var IProtoFilter_1 = require("./SocketServer/ProtoFilter/IProtoFilter");
 Object.defineProperty(exports, "EProtoType", { enumerable: true, get: function () { return IProtoFilter_1.EProtoType; } });
 var GoogleProtoFilter_1 = require("./SocketServer/ProtoFilter/GoogleProtoFilter");

package/dist/types/Framework/Config/DbConfig.d.ts

@@ -1,7 +1,7 @@
-import { MSSqlConfig } from "../Database/MSSqlManager";
+import { MSSqlConfig } from "../Database/MSSql/MSSqlManager";
 import { MongoConfig } from "../Database/Mongo/MongoManager";
-import { MysqlConfig } from "../Database/MysqlManager";
-import { RedisConfig } from "../Database/RedisManager";
+import { MysqlConfig } from "../Database/Mysql/MysqlManager";
+import { RedisConfig } from "../Database/Redis/RedisManager";
 export declare class DbConfig {
     redis: RedisConfig;
     mongos: MongoConfig[];

package/dist/types/Framework/Database/MSSql/MSSqlManager.d.ts

@@ -0,0 +1,26 @@
+import * as mssql from "mssql";
+export declare class MSSqlConfig {
+    open: boolean;
+    auto: boolean;
+    domain: string;
+    port: number;
+    user: string;
+    password: string;
+    database: string;
+    charset: string;
+}
+export declare class MssqlReturn {
+    error: any;
+    fields: any;
+    list: Array<any>;
+}
+export declare class MSSqlManager {
+    protected _init_cbs: any[];
+    protected _pool: mssql.ConnectionPool;
+    get pool(): mssql.ConnectionPool;
+    get isValid(): boolean;
+    constructor();
+    init(cfg: MSSqlConfig): Promise<void>;
+    registerInitCb(cb: Function): void;
+}
+export declare let gMSSqlMgr: MSSqlManager;

package/dist/types/Framework/Database/Mysql/MysqlBaseService.d.ts

@@ -0,0 +1,34 @@
+export declare class BaseModel {
+}
+export declare class MysqlBaseService<T extends BaseModel> {
+    protected _table: string;
+    get table(): string;
+    get version(): number;
+    protected _inited: boolean;
+    get isInited(): boolean;
+    protected _t_type: {
+        new (): T;
+    };
+    constructor(type: {
+        new (): T;
+    });
+    protected _init(): Promise<void>;
+    protected _onReCreated(): Promise<void>;
+    protected _onDroped(): Promise<void>;
+    protected _checkDropTable(cur_version: number): Promise<boolean>;
+    /**
+     * 没有id的表不能使用该函数
+     * @param id
+     */
+    getById(id: any): Promise<T>;
+    get(proterty?: string, where?: string, args?: Array<any>): Promise<any>;
+    getTotal(where?: string, args?: Array<any>): Promise<number>;
+    gets(proterty?: string, where?: string, args?: Array<any>): Promise<any[]>;
+    getCount(where?: string, args?: Array<any>): Promise<any>;
+    getRandoms(num: number, proterty?: string, where?: string, args?: Array<any>): Promise<any[]>;
+    updateProperty(set: string, where?: string, args?: Array<any>, limit?: number): Promise<import("./MysqlManager").SqlReturn>;
+    update(model: T, where?: string, args?: Array<any>, limit?: number): Promise<import("./MysqlManager").SqlReturn>;
+    insert(model: T, ip?: string): Promise<import("./MysqlManager").SqlReturn>;
+    removeById(id: any): Promise<import("./MysqlManager").SqlReturn>;
+    remove(where: string, args?: Array<any>): Promise<import("./MysqlManager").SqlReturn>;
+}

package/dist/types/Framework/Database/Mysql/MysqlManager.d.ts

@@ -0,0 +1,30 @@
+import * as mysql2 from 'mysql2/promise';
+export declare class MysqlConfig {
+    open: boolean;
+    auto: boolean;
+    poolcfg: mysql2.PoolOptions;
+}
+export declare class SqlReturn {
+    error: any;
+    result: mysql2.QueryResult;
+    fields: any;
+    get queryResult(): mysql2.RowDataPacket[];
+    get execResult(): mysql2.ResultSetHeader;
+}
+export declare class SqlReturns {
+    error: any;
+    srs: Array<mysql2.QueryResult>;
+}
+export declare class MysqlManager {
+    protected _init_cbs: any[];
+    protected _pool: mysql2.Pool;
+    get isValid(): boolean;
+    protected _cfg: MysqlConfig;
+    get cfg(): MysqlConfig;
+    constructor();
+    init(cfg: MysqlConfig): Promise<void>;
+    registerInitCb(cb: Function): void;
+    query(sqlStr: string, values?: any): Promise<SqlReturn>;
+    transaction(sqls: any[]): Promise<SqlReturns>;
+}
+export declare let gMysqlMgr: MysqlManager;

package/dist/types/Framework/Database/Redis/RedisManager.d.ts

@@ -0,0 +1,24 @@
+import * as redis from 'redis';
+export declare class RedisConfig {
+    open: boolean;
+    host: string;
+    port: number;
+    database: number;
+    password: any;
+}
+type RedisClientType = redis.RedisClientType<redis.RedisDefaultModules & redis.RedisModules, redis.RedisFunctions, redis.RedisScripts>;
+export declare class RedisManager {
+    protected _redis: RedisClientType;
+    get redis(): RedisClientType;
+    protected _redisCfg: {
+        open: boolean;
+    } & redis.RedisClientOptions;
+    init(redisCfg: {
+        open: boolean;
+    } & redis.RedisClientOptions): Promise<unknown>;
+    onConnect(): void;
+    onEnd(): void;
+    onError(err: any): void;
+}
+export declare let gRedisMgr: RedisManager;
+export {};

package/dist/types/Framework/Service/MysqlAccountService.d.ts

@@ -1,4 +1,4 @@
-import { BaseModel, MysqlBaseService } from '../Database/MysqlBaseService';
+import { BaseModel, MysqlBaseService } from '../Database/Mysql/MysqlBaseService';
 import { MysqlUserModel } from './MysqlUserService';
 import { EAccountFrom } from './ini';
 export declare class MysqlAccountModel extends BaseModel {

package/dist/types/Framework/Service/MysqlUserService.d.ts

@@ -1,4 +1,4 @@
-import { MysqlBaseService, BaseModel } from "../Database/MysqlBaseService";
+import { MysqlBaseService, BaseModel } from "../Database/Mysql/MysqlBaseService";
 import { ERoleGroup } from "./ini";
 export declare class MysqlUserModel extends BaseModel {
     id: number;

package/dist/types/Framework/global.d.ts

@@ -8,9 +8,9 @@ export declare class global {
     static gDbCache: import("./Database/Decorator/DBCache").DBCache;
     static gTriggerMgr: import("./AI/TriggerMgr").TriggerManager;
     static gMongoMgr: import("./Database/Mongo/MongoManager").MongoManager;
-    static gMSSqlMgr: import("./Database/MSSqlManager").MSSqlManager;
-    static gMysqlMgr: import("./Database/MysqlManager").MysqlManager;
-    static gRedisMgr: import("./Database/RedisManager").RedisManager;
+    static gMSSqlMgr: import("./Database/MSSql/MSSqlManager").MSSqlManager;
+    static gMysqlMgr: import("./Database/Mysql/MysqlManager").MysqlManager;
+    static gRedisMgr: import("./Database/Redis/RedisManager").RedisManager;
     static gCacheTool: import("./Logic/CacheTool").CacheTool;
     static gHttpTool: import("./Logic/HttpTool").HttpTool;
     static gLog: import("./Logic/Log").Log;

package/dist/types/Framework/index_export_.d.ts

@@ -19,11 +19,10 @@ export { Table } from './Database/Decorator/Table';
 export { Type } from './Database/Decorator/Type';
 export { EPropertyType } from './Database/Decorator/Property';
 export { MongoBaseService } from './Database/Mongo/MongoBaseService';
-export { BaseModel as MysqlBaseModel } from './Database/MysqlBaseService';
+export { BaseModel as MysqlBaseModel } from './Database/Mysql/MysqlBaseService';
 export { MongoBaseModel, MongoManager, MongoExt } from './Database/Mongo/MongoManager';
-export { MysqlBaseService } from './Database/MysqlBaseService';
-export { SqlReturn, SqlReturns } from './Database/MysqlManager';
-export { RedisManager } from './Database/RedisManager';
+export { MysqlBaseService } from './Database/Mysql/MysqlBaseService';
+export { SqlReturn, SqlReturns } from './Database/Mysql/MysqlManager';
 export { ERoleGroup, EUserState, EAccountFrom } from './Service/ini';
 export { MysqlAccountService } from './Service/MysqlAccountService';
 export { MongoAccountService } from './Service/MongoAccountService';
@@ -33,10 +32,10 @@ export { MysqlUserModel } from './Service/MysqlUserService';
 export { MongoUserModel } from './Service/MongoUserService';
 export { MongoCacheModel } from './Service/MongoCacheService';
 export { DbConfig } from './Config/DbConfig';
-export { MSSqlConfig } from './Database/MSSqlManager';
+export { MSSqlConfig } from './Database/MSSql/MSSqlManager';
 export { MongoConfig } from './Database/Mongo/MongoManager';
-export { MysqlConfig } from './Database/MysqlManager';
-export { RedisConfig } from './Database/RedisManager';
+export { MysqlConfig } from './Database/Mysql/MysqlManager';
+export { RedisConfig, RedisManager } from './Database/Redis/RedisManager';
 export { EProtoType } from './SocketServer/ProtoFilter/IProtoFilter';
 export { GoogleProtoFilter } from './SocketServer/ProtoFilter/GoogleProtoFilter';
 export { IProtoFilter } from './SocketServer/ProtoFilter/IProtoFilter';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "10.0.4",
+  "version": "10.0.6",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",