cgserver 6.1.0 → 6.1.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.
- package/dist/lib/Database/BaseMongoService.js +2 -2
- package/dist/lib/Database/MongoManager.js +1 -1
- package/dist/lib/cgserver.js +8 -2
- package/dist/types/Database/BaseMongoService.d.ts +1 -1
- package/dist/types/Database/MongoManager.d.ts +1 -1
- package/dist/types/cgserver.d.ts +3 -2
- package/package.json +1 -1
|
@@ -35,8 +35,8 @@ class BaseService {
|
|
|
35
35
|
let rs = await MongoManager_1.GMongoMgr.findOne(this._table, proterty, where, sort);
|
|
36
36
|
return rs.one;
|
|
37
37
|
}
|
|
38
|
-
async
|
|
39
|
-
let rs = await MongoManager_1.GMongoMgr.
|
|
38
|
+
async countDocuments(where, options) {
|
|
39
|
+
let rs = await MongoManager_1.GMongoMgr.countDocuments(this._table, where);
|
|
40
40
|
return rs.count;
|
|
41
41
|
}
|
|
42
42
|
async gets(property, where, sort, skip = 0, limit = 0) {
|
|
@@ -176,7 +176,7 @@ class MongoManager {
|
|
|
176
176
|
rs.list = list;
|
|
177
177
|
return rs;
|
|
178
178
|
}
|
|
179
|
-
async
|
|
179
|
+
async countDocuments(collection, where, options) {
|
|
180
180
|
this._convertWhere(where);
|
|
181
181
|
let rs = { errcode: null, count: -1 };
|
|
182
182
|
if (!this._mongo) {
|
package/dist/lib/cgserver.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
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.BaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = void 0;
|
|
3
|
+
exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.MongoCacheModel = exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.GMongoAccountSer = exports.MongoAccountService = exports.GMysqlAccountSer = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = 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.ServerConfig = exports.GFCfg = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GProtoFactory = void 0;
|
|
4
|
+
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.BaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = exports.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = void 0;
|
|
5
5
|
var ProtoFactory_1 = require("./SocketServer/ProtoFilter/ProtoFactory");
|
|
6
6
|
Object.defineProperty(exports, "GProtoFactory", { enumerable: true, get: function () { return ProtoFactory_1.GProtoFactory; } });
|
|
7
7
|
var DBCache_1 = require("./Database/Decorator/DBCache");
|
|
@@ -25,8 +25,10 @@ var Config_1 = require("./Config/Config");
|
|
|
25
25
|
Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return Config_1.Config; } });
|
|
26
26
|
var FrameworkConfig_1 = require("./Config/FrameworkConfig");
|
|
27
27
|
Object.defineProperty(exports, "FrameworkConfig", { enumerable: true, get: function () { return FrameworkConfig_1.FrameworkConfig; } });
|
|
28
|
+
Object.defineProperty(exports, "GFCfg", { enumerable: true, get: function () { return FrameworkConfig_1.GFCfg; } });
|
|
28
29
|
var ServerConfig_1 = require("./Config/ServerConfig");
|
|
29
30
|
Object.defineProperty(exports, "ServerConfig", { enumerable: true, get: function () { return ServerConfig_1.ServerConfig; } });
|
|
31
|
+
9;
|
|
30
32
|
var Core_1 = require("./Core/Core");
|
|
31
33
|
Object.defineProperty(exports, "core", { enumerable: true, get: function () { return Core_1.core; } });
|
|
32
34
|
var Timer_1 = require("./Core/Timer");
|
|
@@ -61,6 +63,7 @@ var MysqlManager_1 = require("./Database/MysqlManager");
|
|
|
61
63
|
Object.defineProperty(exports, "GMysqlMgr", { enumerable: true, get: function () { return MysqlManager_1.GMysqlMgr; } });
|
|
62
64
|
var RedisManager_1 = require("./Database/RedisManager");
|
|
63
65
|
Object.defineProperty(exports, "GRedisMgr", { enumerable: true, get: function () { return RedisManager_1.GRedisMgr; } });
|
|
66
|
+
Object.defineProperty(exports, "RedisManager", { enumerable: true, get: function () { return RedisManager_1.RedisManager; } });
|
|
64
67
|
var CacheTool_1 = require("./Logic/CacheTool");
|
|
65
68
|
Object.defineProperty(exports, "GCacheTool", { enumerable: true, get: function () { return CacheTool_1.GCacheTool; } });
|
|
66
69
|
var HttpTool_1 = require("./Logic/HttpTool");
|
|
@@ -85,6 +88,9 @@ var UserService_2 = require("./Service/UserService");
|
|
|
85
88
|
Object.defineProperty(exports, "MysqlUserModel", { enumerable: true, get: function () { return UserService_2.UserModel; } });
|
|
86
89
|
var MongoUserService_2 = require("./Service/MongoUserService");
|
|
87
90
|
Object.defineProperty(exports, "MongoUserModel", { enumerable: true, get: function () { return MongoUserService_2.UserModel; } });
|
|
91
|
+
var MongoCacheService_1 = require("./Service/MongoCacheService");
|
|
92
|
+
Object.defineProperty(exports, "GMongoCacheSer", { enumerable: true, get: function () { return MongoCacheService_1.GMongoCacheSer; } });
|
|
93
|
+
Object.defineProperty(exports, "MongoCacheModel", { enumerable: true, get: function () { return MongoCacheService_1.MongoCacheModel; } });
|
|
88
94
|
var GoogleProtoFilter_1 = require("./SocketServer/ProtoFilter/GoogleProtoFilter");
|
|
89
95
|
Object.defineProperty(exports, "GoogleProtoFilter", { enumerable: true, get: function () { return GoogleProtoFilter_1.GoogleProtoFilter; } });
|
|
90
96
|
var JsonProtoFilter_1 = require("./SocketServer/ProtoFilter/JsonProtoFilter");
|
|
@@ -18,7 +18,7 @@ export declare class BaseService<T> {
|
|
|
18
18
|
*/
|
|
19
19
|
getById(id: any): Promise<any>;
|
|
20
20
|
get(proterty?: {}, where?: {}, sort?: {}): Promise<any>;
|
|
21
|
-
|
|
21
|
+
countDocuments(where?: {}, options?: mongo.CountDocumentsOptions): Promise<number>;
|
|
22
22
|
gets(property?: {}, where?: {}, sort?: {}, skip?: number, limit?: number): Promise<any[]>;
|
|
23
23
|
getRandoms(num: number, proterty?: {}, where?: {}): Promise<any[]>;
|
|
24
24
|
updateOne(model: any, where?: {}, upsert?: boolean): Promise<{
|
|
@@ -62,7 +62,7 @@ declare class MongoManager {
|
|
|
62
62
|
};
|
|
63
63
|
list: any[];
|
|
64
64
|
}>;
|
|
65
|
-
|
|
65
|
+
countDocuments(collection: string, where?: {}, options?: mongo.CountDocumentsOptions): Promise<{
|
|
66
66
|
errcode: {
|
|
67
67
|
id: number;
|
|
68
68
|
des: string;
|
package/dist/types/cgserver.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export { Point } from "./AI/Point";
|
|
|
8
8
|
export { Trigger, GTriggerMgr } from "./AI/TriggerMgr";
|
|
9
9
|
export { FrameworkErrorCode } from "./Config/_error_";
|
|
10
10
|
export { Config } from "./Config/Config";
|
|
11
|
-
export { FrameworkConfig } from "./Config/FrameworkConfig";
|
|
11
|
+
export { FrameworkConfig, GFCfg } from "./Config/FrameworkConfig";
|
|
12
12
|
export { ServerConfig } from "./Config/ServerConfig";
|
|
13
13
|
export { core } from "./Core/Core";
|
|
14
14
|
export { Timer } from "./Core/Timer";
|
|
@@ -26,7 +26,7 @@ export { GMongoMgr } from './Database/MongoManager';
|
|
|
26
26
|
export { GMSSqlMgr } from './Database/MSSqlManager';
|
|
27
27
|
export { BaseService as MysqlBaseService } from './Database/BaseService';
|
|
28
28
|
export { GMysqlMgr } from './Database/MysqlManager';
|
|
29
|
-
export { GRedisMgr } from './Database/RedisManager';
|
|
29
|
+
export { GRedisMgr, RedisManager } from './Database/RedisManager';
|
|
30
30
|
export { GCacheTool } from './Logic/CacheTool';
|
|
31
31
|
export { GHttpTool } from './Logic/HttpTool';
|
|
32
32
|
export { GLog } from './Logic/Log';
|
|
@@ -37,6 +37,7 @@ export { UserService as MysqlUserService } from './Service/UserService';
|
|
|
37
37
|
export { UserService as MongoUserService } from './Service/MongoUserService';
|
|
38
38
|
export { UserModel as MysqlUserModel } from './Service/UserService';
|
|
39
39
|
export { UserModel as MongoUserModel } from './Service/MongoUserService';
|
|
40
|
+
export { GMongoCacheSer, MongoCacheModel } from './Service/MongoCacheService';
|
|
40
41
|
export { GoogleProtoFilter } from './SocketServer/ProtoFilter/GoogleProtoFilter';
|
|
41
42
|
export { IProtoFilter } from './SocketServer/ProtoFilter/IProtoFilter';
|
|
42
43
|
export { JsonProtoFilter } from './SocketServer/ProtoFilter/JsonProtoFilter';
|