cgserver 6.4.13 → 6.5.0

package/dist/lib/Database/MongoManager.js

@@ -76,14 +76,18 @@ class MongoManager {
     }
     onConnect() {
         this._mongo_init_succ = true;
-        Log_1.GLog.info("mogo has connected!");
+        Log_1.GLog.info("mongo has connected!");
     }
     onEnd() {
         this._mongo_init_succ = false;
-        Log_1.GLog.info("mogo has ended!");
+        Log_1.GLog.error("mongo has ended!", true);
+        Log_1.GLog.info("mongo try reconnect", true);
+        this.init();
     }
     onError(err) {
-        Log_1.GLog.info("Error " + err);
+        Log_1.GLog.error("Error " + err);
+        Log_1.GLog.info("mongo try reconnect", true);
+        this.init();
     }
     async getAutoIds(key) {
         if (!this._mongo) {

package/dist/lib/Logic/AsyncQueueTool.js

@@ -25,7 +25,7 @@ class AsyncQueueItem {
             if (!funcitem.func) {
                 continue;
             }
-            let rs = await cgserver_1.core.safeCall(funcitem.func, funcitem.thisArg, funcitem.params);
+            let rs = await cgserver_1.core.safeCall(funcitem.func, funcitem.thisArg, ...funcitem.params);
             await cgserver_1.core.safeCall(funcitem.resolve, null, rs);
         }
         this.running = false;

package/dist/lib/WebServer/Controller/BaseUserController.js

@@ -39,29 +39,14 @@ class BaseUserController extends BaseController_1.BaseController {
         this._session_id = this._request.getCookie(this._user_session_id) || this._request.params.session_id || this._request.postData.session_id;
         let userId = -1;
         if (this._session_id) {
-            let user = null;
-            if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Cache) {
-                user = CacheTool_1.GCacheTool.get(this._session_id);
-            }
-            else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-                let user_id = parseInt((await RedisManager_1.GRedisMgr.get(this._session_id)) || "-1");
-                if (user_id > 0) {
-                    user = (await UserService_1.GUserSer.getById(user_id));
-                }
-            }
-            else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
-                let user_id = (await MongoCacheService_1.GMongoCacheSer.getData(this._session_id)) || -1;
-                if (user_id > 0) {
-                    user = (await UserService_1.GUserSer.getById(user_id));
-                }
-            }
+            let user = await this._getUserBySession(this._session_id);
             if (!user) {
                 this._update_session();
                 //Session不存在清除客户端cookie
                 this._response.clearCookie(this._user_session_id);
             }
             else {
-                await this._login(user);
+                this._login(user);
                 userId = user.id;
             }
         }
@@ -74,6 +59,33 @@ class BaseUserController extends BaseController_1.BaseController {
             this._user = this._self_user;
         }
     }
+    async _getUserBySession(session) {
+        let user = null;
+        if (!session) {
+            return user;
+        }
+        //每次强制从cache中先找，提高效率
+        //if(this._engine.cfg.session_type==ESessionType.Cache)
+        {
+            user = CacheTool_1.GCacheTool.get(this._session_id);
+        }
+        if (user) {
+            return user;
+        }
+        if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
+            let user_id = parseInt((await RedisManager_1.GRedisMgr.get(this._session_id)) || "-1");
+            if (user_id > 0) {
+                user = (await UserService_1.GUserSer.getById(user_id));
+            }
+        }
+        else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Mongo) {
+            let user_id = (await MongoCacheService_1.GMongoCacheSer.getData(this._session_id)) || -1;
+            if (user_id > 0) {
+                user = (await UserService_1.GUserSer.getById(user_id));
+            }
+        }
+        return user;
+    }
     _logout() {
         if (this._session_id) {
             if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Cache) {
@@ -104,10 +116,16 @@ class BaseUserController extends BaseController_1.BaseController {
             time = this._engine.cfg.cookie.expires.account;
         }
         this._response.setCookie(this._user_session_id, this._session_id, time);
-        if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Cache) {
-            CacheTool_1.GCacheTool.add(this._session_id, user, time * 1000);
+        //if(this._engine.cfg.session_type==ESessionType.Cache)
+        {
+            if (time > 24 * 60 * 60) {
+                CacheTool_1.GCacheTool.add(this._session_id, user, 24 * 60 * 60 * 1000);
+            }
+            else {
+                CacheTool_1.GCacheTool.add(this._session_id, user, time * 1000);
+            }
         }
-        else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
+        if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
             RedisManager_1.GRedisMgr.set(this._session_id, user.id).then(() => {
                 RedisManager_1.GRedisMgr.expire(this._session_id, time);
             });
@@ -122,29 +140,9 @@ class BaseUserController extends BaseController_1.BaseController {
         this._self_user = user;
     }
     /**
-     * 用户信息发生更改，同步更新session里面的用户信息
+     * 已经被启用
      */
     async _update_session() {
-        if (!this._session_id) {
-            return;
-        }
-        let user_id = -1;
-        let um = null;
-        if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Cache) {
-            um = CacheTool_1.GCacheTool.get(this._session_id);
-            if (um) {
-                user_id = um.id;
-            }
-        }
-        else if (this._engine.cfg.session_type == FrameworkConfig_1.ESessionType.Redis) {
-            user_id = parseInt((await RedisManager_1.GRedisMgr.get(this._session_id)) || "-1");
-        }
-        if (user_id < 0) {
-            this._session_id = null;
-            return;
-        }
-        um = (await UserService_1.GUserSer.getById(user_id));
-        this._login(um);
     }
     async update_user(user_id) {
         let user = (await UserService_1.GUserSer.getById(user_id));

package/dist/types/WebServer/Controller/BaseUserController.d.ts

@@ -13,10 +13,11 @@ export declare class BaseUserController<T extends UserModel> extends BaseControl
     get isProxy(): boolean;
     get isCommon(): boolean;
     init(): Promise<void>;
+    protected _getUserBySession(session: string): Promise<T>;
     protected _logout(): void;
     protected _login(user: T): void;
     /**
-     * 用户信息发生更改，同步更新session里面的用户信息
+     * 已经被启用
      */
     protected _update_session(): Promise<void>;
     update_user(user_id: number): Promise<void>;

package/package.json

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