cgserver 6.0.9 → 6.1.2

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.
Files changed (7) hide show
  1. package/dist/lib/Database/BaseMongoService.js +2 -2
  2. package/dist/lib/Database/MongoManager.js +2 -2
  3. package/dist/lib/cgserver.js +5 -2
  4. package/dist/types/Database/BaseMongoService.d.ts +1 -1
  5. package/dist/types/Database/MongoManager.d.ts +1 -1
  6. package/dist/types/cgserver.d.ts +1 -0
  7. package/package.json +2 -2
package/dist/lib/Database/BaseMongoService.js CHANGED
@@ -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 getTotal(where) {
39
- let rs = await MongoManager_1.GMongoMgr.findCount(this._table, where);
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) {
package/dist/lib/Database/MongoManager.js CHANGED
@@ -176,7 +176,7 @@ class MongoManager {
176
176
  rs.list = list;
177
177
  return rs;
178
178
  }
179
- async findCount(collection, property, where) {
179
+ async countDocuments(collection, where, options) {
180
180
  this._convertWhere(where);
181
181
  let rs = { errcode: null, count: -1 };
182
182
  if (!this._mongo) {
@@ -186,7 +186,7 @@ class MongoManager {
186
186
  let count = -1;
187
187
  try {
188
188
  let col = this._mongo.collection(collection);
189
- count = await col.countDocuments(where || {}, property);
189
+ count = await col.countDocuments(where || {}, options);
190
190
  }
191
191
  catch (e) {
192
192
  Log_1.GLog.error(e);
package/dist/lib/cgserver.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = 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.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.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 = void 0;
3
+ exports.IServerWebSocket = exports.IClientWebSocket = 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.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.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 = 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");
@@ -85,6 +85,9 @@ var UserService_2 = require("./Service/UserService");
85
85
  Object.defineProperty(exports, "MysqlUserModel", { enumerable: true, get: function () { return UserService_2.UserModel; } });
86
86
  var MongoUserService_2 = require("./Service/MongoUserService");
87
87
  Object.defineProperty(exports, "MongoUserModel", { enumerable: true, get: function () { return MongoUserService_2.UserModel; } });
88
+ var MongoCacheService_1 = require("./Service/MongoCacheService");
89
+ Object.defineProperty(exports, "GMongoCacheSer", { enumerable: true, get: function () { return MongoCacheService_1.GMongoCacheSer; } });
90
+ Object.defineProperty(exports, "MongoCacheModel", { enumerable: true, get: function () { return MongoCacheService_1.MongoCacheModel; } });
88
91
  var GoogleProtoFilter_1 = require("./SocketServer/ProtoFilter/GoogleProtoFilter");
89
92
  Object.defineProperty(exports, "GoogleProtoFilter", { enumerable: true, get: function () { return GoogleProtoFilter_1.GoogleProtoFilter; } });
90
93
  var JsonProtoFilter_1 = require("./SocketServer/ProtoFilter/JsonProtoFilter");
package/dist/types/Database/BaseMongoService.d.ts CHANGED
@@ -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
- getTotal(where?: {}): Promise<number>;
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<{
package/dist/types/Database/MongoManager.d.ts CHANGED
@@ -62,7 +62,7 @@ declare class MongoManager {
62
62
  };
63
63
  list: any[];
64
64
  }>;
65
- findCount(collection: string, property?: {}, where?: {}): Promise<{
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
@@ -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';
package/package.json CHANGED
@@ -1,11 +1,11 @@
1
1
  {
2
2
  "name": "cgserver",
3
- "version": "6.0.9",
3
+ "version": "6.1.2",
4
4
  "author": "trojan",
5
5
  "type": "commonjs",
6
6
  "description": "free for all.Websocket or Http",
7
7
  "main": "./dist/lib/cgserver.js",
8
- "types": "./dist/types/cgserver.d.ts",
8
+ "types": "./dist/types",
9
9
  "scripts": {
10
10
  "test": "echo \"Error: no test specified\" && exit 1"
11
11
  },