cgserver 12.0.8 → 12.2.0

package/dist/types/Framework/Server/WebSocketServer/IWebSocketServer.d.ts

@@ -1,49 +1,49 @@
-import * as ws from 'websocket';
-import { IServerConfig } from '../../Config/IServerConfig';
-import { BaseMsg } from './IWebSocket';
-import { IClientWebSocket } from './IClientWebSocket';
-export declare class IWebSocketServer {
-    protected _cfg: IServerConfig;
-    get cfg(): IServerConfig;
-    protected _is_runging: boolean;
-    get isrunging(): boolean;
-    get name(): string;
-    private _listening_websocket;
-    get listeningWebSocket(): ws.server;
-    protected _ws_clients: {
-        [socketid: number]: IClientWebSocket;
-    };
-    get wsClients(): {
-        [socketid: number]: IClientWebSocket;
-    };
-    get listenPort(): number;
-    /**
-     * websocket can accepted protocol
-     */
-    protected _accepted_protocol: any;
-    protected _name_vs_class: {};
-    registerWebSocketHandleClass(name: string, cls: any): void;
-    constructor(cfg: IServerConfig);
-    removeServerWebSocketBySocketId(socketId: number): void;
-    run(): Promise<void>;
-    pause(): void;
-    resume(): void;
-    addClient(ws_client: IClientWebSocket): void;
-    isOriginAllowed(origin: any): boolean;
-    initWebSocket(wss?: any): void;
-    onClose(connection: ws.connection, reason: number, desc: string): void;
-    onListenning(): void;
-    onRequest(req: ws.request): void;
-    createWebSocketObjectByProtocol(server_name: string, _ws: ws.connection, req: ws.request): IClientWebSocket;
-    protected _getServerNameByCookies(cookies: any): string;
-    /**
-     * 广播消息
-     * @param msg
-     */
-    broadCast(msg: BaseMsg): void;
-    /**
-     * 获取任意客户端连接
-     * @returns
-     */
-    getAnyWebSocket(): IClientWebSocket;
-}
+import * as ws from 'websocket';
+import { IServerConfig } from '../../Config/IServerConfig';
+import { BaseMsg } from './IWebSocket';
+import { IClientWebSocket } from './IClientWebSocket';
+export declare class IWebSocketServer {
+    protected _cfg: IServerConfig;
+    get cfg(): IServerConfig;
+    protected _is_runging: boolean;
+    get isrunging(): boolean;
+    get name(): string;
+    private _listening_websocket;
+    get listeningWebSocket(): ws.server;
+    protected _ws_clients: {
+        [socketid: number]: IClientWebSocket;
+    };
+    get wsClients(): {
+        [socketid: number]: IClientWebSocket;
+    };
+    get listenPort(): number;
+    /**
+     * websocket can accepted protocol
+     */
+    protected _accepted_protocol: any;
+    protected _name_vs_class: {};
+    registerWebSocketHandleClass(name: string, cls: any): void;
+    constructor(cfg: IServerConfig);
+    removeServerWebSocketBySocketId(socketId: number): void;
+    run(): Promise<void>;
+    pause(): void;
+    resume(): void;
+    addClient(ws_client: IClientWebSocket): void;
+    isOriginAllowed(origin: any): boolean;
+    initWebSocket(wss?: any): void;
+    onClose(connection: ws.connection, reason: number, desc: string): void;
+    onListenning(): void;
+    onRequest(req: ws.request): void;
+    createWebSocketObjectByProtocol(server_name: string, _ws: ws.connection, req: ws.request): IClientWebSocket;
+    protected _getServerNameByCookies(cookies: any): string;
+    /**
+     * 广播消息
+     * @param msg
+     */
+    broadCast(msg: BaseMsg): void;
+    /**
+     * 获取任意客户端连接
+     * @returns
+     */
+    getAnyWebSocket(): IClientWebSocket;
+}

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

