cgserver 8.9.2 → 8.9.4

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

@@ -1,91 +1,91 @@
-export { GCgServer } from './cgserver';
-export { GProtoFactory } from './SocketServer/ProtoFilter/ProtoFactory';
-export { GDBCache } from './Database/Decorator/DBCache';
-export { AiObject } from "./AI/AiObject";
-export { AStar } from "./AI/Astar";
-export { BehaviorAI } from "./AI/BehaviorAI";
-export { Entity } from "./AI/Entity";
-export { Point } from "./AI/Point";
-export { Trigger, GTriggerMgr } from "./AI/TriggerMgr";
-export { FrameworkErrorCode } from "./Config/_error_";
-export { Config } from "./Config/Config";
-export { FrameworkConfig } from "./Config/FrameworkConfig";
-export { IServerConfig, GServerCfg } from "./Config/IServerConfig";
-export { core } from "./Core/Core";
-export { Timer } from "./Core/Timer";
-export { AutoIncrement } from "./Database/Decorator/AutoIncrement";
-export { NotNull } from './Database/Decorator/NotNull';
-export { PrimaryKey } from './Database/Decorator/PrimaryKey';
-export { Property } from './Database/Decorator/Property';
-export { Table } from './Database/Decorator/Table';
-export { Type } from './Database/Decorator/Type';
-export { EPropertyType } from './Database/Decorator/Property';
-export { MongoBaseService } from './Database/MongoBaseService';
-export { BaseModel as MysqlBaseModel } from './Database/MysqlBaseService';
-export { MongoBaseModel } from './Database/MongoManager';
-export { GMongoMgr } from './Database/MongoManager';
-export { GMSSqlMgr } from './Database/MSSqlManager';
-export { MysqlBaseService } from './Database/MysqlBaseService';
-export { GMysqlMgr, SqlResult, SqlReturn, SqlReturns } from './Database/MysqlManager';
-export { GRedisMgr, RedisManager } from './Database/RedisManager';
-export { GCacheTool } from './Logic/CacheTool';
-export { GHttpTool } from './Logic/HttpTool';
-export { GLog } from './Logic/Log';
-export { ERoleGroup, EUserState, EAccountFrom } from './Service/ini';
-export { MysqlAccountService } from './Service/MysqlAccountService';
-export { MongoAccountService } from './Service/MongoAccountService';
-export { MysqlUserService } from './Service/MysqlUserService';
-export { UserService as MongoUserService } from './Service/MongoUserService';
-export { MysqlUserModel } from './Service/MysqlUserService';
-export { MongoUserModel } from './Service/MongoUserService';
-export { GMongoCacheSer, MongoCacheModel } from './Service/MongoCacheService';
-export { DbConfig } from './Config/DbConfig';
-export { MSSqlConfig } from './Database/MSSqlManager';
-export { MongoConfig } from './Database/MongoManager';
-export { MysqlConfig } from './Database/MysqlManager';
-export { RedisConfig } from './Database/RedisManager';
-export { EProtoType } from './SocketServer/ProtoFilter/IProtoFilter';
-export { GoogleProtoFilter } from './SocketServer/ProtoFilter/GoogleProtoFilter';
-export { IProtoFilter } from './SocketServer/ProtoFilter/IProtoFilter';
-export { JsonProtoFilter } from './SocketServer/ProtoFilter/JsonProtoFilter';
-export { IServerWebSocket } from './SocketServer/IServerWebSocket';
-export { IClientWebSocket } from './SocketServer/IClientWebSocket';
-export { ISocketServer } from './SocketServer/ISocketServer';
-export { IWebSocket, BaseMsg } from './SocketServer/IWebSocket';
-export { GAlipayTool, AlipayResult, AlipayCallBack } from './ThirdParty/AlipayTool';
-export { GSmsTool } from './ThirdParty/Alisms';
-export { GAppleTool } from './ThirdParty/AppleTool';
-export { GEmailTool } from './ThirdParty/EmailTool';
-export { GOpenSocial } from './ThirdParty/OpenSocial';
-export { GQiniuTool } from './ThirdParty/QiniuTool';
-export { GQQTool } from './ThirdParty/QQTool';
-export { GWechatOATool } from './ThirdParty/WechatOATool';
-export { GWechatTool } from './ThirdParty/WechatTool';
-export { IWebServer } from './WebServer/IWebServer';
-export { BaseController } from './WebServer/Controller/BaseController';
-export { MysqlBaseUserController } from './WebServer/Controller/MysqlBaseUserController';
-export { MongoBaseUserController } from './WebServer/Controller/MongoBaseUserController';
-export { MysqlAccountModel } from './Service/MysqlAccountService';
-export { MongoAccountModel } from './Service/MongoAccountService';
-export { AdminValidate } from './Decorator/AdminValidate';
-export { AuthorityValidate } from './Decorator/AuthorityValidate';
-export { CreatorValidate } from './Decorator/CreatorValidate';
-export { JsonAdminValidate } from './Decorator/JsonAdminValidate';
-export { JsonAuthorityValidate } from './Decorator/JsonAuthorityValidate';
-export { JsonCreatorValidate } from './Decorator/JsonCreatorValidate';
-export { GCtrMgr } from './WebServer/Engine/ControllerManager';
-export { Engine } from './WebServer/Engine/Engine';
-export { RazorJs } from './WebServer/Engine/RazorJs';
-export { Request } from './WebServer/Engine/Request';
-export { Response } from './WebServer/Engine/Response';
-export { WebServerConfig } from './Config/FrameworkConfig';
-export { GSyncQueueTool } from './Logic/SyncQueueTool';
-export { GEventTool } from './Logic/EventTool';
-export { EAccountState } from './Service/ini';
-export { RpcBaseMsg } from './SocketServer/IRpc';
-export { Rpc, RpcConfig } from './ThirdParty/Rpc';
-export { CgMq, CgMqConfig } from './ThirdParty/CgMq';
-export { IRpcServerWebSocket } from './SocketServer/IRpcServerWebSocket';
-export { IRpcClientWebSocket } from './SocketServer/IRpcClientWebSocket';
-export { SyncCall, SyncCall2 } from './Decorator/SyncCall';
-export { SyncCallServer, SyncCallServer2 } from './Decorator/SyncCallServer';
+export { GCgServer } from './cgserver';
+export { GProtoFactory } from './SocketServer/ProtoFilter/ProtoFactory';
+export { GDBCache } from './Database/Decorator/DBCache';
+export { AiObject } from "./AI/AiObject";
+export { AStar } from "./AI/Astar";
+export { BehaviorAI } from "./AI/BehaviorAI";
+export { Entity } from "./AI/Entity";
+export { Point } from "./AI/Point";
+export { Trigger, GTriggerMgr } from "./AI/TriggerMgr";
+export { FrameworkErrorCode } from "./Config/_error_";
+export { Config } from "./Config/Config";
+export { FrameworkConfig } from "./Config/FrameworkConfig";
+export { IServerConfig, GServerCfg } from "./Config/IServerConfig";
+export { core } from "./Core/Core";
+export { Timer } from "./Core/Timer";
+export { AutoIncrement } from "./Database/Decorator/AutoIncrement";
+export { NotNull } from './Database/Decorator/NotNull';
+export { PrimaryKey } from './Database/Decorator/PrimaryKey';
+export { Property } from './Database/Decorator/Property';
+export { Table } from './Database/Decorator/Table';
+export { Type } from './Database/Decorator/Type';
+export { EPropertyType } from './Database/Decorator/Property';
+export { MongoBaseService } from './Database/MongoBaseService';
+export { BaseModel as MysqlBaseModel } from './Database/MysqlBaseService';
+export { MongoBaseModel, MongoManager } from './Database/MongoManager';
+export { GMongoMgr } from './Database/MongoManager';
+export { GMSSqlMgr } from './Database/MSSqlManager';
+export { MysqlBaseService } from './Database/MysqlBaseService';
+export { GMysqlMgr, SqlResult, SqlReturn, SqlReturns } from './Database/MysqlManager';
+export { GRedisMgr, RedisManager } from './Database/RedisManager';
+export { GCacheTool } from './Logic/CacheTool';
+export { GHttpTool } from './Logic/HttpTool';
+export { GLog } from './Logic/Log';
+export { ERoleGroup, EUserState, EAccountFrom } from './Service/ini';
+export { MysqlAccountService } from './Service/MysqlAccountService';
+export { MongoAccountService } from './Service/MongoAccountService';
+export { MysqlUserService } from './Service/MysqlUserService';
+export { UserService as MongoUserService } from './Service/MongoUserService';
+export { MysqlUserModel } from './Service/MysqlUserService';
+export { MongoUserModel } from './Service/MongoUserService';
+export { GMongoCacheSer, MongoCacheModel } from './Service/MongoCacheService';
+export { DbConfig } from './Config/DbConfig';
+export { MSSqlConfig } from './Database/MSSqlManager';
+export { MongoConfig } from './Database/MongoManager';
+export { MysqlConfig } from './Database/MysqlManager';
+export { RedisConfig } from './Database/RedisManager';
+export { EProtoType } from './SocketServer/ProtoFilter/IProtoFilter';
+export { GoogleProtoFilter } from './SocketServer/ProtoFilter/GoogleProtoFilter';
+export { IProtoFilter } from './SocketServer/ProtoFilter/IProtoFilter';
+export { JsonProtoFilter } from './SocketServer/ProtoFilter/JsonProtoFilter';
+export { IServerWebSocket } from './SocketServer/IServerWebSocket';
+export { IClientWebSocket } from './SocketServer/IClientWebSocket';
+export { ISocketServer } from './SocketServer/ISocketServer';
+export { IWebSocket, BaseMsg } from './SocketServer/IWebSocket';
+export { GAlipayTool, AlipayResult, AlipayCallBack } from './ThirdParty/AlipayTool';
+export { GSmsTool } from './ThirdParty/Alisms';
+export { GAppleTool } from './ThirdParty/AppleTool';
+export { GEmailTool } from './ThirdParty/EmailTool';
+export { GOpenSocial } from './ThirdParty/OpenSocial';
+export { GQiniuTool } from './ThirdParty/QiniuTool';
+export { GQQTool } from './ThirdParty/QQTool';
+export { GWechatOATool } from './ThirdParty/WechatOATool';
+export { GWechatTool } from './ThirdParty/WechatTool';
+export { IWebServer } from './WebServer/IWebServer';
+export { BaseController } from './WebServer/Controller/BaseController';
+export { MysqlBaseUserController } from './WebServer/Controller/MysqlBaseUserController';
+export { MongoBaseUserController } from './WebServer/Controller/MongoBaseUserController';
+export { MysqlAccountModel } from './Service/MysqlAccountService';
+export { MongoAccountModel } from './Service/MongoAccountService';
+export { AdminValidate } from './Decorator/AdminValidate';
+export { AuthorityValidate } from './Decorator/AuthorityValidate';
+export { CreatorValidate } from './Decorator/CreatorValidate';
+export { JsonAdminValidate } from './Decorator/JsonAdminValidate';
+export { JsonAuthorityValidate } from './Decorator/JsonAuthorityValidate';
+export { JsonCreatorValidate } from './Decorator/JsonCreatorValidate';
+export { GCtrMgr } from './WebServer/Engine/ControllerManager';
+export { Engine } from './WebServer/Engine/Engine';
+export { RazorJs } from './WebServer/Engine/RazorJs';
+export { Request } from './WebServer/Engine/Request';
+export { Response } from './WebServer/Engine/Response';
+export { WebServerConfig } from './Config/FrameworkConfig';
+export { GSyncQueueTool } from './Logic/SyncQueueTool';
+export { GEventTool } from './Logic/EventTool';
+export { EAccountState } from './Service/ini';
+export { RpcBaseMsg } from './SocketServer/IRpc';
+export { Rpc, RpcConfig } from './ThirdParty/Rpc';
+export { CgMq, CgMqConfig } from './ThirdParty/CgMq';
+export { IRpcServerWebSocket } from './SocketServer/IRpcServerWebSocket';
+export { IRpcClientWebSocket } from './SocketServer/IRpcClientWebSocket';
+export { SyncCall, SyncCall2 } from './Decorator/SyncCall';
+export { SyncCallServer, SyncCallServer2 } from './Decorator/SyncCallServer';

