cgserver 9.2.7 → 10.0.0

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

@@ -1,5 +1,5 @@
-import { MongoBaseService } from '../Database/MongoBaseService';
-import { MongoBaseModel } from '../Database/MongoManager';
+import { MongoBaseService } from '../Database/Mongo/MongoBaseService';
+import { MongoBaseModel } from '../Database/Mongo/MongoManager';
 import { EAccountFrom } from './ini';
 import { MongoUserModel } from './MongoUserService';
 export declare class MongoAccountModel extends MongoBaseModel {

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

@@ -1,14 +1,12 @@
-import { MongoBaseService } from "../Database/MongoBaseService";
-import { MongoBaseModel } from "../Database/MongoManager";
+import { MongoBaseService } from "../Database/Mongo/MongoBaseService";
+import { MongoBaseModel } from "../Database/Mongo/MongoManager";
 export declare class MongoCacheModel extends MongoBaseModel {
     key: string;
     data: any;
     expireAt: number;
 }
-export declare let GMongoCacheSer: MongoCacheService;
-declare class MongoCacheService extends MongoBaseService<MongoCacheModel> {
+export declare class MongoCacheService extends MongoBaseService<MongoCacheModel> {
     constructor();
     getData(key: string): Promise<any>;
     addData(key: string, data: any, expireAt?: number): Promise<MongoCacheModel>;
 }
-export {};

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

@@ -1,5 +1,5 @@
-import { MongoBaseService } from "../Database/MongoBaseService";
-import { MongoBaseModel } from "../Database/MongoManager";
+import { MongoBaseService } from "../Database/Mongo/MongoBaseService";
+import { MongoBaseModel } from "../Database/Mongo/MongoManager";
 import { ERoleGroup } from "./ini";
 export declare class MongoUserModel extends MongoBaseModel {
     id: number;
@@ -23,8 +23,8 @@ export declare class MongoUserModel extends MongoBaseModel {
     is_robot: number;
     create_time: number;
 }
-export declare let GUserSer: UserService<MongoUserModel>;
-export declare class UserService<T extends MongoUserModel> extends MongoBaseService<T> {
+export declare let GMongoUserSer: MongoUserService<MongoUserModel>;
+export declare class MongoUserService<T extends MongoUserModel> extends MongoBaseService<T> {
     constructor(table: string, type: {
         new (): T;
     });

package/dist/types/Framework/SocketServer/ProtoFilter/ProtoFactory.d.ts

@@ -1,8 +1,7 @@
 import { IProtoFilter } from './IProtoFilter';
 import { EProtoType } from "./IProtoFilter";
-export declare let GProtoFactory: ProtoFactory;
 type ProtoFilterClass = new () => IProtoFilter;
-declare class ProtoFactory {
+export declare class ProtoFactory {
     protected _filters: Map<EProtoType, IProtoFilter>;
     protected _type_filter_classes: Map<EProtoType, ProtoFilterClass>;
     constructor();

package/dist/types/Framework/ThirdParty/AlipayTool.d.ts

@@ -46,8 +46,7 @@ export declare class AlipayCallBack {
     buyer_logon_id: string;
     point_amount: number;
 }
-export declare let GAlipayTool: AlipayTool;
-declare class AlipayTool {
+export declare class AlipayTool {
     protected _alipaySdk: AlipaySdk;
     protected _aliPay: AliPayUtil;
     protected _cfg: {
@@ -106,4 +105,3 @@ declare class AlipayTool {
      */
     getAlipayPage(method: "get" | "post", notifyUrl: string, returnUrl: string, outTradeNo: string, money: number, subject: string, body: string): Promise<string | import("alipay-sdk").AlipaySdkCommonResult>;
 }
-export {};

package/dist/types/Framework/ThirdParty/Alisms.d.ts

@@ -1,5 +1,4 @@
-export declare let GSmsTool: SMSTool;
-declare class SMSTool {
+export declare class SMSTool {
     protected _is_init: boolean;
     protected _sms_client: any;
     init(): boolean;
@@ -11,4 +10,3 @@ declare class SMSTool {
      */
     sendSMS(code: number, phone: string): Promise<String>;
 }
-export {};

package/dist/types/Framework/ThirdParty/AppleTool.d.ts

@@ -115,8 +115,7 @@ export declare class NotificationBody {
     auto_renew_product_id: string;
     notification_type: string;
 }
-export declare let GAppleTool: AppleTool;
-declare class AppleTool {
+export declare class AppleTool {
     protected _verifyUrl: string;
     protected _sandboxVerifyUrl: string;
     onNotify(nb: NotificationBody): Promise<void>;

package/dist/types/Framework/ThirdParty/EmailTool.d.ts

@@ -1,5 +1,3 @@
-export declare let GEmailTool: EmailTool;
-declare class EmailTool {
+export declare class EmailTool {
     send(to: string, subject: string, html: string): Promise<unknown>;
 }
-export {};

package/dist/types/Framework/ThirdParty/QQTool.d.ts

@@ -21,7 +21,6 @@ export declare class QQUserInfo {
     level: string;
     is_yellow_year_vip: string;
 }
-export declare let GQQTool: QQTool;
 export declare class QQTool {
     /**
      * 获取Authorization Code

package/dist/types/Framework/ThirdParty/QiniuTool.d.ts

@@ -1,6 +1,4 @@
-export declare let GQiniuTool: QiniuTool;
-declare class QiniuTool {
+export declare class QiniuTool {
     get host(): string;
     getUploadToken(filename: any): string;
 }
-export {};

package/dist/types/Framework/ThirdParty/WechatTool.d.ts

@@ -1,3 +1,11 @@
+export declare class WechatOAMsg {
+    toUserName: string;
+    fromUserName: string;
+    createTime: number;
+    msgType: string;
+    content: string;
+    msgId: number;
+}
 export declare class WechatUserInfo {
     openid: string;
     nickname: string;
@@ -9,7 +17,6 @@ export declare class WechatUserInfo {
     privilege: string[];
     unionid: string;
 }
-export declare let GWechatTool: WechatTool;
 export declare class WechatTool {
     /**
      * 获取获取code的url
@@ -17,4 +24,6 @@ export declare class WechatTool {
     getAuthCodeUrl(): string;
     getAccessInfo(auth_code: string): Promise<any>;
     getUserInfo(access_token: string, openid: string): Promise<WechatUserInfo>;
+    convertOAMsg(xmlStr: string): WechatOAMsg;
+    toReplyXmlStr(msg: WechatOAMsg): string;
 }

package/dist/types/Framework/WebServer/Engine/ControllerManager.d.ts

@@ -1,6 +1,5 @@
 import { BaseController } from "../Controller/BaseController";
-export declare let GCtrMgr: ControllerManager;
-declare class ControllerManager {
+export declare class ControllerManager {
     protected _static_ctr: {
         [module_name: string]: {
             [ctrname: string]: BaseController;
@@ -32,4 +31,3 @@ declare class ControllerManager {
     getStaticCtr(module_name: string, controller_name: string): BaseController;
     getClass(module_name: string, controller_name: string): any;
 }
-export {};

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

@@ -1,7 +1,7 @@
 import { IWebServer } from "./WebServer/IWebServer";
 import { ISocketServer } from "./SocketServer/ISocketServer";
 import { DbConfig } from "./Config/DbConfig";
-declare class CgServer {
+export declare class CgServer {
     protected _webservers: IWebServer[];
     get webServers(): IWebServer[];
     protected _socketservers: ISocketServer[];
@@ -37,5 +37,3 @@ declare class CgServer {
     pause(): void;
     resume(): void;
 }
-export declare let GCgServer: CgServer;
-export {};

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

@@ -0,0 +1,53 @@
+import { TriggerManager } from './AI/TriggerMgr';
+import { IServerConfig } from './Config/IServerConfig';
+import { ByteTool } from './Core/ByteTool';
+import { DBCache } from './Database/Decorator/DBCache';
+import { MSSqlManager } from './Database/MSSqlManager';
+import { MongoManager } from './Database/Mongo/MongoManager';
+import { MongoServiceManager } from './Database/Mongo/MongoServiceManager';
+import { MysqlManager } from './Database/MysqlManager';
+import { RedisManager } from './Database/RedisManager';
+import { CacheTool } from './Logic/CacheTool';
+import { EventTool } from './Logic/EventTool';
+import { HttpTool } from './Logic/HttpTool';
+import { Log } from './Logic/Log';
+import { SyncQueueTool } from './Logic/SyncQueueTool';
+import { MongoCacheService } from './Service/MongoCacheService';
+import { ProtoFactory } from './SocketServer/ProtoFilter/ProtoFactory';
+import { AlipayTool } from './ThirdParty/AlipayTool';
+import { SMSTool } from './ThirdParty/Alisms';
+import { AppleTool } from './ThirdParty/AppleTool';
+import { EmailTool } from './ThirdParty/EmailTool';
+import { QQTool } from './ThirdParty/QQTool';
+import { QiniuTool } from './ThirdParty/QiniuTool';
+import { WechatTool } from './ThirdParty/WechatTool';
+import { ControllerManager } from './WebServer/Engine/ControllerManager';
+import { CgServer } from './cgserver';
+export declare class global {
+    static gMongoServiceMgr: MongoServiceManager;
+    static gCgServer: CgServer;
+    static gDbCache: DBCache;
+    static gTriggerMgr: TriggerManager;
+    static gServerCfg: IServerConfig;
+    static gMongoMgr: MongoManager;
+    static gMSSqlMgr: MSSqlManager;
+    static gMysqlMgr: MysqlManager;
+    static gRedisMgr: RedisManager;
+    static gCacheTool: CacheTool;
+    static gHttpTool: HttpTool;
+    static gLog: Log;
+    static gSyncQueueTool: SyncQueueTool;
+    static gEventTool: EventTool;
+    static gByteTool: ByteTool;
+    static gSmsTool: SMSTool;
+    static gEmailTool: EmailTool;
+    static gQiniuTool: QiniuTool;
+    static gQQTool: QQTool;
+    static gWechatTool: WechatTool;
+    static gWechatOATool: WechatTool;
+    static gAlipayTool: AlipayTool;
+    static gAppleTool: AppleTool;
+    static gProtoFactory: ProtoFactory;
+    static gCtrMgr: ControllerManager;
+    static gMongoCacheSer: MongoCacheService;
+}

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

@@ -1,91 +1,2 @@
-export { GCgServer } from './cgserver';
-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, MongoExt } from './Database/MongoManager';
-export { GMongoMgr } from './Database/MongoManager';
-export { GMSSqlMgr } from './Database/MSSqlManager';
-export { MysqlBaseService } from './Database/MysqlBaseService';
-export { GMysqlMgr, 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 { GProtoFactory } from './SocketServer/ProtoFilter/ProtoFactory';
-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 { 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 { RpcMsg as RpcBaseMsg } from './SocketServer/IRpc';
-export { Rpc } from './ThirdParty/Rpc';
-export { CgMq, RpcConfig } 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 { GByteTool } from './Core/ByteTool';
+import * as cg from "./index_export_";
+export { cg };

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

@@ -0,0 +1,74 @@
+export { MongoServiceManager } from './Database/Mongo/MongoServiceManager';
+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 } from "./AI/TriggerMgr";
+export { FrameworkErrorCode } from "./Config/_error_";
+export { Config } from "./Config/Config";
+export { FrameworkConfig } from "./Config/FrameworkConfig";
+export { IServerConfig } 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/Mongo/MongoBaseService';
+export { BaseModel as MysqlBaseModel } from './Database/MysqlBaseService';
+export { MongoBaseModel, MongoManager, MongoExt } from './Database/Mongo/MongoManager';
+export { MysqlBaseService } from './Database/MysqlBaseService';
+export { SqlReturn, SqlReturns } from './Database/MysqlManager';
+export { RedisManager } from './Database/RedisManager';
+export { ERoleGroup, EUserState, EAccountFrom } from './Service/ini';
+export { MysqlAccountService } from './Service/MysqlAccountService';
+export { MongoAccountService } from './Service/MongoAccountService';
+export { MysqlUserService } from './Service/MysqlUserService';
+export { MongoUserService } from './Service/MongoUserService';
+export { MysqlUserModel } from './Service/MysqlUserService';
+export { MongoUserModel } from './Service/MongoUserService';
+export { MongoCacheModel } from './Service/MongoCacheService';
+export { DbConfig } from './Config/DbConfig';
+export { MSSqlConfig } from './Database/MSSqlManager';
+export { MongoConfig } from './Database/Mongo/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 { AlipayResult, AlipayCallBack } from './ThirdParty/AlipayTool';
+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 { 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 { EAccountState } from './Service/ini';
+export { RpcMsg as RpcBaseMsg } from './SocketServer/IRpc';
+export { Rpc } from './ThirdParty/Rpc';
+export { CgMq, RpcConfig } 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 { global } from "./global";

package/package.json

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