diff --git a/src/HttpServer/logic/datadef.go b/src/HttpServer/logic/datadef.go index 2eea6db..95f137a 100644 --- a/src/HttpServer/logic/datadef.go +++ b/src/HttpServer/logic/datadef.go @@ -2,15 +2,15 @@ package logic //微信url定义 const ( - URL_WEIXINMSG_CHECK = "https://api.weixin.qq.com/wxa/msg_sec_check" + URL_WEIXINMSG_CHECK = "https://api.weixin.qq.com/wxa/msg_sec_check" URL_WEIXINGETACCESS_TOKEN = "https://api.weixin.qq.com/cgi-bin/token" ) //登录类型枚举 const ( - LOGIN_TYPE_TOURIST = 1 //游客登录 - LOGIN_TYPE_ACCOUNT = 2 //账号密码登录 - LOGIN_TYPE_WECHAT = 3 //微信登录 + LOGIN_TYPE_TOURIST = 1 //游客登录 + LOGIN_TYPE_ACCOUNT = 2 //账号密码登录 + LOGIN_TYPE_WECHAT = 3 //微信登录 ) @@ -20,88 +20,83 @@ type RedisTeamInfo struct { } type WechatLoginReq struct { - Channel_id int `json:"channel_id"` - Invite_type int `json:"invite_type"` - Invite_res_id int `json:"invite_res_id"` - User_invite_uid int `json:"user_invite_uid"` - Code string `json:"code"` - Signature string `json:"signature"` - Iv string `json:"iv"` - Raw_data string `json:"raw_data"` - Encrypted_data string `json:"encrypted_data"` - Token string `json:"token"` - Version string `json:"version"` + Channel_id int `json:"channel_id"` + Invite_type int `json:"invite_type"` + Invite_res_id int `json:"invite_res_id"` + User_invite_uid int `json:"user_invite_uid"` + Code string `json:"code"` + Signature string `json:"signature"` + Iv string `json:"iv"` + Raw_data string `json:"raw_data"` + Encrypted_data string `json:"encrypted_data"` + Token string `json:"token"` + Version string `json:"version"` } type UserLoginReq struct { - Channel_id int `json:"channel_id"` - Invite_type int `json:"invite_type"` - Invite_res_id int `json:"invite_res_id"` - User_invite_uid int `json:"user_invite_uid"` - Scene int `json:"scene"` - RefAppId int `json:"refAppId"` - Code string `json:"code"` - Token string `json:"token"` - Version string `json:"version"` - + Channel_id int `json:"channel_id"` + Invite_type int `json:"invite_type"` + Invite_res_id int `json:"invite_res_id"` + User_invite_uid int `json:"user_invite_uid"` + Scene int `json:"scene"` + RefAppId int `json:"refAppId"` + Code string `json:"code"` + Token string `json:"token"` + Version string `json:"version"` } type UserBaseData struct { - User_id int `json:"user_id"` - User_gender int `json:"user_gender"` - User_nickname string `json:"user_nickname"` - User_openid string `json:"user_openid"` + User_id int `json:"user_id"` + User_gender int `json:"user_gender"` + User_nickname string `json:"user_nickname"` + User_openid string `json:"user_openid"` User_avatar_url string `json:"user_avatar_url"` - User_city string `json:"user_city"` - User_token string `json:"user_token"` + User_city string `json:"user_city"` + User_token string `json:"user_token"` } type UserExtData struct { - User_id int `json:"user_id"` - Hot int `json:"hot"` - Coin int64 `json:"coin"` - LoveExp int `json:"loveExp"` - Bean int `json:"bean"` - ShopNum int `json:"shopNum"` - Lv int `json:"lv"` - Exp int `json:"exp"` - User_invite_uid int `json:"user_invite_uid"` - User_reg_time int `json:"user_reg_time"` - User_channel int `json:"user_channel"` - User_is_black int `json:"user_is_black"` - User_scene int `json:"user_scene"` - Reg_time int `json:"reg_time"` - Invite_uid int `json:"invite_uid"` + User_id int `json:"user_id"` + Hot int `json:"hot"` + Coin int64 `json:"coin"` + LoveExp int `json:"loveExp"` + Bean int `json:"bean"` + ShopNum int `json:"shopNum"` + Lv int `json:"lv"` + Exp int `json:"exp"` + User_invite_uid int `json:"user_invite_uid"` + User_reg_time int `json:"user_reg_time"` + User_channel int `json:"user_channel"` + User_is_black int `json:"user_is_black"` + User_scene int `json:"user_scene"` + Reg_time int `json:"reg_time"` + Invite_uid int `json:"invite_uid"` } type UserLoginData struct { Dasedata UserBaseData `json:"UserBaseData"` - Extdata UserExtData `json:"user_ext_data"` + Extdata UserExtData `json:"user_ext_data"` } type UserLoginResult struct { - Code int `json:"code"` + Code int `json:"code"` Data UserLoginData `json:"data"` } - - type UserLoginResp struct { - Status string `json:"status"` + Status string `json:"status"` Result UserLoginResult `json:"result"` - } - -type QueryInviteReq struct{ +type QueryInviteReq struct { Uuid int `json:"uuid"` } type QueryInviteData struct { - Uuid int `json:"uuid"` - Nickname string `json:"nickname"` - Headurl string `json:"headurl"` - Isfetched int `json:"isfetched"` + Uuid int `json:"uuid"` + Nickname string `json:"nickname"` + Headurl string `json:"headurl"` + Isfetched int `json:"isfetched"` } type QueryInviteDesc struct { @@ -109,16 +104,43 @@ type QueryInviteDesc struct { } type QueryInviteResult struct { - Code int `json:"code"` + Code int `json:"code"` Data QueryInviteDesc `json:"data"` } type QueryInviteResp struct { - Status string `json:"status"` + Status string `json:"status"` Result QueryInviteResult `json:"result"` } -type QueryNewMessageReq struct{ +type QueryBrifeMessageReq struct { + Uuid int `json:"uuid"` +} + +type QueryBrifeMessageData struct { + Uuid int `json:"uuid"` + Ctype int `json:"ctype"` + Isnew int `json:"isnew"` + Headurl string `json:"headurl"` + Nickname string `json:"nickname"` +} + +type QueryBrifeMessageDesc struct { + Emojinfo []int `json:"emojinfo"` + Channelinfo []QueryBrifeMessageData `json:"channelinfo"` +} + +type QueryBrifeMessageResult struct { + Code int `json:"code"` + Data QueryBrifeMessageDesc `json:"data"` +} + +type QueryBrifeMessageResp struct { + Status string `json:"status"` + Result QueryBrifeMessageResult `json:"result"` +} + +type QueryNewMessageReq struct { Uuid int `json:"uuid"` } @@ -127,152 +149,144 @@ type QueryNewMessageDesc struct { } type QueryNewMessageResult struct { - Code int `json:"code"` + Code int `json:"code"` Data QueryNewMessageDesc `json:"data"` } type QueryNewMessageResp struct { - Status string `json:"status"` + Status string `json:"status"` Result QueryNewMessageResult `json:"result"` } - -type InviteWorkReq struct{ +type InviteWorkReq struct { Uuid int `json:"uuid"` } //邀请打工数据结构 type InviteWorkDesc struct { - Uuid int `json:"uuid"` //打工者ID - InviteTime int `json:"invitetime"`//开始打工时间 - Nickname string `json:"nickname"`//昵称 - HeadUrl string `json:"headurl"`//头像 + Uuid int `json:"uuid"` //打工者ID + InviteTime int `json:"invitetime"` //开始打工时间 + Nickname string `json:"nickname"` //昵称 + HeadUrl string `json:"headurl"` //头像 } type InviteWorkOffDesc struct { - Uuid int `json:"uuid"` //打工者ID - InviteTime int `json:"invitetime"` //打工者ID + Uuid int `json:"uuid"` //打工者ID + InviteTime int `json:"invitetime"` //打工者ID } type InviteWorksDesc struct { - Invite_data []InviteWorkDesc `json:"invite_data"` + Invite_data []InviteWorkDesc `json:"invite_data"` Offlinelist []InviteWorkOffDesc `json:"offlinelist"` } type InviteWorkResult struct { - Code int `json:"code"` + Code int `json:"code"` Data InviteWorksDesc `json:"data"` } type InviteWorkResp struct { - Status string `json:"status"` + Status string `json:"status"` Result InviteWorkResult `json:"result"` } type InitIndexDesc struct { - Env_enum int `json:"env_enum"` - Lbase64 int `json:"lbase64"` - Res_url string `json:"res_url"` - Version_config string `json:"version_config"` + Env_enum int `json:"env_enum"` + Lbase64 int `json:"lbase64"` + Res_url string `json:"res_url"` + Version_config string `json:"version_config"` } type InitIndexResult struct { - Code int `json:"code"` + Code int `json:"code"` Data InitIndexDesc `json:"data"` } type InitIndexResp struct { - Status string `json:"status"` + Status string `json:"status"` Result InitIndexResult `json:"result"` } - -type SaveDataBackupReq struct{ - Uuid int `json:"uuid"` +type SaveDataBackupReq struct { + Uuid int `json:"uuid"` Value string `json:"value"` } - type SaveDataBackupResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CommonResult `json:"result"` } - -type FetchInviteReq struct{ +type FetchInviteReq struct { Selfuuid int `json:"selfuuid"` - Fuuid int `json:"fuuid"` + Fuuid int `json:"fuuid"` } - type FetchInviteResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CommonResult `json:"result"` } -type EnterInviteReq struct{ - Selfuuid int `json:"selfuuid"` +type EnterInviteReq struct { + Selfuuid int `json:"selfuuid"` Inviteuuid int `json:"inviteuuid"` Invitetype int `json:"invitetype"` } - type EnterInviteResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CommonResult `json:"result"` } - -type RegeisterReq struct{ - Account string `json:"account"` +type RegeisterReq struct { + Account string `json:"account"` Password string `json:"password"` } type RegeisteraResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CommonResult `json:"result"` } -type AccounLoginReq struct{ - Account string `json:"account"` +type AccounLoginReq struct { + Account string `json:"account"` Password string `json:"password"` } type AccounLoginResp struct { - Status string `json:"status"` + Status string `json:"status"` Result UserLoginResult `json:"result"` } - -type SaveUserDataReq struct{ - Token string `json:"token"` - Hot int `json:"hot"` - Coin int64 `json:"coin"` - Loveexp int `json:"loveexp"` - Bean int `json:"bean"` - Shopnum int `json:"shopnum"` +type SaveUserDataReq struct { + Token string `json:"token"` + Hot int `json:"hot"` + Coin int64 `json:"coin"` + Loveexp int `json:"loveexp"` + Bean int `json:"bean"` + Shopnum int `json:"shopnum"` } type SaveUserDataResp struct { - Status string `json:"status"` + Status string `json:"status"` Result UserLoginResult `json:"result"` } type CommonResult struct { - Code int `json:"code"` + Code int `json:"code"` Data string `json:"data"` } -type SaveDataReq struct{ +type SaveDataReq struct { Token string `json:"token"` Field string `json:"field"` Value string `json:"value"` } type SaveDataResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CommonResult `json:"result"` } @@ -281,32 +295,32 @@ type GetDataDesc struct { } type GetDataResult struct { - Code int `json:"code"` + Code int `json:"code"` Data GetDataDesc `json:"data"` } -type GetDataReq struct{ - Uuid int `json:"uuid"` +type GetDataReq struct { + Uuid int `json:"uuid"` Field string `json:"field"` } type GetDataResp struct { - Status string `json:"status"` + Status string `json:"status"` Result GetDataResult `json:"result"` } type GetDataSaveDesc struct { - Data_uid string `json:"data_uid"` + Data_uid string `json:"data_uid"` Data_value string `json:"data_value"` } -type TextCheckReq struct{ +type TextCheckReq struct { Token string `json:"token"` - Text string `json:"text"` + Text string `json:"text"` } type TextCheckResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CommonResult `json:"result"` } @@ -316,71 +330,70 @@ type MsgCheckDesc struct { type MsgCheckResp struct { Errcode string `json:"errcode"` - Errmsg string `json:"errmsg"` + Errmsg string `json:"errmsg"` } type GetAccessTokenResp struct { Access_token string `json:"access_token"` - Expires_in string `json:"expires_in"` + Expires_in string `json:"expires_in"` } - -type CreateTeamReq struct{ - Token string `json:"token"` - Name string `json:"name"` - Is_open int `json:"is_open"` - Limit int `json:"limit"` +type CreateTeamReq struct { + Token string `json:"token"` + Name string `json:"name"` + Is_open int `json:"is_open"` + Limit int `json:"limit"` } //队伍列表人员id type TeamMemInfo struct { - MemList []int + MemList []int } //玩家投资信心 type TeamDevoteInfo struct { - UserId int `json:"userid"` - Type int `json:"type"` - Assets int `json:"assets"` + UserId int `json:"userid"` + Type int `json:"type"` + Assets int `json:"assets"` } //玩家buff type TeamBuffInfo struct { - BeginTime int - EndTime int + BeginTime int + EndTime int } // type TeamAllBuff struct { - Type int + Type int BuffInfo []TeamBuffInfo } //队伍建筑信息 type TeamBuildingInfo struct { Devote []TeamDevoteInfo - Buff []TeamAllBuff + Buff []TeamAllBuff } type CreateTeamInfo struct { - Id int `json:"id"` - Name string `json:"name"` - Is_open int `json:"is_open"` - Num int `json:"num"` - Assets int `json:"assets"` - Least int `json:"least"` - Captain_id int `json:"captain_id"` - Creator_id int `json:"creator_id"` - Status int `json:"status"` - Create_time int `json:"create_time"` - Update_time int `json:"update_time"` + Id int `json:"id"` + Name string `json:"name"` + Is_open int `json:"is_open"` + Num int `json:"num"` + Assets int `json:"assets"` + Least int `json:"least"` + Captain_id int `json:"captain_id"` + Creator_id int `json:"creator_id"` + Status int `json:"status"` + Create_time int `json:"create_time"` + Update_time int `json:"update_time"` } //队伍信息 type TeamInfo struct { BaseInfo CreateTeamInfo - MemInfo TeamMemInfo - BInfo TeamBuildingInfo + MemInfo TeamMemInfo + BInfo TeamBuildingInfo } type CreateTeamDesc struct { @@ -388,53 +401,51 @@ type CreateTeamDesc struct { } type CreateTeamData struct { - Code int `json:"code"` + Code int `json:"code"` Data CreateTeamDesc `json:"data"` } type CreateTeamResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CreateTeamData `json:"result"` } - -type JoinTeamReq struct{ - Token string `json:"token"` - Team_id int `json:"team_id"` +type JoinTeamReq struct { + Token string `json:"token"` + Team_id int `json:"team_id"` } type JoinTeamResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CommonResult `json:"result"` } - -type JoinTeamByInviteReq struct{ - Token string `json:"token"` - Inviter_id int `json:"inviter_id"` +type JoinTeamByInviteReq struct { + Token string `json:"token"` + Inviter_id int `json:"inviter_id"` } type JoinTeamByInviteResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CommonResult `json:"result"` } -type QuitTeamReq struct{ - Token string `json:"token"` - User_id int `json:"user_id"` - Type int `json:"type"` +type QuitTeamReq struct { + Token string `json:"token"` + User_id int `json:"user_id"` + Type int `json:"type"` } type QuitTeamResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CommonResult `json:"result"` } -type UpdateTeamBuildReq struct{ - Token string `json:"token"` - Build_type int `json:"build_type"` - Assets int `json:"assets"` - Muti int `json:"muti"` +type UpdateTeamBuildReq struct { + Token string `json:"token"` + Build_type int `json:"build_type"` + Assets int `json:"assets"` + Muti int `json:"muti"` } type QuitTeamDesc struct { @@ -442,30 +453,28 @@ type QuitTeamDesc struct { } type QuitTeamResult struct { - Code int `json:"code"` + Code int `json:"code"` Data QuitTeamDesc `json:"data"` } type UpdateTeamBuildResp struct { - Status string `json:"status"` + Status string `json:"status"` Result QuitTeamResult `json:"result"` } - - -type AddTeamBuffReq struct{ - Token string `json:"token"` - Build_type int `json:"build_type"` - Muti int `json:"muti"` +type AddTeamBuffReq struct { + Token string `json:"token"` + Build_type int `json:"build_type"` + Muti int `json:"muti"` } type BuffTimeInfo struct { Buff_begin_time int `json:"buff_begin_time"` - Buff_end_time int `json:"buff_end_time"` + Buff_end_time int `json:"buff_end_time"` } type AddTeamBuffSpec struct { - Build_type int `json:"build_type"` + Build_type int `json:"build_type"` Buff_time []BuffTimeInfo `json:"buff_time"` } @@ -474,25 +483,25 @@ type AddTeamBuffDesc struct { } type AddTeamBuffResult struct { - Code int `json:"code"` + Code int `json:"code"` Data AddTeamBuffDesc `json:"data"` } type AddTeamBuffResp struct { - Status string `json:"status"` + Status string `json:"status"` Result AddTeamBuffResult `json:"result"` } -type GetTeamBuffReq struct{ +type GetTeamBuffReq struct { Token string `json:"token"` } type GetTeamBuffResp struct { - Status string `json:"status"` + Status string `json:"status"` Result AddTeamBuffResult `json:"result"` } -type GetTeamDataReq struct{ +type GetTeamDataReq struct { Token string `json:"token"` } @@ -501,80 +510,78 @@ type GetTeamDataTeamUserList struct { } type GetTeamDataDesc struct { - Team_data CreateTeamInfo `json:"team_data"` + Team_data CreateTeamInfo `json:"team_data"` Team_user_list []GetTeamDataTeamUserList `json:"team_user_list"` - Build_list QuitTeamDesc `json:"build_list"` + Build_list QuitTeamDesc `json:"build_list"` } type GetTeamDataResult struct { - Code int `json:"code"` + Code int `json:"code"` Data GetTeamDataDesc `json:"data"` } type GetTeamDataResp struct { - Status string `json:"status"` + Status string `json:"status"` Result GetTeamDataResult `json:"result"` } -type GetDataByUserIdReq struct{ - Token string `json:"token"` - Field string `json:"field"` - User_id int `json:"user_id"` +type GetDataByUserIdReq struct { + Token string `json:"token"` + Field string `json:"field"` + User_id int `json:"user_id"` } type GetDataByUserIdDesc struct { - Base_data string `json:"base_data"` + Base_data string `json:"base_data"` User_base_data UserBaseData `json:"user_base_data"` - Extdata UserExtData `json:"user_ext_data"` + Extdata UserExtData `json:"user_ext_data"` } type GetDataByUserIdResult struct { - Code int `json:"code"` + Code int `json:"code"` Data GetDataByUserIdDesc `json:"data"` } type GetDataByUserIdResp struct { - Status string `json:"status"` + Status string `json:"status"` Result GetDataByUserIdResult `json:"result"` } - -type GetTeamListReq struct{ - Token string `json:"token"` - Store_num int `json:"store_num"` - Page int `json:"page"` +type GetTeamListReq struct { + Token string `json:"token"` + Store_num int `json:"store_num"` + Page int `json:"page"` } type GetTeamListDesc struct { Items []int `json:"items"` - Count int `json:"count"` + Count int `json:"count"` } type GetTeamListResult struct { - Code int `json:"code"` + Code int `json:"code"` Data GetTeamListDesc `json:"data"` } - type GetTeamListResp struct { - Status string `json:"status"` + Status string `json:"status"` Result GetTeamListResult `json:"result"` } -type SearchTeamReq struct{ - Token string `json:"token"` - Name string `json:"name"` - Store_num int `json:"store_num"` - Page int `json:"page"` +type SearchTeamReq struct { + Token string `json:"token"` + Name string `json:"name"` + Store_num int `json:"store_num"` + Page int `json:"page"` } type SearchTeamResp struct { - Status string `json:"status"` + Status string `json:"status"` Result GetTeamListResult `json:"result"` } type FriendInfo struct { - Uuid int `json:"uuid"` + Uuid int `json:"uuid"` Status int `json:"status"` } @@ -583,7 +590,7 @@ type FriendList struct { } type ApplyInfo struct { - Uuid int `json:"uuid"` + Uuid int `json:"uuid"` Apply_time int `json:"apply_time"` } type ApplyList struct { @@ -594,18 +601,17 @@ type ApproveList struct { Approve_info []ApplyInfo `json:"approve_info"` } -type SetFriendReq struct{ - Token string `json:"token"` - User_id int `json:"user_id"` +type SetFriendReq struct { + Token string `json:"token"` + User_id int `json:"user_id"` } - type SetFriendResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CommonResult `json:"result"` } -type GetFriendListReq struct{ +type GetFriendListReq struct { Token string `json:"token"` } @@ -614,17 +620,16 @@ type GetFriendListDesc struct { } type GetFriendListResult struct { - Code int `json:"code"` + Code int `json:"code"` Data GetFriendListDesc `json:"data"` } type GetFriendListResp struct { - Status string `json:"status"` + Status string `json:"status"` Result GetFriendListResult `json:"result"` } - -type GetAuditListReq struct{ +type GetAuditListReq struct { Token string `json:"token"` } @@ -633,35 +638,34 @@ type GetAuditListDesc struct { } type GetAuditListResult struct { - Code int `json:"code"` + Code int `json:"code"` Data GetAuditListDesc `json:"data"` } type GetAuditListResp struct { - Status string `json:"status"` + Status string `json:"status"` Result GetAuditListResult `json:"result"` } - -type GetRecommendListReq struct{ +type GetRecommendListReq struct { Token string `json:"token"` } type GetRecommendListInfo struct { - Userid int `json:"userid"` - Nickname string `json:"nickname"` + Userid int `json:"userid"` + Nickname string `json:"nickname"` Avatar_url string `json:"avatar_url"` - Gender int `json:"gender"` - City string `json:"city"` - Hot int `json:"hot"` - Coin int64 `json:"coin"` - Love_exp int `json:"love_exp"` - Bean int `json:"bean"` - Shop_num int `json:"shop_num"` + Gender int `json:"gender"` + City string `json:"city"` + Hot int `json:"hot"` + Coin int64 `json:"coin"` + Love_exp int `json:"love_exp"` + Bean int `json:"bean"` + Shop_num int `json:"shop_num"` Cat_num int `json:"cat_num"` - Lv int `json:"lv"` - Exp int `json:"exp"` - Reg_time int `json:"reg_time"` + Lv int `json:"lv"` + Exp int `json:"exp"` + Reg_time int `json:"reg_time"` } type GetRecommendListDesc struct { @@ -669,42 +673,39 @@ type GetRecommendListDesc struct { } type GetRecommendListResult struct { - Code int `json:"code"` + Code int `json:"code"` Data GetRecommendListDesc `json:"data"` } type GetRecommendListResp struct { - Status string `json:"status"` + Status string `json:"status"` Result GetRecommendListResult `json:"result"` } - -type HandleFriendRequestReq struct{ - Token string `json:"token"` - User_id int `json:"user_id"` - Type int `json:"type"` +type HandleFriendRequestReq struct { + Token string `json:"token"` + User_id int `json:"user_id"` + Type int `json:"type"` } - type HandleFriendRequestResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CommonResult `json:"result"` } -type DelFriendReq struct{ - Token string `json:"token"` - User_id int `json:"user_id"` +type DelFriendReq struct { + Token string `json:"token"` + User_id int `json:"user_id"` } - type DelFriendResp struct { - Status string `json:"status"` + Status string `json:"status"` Result CommonResult `json:"result"` } -type QueryPlayerDataReq struct{ - Token string `json:"token"` - User_id int `json:"user_id"` +type QueryPlayerDataReq struct { + Token string `json:"token"` + User_id int `json:"user_id"` } type QueryPlayerDataDesc struct { @@ -712,64 +713,58 @@ type QueryPlayerDataDesc struct { } type QueryPlayerDataResult struct { - Code int `json:"code"` + Code int `json:"code"` Data QueryPlayerDataDesc `json:"data"` } type QueryPlayerDataResp struct { - Status string `json:"status"` + Status string `json:"status"` Result QueryPlayerDataResult `json:"result"` } //********************************************************************************************************** - - - //玩家数据 type UserData struct { - Userid int //玩家id - Hot int - Coin int64 //金币 - Loevexp int - Bean int //咖啡豆 - Shopnum int //店铺数量 - Lv int - Exp int - UserInviteId int - Userregtime int - Channel int - Isblack int - Scene int - Regtime int - InviteUid int - LoginTime int - LoginDay int + Userid int //玩家id + Hot int + Coin int64 //金币 + Loevexp int + Bean int //咖啡豆 + Shopnum int //店铺数量 + Lv int + Exp int + UserInviteId int + Userregtime int + Channel int + Isblack int + Scene int + Regtime int + InviteUid int + LoginTime int + LoginDay int } //--------------------------------------------------------------------------------------------------------------------- //聊天相关 type ChatInfoDesc struct { - Uuid int `json:"uuid"` - Headurl string `json:"headurl"` - Nickname string `json:"nickname"` - Sex int `json:"sex"` //1男0女 - ChatTime int `json:"chattime"` + Uuid int `json:"uuid"` + Headurl string `json:"headurl"` + Nickname string `json:"nickname"` + Sex int `json:"sex"` //1男0女 + ChatTime int `json:"chattime"` Message string `json:"message"` - } //聊天单个页签信息 -type ChatRoomInfo struct { - Chats []ChatInfoDesc `json:"chats"` - Pos int `json:"pos"` - Isnew int `json:"isnew"` //是否有新聊天 +type ChannelInfo struct { + Uuid int `json:"uuid"` + Ctype int `json:"ctype"` + Isnew int `json:"isnew"` //是否有新聊天 + Headurl string `json:"headurl"` + Nickname string `json:"nickname"` } -type ChatRoomInfos []ChatRoomInfo - -type ChatMessagesInfo struct { - World ChatRoomInfo `json:"world"` - Team ChatRoomInfo `json:"team"` - Private ChatRoomInfos `json:"privete"` -} \ No newline at end of file +type EmojunlockInfo struct { + Emojinfo []int `json:"emojinfo"` +} diff --git a/src/HttpServer/logic/function.go b/src/HttpServer/logic/function.go index 98ffc49..2ab9b26 100644 --- a/src/HttpServer/logic/function.go +++ b/src/HttpServer/logic/function.go @@ -886,8 +886,20 @@ func QueryUserTeamId(uuid int) (int, error) { return tmp.Team_id, nil } -func CheckHasNewMessage(uuid int) (bool, error) { - //首先检查工会记录 +func GetChatEmojInfo(uuid int) []int { + var tmp EmojunlockInfo + vv, err := redishandler.GetRedisClient().HGet(redis.USER_CHAT_EMOJUNLOCK_KEY, strconv.Itoa(uuid)) + if err != nil { + return nil + } + err = json.Unmarshal([]byte(vv), &tmp) + if err != nil { + return nil + } + return tmp.Emojinfo +} + +func CheckTeamHasNewMessage(uuid int) (bool, error) { lastteamsec := 0 lastchatteamsec := 0 laststr, err := redishandler.GetRedisClient().HGet(redis.USER_CHAT_TEAM_LASTGET_KEY, strconv.Itoa(uuid)) @@ -920,6 +932,89 @@ func CheckHasNewMessage(uuid int) (bool, error) { redishandler.GetRedisClient().HSet(redis.USER_CHAT_ISNEW, strconv.Itoa(uuid), "1") return true, nil } + return false, nil +} + +func GetPrivateBriefList(uuid int) []QueryBrifeMessageData { + var rtsl []QueryBrifeMessageData + var talklistuid []int //所有的聊天列表 + var nonewmesslist []int //没有新消息的列表 + rselfkey := redis.USER_CHAT_PRIVATE_LASTGET_KEY + ":" + strconv.Itoa(uuid) + vv, err := redishandler.GetRedisClient().HGetAllKeys(rselfkey) + if err != nil { + logger.Error("GetPrivateBriefList failed err=%v", err) + return nil + } + + for _, val := range vv { + bytestr := string(val.([]byte)) + bytenum, _ := strconv.Atoi(bytestr) + talklistuid = append(talklistuid, bytenum) + } + + for _, val := range talklistuid { + selfgetsec := 0 + selftalksec := 0 + rkeysselfs := redis.USER_CHAT_PRIVATE_INFO_KEY + ":" + strconv.Itoa(uuid) + ":" + strconv.Itoa(val) + tmpstr, err := redishandler.GetRedisClient().HGet(rselfkey, strconv.Itoa(uuid)) + if err == nil { + selfgetsec, _ = strconv.Atoi(tmpstr) + } + + //查询最后一条记录 + cselfstr, err := redishandler.GetRedisClient().LIndex(rkeysselfs, 0) + if err == nil { + var chats ChatInfoDesc + err = json.Unmarshal([]byte(cselfstr), &chats) + if err == nil { + selftalksec = chats.ChatTime + } + } + + if selfgetsec < selftalksec { + var tmp QueryBrifeMessageData + tmp.Uuid = val + tmp.Isnew = 1 + tmp.Ctype = 2 + heads, names, err := mysql.QueryNameAndHead(val) + if err != nil { + logger.Error("GetPrivateBriefList err=%v", err) + } + tmp.Nickname = names + tmp.Headurl = heads + rtsl = append(rtsl, tmp) + } else { + nonewmesslist = append(nonewmesslist, val) + } + } + + //如果没有满五个 则从没有新消息的列表取获取 + for _, val := range nonewmesslist { + if len(rtsl) >= 5 { + break + } + + var tmp QueryBrifeMessageData + tmp.Uuid = val + tmp.Isnew = 0 + tmp.Ctype = 2 + heads, names, err := mysql.QueryNameAndHead(val) + if err != nil { + logger.Error("GetPrivateBriefList err=%v", err) + } + tmp.Nickname = names + tmp.Headurl = heads + rtsl = append(rtsl, tmp) + } + return rtsl +} + +func CheckHasNewMessage(uuid int) (bool, error) { + //首先检查工会记录 + isnew, err := CheckTeamHasNewMessage(uuid) + if err == nil && isnew { + return true, nil + } //判断自己的私人聊天记录 var talklistuid []int diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go index 14aacbd..fde70c4 100644 --- a/src/HttpServer/logic/httpserver.go +++ b/src/HttpServer/logic/httpserver.go @@ -27,8 +27,9 @@ func StartHttpServe() { type TestTes struct { TestInt int } + //just for test -func (d *TestTes)Testsendhttp() { +func (d *TestTes) Testsendhttp() { d.TestInt = 99 } @@ -43,62 +44,72 @@ func startServerHttpServe() { //recover() //可以打印panic的错误信息 //fmt.Println(recover()) if err := recover(); err != nil { //产生了panic异常 - logger.Error("%v",err) + logger.Error("%v", err) } }() //别忘了(), 调用此匿名函数 //------------------------------------------------------------- - http.HandleFunc("/catcafe/ClearData", ClearData) //情况账号的测试接口 - http.HandleFunc("/catcafe/AddWhiteList", AddWhiteList) //情况账号的测试接口 - http.HandleFunc("/catcafe/AddGoldAndLove", AddGoldAndLove) //情况账号的测试接口 - http.HandleFunc("/catcafe/QueryAllAccount", QueryAllAccount) //查询所有账号的等级信息等数据 + http.HandleFunc("/catcafe/ClearData", ClearData) //情况账号的测试接口 + http.HandleFunc("/catcafe/AddWhiteList", AddWhiteList) //情况账号的测试接口 + http.HandleFunc("/catcafe/AddGoldAndLove", AddGoldAndLove) //情况账号的测试接口 + http.HandleFunc("/catcafe/QueryAllAccount", QueryAllAccount) //查询所有账号的等级信息等数据 //------------------------------------------------------------- - http.HandleFunc("/catcafe/login", UserLogin) //游客登录 - http.HandleFunc("/catcafe/user/regeister", Regeister) //账号注册 - http.HandleFunc("/catcafe/user/accountlogin", AccounLogin) //账号登录 - http.HandleFunc("/catcafe/user/weakLogin", Wechatlogin) //微信登录 - http.HandleFunc("/catcafe/user/saveUserData", SaveUserData) //保存用户数据 - http.HandleFunc("/catcafe/data/saveData", SaveData) //保存游戏自定义数据 - http.HandleFunc("/catcafe/data/getData", GetData) //获取自定义数据 - http.HandleFunc("/catcafe/team/textCheck", TextCheck) //敏感词检测 - http.HandleFunc("/catcafe/team/createTeam", CreateTeam) //创建队伍 - http.HandleFunc("/catcafe/team/updateTeamData", UpdateTeamData) //修改队伍信息 - http.HandleFunc("/catcafe/team/joinTeam", JoinTeam) //主动加入队伍 - http.HandleFunc("/catcafe/team/joinTeamByInvite", JoinTeamByInvite) //被邀请加入队伍 - http.HandleFunc("/catcafe/team/quitTeam", QuitTeam) //被邀请加入队伍 - http.HandleFunc("/catcafe/team/updateTeamBuild", UpdateTeamBuild) //升级队伍建筑等级 - http.HandleFunc("/catcafe/team/addTeamBuff", AddTeamBuff) //添加BUFF时间 - http.HandleFunc("/catcafe/team/getTeamBuff", GetTeamBuff) //获取BUFF时间 - http.HandleFunc("/catcafe/team/getTeamData", GetTeamData) //获取玩家队伍信息 - http.HandleFunc("/catcafe/team/getDataByUserId", GetDataByUserId) //获取队伍成员的详细数据 - http.HandleFunc("/catcafe/team/getTeamList", GetTeamList) //查询队伍列表 - http.HandleFunc("/catcafe/team/searchTeam", SearchTeam) //根据名称搜索队伍 - http.HandleFunc("/catcafe/friend/setFriendRequest", SetFriendRequest) //申请添加好友 - http.HandleFunc("/catcafe/friend/getList", GetFriendList) //获取好友列表 - http.HandleFunc("/catcafe/friend/getAuditList", GetAuditList) //获取待审核好友列表 - http.HandleFunc("/catcafe/friend/getRecommendList", GetRecommendList) //获取推荐好友列表 - http.HandleFunc("/catcafe/friend/handleFriendRequest", HandleFriendRequest) //处理好友请求 - http.HandleFunc("/catcafe/friend/delFriend", DelFriend) //删除好友 - http.HandleFunc("/catcafe/friend/QueryPlayerData", QueryPlayerData) //根据用户id获取用户信息 好友用 + http.HandleFunc("/catcafe/login", UserLogin) //游客登录 + http.HandleFunc("/catcafe/user/regeister", Regeister) //账号注册 + http.HandleFunc("/catcafe/user/accountlogin", AccounLogin) //账号登录 + http.HandleFunc("/catcafe/user/weakLogin", Wechatlogin) //微信登录 + http.HandleFunc("/catcafe/user/saveUserData", SaveUserData) //保存用户数据 + http.HandleFunc("/catcafe/data/saveData", SaveData) //保存游戏自定义数据 + http.HandleFunc("/catcafe/data/getData", GetData) //获取自定义数据 + http.HandleFunc("/catcafe/team/textCheck", TextCheck) //敏感词检测 + http.HandleFunc("/catcafe/team/createTeam", CreateTeam) //创建队伍 + http.HandleFunc("/catcafe/team/updateTeamData", UpdateTeamData) //修改队伍信息 + http.HandleFunc("/catcafe/team/joinTeam", JoinTeam) //主动加入队伍 + http.HandleFunc("/catcafe/team/joinTeamByInvite", JoinTeamByInvite) //被邀请加入队伍 + http.HandleFunc("/catcafe/team/quitTeam", QuitTeam) //被邀请加入队伍 + http.HandleFunc("/catcafe/team/updateTeamBuild", UpdateTeamBuild) //升级队伍建筑等级 + http.HandleFunc("/catcafe/team/addTeamBuff", AddTeamBuff) //添加BUFF时间 + http.HandleFunc("/catcafe/team/getTeamBuff", GetTeamBuff) //获取BUFF时间 + http.HandleFunc("/catcafe/team/getTeamData", GetTeamData) //获取玩家队伍信息 + http.HandleFunc("/catcafe/team/getDataByUserId", GetDataByUserId) //获取队伍成员的详细数据 + http.HandleFunc("/catcafe/team/getTeamList", GetTeamList) //查询队伍列表 + http.HandleFunc("/catcafe/team/searchTeam", SearchTeam) //根据名称搜索队伍 + http.HandleFunc("/catcafe/friend/setFriendRequest", SetFriendRequest) //申请添加好友 + http.HandleFunc("/catcafe/friend/getList", GetFriendList) //获取好友列表 + http.HandleFunc("/catcafe/friend/getAuditList", GetAuditList) //获取待审核好友列表 + http.HandleFunc("/catcafe/friend/getRecommendList", GetRecommendList) //获取推荐好友列表 + http.HandleFunc("/catcafe/friend/handleFriendRequest", HandleFriendRequest) //处理好友请求 + http.HandleFunc("/catcafe/friend/delFriend", DelFriend) //删除好友 + http.HandleFunc("/catcafe/friend/QueryPlayerData", QueryPlayerData) //根据用户id获取用户信息 好友用 http.HandleFunc("/catcafe/env/index", InitIndex) // //................................................................................................................... - http.HandleFunc("/catcafe/user/queryInvite", QueryInvite) //查询玩家对应邀请关系 - http.HandleFunc("/catcafe/user/fetchInviteReward",FetchInviteReward) //领取邀请奖励 - http.HandleFunc("/catcafe/user/enterInvite",EnterInvite) //别的玩家（新玩家）通过邀请连接进来 - http.HandleFunc("/catcafe/user/queryInviteWork",QueryInviteWork) //获取邀请打工列表 - http.HandleFunc("/catcafe/user/saveDataBackup",SaveDataBackup) //保存玩家数据 备份数据接口 - http.HandleFunc("/catcafe/user/newGetData",NewGetData) //新的获取玩家数据接口 - http.HandleFunc("/catcafe/user/newSaveData",NewSaveData) //新的保存玩家数据接口 - - http.HandleFunc("/catcafe/chat/queryNewMessage",queryNewMessage) //查询红点请求 + http.HandleFunc("/catcafe/user/queryInvite", QueryInvite) //查询玩家对应邀请关系 + http.HandleFunc("/catcafe/user/fetchInviteReward", FetchInviteReward) //领取邀请奖励 + http.HandleFunc("/catcafe/user/enterInvite", EnterInvite) //别的玩家（新玩家）通过邀请连接进来 + http.HandleFunc("/catcafe/user/queryInviteWork", QueryInviteWork) //获取邀请打工列表 + http.HandleFunc("/catcafe/user/saveDataBackup", SaveDataBackup) //保存玩家数据 备份数据接口 + http.HandleFunc("/catcafe/user/newGetData", NewGetData) //新的获取玩家数据接口 + http.HandleFunc("/catcafe/user/newSaveData", NewSaveData) //新的保存玩家数据接口 + http.HandleFunc("/catcafe/chat/queryNewMessage", queryNewMessage) //查询红点请求 + http.HandleFunc("/catcafe/chat/queryBrifeMessage", queryBrifeMessage) //获取聊天页签请求 err := http.ListenAndServe(conf.GetServerHttpAddrConf(), nil) CheckErr(err) } +func queryBrifeMessage(w http.ResponseWriter, r *http.Request) { + + result, _ := ioutil.ReadAll(r.Body) + r.Body.Close() + + s := string(result) + logger.Info("queryBrifeMessage , body:%v", s) + + HandlequeryBrifeMessage(w, s) +} func queryNewMessage(w http.ResponseWriter, r *http.Request) { @@ -108,7 +119,7 @@ func queryNewMessage(w http.ResponseWriter, r *http.Request) { s := string(result) //logger.Info("queryNewMessage , body:%v", s) - HandlequeryNewMessage(w,s) + HandlequeryNewMessage(w, s) } func NewSaveData(w http.ResponseWriter, r *http.Request) { @@ -119,10 +130,9 @@ func NewSaveData(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("NewSaveData , body:%v", s) - HandleNewSaveData(w,s) + HandleNewSaveData(w, s) } - func NewGetData(w http.ResponseWriter, r *http.Request) { result, _ := ioutil.ReadAll(r.Body) @@ -131,7 +141,7 @@ func NewGetData(w http.ResponseWriter, r *http.Request) { s := string(result) //logger.Info("NewGetData , body:%v", s) - HandleNewGetData(w,s) + HandleNewGetData(w, s) } func InitIndex(w http.ResponseWriter, r *http.Request) { @@ -142,10 +152,9 @@ func InitIndex(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("InitIndex , body:%v,uuid=%v", s) - HandleInitIndex(w,s) + HandleInitIndex(w, s) } - func checkFileIsExist(filename string) bool { var exist = true if _, err := os.Stat(filename); os.IsNotExist(err) { @@ -163,7 +172,6 @@ func QueryAllAccount(w http.ResponseWriter, r *http.Request) { a.a = 1*/ logger.Info("QueryAllAccount ") - //先打开文件 filename := "./data.txt" var f *os.File @@ -172,8 +180,8 @@ func QueryAllAccount(w http.ResponseWriter, r *http.Request) { if checkFileIsExist(filename) { //如果文件存在 f, err1 = os.OpenFile(filename, os.O_APPEND|os.O_WRONLY, os.ModeAppend) //打开文件 if err1 != nil { - logger.Error("QueryAllData OpenFile failed err=%v",err1) - }else { + logger.Error("QueryAllData OpenFile failed err=%v", err1) + } else { os.Remove(filename) } } @@ -186,47 +194,46 @@ func QueryAllAccount(w http.ResponseWriter, r *http.Request) { f.Read(fileHeader) fileStat, _ := f.Stat() - w.Header().Set("Content-Disposition", "attachment; filename=" + filename) + w.Header().Set("Content-Disposition", "attachment; filename="+filename) w.Header().Set("Content-Type", http.DetectContentType(fileHeader)) w.Header().Set("Content-Length", strconv.FormatInt(fileStat.Size(), 10)) f.Seek(0, 0) io.Copy(w, f) //io.Copy(f,r.Body) - fmt.Fprint(w,"success") + fmt.Fprint(w, "success") } - func AddGoldAndLove(w http.ResponseWriter, r *http.Request) { query := r.URL.Query() suuid := query.Get("uuid") - sgold := query.Get("gold") - slove := query.Get("love") - uuid,_ := strconv.Atoi(suuid) - gold,_ := strconv.Atoi(sgold) - love,_ := strconv.Atoi(slove) - logger.Info("ClearData , uuid:%v,gold:%v,love:%v", suuid,sgold,slove) + sgold := query.Get("gold") + slove := query.Get("love") + uuid, _ := strconv.Atoi(suuid) + gold, _ := strconv.Atoi(sgold) + love, _ := strconv.Atoi(slove) + logger.Info("ClearData , uuid:%v,gold:%v,love:%v", suuid, sgold, slove) if suuid == "" { fmt.Fprint(w, "uuid is nil,please check") return } - var wilteist []int + var wilteist []int rkey := "CATCAFE_REDIS_CAN_RESETDATA_LIST" - vv,err := redishandler.GetRedisClient().HGetAllKeys(rkey) + vv, err := redishandler.GetRedisClient().HGetAllKeys(rkey) if err != nil { - fmt.Fprint(w,"获取白名单失败！，请检查") + fmt.Fprint(w, "获取白名单失败！，请检查") } - for _,val := range vv { + for _, val := range vv { bytestr := string(val.([]byte)) - bytenum,_ := strconv.Atoi(bytestr) - wilteist = append(wilteist,bytenum) + bytenum, _ := strconv.Atoi(bytestr) + wilteist = append(wilteist, bytenum) } - logger.Info("AddGoldAndLove white list wilteist=%v",wilteist) + logger.Info("AddGoldAndLove white list wilteist=%v", wilteist) isinwhitelist := false - for _,val := range wilteist { + for _, val := range wilteist { if val == uuid { isinwhitelist = true break @@ -240,21 +247,21 @@ func AddGoldAndLove(w http.ResponseWriter, r *http.Request) { } //加金币 - err = mysql.DoAddGold(uuid,gold,love) + err = mysql.DoAddGold(uuid, gold, love) if err != nil { - fmt.Fprint(w, "加金币失败了，错误码%v",err) + fmt.Fprint(w, "加金币失败了，错误码%v", err) } //清楚redis rediskey1 := "cat:cafe:userext:where:user_id:" + suuid err = redishandler.GetRedisClient().Delete(rediskey1) if err != nil { - fmt.Fprint(w, "加金币失败了，错误码%v",err) + fmt.Fprint(w, "加金币失败了，错误码%v", err) } //将id从白名单删除 - redishandler.GetRedisClient().HDel(rkey,suuid) - fmt.Fprint(w,"加金币成功了") + redishandler.GetRedisClient().HDel(rkey, suuid) + fmt.Fprint(w, "加金币成功了") } func AddWhiteList(w http.ResponseWriter, r *http.Request) { @@ -268,12 +275,12 @@ func AddWhiteList(w http.ResponseWriter, r *http.Request) { } //uuidnum,_ := strconv.Atoi(uuid) rkey := "CATCAFE_REDIS_CAN_RESETDATA_LIST" - err := redishandler.GetRedisClient().HSet(rkey,uuid,uuid) - if err!= nil { - fmt.Fprint(w, "添加白名单失败，err=%v",err) - }else { - fmt.Fprint(w, "添加白名单成功！") -} + err := redishandler.GetRedisClient().HSet(rkey, uuid, uuid) + if err != nil { + fmt.Fprint(w, "添加白名单失败，err=%v", err) + } else { + fmt.Fprint(w, "添加白名单成功！") + } } @@ -286,7 +293,7 @@ func ClearData(w http.ResponseWriter, r *http.Request) { fmt.Fprint(w, "uuid is nil,please check") return } - uuidnum,_ := strconv.Atoi(uuid) + uuidnum, _ := strconv.Atoi(uuid) /*coin,err := mysql.TestClearData(uuidnum) if err != nil { logger.Error("ClearData err=%v",err) @@ -295,22 +302,22 @@ func ClearData(w http.ResponseWriter, r *http.Request) { fmt.Fprint(w, "ClearData coin=%v",coin)*/ //首先检查白名单 - var wilteist []int + var wilteist []int rkey := "CATCAFE_REDIS_CAN_RESETDATA_LIST" - vv,err := redishandler.GetRedisClient().HGetAllKeys(rkey) + vv, err := redishandler.GetRedisClient().HGetAllKeys(rkey) if err != nil { - fmt.Fprint(w,"获取白名单失败！，请检查") + fmt.Fprint(w, "获取白名单失败！，请检查") } - for _,val := range vv { + for _, val := range vv { bytestr := string(val.([]byte)) - bytenum,_ := strconv.Atoi(bytestr) - wilteist = append(wilteist,bytenum) + bytenum, _ := strconv.Atoi(bytestr) + wilteist = append(wilteist, bytenum) } - logger.Info("ClearData white list wilteist=%v",wilteist) + logger.Info("ClearData white list wilteist=%v", wilteist) isinwhitelist := false - for _,val := range wilteist { + for _, val := range wilteist { if val == uuidnum { isinwhitelist = true break @@ -325,39 +332,36 @@ func ClearData(w http.ResponseWriter, r *http.Request) { err = mysql.DoClearData(uuidnum) if err != nil { - fmt.Fprint(w, "清除数据失败了，错误码%v",err) + fmt.Fprint(w, "清除数据失败了，错误码%v", err) } //下面清楚redis rediskey := "cat:cafe:data:where:data_uid:" + uuid - exist,_ := redishandler.GetRedisClient().Exists(rediskey) + exist, _ := redishandler.GetRedisClient().Exists(rediskey) if exist { //存在，即删除 err = redishandler.GetRedisClient().Delete(rediskey) if err != nil { - fmt.Fprint(w, "清除数据失败了1，错误码%v",err) + fmt.Fprint(w, "清除数据失败了1，错误码%v", err) } } - rediskey1 := "cat:cafe:data_new:where:data_uid:" + uuid - exist,_ = redishandler.GetRedisClient().Exists(rediskey1) + exist, _ = redishandler.GetRedisClient().Exists(rediskey1) if exist { //存在，即删除 err = redishandler.GetRedisClient().Delete(rediskey1) if err != nil { - fmt.Fprint(w, "清除数据失败了2，错误码%v",err) + fmt.Fprint(w, "清除数据失败了2，错误码%v", err) } } - - fmt.Fprint(w, "清除数据成功了，恭喜！uuid=%v",uuid) + fmt.Fprint(w, "清除数据成功了，恭喜！uuid=%v", uuid) //将id从白名单删除 - redishandler.GetRedisClient().HDel(rkey,uuid) + redishandler.GetRedisClient().HDel(rkey, uuid) //HandleRegeister(w,s) } - func SaveDataBackup(w http.ResponseWriter, r *http.Request) { result, _ := ioutil.ReadAll(r.Body) @@ -366,7 +370,7 @@ func SaveDataBackup(w http.ResponseWriter, r *http.Request) { s := string(result) //logger.Info("SaveDataBackup , body:%v,uuid=%v", s) - HandleSaveDataBackup(w,s) + HandleSaveDataBackup(w, s) } @@ -378,7 +382,7 @@ func QueryInviteWork(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("QueryInviteWork , body:%v,uuid=%v", s) - HandleQueryInviteWork(w,s) + HandleQueryInviteWork(w, s) } @@ -390,11 +394,10 @@ func EnterInvite(w http.ResponseWriter, r *http.Request) { s := string(result) //logger.Info("EnterInvite , body:%v,uuid=%v", s) - HandleEnterInvite(w,s) + HandleEnterInvite(w, s) } - func FetchInviteReward(w http.ResponseWriter, r *http.Request) { result, _ := ioutil.ReadAll(r.Body) @@ -403,7 +406,7 @@ func FetchInviteReward(w http.ResponseWriter, r *http.Request) { s := string(result) //logger.Info("FetchInviteReward , body:%v", s) - HandleFetchInviteReward(w,s) + HandleFetchInviteReward(w, s) } @@ -415,7 +418,7 @@ func QueryInvite(w http.ResponseWriter, r *http.Request) { s := string(result) //logger.Info("QueryInvite , body:%v,uuid=%v", s) - HandleQueryInvite(w,s) + HandleQueryInvite(w, s) } @@ -427,7 +430,7 @@ func Regeister(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("Regeister , body:%v,uuid=%v", s) - HandleRegeister(w,s) + HandleRegeister(w, s) } @@ -439,10 +442,9 @@ func AccounLogin(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("AccounLogin , body:%v,uuid=%v", s) - HandleAccounLogin(w,s) + HandleAccounLogin(w, s) } - func Wechatlogin(w http.ResponseWriter, r *http.Request) { result, _ := ioutil.ReadAll(r.Body) @@ -451,10 +453,9 @@ func Wechatlogin(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("Wechatlogin , body:%v,uuid=%v", s) - HandleWechatlogin(w,s) + HandleWechatlogin(w, s) } - func QueryPlayerData(w http.ResponseWriter, r *http.Request) { result, _ := ioutil.ReadAll(r.Body) @@ -463,10 +464,9 @@ func QueryPlayerData(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("QueryPlayerData , body:%v,uuid=%v", s) - HandleQueryPlayerData(w,s) + HandleQueryPlayerData(w, s) } - func DelFriend(w http.ResponseWriter, r *http.Request) { result, _ := ioutil.ReadAll(r.Body) @@ -475,10 +475,9 @@ func DelFriend(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("DelFriend , body:%v,uuid=%v", s) - HandleDelFriend(w,s) + HandleDelFriend(w, s) } - func HandleFriendRequest(w http.ResponseWriter, r *http.Request) { result, _ := ioutil.ReadAll(r.Body) @@ -487,10 +486,9 @@ func HandleFriendRequest(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("HandleFriendRequest , body:%v,uuid=%v", s) - HandleHandleFriendRequest(w,s) + HandleHandleFriendRequest(w, s) } - func GetRecommendList(w http.ResponseWriter, r *http.Request) { result, _ := ioutil.ReadAll(r.Body) @@ -499,7 +497,7 @@ func GetRecommendList(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("GetRecommendList , body:%v,uuid=%v", s) - HandleGetRecommendList(w,s) + HandleGetRecommendList(w, s) } func GetAuditList(w http.ResponseWriter, r *http.Request) { @@ -510,10 +508,9 @@ func GetAuditList(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("GetAuditList , body:%v,uuid=%v", s) - HandleGetAuditList(w,s) + HandleGetAuditList(w, s) } - func GetFriendList(w http.ResponseWriter, r *http.Request) { result, _ := ioutil.ReadAll(r.Body) @@ -522,7 +519,7 @@ func GetFriendList(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("GetFriendList , body:%v,uuid=%v", s) - HandleGetFriendList(w,s) + HandleGetFriendList(w, s) } func SetFriendRequest(w http.ResponseWriter, r *http.Request) { @@ -533,7 +530,7 @@ func SetFriendRequest(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("SetFriendRequest , body:%v,uuid=%v", s) - HandleSetFriendRequest(w,s) + HandleSetFriendRequest(w, s) } func SearchTeam(w http.ResponseWriter, r *http.Request) { @@ -544,7 +541,7 @@ func SearchTeam(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("SearchTeam , body:%v,uuid=%v", s) - HandleSearchTeam(w,s) + HandleSearchTeam(w, s) } func GetTeamList(w http.ResponseWriter, r *http.Request) { @@ -555,7 +552,7 @@ func GetTeamList(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("GetTeamList , body:%v,uuid=%v", s) - HandleGetTeamList(w,s) + HandleGetTeamList(w, s) } func GetDataByUserId(w http.ResponseWriter, r *http.Request) { @@ -566,7 +563,7 @@ func GetDataByUserId(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("GetDataByUserId , body:%v,uuid=%v", s) - HandleGetDataByUserId(w,s) + HandleGetDataByUserId(w, s) } func GetTeamData(w http.ResponseWriter, r *http.Request) { @@ -577,7 +574,7 @@ func GetTeamData(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("GetTeamData , body:%v,uuid=%v", s) - HandleGetTeamData(w,s) + HandleGetTeamData(w, s) } func GetTeamBuff(w http.ResponseWriter, r *http.Request) { @@ -588,10 +585,9 @@ func GetTeamBuff(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("GetTeamBuff , body:%v,uuid=%v", s) - HandleGetTeamBuff(w,s) + HandleGetTeamBuff(w, s) } - func AddTeamBuff(w http.ResponseWriter, r *http.Request) { result, _ := ioutil.ReadAll(r.Body) @@ -600,7 +596,7 @@ func AddTeamBuff(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("AddTeamBuff , body:%v,uuid=%v", s) - HandleAddTeamBuff(w,s) + HandleAddTeamBuff(w, s) } func UpdateTeamBuild(w http.ResponseWriter, r *http.Request) { @@ -611,7 +607,7 @@ func UpdateTeamBuild(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("UpdateTeamBuild , body:%v,uuid=%v", s) - HandleUpdateTeamBuild(w,s) + HandleUpdateTeamBuild(w, s) } func QuitTeam(w http.ResponseWriter, r *http.Request) { @@ -622,7 +618,7 @@ func QuitTeam(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("QuitTeam , body:%v,uuid=%v", s) - HandleQuitTeam(w,s) + HandleQuitTeam(w, s) } func JoinTeamByInvite(w http.ResponseWriter, r *http.Request) { @@ -633,7 +629,7 @@ func JoinTeamByInvite(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("JoinTeamByInvite , body:%v,uuid=%v", s) - HandleJoinTeamByInvite(w,s) + HandleJoinTeamByInvite(w, s) } func JoinTeam(w http.ResponseWriter, r *http.Request) { @@ -644,7 +640,7 @@ func JoinTeam(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("JoinTeam , body:%v,uuid=%v", s) - HandleJoinTeam(w,s) + HandleJoinTeam(w, s) } func UpdateTeamData(w http.ResponseWriter, r *http.Request) { @@ -655,7 +651,7 @@ func UpdateTeamData(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("UpdateTeamData , body:%v,uuid=%v", s) - HandleUpdateTeamData(w,s) + HandleUpdateTeamData(w, s) } func CreateTeam(w http.ResponseWriter, r *http.Request) { @@ -666,7 +662,7 @@ func CreateTeam(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("CreateTeam , body:%v,uuid=%v", s) - HandleCreateTeam(w,s) + HandleCreateTeam(w, s) } func TextCheck(w http.ResponseWriter, r *http.Request) { @@ -677,7 +673,7 @@ func TextCheck(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("TextCheck , body:%v,uuid=%v", s) - HandleTextCheck(w,s) + HandleTextCheck(w, s) } func SaveUserData(w http.ResponseWriter, r *http.Request) { @@ -688,7 +684,7 @@ func SaveUserData(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("saveUserData , body:%v,uuid=%v", s) - HandleSaveUserData(w,s) + HandleSaveUserData(w, s) } func SaveData(w http.ResponseWriter, r *http.Request) { @@ -699,7 +695,7 @@ func SaveData(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("saveData , body:%v,uuid=%v", s) - HandlesaveData(w,s) + HandlesaveData(w, s) } func GetData(w http.ResponseWriter, r *http.Request) { @@ -710,10 +706,9 @@ func GetData(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("GetData , body:%v,uuid=%v", s) - HandlegetData(w,s) + HandlegetData(w, s) } - func UserLogin(w http.ResponseWriter, r *http.Request) { //logger.Info("%%%%%%%%%%%%%%%%path=%v", *r.URL) //for k, v := range r.Header { @@ -737,7 +732,5 @@ func UserLogin(w http.ResponseWriter, r *http.Request) { s := string(result) logger.Info("UserLogin , body:%v,uuid=%v", s) - HandleUserLogin(w,s) + HandleUserLogin(w, s) } - - diff --git a/src/HttpServer/logic/logic.go b/src/HttpServer/logic/logic.go index 6783e64..513c03c 100644 --- a/src/HttpServer/logic/logic.go +++ b/src/HttpServer/logic/logic.go @@ -26,8 +26,7 @@ func init() { m_userInfo = beegomap.NewBeeMap() } - -func InitUserExt(req *UserLoginReq,resp *UserLoginResp,uuid int) { +func InitUserExt(req *UserLoginReq, resp *UserLoginResp, uuid int) { var extdata UserExtData extdata.User_id = uuid extdata.Lv = 1 @@ -45,7 +44,7 @@ func InitUserExt(req *UserLoginReq,resp *UserLoginResp,uuid int) { extdata.User_scene = req.Scene resp.Result.Data.Extdata = extdata //保存 - udata :=new(UserData) + udata := new(UserData) udata.Scene = extdata.User_scene udata.Hot = extdata.Hot udata.Exp = extdata.Exp @@ -71,7 +70,7 @@ func InitAccountLogin(account string) { //首先生成token newToken := ksuid.New().String() //保存token与account的关系 - SaveAccountToken(account,newToken) + SaveAccountToken(account, newToken) //首先生成user_base_data var basedata UserBaseData basedata.User_id = GetNewUUid() @@ -83,9 +82,9 @@ func InitAccountLogin(account string) { basedata.User_token = newToken //保存base data basic, _ := json.Marshal(&basedata) - SaveUserBasic(basedata.User_id,string(basic)) + SaveUserBasic(basedata.User_id, string(basic)) - SetTouristUid(newToken,basedata.User_id) + SetTouristUid(newToken, basedata.User_id) //然后生成user_ext_data var extdata UserExtData extdata.User_id = basedata.User_id @@ -102,7 +101,7 @@ func InitAccountLogin(account string) { extdata.User_is_black = 0 extdata.User_reg_time = int(time.Now().Unix()) extdata.User_scene = 0 - udata :=new(UserData) + udata := new(UserData) udata.Scene = extdata.User_scene udata.Hot = extdata.Hot udata.Exp = extdata.Exp @@ -124,7 +123,7 @@ func InitAccountLogin(account string) { SaveUserExt(udata) } -func InitTourist(req *UserLoginReq,resp *UserLoginResp) { +func InitTourist(req *UserLoginReq, resp *UserLoginResp) { //首先生成user_base_data var basedata UserBaseData basedata.User_id = GetNewUUid() @@ -137,16 +136,16 @@ func InitTourist(req *UserLoginReq,resp *UserLoginResp) { resp.Result.Data.Dasedata = basedata //保存base data basic, _ := json.Marshal(&basedata) - SaveUserBasic(basedata.User_id,string(basic)) + SaveUserBasic(basedata.User_id, string(basic)) - SetTouristUid(req.Token,basedata.User_id) + SetTouristUid(req.Token, basedata.User_id) //然后生成user_ext_data - InitUserExt(req,resp,basedata.User_id) + InitUserExt(req, resp, basedata.User_id) } //微信登录账户初始化 -func InitWeChatUser(req *WechatLoginReq,resp *UserLoginResp,uinfo *WxUserInfo) { +func InitWeChatUser(req *WechatLoginReq, resp *UserLoginResp, uinfo *WxUserInfo) { //首先生成user_base_data var basedata UserBaseData basedata.User_id = GetNewUUid() @@ -159,9 +158,9 @@ func InitWeChatUser(req *WechatLoginReq,resp *UserLoginResp,uinfo *WxUserInfo) { resp.Result.Data.Dasedata = basedata //保存base data basic, _ := json.Marshal(&basedata) - SaveUserBasic(basedata.User_id,string(basic)) + SaveUserBasic(basedata.User_id, string(basic)) - SetTouristUid(uinfo.OpenID,basedata.User_id) + SetTouristUid(uinfo.OpenID, basedata.User_id) //然后生成user_ext_data var extdata UserExtData extdata.User_id = basedata.User_id @@ -180,7 +179,7 @@ func InitWeChatUser(req *WechatLoginReq,resp *UserLoginResp,uinfo *WxUserInfo) { extdata.User_scene = 0 resp.Result.Data.Extdata = extdata //保存 - udata :=new(UserData) + udata := new(UserData) udata.Scene = extdata.User_scene udata.Hot = extdata.Hot udata.Exp = extdata.Exp @@ -214,7 +213,7 @@ func HandleLoginTime(ext *UserData) { } } -func TransmitUserData(in *UserData ,out *UserExtData) { +func TransmitUserData(in *UserData, out *UserExtData) { out.LoveExp = in.Loevexp out.User_id = in.Userid out.ShopNum = in.Shopnum @@ -232,7 +231,6 @@ func TransmitUserData(in *UserData ,out *UserExtData) { out.Invite_uid = in.InviteUid } - func HandleQueryInvite(w http.ResponseWriter, data string) { SetHeader(w) @@ -247,7 +245,7 @@ func HandleQueryInvite(w http.ResponseWriter, data string) { break } - inlist,err := mysql.QueryInvite(rdata.Uuid) + inlist, err := mysql.QueryInvite(rdata.Uuid) if err != nil { logger.Error("HandleQueryInvite QueryInvite failed=%v", err) resp.Result.Code = ERROR_JSONUNMASHFAILED @@ -255,13 +253,13 @@ func HandleQueryInvite(w http.ResponseWriter, data string) { break } - for _,val := range inlist { + for _, val := range inlist { var tmp QueryInviteData tmp.Uuid = val.Uuid tmp.Nickname = val.NickName tmp.Isfetched = val.IsFecthed tmp.Headurl = val.HeadUrl - resp.Result.Data.Invite_data = append(resp.Result.Data.Invite_data,tmp) + resp.Result.Data.Invite_data = append(resp.Result.Data.Invite_data, tmp) } resp.Result.Code = ERROR_OK @@ -273,6 +271,51 @@ func HandleQueryInvite(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } +func HandlequeryBrifeMessage(w http.ResponseWriter, data string) { + + SetHeader(w) + var resp QueryBrifeMessageResp + resp.Status = "true" + var rdata QueryBrifeMessageReq + err := json.Unmarshal([]byte(data), &rdata) + for { + if err != nil { + logger.Error("HandlequeryBrifeMessage json unmarshal failed=%v", err) + resp.Result.Code = ERROR_JSONUNMASHFAILED + break + } + + //先查询表情信息 + emjs := GetChatEmojInfo(rdata.Uuid) + resp.Result.Data.Emojinfo = append(resp.Result.Data.Emojinfo, emjs...) + + //世界频道 + var world QueryBrifeMessageData + world.Isnew = 0 + world.Ctype = 0 + resp.Result.Data.Channelinfo = append(resp.Result.Data.Channelinfo, world) + + //工会频道 + var team QueryBrifeMessageData + team.Ctype = 1 + team.Isnew = 0 + teamnew, err := CheckTeamHasNewMessage(rdata.Uuid) + if err == nil && teamnew { + team.Isnew = 1 + } + resp.Result.Data.Channelinfo = append(resp.Result.Data.Channelinfo, team) + + //私人频道 + //优先加入有新消息的 + privatebrief := GetPrivateBriefList(rdata.Uuid) + resp.Result.Data.Channelinfo = append(resp.Result.Data.Channelinfo, privatebrief...) + break + } + + //回包 + respstr, _ := json.Marshal(&resp) + fmt.Fprint(w, string(respstr)) +} func HandlequeryNewMessage(w http.ResponseWriter, data string) { @@ -289,7 +332,7 @@ func HandlequeryNewMessage(w http.ResponseWriter, data string) { break } //先从缓存取，如果已经有新消息则直接返回 - exist,err := redishandler.GetRedisClient().HExists(redis.USER_CHAT_ISNEW,strconv.Itoa(rdata.Uuid)) + exist, err := redishandler.GetRedisClient().HExists(redis.USER_CHAT_ISNEW, strconv.Itoa(rdata.Uuid)) if err != nil { logger.Error("HandlequeryNewMessage save failed=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED @@ -303,7 +346,7 @@ func HandlequeryNewMessage(w http.ResponseWriter, data string) { } //如果没有 则进行判断 - isnew,err := CheckHasNewMessage(rdata.Uuid) + isnew, err := CheckHasNewMessage(rdata.Uuid) if err != nil { logger.Error("HandlequeryNewMessage CheckHasNewMessage failed=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED @@ -337,23 +380,22 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { break } - // rkey := redis.USER_NEW_DATA_KEY + strconv.Itoa(rdata.Uuid) - val,err := redishandler.GetRedisClient().GetString(rkey) + val, err := redishandler.GetRedisClient().GetString(rkey) if err != nil { //如果没有 直接保存即可 var tmp1 GetDataSaveDesc tmp1.Data_uid = strconv.Itoa(rdata.Uuid) tmp1.Data_value = rdata.Value - savestr,err:= json.Marshal(&tmp1) + savestr, err := json.Marshal(&tmp1) if err != nil { logger.Error("HandleNewSaveData failed7,err=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED resp.Result.Data = "ERROR_SRVDB_FAILED" break } - err = redishandler.GetRedisClient().SetString(rkey,string(savestr)) + err = redishandler.GetRedisClient().SetString(rkey, string(savestr)) if err != nil { logger.Error("HandleNewSaveData failed7,err=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED @@ -378,7 +420,7 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { //break*/ } - val,_ = redishandler.GetRedisClient().GetString(rkey) + val, _ = redishandler.GetRedisClient().GetString(rkey) var final GetDataSaveDesc err = json.Unmarshal([]byte(val), &final) if err != nil { @@ -388,7 +430,6 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { } val = final.Data_value - //解析val json m1 := make(map[string]interface{}) err = json.Unmarshal([]byte(val), &m1) @@ -410,31 +451,31 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { //比较猫数据 catmap1 := m1["catData"].(map[string]interface{}) catmap2 := m2["catData"].(map[string]interface{}) - logger.Info("HandleNewSaveData catmap1=%v",catmap1) - logger.Info("HandleNewSaveData catmap2=%v",catmap2) + logger.Info("HandleNewSaveData catmap1=%v", catmap1) + logger.Info("HandleNewSaveData catmap2=%v", catmap2) if len(catmap2) < len(catmap1) { logger.Error("HandleNewSaveData failed1,err=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED resp.Result.Data = "ERROR_SRVDB_FAILED" break } - for k,vak := range catmap2 { + for k, vak := range catmap2 { if catmap1[k] != nil { //需要比较等级 c2 := vak.(map[string]interface{}) c1 := catmap1[k].(map[string]interface{}) - if c1["level"]!= nil && c2["level"]!= nil { - logger.Info("HandleNewSaveData c1=%v c2=%v",c1["level"],c2["level"]) + if c1["level"] != nil && c2["level"] != nil { + logger.Info("HandleNewSaveData c1=%v c2=%v", c1["level"], c2["level"]) if c2["level"].(float64) < c1["level"].(float64) { logger.Error("HandleNewSaveData failed2,err=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED resp.Result.Data = "ERROR_SRVDB_FAILED" break } - }else { - logger.Error("HandleNewSaveData failed11,k=%v",k) + } else { + logger.Error("HandleNewSaveData failed11,k=%v", k) } - }else { + } else { //logger.Error("HandleNewSaveData failed10,k=%v",k) } } @@ -442,15 +483,15 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { //比较roomData roommap1 := m1["roomData"].(map[string]interface{}) roommap2 := m2["roomData"].(map[string]interface{}) - logger.Info("HandleNewSaveData catmap1=%v",roommap1) - logger.Info("HandleNewSaveData catmap2=%v",roommap2) + logger.Info("HandleNewSaveData catmap1=%v", roommap1) + logger.Info("HandleNewSaveData catmap2=%v", roommap2) if len(roommap2) < len(roommap1) { logger.Error("HandleNewSaveData failed3,err=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED resp.Result.Data = "ERROR_SRVDB_FAILED" break } - for k,val := range roommap2 { + for k, val := range roommap2 { if roommap1[k] != nil { r2 := val.(map[string]interface{}) r1 := roommap1[k].(map[string]interface{}) @@ -465,8 +506,8 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { }*/ //比较furnitData - rrr2 := r2["furnitData"].(map[string]interface{}) - rrr1 := r1["furnitData"].(map[string]interface{}) + rrr2 := r2["furnitData"].(map[string]interface{}) + rrr1 := r1["furnitData"].(map[string]interface{}) if len(rrr2) < len(rrr1) { logger.Error("HandleNewSaveData failed5,err=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED @@ -474,24 +515,24 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { break } - for k,_ := range rrr2 { + for k, _ := range rrr2 { if rrr1[k] != nil { ddtr2 := rrr2[k].(map[string]interface{}) ddtr1 := rrr1[k].(map[string]interface{}) - if ddtr2["state"]!= nil && ddtr1["state"]!= nil { + if ddtr2["state"] != nil && ddtr1["state"] != nil { if ddtr2["state"].(float64) < ddtr1["state"].(float64) { logger.Error("HandleNewSaveData failed15,d2=%v,d1=%v", ddtr2["state"].(float64), ddtr1["state"].(float64)) resp.Result.Code = ERROR_SRVDB_FAILED resp.Result.Data = "ERROR_SRVDB_FAILED" break - }else { + } else { //logger.Error("HandleNewSaveData failed17,d2=%v,d1=%v", ddtr2["state"].(float64), ddtr1["state"].(float64)) } - }else { + } else { logger.Error("HandleNewSaveData failed18,d2=%v,d1=%v", ddtr2["state"].(float64), ddtr1["state"].(float64)) } - }else { + } else { //logger.Error("HandleNewSaveData failed16,k", k) } } @@ -511,8 +552,8 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { } //签到数据校验 - issign1,ok1 := m1["isSign"].(bool) - issign2,ok2 := m2["isSign"].(bool) + issign1, ok1 := m1["isSign"].(bool) + issign2, ok2 := m2["isSign"].(bool) if ok1 && ok2 { if !issign2 && issign1 { //无需验证 @@ -523,10 +564,10 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { } } - signNowLoop1,ok1 := m1["signNowLoop"].(float64) - signNowLoop2,ok2 := m2["signNowLoop"].(float64) - signLoopId1,ok3 := m2["signLoopId"].(float64) - signLoopId2,ok4 := m2["signLoopId"].(float64) + signNowLoop1, ok1 := m1["signNowLoop"].(float64) + signNowLoop2, ok2 := m2["signNowLoop"].(float64) + signLoopId1, ok3 := m2["signLoopId"].(float64) + signLoopId2, ok4 := m2["signLoopId"].(float64) if ok1 && ok2 && ok3 && ok4 { if signLoopId2 < signLoopId1 { logger.Error("HandleNewSaveData failed31,err=%v", err) @@ -550,14 +591,14 @@ func HandleNewSaveData(w http.ResponseWriter, data string) { var tmp GetDataSaveDesc tmp.Data_uid = strconv.Itoa(rdata.Uuid) tmp.Data_value = rdata.Value - savestr,err:= json.Marshal(&tmp) + savestr, err := json.Marshal(&tmp) if err != nil { logger.Error("HandleNewSaveData failed7,err=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED resp.Result.Data = "ERROR_SRVDB_FAILED" break } - err = redishandler.GetRedisClient().SetString(rkey,string(savestr)) + err = redishandler.GetRedisClient().SetString(rkey, string(savestr)) if err != nil { logger.Error("HandleNewSaveData failed7,err=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED @@ -588,7 +629,7 @@ func HandleSaveDataBackup(w http.ResponseWriter, data string) { break } - err = redishandler.GetRedisClient().HSet(redis.USER_BACKUP_DATA,strconv.Itoa(rdata.Uuid),rdata.Value) + err = redishandler.GetRedisClient().HSet(redis.USER_BACKUP_DATA, strconv.Itoa(rdata.Uuid), rdata.Value) if err != nil { logger.Error("HandleQueryInviteWork save failed=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED @@ -622,19 +663,19 @@ func HandleNewGetData(w http.ResponseWriter, data string) { //先去取出新的数据 rkey := redis.USER_NEW_DATA_KEY + strconv.Itoa(rdata.Uuid) - val,err := redishandler.GetRedisClient().GetString(rkey) - if err != nil { - logger.Error("HandleNewGetData err=%v",err) - //如果不存在数据则去老的取 - rkey1 := "cat:cafe:data:where:data_uid:" + strconv.Itoa(rdata.Uuid) - val,err = redishandler.GetRedisClient().GetString(rkey1) - if err != nil { - resp.Result.Data.Base_data = "{}" - //resp.Result.Code = ERROR_JSONUNMASHFAILED - break - } - isfind = true - } + val, err := redishandler.GetRedisClient().GetString(rkey) + if err != nil { + logger.Error("HandleNewGetData err=%v", err) + //如果不存在数据则去老的取 + rkey1 := "cat:cafe:data:where:data_uid:" + strconv.Itoa(rdata.Uuid) + val, err = redishandler.GetRedisClient().GetString(rkey1) + if err != nil { + resp.Result.Data.Base_data = "{}" + //resp.Result.Code = ERROR_JSONUNMASHFAILED + break + } + isfind = true + } var final GetDataSaveDesc err = json.Unmarshal([]byte(val), &final) @@ -648,19 +689,18 @@ func HandleNewGetData(w http.ResponseWriter, data string) { //如果是从老的数据过来的 存入新的数据key if isfind { - err = redishandler.GetRedisClient().SetString(rkey,val) + err = redishandler.GetRedisClient().SetString(rkey, val) if err != nil { - logger.Error("HandleNewGetData err=%v",err) + logger.Error("HandleNewGetData err=%v", err) } } - break } //回包 respstr, _ := json.Marshal(&resp) - logger.Info("HandleNewGetData new is=%v",string(respstr)) + logger.Info("HandleNewGetData new is=%v", string(respstr)) fmt.Fprint(w, string(respstr)) } @@ -686,7 +726,6 @@ func HandleInitIndex(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleQueryInviteWork(w http.ResponseWriter, data string) { SetHeader(w) @@ -702,18 +741,18 @@ func HandleQueryInviteWork(w http.ResponseWriter, data string) { break } - dalist,offlist,_ := GetdagongList(rdata.Uuid) + dalist, offlist, _ := GetdagongList(rdata.Uuid) if dalist == nil { resp.Result.Code = ERROR_OK break } - for _,val := range *dalist { - resp.Result.Data.Invite_data = append(resp.Result.Data.Invite_data,val) + for _, val := range *dalist { + resp.Result.Data.Invite_data = append(resp.Result.Data.Invite_data, val) } - for _,val := range offlist { - resp.Result.Data.Offlinelist = append(resp.Result.Data.Offlinelist,val) + for _, val := range offlist { + resp.Result.Data.Offlinelist = append(resp.Result.Data.Offlinelist, val) } resp.Result.Code = ERROR_OK @@ -725,8 +764,6 @@ func HandleQueryInviteWork(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - - func HandleEnterInvite(w http.ResponseWriter, data string) { SetHeader(w) @@ -749,7 +786,7 @@ func HandleEnterInvite(w http.ResponseWriter, data string) { //邀请新用户 //首先要判断一下这个玩家是否已经被邀请过了 rkey := redis.USER_BEINVITE_UUIDRELATION + ":" + strconv.Itoa(rdata.Inviteuuid) - exist,err := redishandler.GetRedisClient().HExists(rkey,strconv.Itoa(rdata.Selfuuid)) + exist, err := redishandler.GetRedisClient().HExists(rkey, strconv.Itoa(rdata.Selfuuid)) if err != nil { logger.Error("HandleEnterInvite redis failed=%v", err) resp.Result.Code = ERROR_JSONUNMASHFAILED @@ -764,17 +801,16 @@ func HandleEnterInvite(w http.ResponseWriter, data string) { break } - //记录被邀请关系 - redishandler.GetRedisClient().HSet(rkey,strconv.Itoa(rdata.Selfuuid),strconv.Itoa(rdata.Selfuuid)) + redishandler.GetRedisClient().HSet(rkey, strconv.Itoa(rdata.Selfuuid), strconv.Itoa(rdata.Selfuuid)) //记录邀请关系 rkey = redis.USER_INVITEREWARD_FETCH_REWARD + ":" + strconv.Itoa(rdata.Inviteuuid) - redishandler.GetRedisClient().HSet(rkey,strconv.Itoa(rdata.Selfuuid),"0") - }else { + redishandler.GetRedisClient().HSet(rkey, strconv.Itoa(rdata.Selfuuid), "0") + } else { //邀请打工 //invitelist,err := GetdagongList(rdata.Inviteuuid) - invitelist,reallist,err :=GetRealDagonglist(rdata.Inviteuuid) + invitelist, reallist, err := GetRealDagonglist(rdata.Inviteuuid) if err != nil { /*logger.Error("HandleEnterInvite GetdagongList failed") resp.Result.Code = ERROR_SRVDB_FAILED @@ -783,7 +819,7 @@ func HandleEnterInvite(w http.ResponseWriter, data string) { } if reallist != nil { - if len(*reallist) > 2 { + if len(*reallist) > 2 { logger.Error("HandleEnterInvite dagong num is full") resp.Result.Code = ERROR_DAGONG_FULL //resp.Message = "dagong full" @@ -799,26 +835,24 @@ func HandleEnterInvite(w http.ResponseWriter, data string) { } if invitelist != nil { - err = AddDagongList(rdata.Selfuuid,rdata.Inviteuuid,*invitelist) - }else { + err = AddDagongList(rdata.Selfuuid, rdata.Inviteuuid, *invitelist) + } else { //此时列表为空 新建一个 var newlist WorkList - err = AddDagongList(rdata.Selfuuid,rdata.Inviteuuid,newlist) + err = AddDagongList(rdata.Selfuuid, rdata.Inviteuuid, newlist) } - - }else { + } else { //此时列表为空 新建一个 if invitelist != nil { - err = AddDagongList(rdata.Selfuuid,rdata.Inviteuuid,*invitelist) - }else { + err = AddDagongList(rdata.Selfuuid, rdata.Inviteuuid, *invitelist) + } else { //此时列表为空 新建一个 var newlist WorkList - err = AddDagongList(rdata.Selfuuid,rdata.Inviteuuid,newlist) + err = AddDagongList(rdata.Selfuuid, rdata.Inviteuuid, newlist) } } - if err != nil { logger.Error("HandleEnterInvite ERROR_SRVDB_FAILED") resp.Result.Code = ERROR_SRVDB_FAILED @@ -827,7 +861,6 @@ func HandleEnterInvite(w http.ResponseWriter, data string) { } } - resp.Result.Code = ERROR_OK break } @@ -837,7 +870,6 @@ func HandleEnterInvite(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleFetchInviteReward(w http.ResponseWriter, data string) { SetHeader(w) @@ -854,7 +886,7 @@ func HandleFetchInviteReward(w http.ResponseWriter, data string) { } rkey := redis.USER_INVITEREWARD_FETCH_REWARD + ":" + strconv.Itoa(rdata.Selfuuid) - fetch,err := redishandler.GetRedisClient().HGet(rkey,strconv.Itoa(rdata.Fuuid)) + fetch, err := redishandler.GetRedisClient().HGet(rkey, strconv.Itoa(rdata.Fuuid)) if err != nil { logger.Error("HandleFetchInviteReward redis failed=%v", err) resp.Result.Code = ERROR_JSONUNMASHFAILED @@ -870,7 +902,7 @@ func HandleFetchInviteReward(w http.ResponseWriter, data string) { } //将领取记录记录 - redishandler.GetRedisClient().HSet(rkey,strconv.Itoa(rdata.Fuuid),"1") + redishandler.GetRedisClient().HSet(rkey, strconv.Itoa(rdata.Fuuid), "1") resp.Result.Code = ERROR_OK break @@ -881,7 +913,6 @@ func HandleFetchInviteReward(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleRegeister(w http.ResponseWriter, data string) { SetHeader(w) @@ -900,7 +931,7 @@ func HandleRegeister(w http.ResponseWriter, data string) { //todo 判断密码强度？ //判断账号是否重复有 - exist,err := redishandler.GetRedisClient().HExists(redis.USER_ACCOUNT_PASSWORD_KEY,rdata.Account) + exist, err := redishandler.GetRedisClient().HExists(redis.USER_ACCOUNT_PASSWORD_KEY, rdata.Account) if err != nil { logger.Error("HandleRegeister redis failed failed=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED @@ -913,7 +944,7 @@ func HandleRegeister(w http.ResponseWriter, data string) { break } - err = SaveAccount(rdata.Account,rdata.Password) + err = SaveAccount(rdata.Account, rdata.Password) if err != nil { logger.Error("HandleRegeister redis failed failed=%v", err) resp.Result.Code = ERROR_SRVDB_FAILED @@ -932,7 +963,6 @@ func HandleRegeister(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleAccounLogin(w http.ResponseWriter, data string) { SetHeader(w) @@ -948,7 +978,7 @@ func HandleAccounLogin(w http.ResponseWriter, data string) { break } - err := CheckAccout(rdata.Account,rdata.Password) + err := CheckAccout(rdata.Account, rdata.Password) if err != nil { logger.Error("HandleRegeister pwssword failed failed=%v", err) @@ -959,14 +989,14 @@ func HandleAccounLogin(w http.ResponseWriter, data string) { //查询数据 token := GetAccountToken(rdata.Account) - uuid,err := GetTouristUid(token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(token) + if err != nil || uuid == 0 { logger.Error("HandleAccounLogin getuuid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - basic,err := GetUserBasic(uuid) + basic, err := GetUserBasic(uuid) if err != nil { logger.Error("HandleAccounLogin getbasic failed=%v", err) resp.Result.Code = ERROR_GETUSERBASICFAILED @@ -974,21 +1004,20 @@ func HandleAccounLogin(w http.ResponseWriter, data string) { } resp.Result.Data.Dasedata = *basic - ext,err := GetUserExt(uuid) + ext, err := GetUserExt(uuid) if err != nil { logger.Error("HandleAccounLogin getext failed=%v", err) resp.Result.Code = ERROR_GETUSEREXTFAILED break } - TransmitUserData(ext,&resp.Result.Data.Extdata) + TransmitUserData(ext, &resp.Result.Data.Extdata) //需要处理登录数据 HandleLoginTime(ext) - m_userInfo.Set(uint32(ext.Userid),ext) + m_userInfo.Set(uint32(ext.Userid), ext) SaveUserExt(ext) - resp.Result.Code = ERROR_OK break } @@ -998,7 +1027,6 @@ func HandleAccounLogin(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - //处理微信登录 func HandleWechatlogin(w http.ResponseWriter, data string) { @@ -1022,15 +1050,15 @@ func HandleWechatlogin(w http.ResponseWriter, data string) { resp.Result.Code = ERROR_WECHATLOGINFAILED break } - logger.Info("HandleWechatlogin userInfo=%v",userInfo) + logger.Info("HandleWechatlogin userInfo=%v", userInfo) - uuid,_ := GetTouristUid(userInfo.OpenID) + uuid, _ := GetTouristUid(userInfo.OpenID) if uuid == 0 { //新的账号 需要初始化保存 - InitWeChatUser(&rdata,&resp,userInfo) - }else { + InitWeChatUser(&rdata, &resp, userInfo) + } else { //读取数据 - basic,err := GetUserBasic(uuid) + basic, err := GetUserBasic(uuid) if err != nil { logger.Error("HandleWechatlogin getbasic failed=%v", err) resp.Result.Code = ERROR_GETUSERBASICFAILED @@ -1038,25 +1066,22 @@ func HandleWechatlogin(w http.ResponseWriter, data string) { } resp.Result.Data.Dasedata = *basic - ext,err := GetUserExt(uuid) + ext, err := GetUserExt(uuid) if err != nil { logger.Error("HandleWechatlogin getext failed=%v", err) resp.Result.Code = ERROR_GETUSEREXTFAILED break } - TransmitUserData(ext,&resp.Result.Data.Extdata) + TransmitUserData(ext, &resp.Result.Data.Extdata) //resp.Result.Data.Extdata = *ext //需要处理登录数据 HandleLoginTime(ext) - m_userInfo.Set(uint32(ext.Userid),ext) + m_userInfo.Set(uint32(ext.Userid), ext) SaveUserExt(ext) } - - - resp.Result.Code = ERROR_OK break } @@ -1067,18 +1092,18 @@ func HandleWechatlogin(w http.ResponseWriter, data string) { } //处理游客登录 -func HandleTouristLogin(w http.ResponseWriter, req *UserLoginReq,resp *UserLoginResp) { +func HandleTouristLogin(w http.ResponseWriter, req *UserLoginReq, resp *UserLoginResp) { - logger.Info("HandleTouristLogin req=%v,resp=%v",req,resp) + logger.Info("HandleTouristLogin req=%v,resp=%v", req, resp) for { //首先判断是否存在这个游客账号 - uuid,err := GetTouristUid(req.Token) + uuid, err := GetTouristUid(req.Token) if err != nil { //新账号 初始化 - InitTourist(req,resp) - }else { + InitTourist(req, resp) + } else { //读取数据 - basic,err := GetUserBasic(uuid) + basic, err := GetUserBasic(uuid) if err != nil { logger.Error("HandleTouristLogin getbasic failed=%v", err) resp.Result.Code = ERROR_GETUSERBASICFAILED @@ -1086,16 +1111,16 @@ func HandleTouristLogin(w http.ResponseWriter, req *UserLoginReq,resp *UserLogin } resp.Result.Data.Dasedata = *basic - ext,err := GetUserExt(uuid) + ext, err := GetUserExt(uuid) if err != nil { logger.Error("HandleTouristLogin getext failed=%v", err) resp.Result.Code = ERROR_GETUSEREXTFAILED break } //resp.Result.Data.Extdata = *ext - TransmitUserData(ext,&resp.Result.Data.Extdata) + TransmitUserData(ext, &resp.Result.Data.Extdata) - m_userInfo.Set(uint32(ext.Userid),ext) + m_userInfo.Set(uint32(ext.Userid), ext) SaveUserExt(ext) } @@ -1121,12 +1146,7 @@ func HandleUserLogin(w http.ResponseWriter, data string) { break } - - HandleTouristLogin(w,&rdata,&resp) - - - - + HandleTouristLogin(w, &rdata, &resp) } @@ -1149,8 +1169,8 @@ func HandleSaveUserData(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleSaveUserData json unmarshal failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break @@ -1171,7 +1191,7 @@ func HandleSaveUserData(w http.ResponseWriter, data string) { uinfo.Shopnum = rdata.Shopnum SaveUserExt(uinfo) - basic,err := GetUserBasic(uuid) + basic, err := GetUserBasic(uuid) if err != nil { logger.Error("HandleTouristLogin getbasic failed=%v", err) resp.Result.Code = ERROR_GETUSERBASICFAILED @@ -1179,14 +1199,14 @@ func HandleSaveUserData(w http.ResponseWriter, data string) { } resp.Result.Data.Dasedata = *basic - ext,err := GetUserExt(uuid) + ext, err := GetUserExt(uuid) if err != nil { logger.Error("HandleTouristLogin getext failed=%v", err) resp.Result.Code = ERROR_GETUSEREXTFAILED break } //resp.Result.Data.Extdata = *ext - TransmitUserData(ext,&resp.Result.Data.Extdata) + TransmitUserData(ext, &resp.Result.Data.Extdata) resp.Result.Code = ERROR_OK break @@ -1211,15 +1231,14 @@ func HandlesaveData(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandlesaveData GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - - err = SaveUserBaseData(uuid,rdata.Value) + err = SaveUserBaseData(uuid, rdata.Value) if err != nil { logger.Error("HandlesaveData save failed=%v", err) @@ -1276,18 +1295,18 @@ func HandlegetData(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr))*/ } -func GetAccessToken() string{ +func GetAccessToken() string { //首先从缓存取kwiffwiffiaowosfwkfko - exist,err := redishandler.GetRedisClient().Exists(redis.MSG_CKECK_ACCESSTOKEN) + exist, err := redishandler.GetRedisClient().Exists(redis.MSG_CKECK_ACCESSTOKEN) if err != nil { - logger.Error("GetAccessToken err=%v",err) + logger.Error("GetAccessToken err=%v", err) return "" } if exist { - key,err := redishandler.GetRedisClient().GetString(redis.MSG_CKECK_ACCESSTOKEN) + key, err := redishandler.GetRedisClient().GetString(redis.MSG_CKECK_ACCESSTOKEN) if err != nil { - logger.Error("GetAccessToken err=%v",err) + logger.Error("GetAccessToken err=%v", err) return "" } @@ -1296,9 +1315,9 @@ func GetAccessToken() string{ //去微信获取 url := URL_WEIXINGETACCESS_TOKEN + "?grant_type=client_credential&" + "appid=wx572a2a5ec4538f33&" + "secret=b31e2e7406af88fe7395cd178bdb64fc" - res,err :=http.Get(url) + res, err := http.Get(url) if err != nil { - logger.Error("GetAccessToken http failed err=%v",err) + logger.Error("GetAccessToken http failed err=%v", err) return "" } @@ -1309,8 +1328,8 @@ func GetAccessToken() string{ _ = json.Unmarshal(result, &msgresp) //存入缓存 - expiretime,_ :=strconv.Atoi(msgresp.Expires_in) - redishandler.GetRedisClient().SetExString(redis.MSG_CKECK_ACCESSTOKEN,msgresp.Access_token,expiretime-60) + expiretime, _ := strconv.Atoi(msgresp.Expires_in) + redishandler.GetRedisClient().SetExString(redis.MSG_CKECK_ACCESSTOKEN, msgresp.Access_token, expiretime-60) return msgresp.Access_token } @@ -1329,14 +1348,13 @@ func HandleTextCheck(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleTextCheck GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - //首先获取 msgtoken := GetAccessToken() msgurl := URL_WEIXINMSG_CHECK + "?access_token=" + msgtoken @@ -1352,7 +1370,7 @@ func HandleTextCheck(w http.ResponseWriter, data string) { body := bytes.NewBuffer(bys) res, err := http.Post(msgurl, "application/json;charset=utf-8", body) if err != nil { - logger.Error(" HandleTextCheck ERROR_HTTPPOSTFAILED err=%v", err) + logger.Error(" HandleTextCheck ERROR_HTTPPOSTFAILED err=%v", err) resp.Result.Code = ERROR_HTTPPOSTFAILED return } @@ -1363,8 +1381,8 @@ func HandleTextCheck(w http.ResponseWriter, data string) { var msgresp MsgCheckResp _ = json.Unmarshal(result, &msgresp) - code,_ := strconv.Atoi(msgresp.Errcode) - resp.Result.Code =code + code, _ := strconv.Atoi(msgresp.Errcode) + resp.Result.Code = code resp.Result.Data = msgresp.Errmsg resp.Result.Code = ERROR_OK @@ -1390,14 +1408,13 @@ func HandleCreateTeam(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleCreateTeam GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - //首先判断一下当前队伍名称是否已经存在 isexist := GetUserTeamNameIsExist(rdata.Name) if isexist { @@ -1423,7 +1440,7 @@ func HandleCreateTeam(w http.ResponseWriter, data string) { //初始化队伍数据 var bteaminfo TeamInfo - bteaminfo.MemInfo.MemList = append(bteaminfo.MemInfo.MemList,uuid) + bteaminfo.MemInfo.MemList = append(bteaminfo.MemInfo.MemList, uuid) var teaminfo CreateTeamInfo teaminfo.Name = rdata.Name teaminfo.Status = 0 @@ -1439,13 +1456,13 @@ func HandleCreateTeam(w http.ResponseWriter, data string) { resp.Result.Data.Team_data = teaminfo bteaminfo.BaseInfo = teaminfo //保存队伍数据 - SaveTeamInfo(teaminfo.Id,&bteaminfo) + SaveTeamInfo(teaminfo.Id, &bteaminfo) //保存队伍id - SaveTeamToUuid(teaminfo.Id,uuid) + SaveTeamToUuid(teaminfo.Id, uuid) //保存队伍名称 - SetUserTeamName(rdata.Name,teaminfo.Id) + SetUserTeamName(rdata.Name, teaminfo.Id) resp.Result.Code = ERROR_OK break @@ -1470,14 +1487,13 @@ func HandleUpdateTeamData(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleUpdateTeamData GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - //首先判断一下当前队伍名称是否已经存在 isexist := GetUserTeamNameIsExist(rdata.Name) if isexist { @@ -1487,14 +1503,14 @@ func HandleUpdateTeamData(w http.ResponseWriter, data string) { } //首先查询teamid - teamid,err := GetTeamByUuid(uuid) + teamid, err := GetTeamByUuid(uuid) if err != nil { logger.Error("HandleUpdateTeamData getteamid failed=%v", err) resp.Result.Code = ERROR_QUERYTEAMID_FAILED break } //查询队伍数据 - teaminfo,err := GetTeamInfo(teamid) + teaminfo, err := GetTeamInfo(teamid) if err != nil { logger.Error("HandleUpdateTeamData getteaminfo failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED @@ -1519,11 +1535,11 @@ func HandleUpdateTeamData(w http.ResponseWriter, data string) { teaminfo.BaseInfo.Update_time = int(time.Now().Unix()) //保存队伍数据 - SaveTeamInfo(teaminfo.BaseInfo.Id,teaminfo) + SaveTeamInfo(teaminfo.BaseInfo.Id, teaminfo) DelUserTeamName(orinname) //保存队伍名称 - SetUserTeamName(rdata.Name,teaminfo.BaseInfo.Id) + SetUserTeamName(rdata.Name, teaminfo.BaseInfo.Id) resp.Result.Code = ERROR_OK break @@ -1534,7 +1550,6 @@ func HandleUpdateTeamData(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleJoinTeam(w http.ResponseWriter, data string) { SetHeader(w) var resp JoinTeamResp @@ -1542,22 +1557,22 @@ func HandleJoinTeam(w http.ResponseWriter, data string) { resp.Result.Code = ERROR_OK var rdata JoinTeamReq err := json.Unmarshal([]byte(data), &rdata) - for { - if err != nil { + for { + if err != nil { logger.Error("HandleJoinTeam json unmarshal failed=%v", err) resp.Result.Code = ERROR_JSONUNMASHFAILED break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleJoinTeam GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } //获取店铺数据 - tinfo,err := GetTeamInfo(rdata.Team_id) + tinfo, err := GetTeamInfo(rdata.Team_id) if err != nil { logger.Error("HandleJoinTeam GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED @@ -1595,13 +1610,12 @@ func HandleJoinTeam(w http.ResponseWriter, data string) { break } - tinfo.MemInfo.MemList = append(tinfo.MemInfo.MemList,uuid) + tinfo.MemInfo.MemList = append(tinfo.MemInfo.MemList, uuid) //保存队伍与uuid - SaveTeamToUuid(tinfo.BaseInfo.Id,uuid) + SaveTeamToUuid(tinfo.BaseInfo.Id, uuid) //保存队伍数据 - SaveTeamInfo(tinfo.BaseInfo.Id,tinfo) - + SaveTeamInfo(tinfo.BaseInfo.Id, tinfo) resp.Result.Code = ERROR_OK resp.Result.Data = "" @@ -1613,7 +1627,6 @@ func HandleJoinTeam(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleJoinTeamByInvite(w http.ResponseWriter, data string) { SetHeader(w) var resp JoinTeamByInviteResp @@ -1628,29 +1641,27 @@ func HandleJoinTeamByInvite(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleJoinTeamByInvite GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - //获取店铺数据 - teamid,err := GetTeamByUuid(rdata.Inviter_id) + teamid, err := GetTeamByUuid(rdata.Inviter_id) if err != nil { logger.Error("HandleJoinTeamByInvite GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED break } - tinfo ,err := GetTeamInfo(teamid) + tinfo, err := GetTeamInfo(teamid) if err != nil { logger.Error("HandleJoinTeamByInvite GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED break } - //判断一下是否已经在队伍中 inteam := tinfo.IsInTeam(uuid) @@ -1660,14 +1671,12 @@ func HandleJoinTeamByInvite(w http.ResponseWriter, data string) { break } - tinfo.MemInfo.MemList = append(tinfo.MemInfo.MemList,uuid) - + tinfo.MemInfo.MemList = append(tinfo.MemInfo.MemList, uuid) //保存队伍与uuid - SaveTeamToUuid(tinfo.BaseInfo.Id,uuid) + SaveTeamToUuid(tinfo.BaseInfo.Id, uuid) //保存队伍数据 - SaveTeamInfo(tinfo.BaseInfo.Id,tinfo) - + SaveTeamInfo(tinfo.BaseInfo.Id, tinfo) resp.Result.Code = ERROR_OK resp.Result.Data = "" @@ -1679,7 +1688,6 @@ func HandleJoinTeamByInvite(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleQuitTeam(w http.ResponseWriter, data string) { SetHeader(w) var resp QuitTeamResp @@ -1694,20 +1702,20 @@ func HandleQuitTeam(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleQuitTeam GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - teamid,err := GetTeamByUuid(uuid) + teamid, err := GetTeamByUuid(uuid) if err != nil { logger.Error("HandleQuitTeam GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED break } - tinfo ,err := GetTeamInfo(teamid) + tinfo, err := GetTeamInfo(teamid) if err != nil { logger.Error("HandleQuitTeam GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED @@ -1724,24 +1732,22 @@ func HandleQuitTeam(w http.ResponseWriter, data string) { if rdata.Type == 0 { //踢人 需要判断是否是队长 - if uuid!=tinfo.BaseInfo.Captain_id { + if uuid != tinfo.BaseInfo.Captain_id { logger.Error("HandleQuitTeam not caption failed=%v", err) resp.Result.Code = ERROR_NOTCAPTION break } - }else { + } else { //主动离开 需要扣除投资额 //todo 扣除投资额 } - //删除成员信息 //tinfo.MemInfo.MemList = append(tinfo.MemInfo.MemList,uuid) tinfo.DelTeamMember(rdata.User_id) //保存队伍数据 - SaveTeamInfo(tinfo.BaseInfo.Id,tinfo) - + SaveTeamInfo(tinfo.BaseInfo.Id, tinfo) resp.Result.Code = ERROR_OK resp.Result.Data = "" @@ -1753,7 +1759,6 @@ func HandleQuitTeam(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleUpdateTeamBuild(w http.ResponseWriter, data string) { SetHeader(w) var resp UpdateTeamBuildResp @@ -1768,20 +1773,20 @@ func HandleUpdateTeamBuild(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleUpdateTeamBuild GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - teamid,err := GetTeamByUuid(uuid) + teamid, err := GetTeamByUuid(uuid) if err != nil { logger.Error("HandleUpdateTeamBuild GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED break } - tinfo ,err := GetTeamInfo(teamid) + tinfo, err := GetTeamInfo(teamid) if err != nil { logger.Error("HandleUpdateTeamBuild GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED @@ -1796,15 +1801,14 @@ func HandleUpdateTeamBuild(w http.ResponseWriter, data string) { break } - //处理投资 - tinfo.DoDevote(rdata.Build_type,rdata.Assets,uuid,rdata.Muti) + tinfo.DoDevote(rdata.Build_type, rdata.Assets, uuid, rdata.Muti) //保存队伍数据 - SaveTeamInfo(tinfo.BaseInfo.Id,tinfo) + SaveTeamInfo(tinfo.BaseInfo.Id, tinfo) - for _,val := range tinfo.BInfo.Devote { - resp.Result.Data.Build_list = append(resp.Result.Data.Build_list,val) + for _, val := range tinfo.BInfo.Devote { + resp.Result.Data.Build_list = append(resp.Result.Data.Build_list, val) } resp.Result.Code = ERROR_OK @@ -1830,20 +1834,20 @@ func HandleAddTeamBuff(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleAddTeamBuff GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - teamid,err := GetTeamByUuid(uuid) + teamid, err := GetTeamByUuid(uuid) if err != nil { logger.Error("HandleAddTeamBuff GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED break } - tinfo ,err := GetTeamInfo(teamid) + tinfo, err := GetTeamInfo(teamid) if err != nil { logger.Error("HandleAddTeamBuff GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED @@ -1859,12 +1863,10 @@ func HandleAddTeamBuff(w http.ResponseWriter, data string) { } //处理buff - tinfo.DoAddBuffTimee(rdata.Build_type,rdata.Muti,&resp) - + tinfo.DoAddBuffTimee(rdata.Build_type, rdata.Muti, &resp) //保存队伍数据 - SaveTeamInfo(tinfo.BaseInfo.Id,tinfo) - + SaveTeamInfo(tinfo.BaseInfo.Id, tinfo) resp.Result.Code = ERROR_OK break @@ -1889,38 +1891,37 @@ func HandleGetTeamBuff(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleGetTeamBuff GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - teamid,err := GetTeamByUuid(uuid) + teamid, err := GetTeamByUuid(uuid) if err != nil { logger.Error("HandleGetTeamBuff GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED break } - tinfo ,err := GetTeamInfo(teamid) + tinfo, err := GetTeamInfo(teamid) if err != nil { logger.Error("HandleGetTeamBuff GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED break } - //处理buff - for _,vak := range tinfo.BInfo.Buff { + for _, vak := range tinfo.BInfo.Buff { var tmp AddTeamBuffSpec tmp.Build_type = vak.Type - for _,val1 := range vak.BuffInfo { + for _, val1 := range vak.BuffInfo { var tmp1 BuffTimeInfo tmp1.Buff_begin_time = val1.BeginTime tmp1.Buff_end_time = val1.EndTime - tmp.Buff_time = append(tmp.Buff_time,tmp1) + tmp.Buff_time = append(tmp.Buff_time, tmp1) } - resp.Result.Data.Build_list = append(resp.Result.Data.Build_list,tmp) + resp.Result.Data.Build_list = append(resp.Result.Data.Build_list, tmp) } resp.Result.Code = ERROR_OK @@ -1946,20 +1947,20 @@ func HandleGetTeamData(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleGetTeamData GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - teamid,err := GetTeamByUuid(uuid) + teamid, err := GetTeamByUuid(uuid) if err != nil { logger.Error("HandleGetTeamData GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED break } - tinfo ,err := GetTeamInfo(teamid) + tinfo, err := GetTeamInfo(teamid) if err != nil { logger.Error("HandleGetTeamData GetTeamInfoFailed failed=%v", err) resp.Result.Code = ERROR_GETTEAMINFO_FAILED @@ -1967,15 +1968,15 @@ func HandleGetTeamData(w http.ResponseWriter, data string) { } resp.Result.Data.Team_data = tinfo.BaseInfo - for _,val := range tinfo.MemInfo.MemList { + for _, val := range tinfo.MemInfo.MemList { var tmp GetTeamDataTeamUserList tmp.Uuid = val - resp.Result.Data.Team_user_list = append(resp.Result.Data.Team_user_list,tmp) + resp.Result.Data.Team_user_list = append(resp.Result.Data.Team_user_list, tmp) } - for _,val := range tinfo.BInfo.Devote { + for _, val := range tinfo.BInfo.Devote { var tmp TeamDevoteInfo tmp = val - resp.Result.Data.Build_list.Build_list = append(resp.Result.Data.Build_list.Build_list,tmp) + resp.Result.Data.Build_list.Build_list = append(resp.Result.Data.Build_list.Build_list, tmp) } resp.Result.Code = ERROR_OK @@ -1987,7 +1988,6 @@ func HandleGetTeamData(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleGetDataByUserId(w http.ResponseWriter, data string) { SetHeader(w) var resp GetDataByUserIdResp @@ -2002,26 +2002,26 @@ func HandleGetDataByUserId(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleGetDataByUserId GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - basic,err := GetUserBasic(rdata.User_id) + basic, err := GetUserBasic(rdata.User_id) if err != nil { logger.Error("HandleGetDataByUserId GetUserBasic failed=%v", err) resp.Result.Code = ERROR_GETUSERINFOBYIDFAILED break } - base,err := GetUserBaseData(rdata.User_id) + base, err := GetUserBaseData(rdata.User_id) if err != nil { logger.Error("HandleGetDataByUserId GetUserBase failed=%v", err) resp.Result.Code = ERROR_GETUSERINFOBYIDFAILED break } - ext,err := GetUserExt(rdata.User_id) + ext, err := GetUserExt(rdata.User_id) if err != nil { logger.Error("HandleGetDataByUserId GetUserExt failed=%v", err) resp.Result.Code = ERROR_GETUSERINFOBYIDFAILED @@ -2031,7 +2031,7 @@ func HandleGetDataByUserId(w http.ResponseWriter, data string) { resp.Result.Data.Base_data = base resp.Result.Data.User_base_data = *basic //resp.Result.Data.Extdata = *ext - TransmitUserData(ext,&resp.Result.Data.Extdata) + TransmitUserData(ext, &resp.Result.Data.Extdata) resp.Result.Code = ERROR_OK break } @@ -2041,7 +2041,6 @@ func HandleGetDataByUserId(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleGetTeamList(w http.ResponseWriter, data string) { SetHeader(w) var resp GetTeamListResp @@ -2056,14 +2055,14 @@ func HandleGetTeamList(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleGetTeamList GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - teams,err,sum := GetTeamListByCond(rdata.Store_num,rdata.Page) + teams, err, sum := GetTeamListByCond(rdata.Store_num, rdata.Page) if err != nil { logger.Error("HandleGetTeamList GetTeamListByCond failed=%v", err) resp.Result.Code = ERROR_GETTEAMLISTFAILED @@ -2071,8 +2070,8 @@ func HandleGetTeamList(w http.ResponseWriter, data string) { } resp.Result.Data.Count = sum - for _,val := range teams { - resp.Result.Data.Items = append(resp.Result.Data.Items,val.BaseInfo.Id) + for _, val := range teams { + resp.Result.Data.Items = append(resp.Result.Data.Items, val.BaseInfo.Id) } resp.Result.Code = ERROR_OK @@ -2098,14 +2097,14 @@ func HandleSearchTeam(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleSearchTeam GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - teams,err,sum := GetTeamListByNameCond(rdata.Store_num,rdata.Page,rdata.Name) + teams, err, sum := GetTeamListByNameCond(rdata.Store_num, rdata.Page, rdata.Name) if err != nil { logger.Error("HandleSearchTeam GetTeamListByCond failed=%v", err) resp.Result.Code = ERROR_GETTEAMLISTFAILED @@ -2113,8 +2112,8 @@ func HandleSearchTeam(w http.ResponseWriter, data string) { } resp.Result.Data.Count = sum - for _,val := range teams { - resp.Result.Data.Items = append(resp.Result.Data.Items,val.BaseInfo.Id) + for _, val := range teams { + resp.Result.Data.Items = append(resp.Result.Data.Items, val.BaseInfo.Id) } resp.Result.Code = ERROR_OK @@ -2126,7 +2125,6 @@ func HandleSearchTeam(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleSetFriendRequest(w http.ResponseWriter, data string) { SetHeader(w) var resp SetFriendResp @@ -2141,15 +2139,15 @@ func HandleSetFriendRequest(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleSetFriendRequest GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } //先判断是否是好友关系 - list,err := GetUserFriendList(rdata.User_id) + list, err := GetUserFriendList(rdata.User_id) if err != nil { logger.Error("HandleSetFriendRequest GetFriendList failed=%v", err) resp.Result.Code = ERROR_GETFRIENDLISTAILED @@ -2163,7 +2161,7 @@ func HandleSetFriendRequest(w http.ResponseWriter, data string) { } //判断自己的好友人数是否已经达到上限 - ownlist,err := GetUserFriendList(uuid) + ownlist, err := GetUserFriendList(uuid) if err != nil { logger.Error("HandleSetFriendRequest GetFriendList failed=%v", err) resp.Result.Code = ERROR_GETFRIENDLISTAILED @@ -2177,7 +2175,7 @@ func HandleSetFriendRequest(w http.ResponseWriter, data string) { } //判断申请列表是否已经有对该玩家的申请 24小时，此处需要判断24小时内的申请次数上限，需要先提出超过24小时的申请 - applylist,err := GetUserApplyList(uuid) + applylist, err := GetUserApplyList(uuid) if err != nil { logger.Error("HandleSetFriendRequest GetApplyListFailed failed=%v", err) resp.Result.Code = ERROR_FRIENDGETAPPLISTFAILED @@ -2190,14 +2188,14 @@ func HandleSetFriendRequest(w http.ResponseWriter, data string) { break } - if len(applylist.Apply_info) >=FRIEND_APPLY_LIMIT { + if len(applylist.Apply_info) >= FRIEND_APPLY_LIMIT { logger.Error("HandleSetFriendRequest Apply limit failed=%v", err) resp.Result.Code = ERROR_FRIENDAPPLYLIMIT break } //加入对方列表，如果已经在对方待批准列表则返回错误 - approvelist,err := GetUserApproveList(rdata.User_id) + approvelist, err := GetUserApproveList(rdata.User_id) if err != nil { logger.Error("HandleSetFriendRequest GetApproveListFailed failed=%v", err) resp.Result.Code = RROR_FRIENDGETAPPROVELISTFAILED @@ -2210,17 +2208,17 @@ func HandleSetFriendRequest(w http.ResponseWriter, data string) { break } - if len(approvelist.Approve_info) >=FRIEND_APPROVE_LIMIT { + if len(approvelist.Approve_info) >= FRIEND_APPROVE_LIMIT { logger.Error("HandleSetFriendRequest Apply limit failed=%v", err) resp.Result.Code = ERROR_FRIENDAPPROVELIMIT break } //添加到对方的待批准记录 - SaveUserApplyList(uuid,rdata.User_id) + SaveUserApplyList(uuid, rdata.User_id) //添加到自己的申请记录 - SaveUserApproveList(rdata.User_id,uuid) + SaveUserApproveList(rdata.User_id, uuid) //清空好友推荐缓存 DelCacheRecommandFriendList(uuid) @@ -2248,20 +2246,20 @@ func HandleGetFriendList(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleGetFriendList GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - friendlist,err := GetUserFriendList(uuid) + friendlist, err := GetUserFriendList(uuid) if err != nil { logger.Error("HandleSetFriendRequest GetFriendList failed=%v", err) resp.Result.Code = ERROR_GETFRIENDLISTAILED break } - resp.Result.Data.Friend_list = append(resp.Result.Data.Friend_list,friendlist.Friends...) + resp.Result.Data.Friend_list = append(resp.Result.Data.Friend_list, friendlist.Friends...) resp.Result.Code = ERROR_OK break @@ -2272,7 +2270,6 @@ func HandleGetFriendList(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleGetAuditList(w http.ResponseWriter, data string) { SetHeader(w) var resp GetAuditListResp @@ -2287,20 +2284,20 @@ func HandleGetAuditList(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleGetAuditList GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - approvelist,err := GetUserApproveList(uuid) + approvelist, err := GetUserApproveList(uuid) if err != nil { logger.Error("HandleGetAuditList Getapprovelistfailedt failed=%v", err) resp.Result.Code = RROR_FRIENDGETAPPROVELISTFAILED break } - resp.Result.Data.Approve_list = append(resp.Result.Data.Approve_list,approvelist.Approve_info...) + resp.Result.Data.Approve_list = append(resp.Result.Data.Approve_list, approvelist.Approve_info...) resp.Result.Code = ERROR_OK break @@ -2311,7 +2308,6 @@ func HandleGetAuditList(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleGetRecommendList(w http.ResponseWriter, data string) { SetHeader(w) var resp GetRecommendListResp @@ -2326,15 +2322,15 @@ func HandleGetRecommendList(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleGetRecommendList GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } //需要判断自己的好友位置是否已满 - friendlist,err := GetUserFriendList(uuid) + friendlist, err := GetUserFriendList(uuid) if err != nil { logger.Error("HandleGetRecommendList GetFriendList failed=%v", err) resp.Result.Code = ERROR_GETFRIENDLISTAILED @@ -2346,15 +2342,15 @@ func HandleGetRecommendList(w http.ResponseWriter, data string) { break } - rlist,err := friendlist.GetRecommandFriendList(uuid,FRIEND_RECOMMAND_NUM) + rlist, err := friendlist.GetRecommandFriendList(uuid, FRIEND_RECOMMAND_NUM) if err != nil { logger.Error("HandleGetRecommendList GetRecommandFriendList failed=%v", err) resp.Result.Code = ERROR_FRIENDGETRECOMMADNFAILED break } - for _,val := range rlist.Recommend_list { - resp.Result.Data.Recommend_list = append(resp.Result.Data.Recommend_list,val) + for _, val := range rlist.Recommend_list { + resp.Result.Data.Recommend_list = append(resp.Result.Data.Recommend_list, val) } resp.Result.Code = ERROR_OK @@ -2366,7 +2362,6 @@ func HandleGetRecommendList(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleHandleFriendRequest(w http.ResponseWriter, data string) { SetHeader(w) var resp HandleFriendRequestResp @@ -2381,14 +2376,14 @@ func HandleHandleFriendRequest(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleHandleFriendRequest GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - approvelist,err := GetUserApproveList(uuid) + approvelist, err := GetUserApproveList(uuid) if !approvelist.InApproveList(rdata.User_id) { logger.Error("HandleHandleFriendRequest NOTINAPPROVELIST failed=%v", err) resp.Result.Code = ERROR_NOTINAPPROVELIST @@ -2396,7 +2391,7 @@ func HandleHandleFriendRequest(w http.ResponseWriter, data string) { } //从待批准列表删除 - err = DelFromApproveList(uuid,rdata.User_id) + err = DelFromApproveList(uuid, rdata.User_id) if err != nil { logger.Error("HandleHandleFriendRequest ERROR_FRIENDAPPROVEFAILED failed=%v", err) resp.Result.Code = ERROR_FRIENDAPPROVEFAILED @@ -2405,7 +2400,7 @@ func HandleHandleFriendRequest(w http.ResponseWriter, data string) { if rdata.Type == 0 { //如果同意将其加入好友列表 status 1表示删除 0表示未删除 - err = SaveUserFriendList(uuid,rdata.User_id,0) + err = SaveUserFriendList(uuid, rdata.User_id, 0) if err != nil { logger.Error("HandleHandleFriendRequest ERROR_FRIENDAPPROVEFAILED failed=%v", err) resp.Result.Code = ERROR_FRIENDAPPROVEFAILED @@ -2413,7 +2408,6 @@ func HandleHandleFriendRequest(w http.ResponseWriter, data string) { } } - resp.Result.Code = ERROR_OK break } @@ -2423,7 +2417,6 @@ func HandleHandleFriendRequest(w http.ResponseWriter, data string) { fmt.Fprint(w, string(respstr)) } - func HandleDelFriend(w http.ResponseWriter, data string) { SetHeader(w) var resp DelFriendResp @@ -2438,14 +2431,14 @@ func HandleDelFriend(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleDelFriend GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break } - friendlist,err := GetUserFriendList(uuid) + friendlist, err := GetUserFriendList(uuid) if err != nil { logger.Error("HandleDelFriend GetFriendList failed=%v", err) resp.Result.Code = ERROR_GETFRIENDLISTAILED @@ -2457,14 +2450,13 @@ func HandleDelFriend(w http.ResponseWriter, data string) { break } - err = SaveUserFriendList(uuid,rdata.User_id,1) + err = SaveUserFriendList(uuid, rdata.User_id, 1) if err != nil { logger.Error("HandleSetFriendRequest ERROR_FRIENDAPPROVEFAILED failed=%v", err) resp.Result.Code = ERROR_FRIENDDELFRIENDFAILED break } - resp.Result.Code = ERROR_OK break } @@ -2488,8 +2480,8 @@ func HandleQueryPlayerData(w http.ResponseWriter, data string) { break } - uuid,err := GetTouristUid(rdata.Token) - if err != nil || uuid==0{ + uuid, err := GetTouristUid(rdata.Token) + if err != nil || uuid == 0 { logger.Error("HandleQueryPlayerData GetTouristUid failed=%v", err) resp.Result.Code = ERROR_GETUSERIDFAILED break @@ -2511,4 +2503,4 @@ func HandleQueryPlayerData(w http.ResponseWriter, data string) { //回包 respstr, _ := json.Marshal(&resp) fmt.Fprint(w, string(respstr)) -} \ No newline at end of file +} diff --git a/src/common/redis/def.go b/src/common/redis/def.go index 0530b3a..93b3bd4 100644 --- a/src/common/redis/def.go +++ b/src/common/redis/def.go @@ -28,4 +28,5 @@ const ( USER_CHAT_TEAM_INFO_KEY = "CATCAFE_USER_CHAT_TEAM_INFO_KEY" // 加teamid 存储的是队伍聊天的信息 list结构 最新的消息在最头部 USER_CHAT_PRIVATE_LASTGET_KEY = "CATCAFE_USER_CHAT_PRIVATE_LASTGET_KEY" // hset key加自己的uuid field为目标的uuid value为时间戳 USER_CHAT_PRIVATE_INFO_KEY = "CATCAFE_USER_CHAT_PRIVATE_INFO_KEY" //list key需要加上自己的:uuid再加上目标:uuid 存储的是和自己相关的所有聊天信息 + USER_CHAT_EMOJUNLOCK_KEY = "CATCAFE_USER_CHAT_EMOJUNLOCK_KEY" //hset 记录的是玩家表情页签解锁情况 []int 0表示未解锁 1表示解锁 ) -- libgit2 0.21.0