package/dist/types/test/test.d.ts

@@ -1 +1 @@
-export {};
+export {};

package/package.json

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

package/dist/lib/Framework/WebServer/Decorator/AdminValidate.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdminValidate = void 0;
-function AdminValidate(target, propertyName, descriptor) {
-    let method = descriptor.value;
-    descriptor.value = function () {
-        let self = this;
-        if (!self.isLogin) {
-            self.redirect(null, "Login");
-            return;
-        }
-        if (!self.isAdmin) {
-            self.showText("需要管理员权限");
-            return;
-        }
-        return method.apply(this, arguments);
-    };
-}
-exports.AdminValidate = AdminValidate;

package/dist/lib/Framework/WebServer/Decorator/AuthorityValidate.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AuthorityValidate = void 0;
-let AuthorityValidate = function (rg, ctr_name) {
-    ctr_name = ctr_name || "Wechat";
-    return function (target, propertyName, descriptor) {
-        let method = descriptor.value;
-        descriptor.value = function () {
-            let self = this;
-            if (!self.isLogin) {
-                self.redirect(null, ctr_name);
-                return;
-            }
-            if (rg && self.selfUser.role_group != rg) {
-                self.redirect(null, ctr_name); //权限不足
-                return;
-            }
-            return method.apply(this, arguments);
-        };
-    };
-};
-exports.AuthorityValidate = AuthorityValidate;

