cgserver 9.0.7 → 9.1.0

package/README.md

@@ -1,3 +1,7 @@
+9.1.0
+1、支持多mongo示例
+2、支持多service实例
+ps:新的service必须是无参数得constructor
 9.0.7(重要修复)
 1、修复createFilter的bug
 9.0.6(修复bug)

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

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbConfig = void 0;
 const MSSqlManager_1 = require("../Database/MSSqlManager");
-const MongoManager_1 = require("../Database/MongoManager");
 const MysqlManager_1 = require("../Database/MysqlManager");
 const RedisManager_1 = require("../Database/RedisManager");
 class DbConfig {
     redis = new RedisManager_1.RedisConfig();
-    mongo = new MongoManager_1.MongoConfig();
+    mongos = [];
+    mongo = null;
     mysql = new MysqlManager_1.MysqlConfig();
     mssql = new MSSqlManager_1.MSSqlConfig();
 }

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoBaseService = void 0;
 const MongoManager_1 = require("./MongoManager");
+const MongoServiceManager_1 = require("./MongoServiceManager");
 class MongoBaseService {
     _table = "";
     get table() {
@@ -12,73 +13,82 @@ class MongoBaseService {
         return this._inited;
     }
     get mongoDb() {
-        return MongoManager_1.GMongoMgr.mongoDb;
+        return MongoManager_1.GMongoMgr.getMongo(this._dbname);
+    }
+    _dbname = "";
+    get dbname() {
+        if (!this._dbname) {
+            this._dbname = MongoManager_1.GMongoMgr.defdbname;
+        }
+        return this._dbname;
     }
     _t_type = null;
-    constructor(table, type) {
+    constructor(table, type, dbname = "") {
         this._t_type = type;
         this._table = table;
+        this._dbname = dbname;
+        MongoServiceManager_1.GMongoSerMgr.add(this);
     }
-    async getNextId(key) {
+    async getNextId(key = "") {
         if (!key) {
             key = this._table;
         }
-        let id = await MongoManager_1.GMongoMgr.getAutoIds(this._table);
+        let id = await this.mongoDb.getAutoIds(this._table);
         return id;
     }
     toObjectId(id) {
-        return MongoManager_1.GMongoMgr.toObjectId(id);
+        return this.mongoDb.toObjectId(id);
     }
     /**
      * 没有id(非_id)的表不能使用该函数
      * @param id
      */
     async getById(id) {
-        let rs = await MongoManager_1.GMongoMgr.findOne(this._table, null, { id: id });
+        let rs = await this.mongoDb.findOne(this._table, null, { id: id });
         return rs.one;
     }
-    async get(property, where) {
-        let rs = await MongoManager_1.GMongoMgr.findOne(this._table, property, where);
+    async get(property = null, where = null) {
+        let rs = await this.mongoDb.findOne(this._table, property, where);
         return rs.one;
     }
-    async countDocuments(where, options) {
-        let rs = await MongoManager_1.GMongoMgr.countDocuments(this._table, where);
+    async countDocuments(where = null, options) {
+        let rs = await this.mongoDb.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);
+    async gets(property = null, where = null, sort = null, skip = 0, limit = 0) {
+        let rs = await this.mongoDb.findMany(this._table, property, where, sort, skip, limit);
         return rs.list;
     }
-    async getRandoms(num, property, where) {
-        let rs = await MongoManager_1.GMongoMgr.simpleAggregate(this._table, property, where, null, num);
+    async getRandoms(num, property, where = null) {
+        let rs = await this.mongoDb.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);
+        let rs = await this.mongoDb.updateOne(this._table, model, where, upsert);
         return rs;
     }
-    async updateMany(model, where) {
-        let rs = await MongoManager_1.GMongoMgr.updateMany(this._table, model, where);
+    async updateMany(model, where = null) {
+        let rs = await this.mongoDb.updateMany(this._table, model, where);
         return rs;
     }
     async insert(model) {
-        let rs = await MongoManager_1.GMongoMgr.insertOne(this._table, model);
+        let rs = await this.mongoDb.insertOne(this._table, model);
         return rs;
     }
     async deleteOne(where) {
-        let rs = await MongoManager_1.GMongoMgr.deleteOne(this._table, where);
+        let rs = await this.mongoDb.deleteOne(this._table, where);
         return rs;
     }
     async deleteMany(where) {
-        let rs = await MongoManager_1.GMongoMgr.deleteMany(this._table, where);
+        let rs = await this.mongoDb.deleteMany(this._table, where);
         return rs;
     }
     async createIndex(index, options) {
-        let rs = await MongoManager_1.GMongoMgr.createIndex(this._table, index, options);
+        let rs = await this.mongoDb.createIndex(this._table, index, options);
         return rs;
     }
     aggregate(pipeline, options) {
-        let ret = MongoManager_1.GMongoMgr.aggregate(this._table, pipeline, options);
+        let ret = this.mongoDb.aggregate(this._table, pipeline, options);
         return ret;
     }
     /**

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoManager = exports.GMongoMgr = exports.MgReturn = exports.MrResult = exports.MongoBaseModel = exports.MongoConfig = void 0;
+exports.MongoExt = exports.GMongoMgr = exports.MongoManager = exports.MgReturn = exports.MrResult = exports.MongoBaseModel = exports.MongoConfig = void 0;
 const Log_1 = require("../Logic/Log");
 const mongo = require("mongodb");
 const _error_1 = require("../Config/_error_");
@@ -43,8 +43,41 @@ class MgReturn {
     list = [];
 }
 exports.MgReturn = MgReturn;
-exports.GMongoMgr = null;
 class MongoManager {
+    _dbs = {};
+    _defdbname = "";
+    get defdbname() {
+        return this._defdbname;
+    }
+    //初始化多个数据库，第一个open数据库为默认数据库
+    async init(cfgs) {
+        for (let i = 0; i < cfgs.length; ++i) {
+            let cfg = cfgs[i];
+            if (this._dbs[cfg.database]) {
+                Log_1.GLog.error("数据库配置得database不能相同!database=" + cfg.database);
+                return false;
+            }
+            let mongoext = new MongoExt();
+            let ret = await mongoext.init(cfg);
+            if (!ret) {
+                Log_1.GLog.error("数据库初始化失败!cfg=" + JSON.stringify(cfg));
+                return false;
+            }
+            this._dbs[cfg.database] = mongoext;
+            this._defdbname = cfg.database;
+        }
+        return true;
+    }
+    getMongo(dbname = "") {
+        if (!dbname) {
+            dbname = this._defdbname;
+        }
+        return this._dbs[dbname];
+    }
+}
+exports.MongoManager = MongoManager;
+exports.GMongoMgr = new MongoManager();
+class MongoExt {
     _mongocfg = null;
     _init_cbs = [];
     _mongoDb = null;
@@ -466,5 +499,4 @@ class MongoManager {
         return false;
     }
 }
-exports.MongoManager = MongoManager;
-exports.GMongoMgr = new MongoManager();
+exports.MongoExt = MongoExt;

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

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GMongoSerMgr = void 0;
+const Log_1 = require("../Logic/Log");
+const MongoManager_1 = require("./MongoManager");
+class MongoServiceManager {
+    _dbservicess = {};
+    add(ser) {
+        let dbname = ser.dbname;
+        if (!this._dbservicess[dbname]) {
+            this._dbservicess[dbname] = {};
+        }
+        let classname = ser.constructor.name;
+        if (this._dbservicess[dbname][classname]) {
+            Log_1.GLog.error("same db created duplicated service:" + classname);
+            return;
+        }
+        this._dbservicess[dbname][classname] = ser;
+    }
+    getService(type, dbname = "") {
+        if (!dbname) {
+            dbname = MongoManager_1.GMongoMgr.defdbname;
+        }
+        //后有defdbname，所以检测一下，把之前的空转换为defname
+        if (dbname && this._dbservicess[""]) {
+            if (!this._dbservicess[dbname]) {
+                this._dbservicess[dbname] = {};
+            }
+            for (let key in this._dbservicess[""]) {
+                let ser = this._dbservicess[""][key];
+                this._dbservicess[dbname][key] = ser;
+            }
+            this._dbservicess[""] = undefined;
+            delete this._dbservicess[""];
+        }
+        //正式逻辑
+        let dbservices = this._dbservicess[dbname];
+        let classname = type.name;
+        if (!dbservices) {
+            this._dbservicess[dbname] = {};
+        }
+        if (!dbservices[classname]) {
+            //mongobaseservice 会掉add
+            new type();
+        }
+        return dbservices[classname];
+    }
+}
+exports.GMongoSerMgr = new MongoServiceManager();

package/dist/lib/Framework/SocketServer/ISocketServer.js

@@ -1,15 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ISocketServer = void 0;
-const MysqlManager_1 = require("../Database/MysqlManager");
-const RedisManager_1 = require("../Database/RedisManager");
 const ws = require("websocket");
 const Log_1 = require("./../Logic/Log");
 const fs = require("fs");
 const http = require("http");
 const https = require("https");
-const MongoManager_1 = require("../Database/MongoManager");
-const MSSqlManager_1 = require("../Database/MSSqlManager");
 const EventTool_1 = require("../Logic/EventTool");
 const IServerConfig_1 = require("../Config/IServerConfig");
 const cgserver_1 = require("../cgserver");
@@ -62,12 +58,7 @@ class ISocketServer {
     async run() {
         cgserver_1.GCgServer.addSocketServer(this);
         let dbcfg = IServerConfig_1.GServerCfg.db;
-        if (dbcfg) {
-            await RedisManager_1.GRedisMgr.init(dbcfg.redis);
-            await MysqlManager_1.GMysqlMgr.init(dbcfg.mysql);
-            await MSSqlManager_1.GMSSqlMgr.init(dbcfg.mssql);
-            await MongoManager_1.GMongoMgr.init(dbcfg.mongo);
-        }
+        await cgserver_1.GCgServer.initDb(dbcfg);
         this.initWebSocket();
     }
     pause() {

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

@@ -59,7 +59,7 @@ class BaseController {
         return { model };
     }
     showJson(model) {
-        this._response.renderJson(model, this._request.headers.origin);
+        this._response.renderJson(model);
     }
     show(model) {
         let html = this._engine.getRenderHtml(this._request, this._response, this._init_data(model));

package/dist/lib/Framework/WebServer/Engine/Response.js

@@ -43,25 +43,28 @@ class Response {
         this._res.writeHead(302, { 'Location': path });
         this._res.end();
     }
-    renderJson(data, origin) {
-        this._res.json(data);
+    render(data) {
+        return this._res.send(data);
+    }
+    renderJson(data) {
         this.debugInfo(data);
+        return this._res.json(data);
     }
-    renderJson404(origin) {
-        this._res.status(404).json();
+    renderJson404() {
+        return this._res.status(404).json();
     }
-    renderJson500(origin) {
-        this._res.status(500).json();
+    renderJson500() {
         this.debugInfo("500");
+        return this._res.status(500).json();
     }
     renderHtml(html) {
-        this._res.send(html || "");
+        return this._res.send(html || "");
     }
     render404(html) {
-        this._res.status(404).send(html || "没找到该页面");
+        return this._res.status(404).send(html || "没找到该页面");
     }
     render500(html) {
-        this._res.status(500).send(html || "服务器内部错误500");
+        return this._res.status(500).send(html || "服务器内部错误500");
     }
     renderOptions(method, origin) {
         this._res.sendStatus(204);

package/dist/lib/Framework/WebServer/IWebServer.js

@@ -3,15 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IWebServer = void 0;
 const Engine_1 = require("./Engine/Engine");
 const Log_1 = require("../Logic/Log");
-const RedisManager_1 = require("../Database/RedisManager");
-const MysqlManager_1 = require("../Database/MysqlManager");
 const RazorJs_1 = require("./Engine/RazorJs");
-const MongoManager_1 = require("../Database/MongoManager");
-const AlipayTool_1 = require("../ThirdParty/AlipayTool");
 const IServerConfig_1 = require("../Config/IServerConfig");
 const EventTool_1 = require("../Logic/EventTool");
 const cgserver_1 = require("../cgserver");
-const MSSqlManager_1 = require("../Database/MSSqlManager");
 //实现对controller的手动注册
 class IWebServer {
     _engine = null;
@@ -26,13 +21,7 @@ class IWebServer {
             return false;
         }
         let dbcfg = IServerConfig_1.GServerCfg.db;
-        if (dbcfg) {
-            await RedisManager_1.GRedisMgr.init(dbcfg.redis);
-            await MysqlManager_1.GMysqlMgr.init(dbcfg.mysql);
-            await MSSqlManager_1.GMSSqlMgr.init(dbcfg.mssql);
-            await MongoManager_1.GMongoMgr.init(dbcfg.mongo);
-        }
-        AlipayTool_1.GAlipayTool.init();
+        await cgserver_1.GCgServer.initDb(dbcfg);
         //初始化web引擎
         this._engine = new Engine_1.Engine(cfg, new RazorJs_1.RazorJs());
         this._engine.start();

package/dist/lib/Framework/cgserver.js

@@ -130,7 +130,11 @@ class CgServer {
         await MSSqlManager_1.GMSSqlMgr.init(dbcfg.mssql);
         await MysqlManager_1.GMysqlMgr.init(dbcfg.mysql);
         await RedisManager_1.GRedisMgr.init(dbcfg.redis);
-        await MongoManager_1.GMongoMgr.init(dbcfg.mongo);
+        let mongos = dbcfg.mongos || [];
+        if (dbcfg.mongo) {
+            mongos.push(dbcfg.mongo);
+        }
+        await MongoManager_1.GMongoMgr.init(mongos);
     }
     pause() {
         for (let i = 0; i < this._webservers.length; ++i) {

package/dist/lib/Framework/index.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoCacheModel = exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.SqlReturns = exports.SqlReturn = exports.SqlResult = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = 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.GServerCfg = exports.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GCgServer = void 0;
-exports.RpcConfig = exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = 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.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.AlipayCallBack = exports.AlipayResult = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.GProtoFactory = exports.RedisConfig = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = void 0;
-exports.GByteTool = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = void 0;
+exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.GMongoSerMgr = exports.RedisManager = exports.GRedisMgr = exports.SqlReturns = exports.SqlReturn = exports.SqlResult = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = 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.GServerCfg = exports.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GCgServer = void 0;
+exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = 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.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.AlipayCallBack = exports.AlipayResult = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.GProtoFactory = exports.RedisConfig = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheModel = exports.GMongoCacheSer = void 0;
+exports.GByteTool = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = exports.CgMq = void 0;
 var cgserver_1 = require("./cgserver");
 Object.defineProperty(exports, "GCgServer", { enumerable: true, get: function () { return cgserver_1.GCgServer; } });
 var DBCache_1 = require("./Database/Decorator/DBCache");
@@ -47,6 +47,7 @@ var Type_1 = require("./Database/Decorator/Type");
 Object.defineProperty(exports, "Type", { enumerable: true, get: function () { return Type_1.Type; } });
 var Property_2 = require("./Database/Decorator/Property");
 Object.defineProperty(exports, "EPropertyType", { enumerable: true, get: function () { return Property_2.EPropertyType; } });
+///数据库相关
 var MongoBaseService_1 = require("./Database/MongoBaseService");
 Object.defineProperty(exports, "MongoBaseService", { enumerable: true, get: function () { return MongoBaseService_1.MongoBaseService; } });
 var MysqlBaseService_1 = require("./Database/MysqlBaseService");
@@ -54,6 +55,7 @@ Object.defineProperty(exports, "MysqlBaseModel", { enumerable: true, get: functi
 var MongoManager_1 = require("./Database/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 MongoManager_2 = require("./Database/MongoManager");
 Object.defineProperty(exports, "GMongoMgr", { enumerable: true, get: function () { return MongoManager_2.GMongoMgr; } });
 var MSSqlManager_1 = require("./Database/MSSqlManager");
@@ -68,6 +70,8 @@ Object.defineProperty(exports, "SqlReturns", { enumerable: true, get: function (
 var RedisManager_1 = require("./Database/RedisManager");
 Object.defineProperty(exports, "GRedisMgr", { enumerable: true, get: function () { return RedisManager_1.GRedisMgr; } });
 Object.defineProperty(exports, "RedisManager", { enumerable: true, get: function () { return RedisManager_1.RedisManager; } });
+var MongoServiceManager_1 = require("./Database/MongoServiceManager");
+Object.defineProperty(exports, "GMongoSerMgr", { enumerable: true, get: function () { return MongoServiceManager_1.GMongoSerMgr; } });
 var CacheTool_1 = require("./Logic/CacheTool");
 Object.defineProperty(exports, "GCacheTool", { enumerable: true, get: function () { return CacheTool_1.GCacheTool; } });
 var HttpTool_1 = require("./Logic/HttpTool");

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

@@ -4,6 +4,7 @@ import { MysqlConfig } from "../Database/MysqlManager";
 import { RedisConfig } from "../Database/RedisManager";
 export declare class DbConfig {
     redis: RedisConfig;
+    mongos: MongoConfig[];
     mongo: MongoConfig;
     mysql: MysqlConfig;
     mssql: MSSqlConfig;

package/dist/types/Framework/Database/MongoBaseService.d.ts

@@ -1,16 +1,19 @@
+import { MongoBaseModel } from "./MongoManager";
 import * as mongo from 'mongodb';
-export declare class MongoBaseService<T> {
+export declare class MongoBaseService<T extends MongoBaseModel> {
     protected _table: string;
     get table(): string;
     protected _inited: boolean;
     get isInited(): boolean;
-    get mongoDb(): mongo.Db;
+    get mongoDb(): import("./MongoManager").MongoExt;
+    protected _dbname: string;
+    get dbname(): string;
     protected _t_type: {
         new (): T;
     };
     constructor(table: string, type: {
         new (): T;
-    });
+    }, dbname?: string);
     getNextId(key?: string): Promise<number>;
     toObjectId(id: string): mongo.BSON.ObjectId;
     /**
@@ -18,18 +21,18 @@ export declare class MongoBaseService<T> {
      * @param id
      */
     getById(id: any): Promise<T>;
-    get(property?: {}, where?: {}): Promise<T>;
-    countDocuments(where?: {}, options?: mongo.CountDocumentsOptions): Promise<number>;
-    gets(property?: {}, where?: {}, sort?: {}, skip?: number, limit?: number): Promise<T[]>;
-    getRandoms(num: number, property?: {}, where?: {}): Promise<T[]>;
-    updateOne(model: any, where?: {}, upsert?: boolean): Promise<{
+    get(property?: any, where?: any): Promise<T>;
+    countDocuments(where?: any, options?: mongo.CountDocumentsOptions): Promise<number>;
+    gets(property?: any, where?: any, sort?: any, skip?: number, limit?: number): Promise<T[]>;
+    getRandoms(num: number, property: any, where?: any): Promise<T[]>;
+    updateOne(model: any, where?: any, upsert?: boolean): Promise<{
         errcode: {
             id: number;
             des: string;
         };
         rs: mongo.UpdateResult<mongo.BSON.Document>;
     }>;
-    updateMany(model: any, where?: {}): Promise<{
+    updateMany(model: any, where?: any): Promise<{
         errcode: {
             id: number;
             des: string;

package/dist/types/Framework/Database/MongoManager.d.ts

@@ -35,8 +35,17 @@ export declare class MgReturn {
     result: MrResult;
     list: any[];
 }
-export declare let GMongoMgr: MongoManager;
 export declare class MongoManager {
+    protected _dbs: {
+        [key: string]: MongoExt;
+    };
+    protected _defdbname: string;
+    get defdbname(): string;
+    init(cfgs: MongoConfig[]): Promise<boolean>;
+    getMongo(dbname?: string): MongoExt;
+}
+export declare let GMongoMgr: MongoManager;
+export declare class MongoExt {
     protected _mongocfg: MongoConfig;
     protected _init_cbs: any[];
     protected _mongoDb: mongo.Db;

package/dist/types/Framework/Database/MongoServiceManager.d.ts

@@ -0,0 +1,15 @@
+import { MongoBaseService } from "./MongoBaseService";
+import { MongoBaseModel } from "./MongoManager";
+declare class MongoServiceManager {
+    protected _dbservicess: {
+        [dbname: string]: {
+            [classname: string]: MongoBaseService<MongoBaseModel>;
+        };
+    };
+    add(ser: MongoBaseService<MongoBaseModel>): void;
+    getService<T extends MongoBaseService<MongoBaseModel>>(type: {
+        new (): T;
+    }, dbname?: string): T;
+}
+export declare let GMongoSerMgr: MongoServiceManager;
+export {};

package/dist/types/Framework/WebServer/Engine/Response.d.ts

@@ -17,12 +17,13 @@ export declare class Response {
     setCookie(key: string, value: any, time?: any): void;
     clearCookie(key: string): void;
     redirect(path: string): void;
-    renderJson(data: any, origin?: string | string[] | undefined): void;
-    renderJson404(origin?: string | string[] | undefined): void;
-    renderJson500(origin?: string | string[] | undefined): void;
-    renderHtml(html: string): void;
-    render404(html?: string): void;
-    render500(html?: string): void;
+    render(data: any): Express.Response<any, Record<string, any>>;
+    renderJson(data: any): Express.Response<any, Record<string, any>>;
+    renderJson404(): Express.Response<any, Record<string, any>>;
+    renderJson500(): Express.Response<any, Record<string, any>>;
+    renderHtml(html: string): Express.Response<any, Record<string, any>>;
+    render404(html?: string): Express.Response<any, Record<string, any>>;
+    render500(html?: string): Express.Response<any, Record<string, any>>;
     renderOptions(method: any, origin: any): void;
     renderFile(fullPath: string): void;
     downloadFile(fullPath: string): void;

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

@@ -21,12 +21,13 @@ export { Type } from './Database/Decorator/Type';
 export { EPropertyType } from './Database/Decorator/Property';
 export { MongoBaseService } from './Database/MongoBaseService';
 export { BaseModel as MysqlBaseModel } from './Database/MysqlBaseService';
-export { MongoBaseModel, MongoManager } from './Database/MongoManager';
+export { MongoBaseModel, MongoManager, MongoExt } from './Database/MongoManager';
 export { GMongoMgr } from './Database/MongoManager';
 export { GMSSqlMgr } from './Database/MSSqlManager';
 export { MysqlBaseService } from './Database/MysqlBaseService';
 export { GMysqlMgr, SqlResult, SqlReturn, SqlReturns } from './Database/MysqlManager';
 export { GRedisMgr, RedisManager } from './Database/RedisManager';
+export { GMongoSerMgr } from './Database/MongoServiceManager';
 export { GCacheTool } from './Logic/CacheTool';
 export { GHttpTool } from './Logic/HttpTool';
 export { GLog } from './Logic/Log';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "9.0.7",
+  "version": "9.1.0",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -63,8 +63,8 @@
     "jsonc": "^2.0.0",
     "log4js": "^6.9.1",
     "mime": "^3.0.0",
-    "mongodb": "^6.3.0",
-    "mssql": "^10.0.2",
+    "mongodb": "^6.7.0",
+    "mssql": "^11.0.0",
     "mysql": "^2.18.1",
     "nodemailer": "^6.9.10",
     "process": "^0.11.10",