cgserver 13.0.5 → 13.1.0

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

@@ -68,7 +68,7 @@ class MongoBaseService {
         if (!this.model) {
             throw new Error("Model is not defined");
         }
-        let one = await this.model.findOne(filter, projection, options);
+        let one = await this.model.findOne(filter, projection, options).lean();
         return one;
     }
     async find(filter, projection, options) {
@@ -83,7 +83,7 @@ class MongoBaseService {
         if (!this.model) {
             throw new Error("Model is not defined");
         }
-        return await this.model.findById(id, projection, options);
+        return await this.model.findById(id, projection, options).lean();
     }
     async create(doc) {
         if (!this.model) {

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) {
@@ -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;
@@ -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") {
@@ -117,12 +117,12 @@ 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);
             });
         }
         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/lib/Framework/Service/MongoAccountService.js

@@ -149,7 +149,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
         }
         if (force_user) {
             let userser = this.userService;
-            let user = await userser.findOne({ account_id: account.id });
+            let user = await userser.findOne({ account_id: account._id.toString() });
             if (!user) {
                 switch (from) {
                     case ini_1.EAccountFrom.QQ:
@@ -193,9 +193,9 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
                                         };
                                 }
                             }
-                            let user = await userser.add(account.id, extra_info.nickname, extra_info.sex, extra_info.logo);
+                            let user = await userser.add(account._id.toString(), extra_info.nickname, extra_info.sex, extra_info.logo);
                             if (!user) {
-                                this.deleteOne({ id: account.id });
+                                this.deleteOne({ id: account._id.toString() });
                                 rs.errcode = _error_1.EErrorCode.User_Create_Failed;
                                 return rs;
                             }
@@ -206,13 +206,13 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
                         {
                             let user = null;
                             if (extra_info) {
-                                user = await userser.add(account.id, extra_info.nickname, extra_info.sex, extra_info.logo);
+                                user = await userser.add(account._id.toString(), extra_info.nickname, extra_info.sex, extra_info.logo);
                             }
                             else {
-                                user = await userser.add(account.id);
+                                user = await userser.add(account._id.toString());
                             }
                             if (!user) {
-                                this.deleteOne({ id: account.id });
+                                this.deleteOne({ _id: account._id });
                                 rs.errcode = _error_1.EErrorCode.User_Create_Failed;
                                 return rs;
                             }
@@ -229,7 +229,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
         }
         account.login_time = new Date();
         account.login_ip = ip;
-        await account.save();
+        this.updateOne({ _id: account._id }, { $set: { login_time: account.login_time, login_ip: account.login_ip } });
         rs.account = account;
         return rs;
     }

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

@@ -1,6 +1,9 @@
-import mongoose, { Document, FilterQuery, UpdateQuery, Types, MongooseQueryOptions } from 'mongoose';
+import mongoose, { FilterQuery, UpdateQuery, Types, MongooseQueryOptions } from 'mongoose';
 import { Errcode } from '../../Config/_error_';
-export declare class MongoBaseService<T extends Document> {
+export interface IMongoBaseModel {
+    _id: Types.ObjectId;
+}
+export declare class MongoBaseService<T> {
     protected _model: mongoose.Model<T>;
     protected _schema: mongoose.Schema<T>;
     protected _collection_name: string;

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,9 +1,9 @@
 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 extends mongoose.Document {
+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,8 @@
 import { MongoBaseService } from "../Database/Mongo/MongoBaseService";
 import mongoose from "mongoose";
 import { EUserState } from "./ini";
-export interface IMongoUserModel extends mongoose.Document {
+export interface IMongoUserModel {
+    _id: number;
     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.5",
+  "version": "13.1.0",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",