package/dist/lib/Framework/WebServer/Decorator/CreatorValidate.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreatorValidate = void 0;
-function CreatorValidate(target, propertyName, descriptor) {
-    let method = descriptor.value;
-    descriptor.value = function () {
-        let self = this;
-        if (!self.isLogin) {
-            self.redirect(null, "Login");
-            return;
-        }
-        if (!self.isCreator) {
-            self.showText("需要创始人权限");
-            return;
-        }
-        return method.apply(this, arguments);
-    };
-}
-exports.CreatorValidate = CreatorValidate;

package/dist/lib/Framework/WebServer/Decorator/JsonAdminValidate.js

@@ -1,15 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonAdminValidate = void 0;
-function JsonAdminValidate(target, propertyName, descriptor) {
-    let method = descriptor.value;
-    descriptor.value = function () {
-        let self = this;
-        if (!self.isAdmin) {
-            self.showJson({ errcode: { id: 1, des: "需要管理员或创始人权限" }, err: "需要管理员或创始人权限" });
-            return;
-        }
-        return method.apply(this, arguments);
-    };
-}
-exports.JsonAdminValidate = JsonAdminValidate;

package/dist/lib/Framework/WebServer/Decorator/JsonAuthorityValidate.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonAuthorityValidate = void 0;
-let JsonAuthorityValidate = function (rg) {
-    return function (target, propertyName, descriptor) {
-        let method = descriptor.value;
-        descriptor.value = function () {
-            let self = this;
-            if (!self.isLogin) {
-                self.showJson({ errcode: { id: 1, des: "未登陆" }, err: "未登陆" });
-            }
-            if (rg && self.selfUser.role_group != rg) {
-                self.showJson({ errcode: { id: 2, des: "权限不足" }, err: "权限不足" });
-                return;
-            }
-            return method.apply(this, arguments);
-        };
-    };
-};
-exports.JsonAuthorityValidate = JsonAuthorityValidate;

