cgserver 7.10.2113 → 7.11.2113

package/src/Framework/Service/UserService.ts

@@ -1,168 +0,0 @@
-import * as _ from "underscore";
-import { MysqlBaseService, BaseModel } from "../Database/MysqlBaseService";
-import { PrimaryKey } from "../Database/Decorator/PrimaryKey";
-import { NotNull } from "../Database/Decorator/NotNull";
-import { EPropertyType } from "../Database/Decorator/Property";
-import { Type } from "../Database/Decorator/Type";
-import { ERoleGroup, EUserState } from "./ini";
-
-export class UserModel extends BaseModel
-{
-    @Type(EPropertyType.Int)
-    @NotNull
-    @PrimaryKey
-    id:number=-1
-
-    @NotNull
-    @Type(EPropertyType.Int,-1)
-    account_id:number=-1
-
-    @NotNull
-    @Type(EPropertyType.Varchar,"noname",32)
-    nickname:string=""
-
-    @NotNull
-    @Type(EPropertyType.SmallInt,0)
-    sex:number=-1
-
-    @NotNull
-    @Type(EPropertyType.Varchar,"",255)
-    logo:string=""
-
-    @NotNull
-    @Type(EPropertyType.Int,0)
-    state:number=EUserState.Waitting
-
-    @NotNull
-    @Type(EPropertyType.Int,4)
-    role_group:number=4
-
-    @NotNull
-    @Type(EPropertyType.Int,0)
-    role:number=0
-
-    @NotNull
-    @Type(EPropertyType.Varchar,"")
-    phone:string=""
-
-    @NotNull
-    @Type(EPropertyType.Varchar,"")
-    wechat:string=""
-
-    @NotNull
-    @Type(EPropertyType.Varchar,"")
-    qq:string=""
-
-    @NotNull
-    @Type(EPropertyType.Varchar,"")
-    email:string=""
-
-    @NotNull
-    @Type(EPropertyType.Varchar,"",512)
-    about:string=""
-
-    @NotNull
-    @Type(EPropertyType.Int,-1)
-    pre_user_id:number=-1
-    
-    @NotNull
-    @Type(EPropertyType.Int,0)
-    exp:number = 0
-
-    @NotNull
-    @Type(EPropertyType.Int,1)
-    level:number = 1//等级
-
-    @NotNull
-    @Type(EPropertyType.Int,0)
-    vip_exp:number = 0
-
-    @NotNull
-    @Type(EPropertyType.Int,0)
-    vip_level:number = 0//等级
-
-    @NotNull
-    @Type(EPropertyType.TinyInt,0)
-    is_robot:number = 0
-
-    @NotNull
-    @Type(EPropertyType.BigInt,0)
-    create_time:number = 0
-}
-//暂时不实例化，方便重写
-export let GUserSer:UserService<UserModel>=null
-export class UserService<T extends UserModel> extends MysqlBaseService<T>
-{
-    constructor(type: { new(): T})
-    {
-        super(type)
-        GUserSer = this
-    }
-    protected _newUserModel():T
-    {
-        return <T>(new UserModel())
-    }
-    protected async _createNewUser(account_id:number,nickname:string,sex:number,logo:string,group?:ERoleGroup)
-    {
-        group = group || ERoleGroup.Common
-        let um = this._newUserModel()
-        um.account_id = account_id
-        um.nickname = nickname
-        if(!um.nickname||um.nickname.length==0)
-        {
-            um.nickname = "noname"
-        }
-        um.sex = sex||0
-        um.logo = logo||""
-        um.account_id = account_id
-        um.state = EUserState.Waitting
-        um.role_group = group
-        um.role = 0
-        //随机userid
-        let id = 0
-        do
-        {
-            id=_.random(1000000,9999999)
-            let p = await this.get("id","id=?",[id])
-            if(!p)
-            {
-                break
-            }
-        }while(true)
-        um.id = id
-        return um
-    }
-    async updateBaseInfoByAccount(account_id:number,nickname:string,sex:number,logo:string)
-    {
-        let sr = await this.updateProperty("nickname=?,sex=?,logo=?","account_id=?",[nickname,sex,logo,account_id])
-        if(sr.error&&sr.results.affectedRows<=0)
-        {
-            return "更新失败"
-        }
-        return
-    }
-    async add(account_id:number,nickname:string,sex:number,logo:string,group?:ERoleGroup)
-    {
-        let um:any = await this._createNewUser(account_id,nickname,sex,logo,group)
-        let sr = await this.insert(um)
-        if(sr.error||sr.results.length<=0)
-        {
-            return null
-        }
-        return um
-    }
-    async updateRoleGroup(user_id:number,role_group:ERoleGroup)
-    {
-        let sr = await this.updateProperty("role_group=?","id=?",[role_group,user_id])
-        if(sr.error&&sr.results.affectedRows<=0)
-        {
-            return "更新失败"
-        }
-        return
-    }
-    async getByAccountId(account_id:number)
-    {
-        let pm:T = await this.get(null,"account_id=?",[account_id])
-        return pm
-    }
-}

