cgserver 13.0.6 → 13.1.1

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

@@ -69,6 +69,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 +78,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 +185,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 +210,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

@@ -15,7 +15,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
         return this._self_user;
     }
     get isSelf() {
-        return this._self_user && (this._self_user.id == this._user.id);
+        return this._self_user && (this._self_user._id == this._user._id);
     }
     get isLogin() {
         return this._self_user && true;
@@ -27,7 +27,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
         let userSer = this.userService;
         this._engine.cfg.session_type = this._engine.cfg.session_type || FrameworkConfig_1.ESessionType.Cache;
         this._session_id = this._request.getCookie(this._user_session_id) || this._request.params.session_id || this._request.postData.session_id;
-        let userId = "";
+        let userId = 0;
         if (this._session_id) {
             let user = await this._getUserBySession(this._session_id);
             if (!user) {
@@ -97,7 +97,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             return;
         }
         if (!this._session_id) {
-            this._session_id = Math.random().toString(36).substring(2) + user.id;
+            this._session_id = Math.random().toString(36).substring(2) + user._id;
         }
         let time = 0;
         if (this._request.postData.remember == "on") {
@@ -122,7 +122,7 @@ class MongoBaseUserController extends BaseController_1.BaseController {
             });
         }
         else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-            MongoCacheService_1.gMongoCacheSer.addData(this._session_id, user.id, new Date(Date.now() + time * 1000));
+            MongoCacheService_1.gMongoCacheSer.addData(this._session_id, user._id, new Date(Date.now() + time * 1000));
         }
         this._self_user = user;
     }
@@ -133,10 +133,10 @@ class MongoBaseUserController extends BaseController_1.BaseController {
     }
     async update_user(user_id) {
         let user = (await this.userService.findById(user_id));
-        if (this._user && this._user.id == user.id) {
+        if (this._user && this._user._id == user._id) {
             this._user = user;
         }
-        if (this._self_user && this._self_user.id == user.id) {
+        if (this._self_user && this._self_user._id == user._id) {
             this._login(user);
         }
     }

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

@@ -1,6 +1,10 @@
 import mongoose, { FilterQuery, UpdateQuery, Types, MongooseQueryOptions } from 'mongoose';
 import { Errcode } from '../../Config/_error_';
-export declare class MongoBaseService<T> {
+export interface IMongoBaseModel {
+    _id: any;
+    id: any;
+}
+export declare class MongoBaseService<T extends IMongoBaseModel> {
     protected _model: mongoose.Model<T>;
     protected _schema: mongoose.Schema<T>;
     protected _collection_name: string;
@@ -34,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/Database/Mongo/MongoManager.d.ts

@@ -7,8 +7,6 @@ export declare class MongoConfig {
     database: string;
     debug: boolean;
 }
-export interface IMongoBaseModel extends mongoose.Document {
-}
 export declare class MrResult {
     /**
      * select 的数据量

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

@@ -1,10 +1,9 @@
-import mongoose, { Types } from 'mongoose';
+import mongoose from 'mongoose';
 import { Errcode } from '../Config/_error_';
-import { MongoBaseService } from '../Database/Mongo/MongoBaseService';
+import { IMongoBaseModel, MongoBaseService } from '../Database/Mongo/MongoBaseService';
 import { EAccountFrom, EAccountState } from './ini';
 import { IMongoUserModel, MongoUserService } from './MongoUserService';
-export interface IMongoAccountModel {
-    _id: Types.ObjectId;
+export interface IMongoAccountModel extends IMongoBaseModel {
     phone: string;
     email: string;
     name: string;

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

@@ -1,6 +1,5 @@
-import mongoose from "mongoose";
-import { MongoBaseService } from "../Database/Mongo/MongoBaseService";
-export interface IMongoCacheModel extends mongoose.Document {
+import { IMongoBaseModel, MongoBaseService } from "../Database/Mongo/MongoBaseService";
+export interface IMongoCacheModel extends IMongoBaseModel {
     key: string;
     data: any;
     expireAt: Date;

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

@@ -1,7 +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 extends mongoose.Document {
+export interface IMongoUserModel extends IMongoBaseModel {
     account_id: string;
     state: EUserState;
     is_robot: boolean;

package/dist/types/Framework/index_export_.d.ts

@@ -21,9 +21,9 @@ export { Property } from './Database/Decorator/Property';
 export { Table } from './Database/Decorator/Table';
 export { Type } from './Database/Decorator/Type';
 export { EPropertyType } from './Database/Decorator/Property';
-export { MongoBaseService } from './Database/Mongo/MongoBaseService';
+export { IMongoBaseModel, MongoBaseService } from './Database/Mongo/MongoBaseService';
 export { BaseModel as MysqlBaseModel } from './Database/Mysql/MysqlBaseService';
-export { IMongoBaseModel, MongoManager, MongoExt } from './Database/Mongo/MongoManager';
+export { MongoManager, MongoExt } from './Database/Mongo/MongoManager';
 export { MysqlBaseService } from './Database/Mysql/MysqlBaseService';
 export { SqlReturn, SqlReturns } from './Database/Mysql/MysqlManager';
 export { EUserState, EAccountFrom } from './Service/ini';

package/package.json

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