package/dist/lib/Framework/WebServer/Decorator/JsonCreatorValidate.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonCreatorValidate = void 0;
-function JsonCreatorValidate(target, propertyName, descriptor) {
-    let method = descriptor.value;
-    descriptor.value = function () {
-        let self = this;
-        if (!self.isLogin) {
-            self.showJson({ errcode: { id: 1, des: "请登陆后尝试" }, err: "请登陆后尝试" });
-            return;
-        }
-        if (!self.isCreator) {
-            self.showJson({ errcode: { id: 1, des: "需要创始人权限" }, err: "需要创始人权限" });
-            return;
-        }
-        return method.apply(this, arguments);
-    };
-}
-exports.JsonCreatorValidate = JsonCreatorValidate;

package/dist/lib/Framework/WebServer/Decorator/SyncCall.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SyncCall2 = exports.SyncCall = void 0;
-const SyncQueueTool_1 = require("../../Logic/SyncQueueTool");
-/**
- * 异步函数变为同步函数，当前进程有效
- * @param target
- * @param propertyName
- * @param descriptor
- */
-function SyncCall(target, propertyName, descriptor) {
-    let method = descriptor.value;
-    descriptor.value = function () {
-        let self = this;
-        let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
-            return await method.apply(self, arguments);
-        });
-        return ret;
-    };
-}
-exports.SyncCall = SyncCall;
-/**
- * 异步函数变为同步函数，当前进程有效
- * @param param_index 动态参数的索引
- */
-function SyncCall2(param_index) {
-    return (target, propertyName, descriptor) => {
-        let method = descriptor.value;
-        descriptor.value = function () {
-            let key = propertyName;
-            if (param_index != undefined && param_index < arguments.length) {
-                key = propertyName + "_" + arguments[param_index];
-            }
-            let ret = SyncQueueTool_1.GSyncQueueTool.add(key, async () => {
-                return await method.apply(target, arguments);
-            });
-            return ret;
-        };
-    };
-}
-exports.SyncCall2 = SyncCall2;

package/dist/lib/Framework/WebServer/Decorator/SyncCallServer.js

