cgserver 13.0.4 → 13.0.6

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

@@ -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/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,6 @@
-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 declare class MongoBaseService<T> {
     protected _model: mongoose.Model<T>;
     protected _schema: mongoose.Schema<T>;
     protected _collection_name: string;

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

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

package/package.json

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