cgserver 6.2.7 → 6.2.10

package/dist/lib/SocketServer/IWebSocket.js

@@ -157,12 +157,12 @@ class IWebSocket {
                 try {
                     if (Core_1.core.isAsyncFunc(otherfunc)) {
                         //默认支持其他所有处理消息
-                        await otherfunc(jsonData).catch((reason) => {
+                        await otherfunc.call(this, jsonData).catch((reason) => {
                             Log_1.GLog.error(reason);
                         });
                     }
                     else {
-                        otherfunc(jsonData);
+                        otherfunc.call(this, jsonData);
                     }
                 }
                 catch (e) {
@@ -177,12 +177,12 @@ class IWebSocket {
             try {
                 if (Core_1.core.isAsyncFunc(func)) {
                     //默认支持其他所有处理消息
-                    await func(jsonData).catch((reason) => {
+                    await func.call(this, jsonData).catch((reason) => {
                         Log_1.GLog.error(reason);
                     });
                 }
                 else {
-                    func(jsonData);
+                    func.call(this, jsonData);
                 }
             }
             catch (e) {

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

@@ -94,7 +94,7 @@ class BaseUserController extends BaseController_1.BaseController {
             return;
         }
         if (!this._session_id) {
-            this._session_id = Math.random().toString(36).substr(2) + user.id;
+            this._session_id = Math.random().toString(36).substring(2) + user.id;
         }
         let time = 0;
         if (this._request.postData.remember == "on") {

package/dist/lib/cgserver.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.MongoCacheModel = exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.GMongoAccountSer = exports.MongoAccountService = exports.GMysqlAccountSer = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.GMysqlMgr = exports.MysqlBaseService = exports.GMSSqlMgr = exports.GMongoMgr = exports.MongoBaseModel = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.ServerConfig = exports.GFCfg = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GProtoFactory = void 0;
-exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = exports.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = void 0;
+exports.GCgServer = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.GCtrMgr = exports.JsonCreatorValidate = exports.JsonAuthorityValidate = exports.JsonAdminValidate = exports.CreatorValidate = exports.AuthorityValidate = exports.AdminValidate = exports.MongoAccountModel = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = exports.IWebSocket = exports.ISocketServer = exports.IServerWebSocket = exports.IClientWebSocket = void 0;
 var ProtoFactory_1 = require("./SocketServer/ProtoFilter/ProtoFactory");
 Object.defineProperty(exports, "GProtoFactory", { enumerable: true, get: function () { return ProtoFactory_1.GProtoFactory; } });
 var DBCache_1 = require("./Database/Decorator/DBCache");
@@ -157,4 +157,17 @@ var Response_1 = require("./WebServer/Engine/Response");
 Object.defineProperty(exports, "Response", { enumerable: true, get: function () { return Response_1.Response; } });
 var FrameworkConfig_2 = require("./Config/FrameworkConfig");
 Object.defineProperty(exports, "WebServerConfig", { enumerable: true, get: function () { return FrameworkConfig_2.WebServerConfig; } });
-process.env.TZ = "Asia/Shanghai";
+const Log_2 = require("./Logic/Log");
+class CgServer {
+    constructor() {
+        this.init();
+    }
+    init() {
+        process.on("uncaughtException", this.onUnCaughtException.bind(this));
+        process.env.TZ = "Asia/Shanghai";
+    }
+    onUnCaughtException(e) {
+        Log_2.GLog.error(e.stack);
+    }
+}
+exports.GCgServer = new CgServer();

package/dist/types/cgserver.d.ts

@@ -72,3 +72,9 @@ export { RazorJs } from './WebServer/Engine/RazorJs';
 export { Request } from './WebServer/Engine/Request';
 export { Response } from './WebServer/Engine/Response';
 export { WebServerConfig } from './Config/FrameworkConfig';
+declare class CgServer {
+    constructor();
+    init(): void;
+    onUnCaughtException(e: any): void;
+}
+export declare let GCgServer: CgServer;

package/package.json

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