@@ -1,62 +1,62 @@
-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 {
-    id: number;
-    phone: string;
-    email: string;
-    name: string;
-    password: string;
-    unionid: string;
-    openid: string;
-    create_time: number;
-    create_ip: string;
-    login_time: number;
-    login_ip: string;
-    from: number;
-    state: number;
-}
-export declare class MongoAccountService<T extends MongoAccountModel> extends MongoBaseService<T> {
-    /**
-     * 注册新账号
-     * @param unionid
-     * @param openid
-     * @param ip
-     * @param from
-     */
-    add(unionid: string, openid: string, ip: string, from: EAccountFrom): Promise<T>;
-    /**
-     * 通过第三方信息获取账号
-     * @param unionid
-     * @param openid
-     */
-    getByThird(unionid: string, openid: string): Promise<T>;
-    /**
-     * 通过第三方信息获取账号
-     * @param unionid
-     */
-    getByUnionid(unionid: string): Promise<T>;
-    getByPhone(phone: string): Promise<T>;
-    /**
-     * 登陆接口
-     * @param unionid 用户名、邮箱、手机号或者第三方的unionid
-     * @param openid 密码或者第三方的openid
-     * @param ip 登录ip
-     * @param from 登录来源
-     * @param access_token qq、wechat使用
-     */
-    login(unionid: string, openid: string, ip: string, from: EAccountFrom, force_user?: boolean, access_token?: string): Promise<{
-        errcode: any;
-        account: T;
-        is_new: boolean;
-    }>;
-    protected _login(unionid: string, openid: string, from: EAccountFrom): Promise<{
-        errcode: any;
-        account: T;
-    }>;
-    register(type: EAccountFrom, key: string, password: string, ip: string, extra?: any): Promise<{
-        user: MongoUserModel;
-        errcode: any;
-    }>;
-}
+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 {
+    id: number;
+    phone: string;
+    email: string;
+    name: string;
+    password: string;
+    unionid: string;
+    openid: string;
+    create_time: number;
+    create_ip: string;
+    login_time: number;
+    login_ip: string;
+    from: number;
+    state: number;
+}
+export declare class MongoAccountService<T extends MongoAccountModel> extends MongoBaseService<T> {
+    /**
+     * 注册新账号
+     * @param unionid
+     * @param openid
+     * @param ip
+     * @param from
+     */
+    add(unionid: string, openid: string, ip: string, from: EAccountFrom): Promise<T>;
+    /**
+     * 通过第三方信息获取账号
+     * @param unionid
+     * @param openid
+     */
+    getByThird(unionid: string, openid: string): Promise<T>;
+    /**
+     * 通过第三方信息获取账号
+     * @param unionid
+     */
+    getByUnionid(unionid: string): Promise<T>;
+    getByPhone(phone: string): Promise<T>;
+    /**
+     * 登陆接口
+     * @param unionid 用户名、邮箱、手机号或者第三方的unionid
+     * @param openid 密码或者第三方的openid
+     * @param ip 登录ip
+     * @param from 登录来源
+     * @param access_token qq、wechat使用
+     */
+    login(unionid: string, openid: string, ip: string, from: EAccountFrom, force_user?: boolean, access_token?: string): Promise<{
+        errcode: any;
+        account: T;
+        is_new: boolean;
+    }>;
+    protected _login(unionid: string, openid: string, from: EAccountFrom): Promise<{
+        errcode: any;
+        account: T;
+    }>;
+    register(type: EAccountFrom, key: string, password: string, ip: string, extra?: any): Promise<{
+        user: MongoUserModel;
+        errcode: any;
+    }>;
+}

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

