cgserver 8.9.1 → 8.9.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.GMongoMgr = exports.MgReturn = exports.MrResult = exports.MongoBaseModel = exports.MongoConfig = void 0;
|
|
3
|
+
exports.MongoManager = exports.GMongoMgr = exports.MgReturn = exports.MrResult = exports.MongoBaseModel = exports.MongoConfig = void 0;
|
|
4
4
|
const Log_1 = require("../Logic/Log");
|
|
5
5
|
const mongo = require("mongodb");
|
|
6
6
|
const _error_1 = require("../Config/_error_");
|
|
@@ -393,7 +393,7 @@ class MongoManager {
|
|
|
393
393
|
rs.rs = i_rs;
|
|
394
394
|
return rs;
|
|
395
395
|
}
|
|
396
|
-
async simpleAggregate(collection, property
|
|
396
|
+
async simpleAggregate(collection, property, where, size, random_size) {
|
|
397
397
|
this._convertWhere(where);
|
|
398
398
|
let rs = { errcode: null, list: null };
|
|
399
399
|
if (!this._mongoDb) {
|
|
@@ -404,8 +404,12 @@ class MongoManager {
|
|
|
404
404
|
try {
|
|
405
405
|
let col = this._mongoDb.collection(collection);
|
|
406
406
|
let params = [];
|
|
407
|
-
|
|
408
|
-
|
|
407
|
+
if (where) {
|
|
408
|
+
params.push({ '$match': where });
|
|
409
|
+
}
|
|
410
|
+
if (property) {
|
|
411
|
+
params.push({ '$project': property });
|
|
412
|
+
}
|
|
409
413
|
if (random_size) {
|
|
410
414
|
params.push({ '$sample': { 'size': random_size } });
|
|
411
415
|
}
|
|
@@ -459,4 +463,5 @@ class MongoManager {
|
|
|
459
463
|
return false;
|
|
460
464
|
}
|
|
461
465
|
}
|
|
466
|
+
exports.MongoManager = MongoManager;
|
|
462
467
|
exports.GMongoMgr = new MongoManager();
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.
|
|
5
|
-
exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = void 0;
|
|
3
|
+
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.GProtoFactory = exports.GCgServer = void 0;
|
|
4
|
+
exports.CgMq = exports.RpcConfig = 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.RedisConfig = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheModel = void 0;
|
|
5
|
+
exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.CgMqConfig = void 0;
|
|
6
6
|
var cgserver_1 = require("./cgserver");
|
|
7
7
|
Object.defineProperty(exports, "GCgServer", { enumerable: true, get: function () { return cgserver_1.GCgServer; } });
|
|
8
8
|
var ProtoFactory_1 = require("./SocketServer/ProtoFilter/ProtoFactory");
|
|
@@ -55,6 +55,7 @@ var MysqlBaseService_1 = require("./Database/MysqlBaseService");
|
|
|
55
55
|
Object.defineProperty(exports, "MysqlBaseModel", { enumerable: true, get: function () { return MysqlBaseService_1.BaseModel; } });
|
|
56
56
|
var MongoManager_1 = require("./Database/MongoManager");
|
|
57
57
|
Object.defineProperty(exports, "MongoBaseModel", { enumerable: true, get: function () { return MongoManager_1.MongoBaseModel; } });
|
|
58
|
+
Object.defineProperty(exports, "MongoManager", { enumerable: true, get: function () { return MongoManager_1.MongoManager; } });
|
|
58
59
|
var MongoManager_2 = require("./Database/MongoManager");
|
|
59
60
|
Object.defineProperty(exports, "GMongoMgr", { enumerable: true, get: function () { return MongoManager_2.GMongoMgr; } });
|
|
60
61
|
var MSSqlManager_1 = require("./Database/MSSqlManager");
|
|
@@ -36,7 +36,7 @@ export declare class MgReturn {
|
|
|
36
36
|
list: any[];
|
|
37
37
|
}
|
|
38
38
|
export declare let GMongoMgr: MongoManager;
|
|
39
|
-
declare class MongoManager {
|
|
39
|
+
export declare class MongoManager {
|
|
40
40
|
protected _mongocfg: MongoConfig;
|
|
41
41
|
protected _init_cbs: any[];
|
|
42
42
|
protected _mongoDb: mongo.Db;
|
|
@@ -153,4 +153,3 @@ declare class MongoManager {
|
|
|
153
153
|
*/
|
|
154
154
|
quickTransaction(cb: Function, options?: mongo.TransactionOptions): Promise<false | any>;
|
|
155
155
|
}
|
|
156
|
-
export {};
|
|
@@ -22,7 +22,7 @@ export { Type } from './Database/Decorator/Type';
|
|
|
22
22
|
export { EPropertyType } from './Database/Decorator/Property';
|
|
23
23
|
export { MongoBaseService } from './Database/MongoBaseService';
|
|
24
24
|
export { BaseModel as MysqlBaseModel } from './Database/MysqlBaseService';
|
|
25
|
-
export { MongoBaseModel } from './Database/MongoManager';
|
|
25
|
+
export { MongoBaseModel, MongoManager } from './Database/MongoManager';
|
|
26
26
|
export { GMongoMgr } from './Database/MongoManager';
|
|
27
27
|
export { GMSSqlMgr } from './Database/MSSqlManager';
|
|
28
28
|
export { MysqlBaseService } from './Database/MysqlBaseService';
|