package/src/Framework/Service/ini.ts

@@ -1,33 +0,0 @@
-export enum ERoleGroup
-{
-    Creator=1,//创始人
-    Admin,//管理员
-    Proxy,//代理
-    Common//普通成员
-}
-export enum EUserState
-{
-    Ban=-1,
-    Waitting=0,
-    Normarl=1
-}
-export enum EAccountState
-{
-    Delete=-2,
-    Ban=-1,
-    Waitting=0,
-    Normarl=1
-}
-export enum EAccountFrom
-{
-    Guest=0,
-    OpenSocial,
-    WeChat,
-    QQ,
-    Phone,
-    Email,
-    Name,
-    QuickPhone,
-    Apple,
-    Google
-}

package/src/Framework/SocketServer/IClientWebSocket.ts

@@ -1,50 +0,0 @@
-import { ISocketServer } from './ISocketServer';
-import { IWebSocket } from './IWebSocket';
-import { GLog } from '../Logic/Log';
-import { EProtoType } from './ProtoFilter/IProtoFilter';
-import * as ws from 'websocket';
-/**
- * 服务器接收到的客户端的连接
- * 客户端的session对象
- */
-export class IClientWebSocket extends IWebSocket
-{
-    protected _server:ISocketServer=null
-    get server()
-    {
-        return this._server
-    }
-    constructor(server:ISocketServer,protoType=EProtoType.Json,protoPath="")
-    {
-        super(protoType,protoPath)    
-        this._server = server
-        this._tipKey=this._server.name
-    }
-    onClose (reasonCode:number, description:string)
-    {
-        super.onClose(reasonCode, description)
-        this._server.removeServerWebSocketBySocketId(this._socket_id)
-    }
-    broadCast(data)
-    {
-        if (!data)
-        {
-            GLog.info("Send Message warning:null data!")
-            return
-        }
-        GLog.info("broadCast:----------------------------------")
-        GLog.info(data)
-        let msg = this._protoFilter.encode(data)
-        this._server.broadCast(msg)
-    }
-    protected _onDecode(message:ws.Message,...params)
-    {
-        let msg = super._onDecode(message,"msgReq")
-        return msg
-    }
-    protected _onEncode(data,...params)
-    {
-        let msg = super._onEncode(data,"msgRes")
-        return msg
-    }
-}

package/src/Framework/SocketServer/IRpc.ts

@@ -1,12 +0,0 @@
-import { BaseMsg } from "./IWebSocket";
-
-export class RpcBaseMsg extends BaseMsg
-{
-    __rpcid=""
-    __return=false
-}
-
-export abstract class IRpc
-{
-    abstract callRemote(msg: RpcBaseMsg);
-}

package/src/Framework/SocketServer/IRpcClientWebSocket.ts

@@ -1,75 +0,0 @@
-import _ = require("underscore");
-import { GEventTool } from "../Logic/EventTool";
-import { GLog } from "../Logic/Log";
-import { IRpc, RpcBaseMsg } from "./IRpc";
-import { IClientWebSocket } from "./IClientWebSocket";
-
-export class IRpcClientWebSocket extends IClientWebSocket implements IRpc
-{
-    protected _genId(pre="")
-    {
-        return pre+"_"+Date.now()%10000000000+"_"+_.uniqueId()+_.random(9999999)
-    }
-    getNewMsg(cmd: string, errcode?: { id: number; des: string; }) {
-        let msg = super.getNewMsg(cmd,errcode) as RpcBaseMsg|any
-        msg.__rpcid=this._genId(cmd)
-        return msg
-    }
-    extendRetMsg(msg:RpcBaseMsg,errcode?: { id: number; des: string; })
-    {
-        let basemsg = super.getNewMsg(msg.cmd,errcode)
-        basemsg.__rpcid=msg.__rpcid
-        _.extend(msg,basemsg)
-        return msg
-    }
-    async callRemote(msg: RpcBaseMsg)
-    {
-        if(!msg)
-        {
-            GLog.error("send null msg!")
-            return
-        }
-        if(!msg.__rpcid)
-        {
-            msg.__rpcid=this._genId(msg.cmd)
-        }
-        return new Promise((resolve,reject)=>
-        {
-            let handler = null
-            let func=(jsonData)=>
-            {
-                if(handler)
-                {
-                    clearTimeout(handler)
-                    handler=null
-                }
-                resolve(jsonData)
-            }
-            handler = setTimeout(()=>
-            {
-                GEventTool.off(msg.__rpcid,func)
-                resolve({errcode:{id:10086,des:"timeout"}})
-            },3000)
-            GEventTool.once(msg.__rpcid,func)
-            super.send(msg)
-        })
-    }
-    receive_other_all(msg:RpcBaseMsg)
-    {
-        if(msg.__return)
-        {
-            GEventTool.emit(msg.__rpcid,msg)
-            return
-        }
-        GLog.error({des:"no handle",msg})
-    }
-    protected async _onMessage(msg:RpcBaseMsg)
-    {
-        if(msg.__return)
-        {
-            GEventTool.emit(msg.__rpcid,msg)
-            return
-        }
-        super._onMessage(msg)
-    }
-}

