cgserver 6.6.4 → 6.6.6

package/README.md

@@ -1,3 +1,7 @@
+6.6.5
+1、mongomanager可单独初始化
+6.6.5
+1、mongoaccountservice增加登录时间和ip
 6.5.8
 1、修改编译bug
 6.5.7

package/dist/lib/Core/Core.js

@@ -192,9 +192,9 @@ class core {
         if (core.isArray(items)) {
             return items.length;
         }
-        if (core.isObject) {
+        if (core.isObject(items)) {
             let len = 0;
-            core.foreach(items, function () {
+            core.foreach(items, () => {
                 ++len;
             });
             return len;

package/dist/lib/Database/MongoManager.js

@@ -1,11 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GMongoMgr = exports.MgReturn = exports.MrResult = exports.MongoBaseModel = void 0;
+exports.GMongoMgr = exports.MgReturn = exports.MrResult = exports.MongoBaseModel = exports.MongoConfig = void 0;
 const Log_1 = require("../Logic/Log");
 const mongo = require("mongodb");
 const _error_1 = require("../Config/_error_");
 const Core_1 = require("../Core/Core");
-const ServerConfig_1 = require("../Config/ServerConfig");
+class MongoConfig {
+    open = false;
+    host = "127.0.0.1";
+    port = 27017;
+    options = null;
+    database = 'mongodb';
+}
+exports.MongoConfig = MongoConfig;
 class MongoBaseModel {
     _id;
 }
@@ -38,6 +45,7 @@ class MgReturn {
 exports.MgReturn = MgReturn;
 exports.GMongoMgr = null;
 class MongoManager {
+    _mongocfg = null;
     _init_cbs = [];
     _mongo = null;
     get mongo() {
@@ -50,22 +58,23 @@ class MongoManager {
     }
     constructor() {
     }
-    async init() {
+    async init(cfg) {
+        if (!cfg || !this._mongocfg.open) {
+            return false;
+        }
         if (this._inited) {
             return false;
         }
         if (this._mongo) {
             return true;
         }
-        if (!ServerConfig_1.GServerCfg.db.mongo || !ServerConfig_1.GServerCfg.db.mongo.open) {
-            return true;
-        }
+        this._mongocfg = cfg;
         this._inited = true;
-        Log_1.GLog.info("mongo config=" + JSON.stringify(ServerConfig_1.GServerCfg.db.mongo));
-        let client = new mongo.MongoClient("mongodb://" + ServerConfig_1.GServerCfg.db.mongo.host + ":" + ServerConfig_1.GServerCfg.db.mongo.port, ServerConfig_1.GServerCfg.db.mongo.options);
+        Log_1.GLog.info("mongo config=" + JSON.stringify(this._mongocfg));
+        let client = new mongo.MongoClient("mongodb://" + this._mongocfg.host + ":" + this._mongocfg.port, this._mongocfg.options);
         await Core_1.core.safeCall(client.connect, client);
         this.onConnect();
-        this._mongo = client.db(ServerConfig_1.GServerCfg.db.mongo.database);
+        this._mongo = client.db(this._mongocfg.database);
         for (let i = 0; i < this._init_cbs.length; ++i) {
             this._init_cbs[i]();
         }
@@ -82,12 +91,12 @@ class MongoManager {
         this._mongo_init_succ = false;
         Log_1.GLog.error("mongo has ended!");
         Log_1.GLog.info("mongo try reconnect");
-        this.init();
+        this.init(this._mongocfg);
     }
     onError(err) {
         Log_1.GLog.error("Error " + err);
         Log_1.GLog.info("mongo try reconnect");
-        this.init();
+        this.init(this._mongocfg);
     }
     async getAutoIds(key) {
         if (!this._mongo) {

package/dist/lib/Service/MongoAccountService.js

@@ -280,6 +280,9 @@ class AccountService extends MongoBaseService_1.MongoBaseService {
                 await MongoUserService_1.GUserSer.updateBaseInfoByAccount(account.id, extra_info.nickname, extra_info.sex, extra_info.logo);
             }
         }
+        account.login_time = Date.now();
+        account.login_ip = ip;
+        this.updateOne({ login_time: account.login_time, login_ip: account.login_ip }, { id: account.id });
         rs.account = account;
         return rs;
     }

package/dist/lib/SocketServer/ISocketServer.js

@@ -73,8 +73,8 @@ class ISocketServer {
         cgserver_1.GCgServer.addSocketServer(this);
         await MSSqlManager_1.GMSSqlMgr.init();
         await MysqlManager_1.GMysqlMgr.init();
-        await RedisManager_1.GRedisMgr.init(ServerConfig_1.GServerCfg.db.redis);
-        await MongoManager_1.GMongoMgr.init();
+        await RedisManager_1.GRedisMgr.init(ServerConfig_1.GServerCfg.db?.redis);
+        await MongoManager_1.GMongoMgr.init(ServerConfig_1.GServerCfg.db?.mongo);
         let code = await RedisManager_1.GRedisMgr.incr("server_code");
         this._code = code;
         this.initWebSocket();

package/dist/lib/WebServer/IWebServer.js

@@ -24,9 +24,9 @@ class IWebServer {
             Log_1.GLog.error("webserver 配置不存在，启动服务器失败");
             return false;
         }
-        await RedisManager_1.GRedisMgr.init(ServerConfig_1.GServerCfg.db.redis);
+        await RedisManager_1.GRedisMgr.init(ServerConfig_1.GServerCfg.db?.redis);
         await MysqlManager_1.GMysqlMgr.init();
-        await MongoManager_1.GMongoMgr.init();
+        await MongoManager_1.GMongoMgr.init(ServerConfig_1.GServerCfg.db?.mongo);
         AlipayTool_1.GAlipayTool.init();
         //初始化web引擎
         this._engine = new Engine_1.Engine(cfg, new RazorJs_1.RazorJs());

package/dist/types/Config/FrameworkConfig.d.ts

@@ -1,4 +1,4 @@
-import { MongoClientOptions } from "mongodb";
+import { MongoConfig } from "../Database/MongoManager";
 import { Config } from "./Config";
 export declare enum ESessionType {
     Cache = 0,
@@ -129,13 +129,7 @@ export declare class FrameworkConfig extends Config {
             database: number;
             password: any;
         };
-        mongo: {
-            open: boolean;
-            host: string;
-            port: number;
-            options: MongoClientOptions;
-            database: string;
-        };
+        mongo: MongoConfig;
         mysql: {
             open: boolean;
             auto: boolean;

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

@@ -1,4 +1,11 @@
 import * as mongo from 'mongodb';
+export declare class MongoConfig {
+    open: boolean;
+    host: string;
+    port: number;
+    options: mongo.MongoClientOptions;
+    database: string;
+}
 export declare class MongoBaseModel {
     _id: any;
 }
@@ -30,6 +37,7 @@ export declare class MgReturn {
 }
 export declare let GMongoMgr: MongoManager;
 declare class MongoManager {
+    protected _mongocfg: MongoConfig;
     protected _init_cbs: any[];
     protected _mongo: mongo.Db;
     get mongo(): mongo.Db;
@@ -37,7 +45,7 @@ declare class MongoManager {
     protected _inited: boolean;
     get isValid(): boolean;
     constructor();
-    init(): Promise<boolean>;
+    init(cfg: MongoConfig): Promise<boolean>;
     registerInitCb(cb: Function): void;
     onConnect(): void;
     onEnd(): void;

package/package.json

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