@@ -1,19 +1,19 @@
-import { MongoBaseService } from "../Database/Mongo/MongoBaseService";
-import { MongoBaseModel } from "../Database/Mongo/MongoManager";
-export declare class MongoCacheModel extends MongoBaseModel {
-    key: string;
-    data: any;
-    expireAt: number;
-}
-/**
- * mongo版本的缓存服务
- * 可以用来缓存kv数据
- */
-export declare class MongoCacheService extends MongoBaseService<MongoCacheModel> {
-    constructor(table: string, type: {
-        new (): MongoCacheModel;
-    }, dbname?: string);
-    getData(key: string): Promise<any>;
-    addData(key: string, data: any, expireAt?: number): Promise<MongoCacheModel>;
-}
-export declare let gMongoCacheSer: MongoCacheService;
+import { MongoBaseService } from "../Database/Mongo/MongoBaseService";
+import { MongoBaseModel } from "../Database/Mongo/MongoManager";
+export declare class MongoCacheModel extends MongoBaseModel {
+    key: string;
+    data: any;
+    expireAt: number;
+}
+/**
+ * mongo版本的缓存服务
+ * 可以用来缓存kv数据
+ */
+export declare class MongoCacheService extends MongoBaseService<MongoCacheModel> {
+    constructor(table: string, type: {
+        new (): MongoCacheModel;
+    }, dbname?: string);
+    getData(key: string): Promise<any>;
+    addData(key: string, data: any, expireAt?: number): Promise<MongoCacheModel>;
+}
+export declare let gMongoCacheSer: MongoCacheService;

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