@@ -1,77 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SyncCallServer2 = exports.SyncCallServer = void 0;
-const Core_1 = require("../../Core/Core");
-const SyncQueueTool_1 = require("../../Logic/SyncQueueTool");
-const MongoCacheService_1 = require("../../Service/MongoCacheService");
-/**
- * 异步函数变为同步函数
- * 服务器间的异步，效率低
- * 只支持mongo模式
- * @returns
- */
-function SyncCallServer(target, propertyName, descriptor) {
-    let method = descriptor.value;
-    descriptor.value = async () => {
-        let key = "sync_" + method.name;
-        let func = async () => {
-            let item = await MongoCacheService_1.GMongoCacheSer.getData(key);
-            let ret = null;
-            while (item) {
-                await Core_1.core.sleep(200);
-                item = await MongoCacheService_1.GMongoCacheSer.getData(key);
-            }
-            //10秒后过期，避免卡死
-            let mcm = await MongoCacheService_1.GMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
-            if (!mcm) {
-                await func();
-            }
-            return;
-        };
-        await func();
-        let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
-            return await method.apply(self, arguments);
-        });
-        await MongoCacheService_1.GMongoCacheSer.deleteOne({ key });
-        return ret;
-    };
-}
-exports.SyncCallServer = SyncCallServer;
-/**
- * 异步函数变为同步函数
- * 服务器间的异步，效率低
- * 只支持mongo模式
- * @returns
- */
-let SyncCallServer2 = function (params_index) {
-    return function (target, propertyName, descriptor) {
-        let method = descriptor.value;
-        descriptor.value = async () => {
-            let key = "sync_" + method.name;
-            if (params_index != undefined && params_index < arguments.length) {
-                key = key + "_" + arguments[params_index];
-            }
-            let func = async () => {
-                let item = await MongoCacheService_1.GMongoCacheSer.getData(key);
-                let ret = null;
-                while (item) {
-                    await Core_1.core.sleep(200);
-                    item = await MongoCacheService_1.GMongoCacheSer.getData(key);
-                }
-                //10秒后过期，避免卡死
-                let mcm = await MongoCacheService_1.GMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
-                if (!mcm) {
-                    await func();
-                }
-                return;
-            };
-            await func();
-            let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
-                return await method.apply(self, arguments);
-            });
-            await MongoCacheService_1.GMongoCacheSer.deleteOne({ key });
-            return ret;
-        };
-    };
-};
-exports.SyncCallServer2 = SyncCallServer2;

package/dist/types/Framework/WebServer/Decorator/AdminValidate.d.ts

@@ -1 +0,0 @@
-export declare function AdminValidate(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;

package/dist/types/Framework/WebServer/Decorator/AuthorityValidate.d.ts

@@ -1,2 +0,0 @@
-import { ERoleGroup } from "../../Service/ini";
-export declare let AuthorityValidate: (rg?: ERoleGroup, ctr_name?: string) => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

package/dist/types/Framework/WebServer/Decorator/CreatorValidate.d.ts

@@ -1 +0,0 @@
-export declare function CreatorValidate(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;

package/dist/types/Framework/WebServer/Decorator/JsonAdminValidate.d.ts

@@ -1 +0,0 @@
-export declare function JsonAdminValidate(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;

package/dist/types/Framework/WebServer/Decorator/JsonAuthorityValidate.d.ts

@@ -1,2 +0,0 @@
-import { ERoleGroup } from "../../Service/ini";
-export declare let JsonAuthorityValidate: (rg?: ERoleGroup) => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

package/dist/types/Framework/WebServer/Decorator/JsonCreatorValidate.d.ts

@@ -1 +0,0 @@
-export declare function JsonCreatorValidate(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;

package/dist/types/Framework/WebServer/Decorator/SyncCall.d.ts

@@ -1,12 +0,0 @@
-/**
- * 异步函数变为同步函数，当前进程有效
- * @param target
- * @param propertyName
- * @param descriptor
- */
-export declare function SyncCall(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;
-/**
- * 异步函数变为同步函数，当前进程有效
- * @param param_index 动态参数的索引
- */
-export declare function SyncCall2(param_index?: number): (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

package/dist/types/Framework/WebServer/Decorator/SyncCallServer.d.ts

@@ -1,14 +0,0 @@
-/**
- * 异步函数变为同步函数
- * 服务器间的异步，效率低
- * 只支持mongo模式
- * @returns
- */
-export declare function SyncCallServer(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;
-/**
- * 异步函数变为同步函数
- * 服务器间的异步，效率低
- * 只支持mongo模式
- * @returns
- */
-export declare let SyncCallServer2: (params_index?: number) => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;