cgserver 8.0.2504 → 8.3.2546

package/dist/lib/Framework/Service/MongoAccountService.js

@@ -5,7 +5,6 @@ const _error_1 = require("../Config/_error_");
 const MongoBaseService_1 = require("../Database/MongoBaseService");
 const MongoManager_1 = require("../Database/MongoManager");
 const CacheTool_1 = require("../Logic/CacheTool");
-const Log_1 = require("../Logic/Log");
 const OpenSocial_1 = require("../ThirdParty/OpenSocial");
 const QQTool_1 = require("../ThirdParty/QQTool");
 const WechatTool_1 = require("../ThirdParty/WechatTool");
@@ -28,10 +27,6 @@ class MongoAccountModel extends MongoManager_1.MongoBaseModel {
 }
 exports.MongoAccountModel = MongoAccountModel;
 class MongoAccountService extends MongoBaseService_1.MongoBaseService {
-    _getNewModel() {
-        Log_1.GLog.error("you should override this function:_getNewModel(){return T}!");
-        return null;
-    }
     /**
      * 注册新账号
      * @param unionid
@@ -40,7 +35,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
      * @param from
      */
     async add(unionid, openid, ip, from) {
-        let account = this._getNewModel();
+        let account = new this._t_type();
         switch (from) {
             case ini_1.EAccountFrom.OpenSocial:
             case ini_1.EAccountFrom.WeChat:
@@ -310,7 +305,7 @@ class MongoAccountService extends MongoBaseService_1.MongoBaseService {
     async register(type, key, password, ip, extra) {
         let rs = { user: null, errcode: null };
         extra = extra || {};
-        let am = this._getNewModel();
+        let am = new this._t_type();
         switch (type) {
             case ini_1.EAccountFrom.Phone:
                 {

package/dist/lib/Framework/Service/MysqlAccountService.js

@@ -21,7 +21,6 @@ const NotNull_1 = require("../Database/Decorator/NotNull");
 const Type_1 = require("../Database/Decorator/Type");
 const AutoIncrement_1 = require("../Database/Decorator/AutoIncrement");
 const ini_1 = require("./ini");
-const Log_1 = require("../Logic/Log");
 let MysqlAccountModel = class MysqlAccountModel extends MysqlBaseService_1.BaseModel {
     id = -1;
     phone = "";
@@ -103,10 +102,6 @@ MysqlAccountModel = __decorate([
 exports.MysqlAccountModel = MysqlAccountModel;
 //暂时不实例化，方便重写
 class MysqlAccountService extends MysqlBaseService_1.MysqlBaseService {
-    _getNewModel() {
-        Log_1.GLog.error("you should override this function:_getNewModel(){return T}!");
-        return null;
-    }
     /**
      * 注册新账号
      * @param unionid
@@ -115,7 +110,7 @@ class MysqlAccountService extends MysqlBaseService_1.MysqlBaseService {
      * @param from
      */
     async add(unionid, openid, ip, from) {
-        let account = this._getNewModel();
+        let account = new this._t_type();
         switch (from) {
             case ini_1.EAccountFrom.OpenSocial:
             case ini_1.EAccountFrom.WeChat:
@@ -379,7 +374,7 @@ class MysqlAccountService extends MysqlBaseService_1.MysqlBaseService {
     async register(type, key, password, ip, extra) {
         let rs = { user: null, errcode: null };
         extra = extra || {};
-        let am = this._getNewModel();
+        let am = new this._t_type();
         switch (type) {
             case ini_1.EAccountFrom.Phone:
                 {

package/dist/lib/Framework/cgserver.js

@@ -24,6 +24,12 @@ class CgServer {
     }
     init() {
         process.on("uncaughtException", this.onUnCaughtException.bind(this));
+        process.on("exit", this.onExit.bind(this));
+        //ctrl+c
+        process.on("SIGINT", this.onExit.bind(this));
+        //kill pid
+        process.on("SIGUSR1", this.onExit.bind(this));
+        process.on("SIGUSR2", this.onExit.bind(this));
         process.env.TZ = "Asia/Shanghai";
         EventTool_1.GEventTool.on("socket_server_init_done", this.onStart.bind(this));
         EventTool_1.GEventTool.on("web_server_init_done", this.onStart.bind(this));
@@ -58,6 +64,20 @@ class CgServer {
             Core_1.core.safeCall(events[i]);
         }
     }
+    async onExit() {
+        let events = this._events["exit"] || [];
+        let exit = true;
+        for (let i = 0; i < events.length; ++i) {
+            //只要有一个函数返回true，就不退出
+            let ret = await Core_1.core.safeCall(events[i]);
+            if (ret === true) {
+                exit = false;
+            }
+        }
+        if (exit) {
+            process.exit(0);
+        }
+    }
     addListener(event, func) {
         this._events[event] = this._events[event] || [];
         this._events[event].push(func);
@@ -76,6 +96,10 @@ class CgServer {
     }
     onUnCaughtException(e) {
         Log_1.GLog.error(e.stack);
+        let events = this._events["uncaughtexception"] || [];
+        for (let i = 0; i < events.length; ++i) {
+            Core_1.core.safeCall(events[i]);
+        }
     }
     addWebServer(server) {
         this._webservers.push(server);

package/dist/lib/Framework/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoCacheModel = exports.GMongoCacheSer = exports.MongoUserModel = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.ERoleGroup = exports.GLog = exports.GHttpTool = exports.GCacheTool = exports.RedisManager = exports.GRedisMgr = exports.SqlReturns = exports.SqlReturn = exports.SqlResult = 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.GServerCfg = exports.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.GTriggerMgr = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.GDBCache = exports.GProtoFactory = exports.GCgServer = void 0;
-exports.SyncCallServer = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.CgMqConfig = exports.CgMq = exports.RpcConfig = exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = 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.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = void 0;
+exports.SyncCallServer = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.CgMqConfig = exports.CgMq = exports.RpcConfig = exports.Rpc = exports.RpcBaseMsg = exports.EAccountState = exports.GEventTool = exports.GSyncQueueTool = 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.MysqlBaseUserController = exports.BaseController = exports.IWebServer = exports.GWechatTool = exports.GWechatOATool = exports.GQQTool = exports.GQiniuTool = exports.GOpenSocial = exports.GEmailTool = exports.GAppleTool = exports.GSmsTool = exports.AlipayCallBack = exports.AlipayResult = exports.GAlipayTool = exports.BaseMsg = exports.IWebSocket = exports.ISocketServer = exports.IClientWebSocket = exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = void 0;
 var cgserver_1 = require("./cgserver");
 Object.defineProperty(exports, "GCgServer", { enumerable: true, get: function () { return cgserver_1.GCgServer; } });
 var ProtoFactory_1 = require("./SocketServer/ProtoFilter/ProtoFactory");
@@ -110,6 +110,8 @@ Object.defineProperty(exports, "IWebSocket", { enumerable: true, get: function (
 Object.defineProperty(exports, "BaseMsg", { enumerable: true, get: function () { return IWebSocket_1.BaseMsg; } });
 var AlipayTool_1 = require("./ThirdParty/AlipayTool");
 Object.defineProperty(exports, "GAlipayTool", { enumerable: true, get: function () { return AlipayTool_1.GAlipayTool; } });
+Object.defineProperty(exports, "AlipayResult", { enumerable: true, get: function () { return AlipayTool_1.AlipayResult; } });
+Object.defineProperty(exports, "AlipayCallBack", { enumerable: true, get: function () { return AlipayTool_1.AlipayCallBack; } });
 var Alisms_1 = require("./ThirdParty/Alisms");
 Object.defineProperty(exports, "GSmsTool", { enumerable: true, get: function () { return Alisms_1.GSmsTool; } });
 var AppleTool_1 = require("./ThirdParty/AppleTool");

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

@@ -18,7 +18,6 @@ export declare class MongoAccountModel extends MongoBaseModel {
     state: number;
 }
 export declare class MongoAccountService<T extends MongoAccountModel> extends MongoBaseService<T> {
-    protected _getNewModel(): T;
     /**
      * 注册新账号
      * @param unionid

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

@@ -23,7 +23,6 @@ export declare class MysqlAccountModel extends BaseModel {
     state: number;
 }
 export declare class MysqlAccountService<T extends MysqlAccountModel> extends MysqlBaseService<T> {
-    protected _getNewModel(): T;
     /**
      * 注册新账号
      * @param unionid

package/dist/types/Framework/cgserver.d.ts

@@ -14,8 +14,9 @@ declare class CgServer {
     init(): void;
     protected _done: number;
     onStart(): void;
-    addListener(event: "start", func: () => void): void;
-    removeListener(event: "start", func: () => void): boolean;
+    onExit(): Promise<void>;
+    addListener(event: "start" | "exit" | "uncaughtexception", func: () => void): void;
+    removeListener(event: "start" | "exit" | "uncaughtexception", func: () => void): boolean;
     onUnCaughtException(e: any): void;
     addWebServer(server: IWebServer): void;
     addSocketServer(server: ISocketServer): void;

package/dist/types/Framework/index.d.ts

@@ -47,7 +47,7 @@ export { IServerWebSocket } from './SocketServer/IServerWebSocket';
 export { IClientWebSocket } from './SocketServer/IClientWebSocket';
 export { ISocketServer } from './SocketServer/ISocketServer';
 export { IWebSocket, BaseMsg } from './SocketServer/IWebSocket';
-export { GAlipayTool } from './ThirdParty/AlipayTool';
+export { GAlipayTool, AlipayResult, AlipayCallBack } from './ThirdParty/AlipayTool';
 export { GSmsTool } from './ThirdParty/Alisms';
 export { GAppleTool } from './ThirdParty/AppleTool';
 export { GEmailTool } from './ThirdParty/EmailTool';

package/package.json

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