@@ -1,31 +1,31 @@
-import { MongoBaseService } from "../Database/Mongo/MongoBaseService";
-import { MongoBaseModel } from "../Database/Mongo/MongoManager";
-import { ERoleGroup } from "./ini";
-export declare class MongoUserModel extends MongoBaseModel {
-    id: number;
-    account_id: number;
-    nickname: string;
-    sex: number;
-    logo: string;
-    state: number;
-    role_group: number;
-    role: number;
-    phone: string;
-    wechat: string;
-    qq: string;
-    email: string;
-    about: string;
-    pre_user_id: number;
-    exp: number;
-    level: number;
-    vip_exp: number;
-    vip_level: number;
-    is_robot: number;
-    create_time: number;
-}
-export declare class MongoUserService<T extends MongoUserModel> extends MongoBaseService<T> {
-    protected _createNewUser(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<T>;
-    add(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<T>;
-    getByAccountId(account_id: number): Promise<T>;
-    updateBaseInfoByAccount(account_id: number, nickname: string, sex: number, logo: string): Promise<string>;
-}
+import { MongoBaseService } from "../Database/Mongo/MongoBaseService";
+import { MongoBaseModel } from "../Database/Mongo/MongoManager";
+import { ERoleGroup } from "./ini";
+export declare class MongoUserModel extends MongoBaseModel {
+    id: number;
+    account_id: number;
+    nickname: string;
+    sex: number;
+    logo: string;
+    state: number;
+    role_group: number;
+    role: number;
+    phone: string;
+    wechat: string;
+    qq: string;
+    email: string;
+    about: string;
+    pre_user_id: number;
+    exp: number;
+    level: number;
+    vip_exp: number;
+    vip_level: number;
+    is_robot: number;
+    create_time: number;
+}
+export declare class MongoUserService<T extends MongoUserModel> extends MongoBaseService<T> {
+    protected _createNewUser(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<T>;
+    add(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<T>;
+    getByAccountId(account_id: number): Promise<T>;
+    updateBaseInfoByAccount(account_id: number, nickname: string, sex: number, logo: string): Promise<string>;
+}

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

@@ -1,67 +1,67 @@
-import { BaseModel, MysqlBaseService } from '../Database/Mysql/MysqlBaseService';
-import { MysqlUserModel } from './MysqlUserService';
-import { EAccountFrom } from './ini';
-export declare class MysqlAccountModel extends BaseModel {
-    id: number;
-    phone: string;
-    email: string;
-    name: string;
-    password: string;
-    /**
-     * 微信、QQ、OpenSocial、Apple、Google等三方登录的唯一标识
-     */
-    unionid: string;
-    /**
-     * 微信、QQ、OpenSocial、Apple、Google等三方登录的唯一标识
-     */
-    openid: string;
-    create_time: number;
-    create_ip: string;
-    login_time: number;
-    login_ip: string;
-    from: number;
-    state: number;
-}
-export declare class MysqlAccountService<T extends MysqlAccountModel> extends MysqlBaseService<T> {
-    /**
-     * 注册新账号
-     * @param unionid
-     * @param openid
-     * @param ip
-     * @param from
-     */
-    add(unionid: string, openid: string, ip: string, from: EAccountFrom): Promise<T>;
-    /**
-     * 通过第三方信息获取账号
-     * @param unionid
-     * @param openid
-     */
-    getByThird(unionid: string, openid: string): Promise<T>;
-    /**
-     * 通过第三方信息获取账号
-     * @param unionid
-     */
-    getByUnionid(unionid: string): Promise<T>;
-    getByPhone(phone: string): Promise<T>;
-    /**
-     * 登陆接口
-     * @param unionid
-     * @param openid
-     * @param ip
-     * @param from
-     * @param access_token qq、wechat使用
-     */
-    login(unionid: string, openid: string, ip: string, from: EAccountFrom, force_user?: boolean, access_token?: string): Promise<{
-        errcode: any;
-        account: T;
-        is_new: boolean;
-    }>;
-    protected _login(unionid: string, openid: string, from: EAccountFrom): Promise<{
-        errcode: any;
-        account: T;
-    }>;
-    register(type: EAccountFrom, key: string, password: string, ip: string, extra?: any): Promise<{
-        user: MysqlUserModel;
-        errcode: any;
-    }>;
-}
+import { BaseModel, MysqlBaseService } from '../Database/Mysql/MysqlBaseService';
+import { MysqlUserModel } from './MysqlUserService';
+import { EAccountFrom } from './ini';
+export declare class MysqlAccountModel extends BaseModel {
+    id: number;
+    phone: string;
+    email: string;
+    name: string;
+    password: string;
+    /**
+     * 微信、QQ、OpenSocial、Apple、Google等三方登录的唯一标识
+     */
+    unionid: string;
+    /**
+     * 微信、QQ、OpenSocial、Apple、Google等三方登录的唯一标识
+     */
+    openid: string;
+    create_time: number;
+    create_ip: string;
+    login_time: number;
+    login_ip: string;
+    from: number;
+    state: number;
+}
+export declare class MysqlAccountService<T extends MysqlAccountModel> extends MysqlBaseService<T> {
+    /**
+     * 注册新账号
+     * @param unionid
+     * @param openid
+     * @param ip
+     * @param from
+     */
+    add(unionid: string, openid: string, ip: string, from: EAccountFrom): Promise<T>;
+    /**
+     * 通过第三方信息获取账号
+     * @param unionid
+     * @param openid
+     */
+    getByThird(unionid: string, openid: string): Promise<T>;
+    /**
+     * 通过第三方信息获取账号
+     * @param unionid
+     */
+    getByUnionid(unionid: string): Promise<T>;
+    getByPhone(phone: string): Promise<T>;
+    /**
+     * 登陆接口
+     * @param unionid
+     * @param openid
+     * @param ip
+     * @param from
+     * @param access_token qq、wechat使用
+     */
+    login(unionid: string, openid: string, ip: string, from: EAccountFrom, force_user?: boolean, access_token?: string): Promise<{
+        errcode: any;
+        account: T;
+        is_new: boolean;
+    }>;
+    protected _login(unionid: string, openid: string, from: EAccountFrom): Promise<{
+        errcode: any;
+        account: T;
+    }>;
+    register(type: EAccountFrom, key: string, password: string, ip: string, extra?: any): Promise<{
+        user: MysqlUserModel;
+        errcode: any;
+    }>;
+}

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

@@ -1,33 +1,33 @@
-import { MysqlBaseService, BaseModel } from "../Database/Mysql/MysqlBaseService";
-import { ERoleGroup } from "./ini";
-export declare class MysqlUserModel extends BaseModel {
-    id: number;
-    account_id: number;
-    nickname: string;
-    sex: number;
-    logo: string;
-    state: number;
-    role_group: number;
-    role: number;
-    phone: string;
-    email: string;
-    about: string;
-    pre_user_id: number;
-    exp: number;
-    level: number;
-    vip_exp: number;
-    vip_level: number;
-    is_robot: number;
-    create_time: number;
-}
-export declare let GUserSer: MysqlUserService<MysqlUserModel>;
-export declare class MysqlUserService<T extends MysqlUserModel> extends MysqlBaseService<T> {
-    constructor(type: {
-        new (): T;
-    });
-    protected _createNewUser(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<T>;
-    updateBaseInfoByAccount(account_id: number, nickname: string, sex: number, logo: string): Promise<string>;
-    add(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<any>;
-    updateRoleGroup(user_id: number, role_group: ERoleGroup): Promise<string>;
-    getByAccountId(account_id: number): Promise<T>;
-}
+import { MysqlBaseService, BaseModel } from "../Database/Mysql/MysqlBaseService";
+import { ERoleGroup } from "./ini";
+export declare class MysqlUserModel extends BaseModel {
+    id: number;
+    account_id: number;
+    nickname: string;
+    sex: number;
+    logo: string;
+    state: number;
+    role_group: number;
+    role: number;
+    phone: string;
+    email: string;
+    about: string;
+    pre_user_id: number;
+    exp: number;
+    level: number;
+    vip_exp: number;
+    vip_level: number;
+    is_robot: number;
+    create_time: number;
+}
+export declare let GUserSer: MysqlUserService<MysqlUserModel>;
+export declare class MysqlUserService<T extends MysqlUserModel> extends MysqlBaseService<T> {
+    constructor(type: {
+        new (): T;
+    });
+    protected _createNewUser(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<T>;
+    updateBaseInfoByAccount(account_id: number, nickname: string, sex: number, logo: string): Promise<string>;
+    add(account_id: number, nickname: string, sex: number, logo: string, group?: ERoleGroup): Promise<any>;
+    updateRoleGroup(user_id: number, role_group: ERoleGroup): Promise<string>;
+    getByAccountId(account_id: number): Promise<T>;
+}

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

@@ -1,29 +1,29 @@
-export declare enum ERoleGroup {
-    Creator = 1,
-    Admin = 2,
-    Proxy = 3,
-    Common = 4
-}
-export declare enum EUserState {
-    Ban = -1,
-    Waitting = 0,
-    Normarl = 1
-}
-export declare enum EAccountState {
-    Delete = -2,
-    Ban = -1,
-    Waitting = 0,
-    Normarl = 1
-}
-export declare enum EAccountFrom {
-    Guest = 0,
-    _OpenSocial = 1,
-    WeChat = 2,
-    QQ = 3,
-    Phone = 4,
-    Email = 5,
-    Name = 6,
-    QuickPhone = 7,
-    Apple = 8,
-    Google = 9
-}
+export declare enum ERoleGroup {
+    Creator = 1,//创始人
+    Admin = 2,//管理员
+    Proxy = 3,//代理
+    Common = 4
+}
+export declare enum EUserState {
+    Ban = -1,
+    Waitting = 0,
+    Normarl = 1
+}
+export declare enum EAccountState {
+    Delete = -2,
+    Ban = -1,
+    Waitting = 0,
+    Normarl = 1
+}
+export declare enum EAccountFrom {
+    Guest = 0,
+    _OpenSocial = 1,//去掉不要了
+    WeChat = 2,
+    QQ = 3,
+    Phone = 4,
+    Email = 5,
+    Name = 6,
+    QuickPhone = 7,
+    Apple = 8,
+    Google = 9
+}