package/src/Framework/SocketServer/IRpcServerWebSocket.ts

@@ -1,76 +0,0 @@
-import _ = require("underscore");
-import { GEventTool } from "../Logic/EventTool";
-import { GLog } from "../Logic/Log";
-import { IServerWebSocket } from "./IServerWebSocket";
-import { IRpc, RpcBaseMsg } from "./IRpc";
-import { BaseMsg } from "./IWebSocket";
-
-export class IRpcServerWebSocket extends IServerWebSocket implements IRpc
-{
-    protected _genId(pre="")
-    {
-        return pre+"_"+Date.now()%10000000000+"_"+_.uniqueId()+_.random(9999999)
-    }
-    getNewMsg(cmd: string, errcode?: { id: number; des: string; }) {
-        let msg = super.getNewMsg(cmd,errcode) as RpcBaseMsg|any
-        msg.__rpcid=this._genId(cmd)
-        return msg
-    }
-    extendRetMsg(msg:RpcBaseMsg,errcode?: { id: number; des: string; })
-    {
-        let basemsg = super.getNewMsg(msg.cmd,errcode)
-        basemsg.__rpcid=msg.__rpcid
-        _.extend(msg,basemsg)
-        return msg
-    }
-    async callRemote(msg: RpcBaseMsg)
-    {
-        if(!msg)
-        {
-            GLog.error("send null msg!")
-            return
-        }
-        if(!msg.__rpcid)
-        {
-            msg.__rpcid=this._genId(msg.cmd)
-        }
-        return new Promise((resolve,reject)=>
-        {
-            let handler = null
-            let func=(jsonData)=>
-            {
-                if(handler)
-                {
-                    clearTimeout(handler)
-                    handler=null
-                }
-                resolve(jsonData)
-            }
-            handler = setTimeout(()=>
-            {
-                GEventTool.off(msg.__rpcid,func)
-                resolve({errcode:{id:10086,des:"timeout"}})
-            },3000)
-            GEventTool.once(msg.__rpcid,func)
-            super.send(msg)
-        })
-    }
-    receive_other_all(msg:RpcBaseMsg)
-    {
-        if(msg.__rpcid)
-        {
-            GEventTool.emit(msg.__rpcid,msg)
-            return
-        }
-        GLog.error({des:"no handle",msg})
-    }
-    protected async _onMessage(msg:RpcBaseMsg)
-    {
-        if(msg.__return)
-        {
-            GEventTool.emit(msg.__rpcid,msg)
-            return
-        }
-        super._onMessage(msg)
-    }
-}

package/src/Framework/SocketServer/IServerWebSocket.ts

@@ -1,88 +0,0 @@
-import { IWebSocket } from './IWebSocket';
-import * as ws from 'websocket';
-import { GLog } from '../Logic/Log';
-import { EProtoType } from './ProtoFilter/IProtoFilter';
-
-/**
- * 连接到服务器的websocket
- * 默认自动重连
- */
-export class IServerWebSocket extends IWebSocket
-{
-    protected _host:string = ""
-    /**
-     * 连接的服务器地址
-     */
-    get host()
-    {
-        return this._host
-    }
-    protected _port:number = -1
-    /**
-     * 连接的服务器端口
-     */
-    get port()
-    {
-        return this._port
-    }
-
-    protected _need_close:boolean=false
-    constructor(protoType=EProtoType.Json,protoPath="")
-    {
-        super(protoType,protoPath)
-    }
-    connect(domain:string,port:number)
-    {
-        this._host = domain || this._host
-        this._port = port || this._port
-        this._connect()
-    }
-    protected _connect()
-    {
-        let url = "ws://" + this._host + ":" + this._port + "/"
-        GLog.info("Trying to connect to server : " + url)
-        let _ws = new ws.client()
-        _ws.on("connect",super.onConnect.bind(this))
-        _ws.on("connectFailed",this.onClose.bind(this))
-        _ws.connect(url,null,null,{cookie:"client="+this._tipKey})
-    }
-    onOpen(e?)
-    {
-        super.onOpen(e)
-        GLog.info("success to connect to " + this._host + ":" + this._port)
-    }
-    onClose(reasonCode:number, description:string)
-    {
-        super.onClose(reasonCode, description)
-        if(!this._need_close)
-        {
-            setTimeout(()=>
-            {
-                if(!this._need_close)
-                {
-                    this.connect(this._host,this._port)
-                }
-            },1000)
-            return true
-        }
-        else
-        {
-            return false
-        }
-    }
-    close()
-    {
-        this._need_close = true
-        super.close()
-    }
-    protected _onDecode(message:ws.Message,...params)
-    {
-        let msg = super._onDecode(message,"msgRes")
-        return msg
-    }
-    protected _onEncode(data,...params)
-    {
-        let msg = super._onEncode(data,"msgReq")
-        return msg
-    }
-}