cgserver 13.1.0 → 13.1.2

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

@@ -62,6 +62,7 @@ class MongoBaseService {
         this._collection_name = collection_name;
         schema.set('collection', collection_name);
         this._schema = schema;
+        this._schema.set('minimize', false);
     }
     async findOne(filter, projection, options) {
         filter = this._convertFilter(filter);
@@ -69,6 +70,7 @@ class MongoBaseService {
             throw new Error("Model is not defined");
         }
         let one = await this.model.findOne(filter, projection, options).lean();
+        this._convertId(one);
         return one;
     }
     async find(filter, projection, options) {
@@ -77,13 +79,18 @@ class MongoBaseService {
             throw new Error("Model is not defined");
         }
         let list = await this.model.find(filter, projection, options).lean();
+        list.forEach(one => {
+            this._convertId(one);
+        });
         return list;
     }
     async findById(id, projection, options) {
         if (!this.model) {
             throw new Error("Model is not defined");
         }
-        return await this.model.findById(id, projection, options).lean();
+        let one = await this.model.findById(id, projection, options).lean();
+        this._convertId(one);
+        return one;
     }
     async create(doc) {
         if (!this.model) {
@@ -179,8 +186,9 @@ class MongoBaseService {
         if (!this.model) {
             throw new Error("Model is not defined");
         }
-        let rs = await this.model.findOneAndUpdate(filter, update, options);
-        return rs;
+        let one = await this.model.findOneAndUpdate(filter, update, options).lean();
+        this._convertId(one);
+        return one;
     }
     async countDocuments(filter) {
         filter = this._convertFilter(filter);
@@ -203,6 +211,18 @@ class MongoBaseService {
         }
         return filter;
     }
+    _convertId(one) {
+        if (!one) {
+            return one;
+        }
+        if (typeof one._id === 'object' && one._id instanceof mongoose_1.Types.ObjectId) {
+            one.id = one._id.toString();
+        }
+        else {
+            one.id = one._id;
+        }
+        return one;
+    }
     async getAutoIds() {
         let id = await MongoManager_1.gMongoMgr.getMongo().getAutoIds(this.model.collection.name);
         return id;

package/dist/lib/Framework/Server/WebServer/Controller/MongoBaseUserController.js

@@ -37,7 +37,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             }
             else {
                 this._login(user);
-                userId = user._id;
+                userId = user.id;
             }
         }
         let params = this._request.params;
@@ -117,7 +117,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             }
         }
         if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-            RedisManager_1.gRedisMgr.redis.set(this._session_id, user._id).then(() => {
+            RedisManager_1.gRedisMgr.redis.set(this._session_id, user.id).then(() => {
                 RedisManager_1.gRedisMgr.redis.expire(this._session_id, time);
             });
         }

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

@@ -1,9 +1,10 @@
 import mongoose, { FilterQuery, UpdateQuery, Types, MongooseQueryOptions } from 'mongoose';
 import { Errcode } from '../../Config/_error_';
 export interface IMongoBaseModel {
-    _id: Types.ObjectId;
+    _id: any;
+    id: any;
 }
-export declare class MongoBaseService<T> {
+export declare class MongoBaseService<T extends IMongoBaseModel> {
     protected _model: mongoose.Model<T>;
     protected _schema: mongoose.Schema<T>;
     protected _collection_name: string;
@@ -37,8 +38,9 @@ export declare class MongoBaseService<T> {
     }>;
     exists(filter: FilterQuery<T>): Promise<boolean>;
     aggregate(pipeline?: any[]): mongoose.Aggregate<any[]>;
-    findOneAndUpdate(filter: FilterQuery<T>, update: UpdateQuery<T>, options?: MongooseQueryOptions): Promise<mongoose.IfAny<T, any, mongoose.Document<unknown, {}, T, {}> & mongoose.Default__v<mongoose.Require_id<T>>>>;
+    findOneAndUpdate(filter: FilterQuery<T>, update: UpdateQuery<T>, options?: MongooseQueryOptions): Promise<T>;
     countDocuments(filter?: FilterQuery<T>): Promise<number>;
     protected _convertFilter(filter: FilterQuery<T>): FilterQuery<T>;
+    protected _convertId(one: T | null): T;
     getAutoIds(): Promise<number>;
 }

package/dist/types/Framework/Service/MongoUserService.d.ts

@@ -1,8 +1,7 @@
-import { MongoBaseService } from "../Database/Mongo/MongoBaseService";
+import { IMongoBaseModel, MongoBaseService } from "../Database/Mongo/MongoBaseService";
 import mongoose from "mongoose";
 import { EUserState } from "./ini";
-export interface IMongoUserModel {
-    _id: number;
+export interface IMongoUserModel extends IMongoBaseModel {
     account_id: string;
     state: EUserState;
     is_robot: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "13.1.0",
+  "version": "13.1.2",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",