cgserver 6.0.8 → 6.1.1

package/dist/lib/Database/BaseMongoService.js

@@ -35,8 +35,8 @@ class BaseService {
         let rs = await MongoManager_1.GMongoMgr.findOne(this._table, proterty, where, sort);
         return rs.one;
     }
-    async getTotal(where) {
-        let rs = await MongoManager_1.GMongoMgr.findCount(this._table, where);
+    async countDocuments(where, options) {
+        let rs = await MongoManager_1.GMongoMgr.countDocuments(this._table, where);
         return rs.count;
     }
     async gets(property, where, sort, skip = 0, limit = 0) {

package/dist/lib/Database/MongoManager.js

@@ -176,7 +176,7 @@ class MongoManager {
         rs.list = list;
         return rs;
     }
-    async findCount(collection, property, where) {
+    async countDocuments(collection, where, options) {
         this._convertWhere(where);
         let rs = { errcode: null, count: -1 };
         if (!this._mongo) {
@@ -186,7 +186,7 @@ class MongoManager {
         let count = -1;
         try {
             let col = this._mongo.collection(collection);
-            count = await col.countDocuments(where || {}, property);
+            count = await col.countDocuments(where || {}, options);
         }
         catch (e) {
             Log_1.GLog.error(e);

package/dist/types/Database/BaseMongoService.d.ts

@@ -18,7 +18,7 @@ export declare class BaseService<T> {
      */
     getById(id: any): Promise<any>;
     get(proterty?: {}, where?: {}, sort?: {}): Promise<any>;
-    getTotal(where?: {}): Promise<number>;
+    countDocuments(where?: {}, options?: mongo.CountDocumentsOptions): Promise<number>;
     gets(property?: {}, where?: {}, sort?: {}, skip?: number, limit?: number): Promise<any[]>;
     getRandoms(num: number, proterty?: {}, where?: {}): Promise<any[]>;
     updateOne(model: any, where?: {}, upsert?: boolean): Promise<{

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

@@ -62,7 +62,7 @@ declare class MongoManager {
         };
         list: any[];
     }>;
-    findCount(collection: string, property?: {}, where?: {}): Promise<{
+    countDocuments(collection: string, where?: {}, options?: mongo.CountDocumentsOptions): Promise<{
         errcode: {
             id: number;
             des: string;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "cgserver",
-  "version": "6.0.8",
+  "version": "6.1.1",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
-  "main": "./dist/cgserver.js",
+  "main": "./dist/lib/cgserver.js",
   "types": "./dist/types/cgserver.d.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"