liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2023-04-27 14:24:51 +08:00
parent fd0585b963 b9845d7662
commit d7d8dd0b83
11 changed files with 1076 additions and 1037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
business/jxutils/cache/cache.go vendored
View File

@@ -12,13 +12,13 @@ type ICacher interface {
GetAs(key string, ptr interface{}) error GetAs(key string, ptr interface{}) error
Keys(prefix string) ([]string, error) Keys(prefix string) ([]string, error)
//FlushDB() error FlushDB() error
//Incr(key string) error Incr(key string) error
//LRange(key string) (retVal []string) LRange(key string) (retVal []string)
//Exists(keys ...string) (int64, error) Exists(keys ...string) (int64, error)
//RPush(key string, value interface{}) error RPush(key string, value interface{}) error
//Expire(key string, expiration time.Duration) error Expire(key string, expiration time.Duration) error
//LRem(key string, count int, value interface{}) error LRem(key string, count int, value interface{}) error
//LSet(key string, index int, value interface{}) error LSet(key string, index int, value interface{}) error
//ExpireResult(key string, expiration time.Duration) (bool, error) ExpireResult(key string, expiration time.Duration) (bool, error)
} }

12
business/partner/purchase/ebai/im.go
View File

@@ -1,7 +1,11 @@
package ebai package ebai
import ( import (
"encoding/json"
"git.rosy.net.cn/baseapi/platformapi/ebaiapi" "git.rosy.net.cn/baseapi/platformapi/ebaiapi"
"git.rosy.net.cn/jx-callback/business/partner/purchase/im"
"git.rosy.net.cn/jx-callback/globals/api"
) )
const ( const (
@@ -10,9 +14,9 @@ const (
// OnImMessage 用户/骑手 发送/已读消息 回调 // OnImMessage 用户/骑手 发送/已读消息 回调
func (p *PurchaseHandler) OnImMessage(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse) { func (p *PurchaseHandler) OnImMessage(msg *ebaiapi.CallbackMsg) (response *ebaiapi.CallbackResponse) {
//str, err := json.Marshal(msg.Data) str, err := json.Marshal(msg.Data)
//im.ReadMsgFromVendor(IMVendorIDELM, msg.Source, str) im.ReadMsgFromVendor(IMVendorIDELM, msg.Source, str)
return nil //return nil
//return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, nil) return api.EbaiAPI.Err2CallbackResponse(msg.Cmd, err, nil)
} }

703
business/partner/purchase/im/im.go
View File

@@ -1,356 +1,361 @@
package im package im
// import (
//import ( "encoding/json"
// "encoding/json" "errors"
// "errors" "fmt"
// "fmt"
// "net/http" "git.rosy.net.cn/jx-callback/globals"
//
// "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/baseapi/platformapi/ebaiapi"
//
// "git.rosy.net.cn/baseapi/platformapi/ebaiapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
// "git.rosy.net.cn/baseapi/utils"
// "git.rosy.net.cn/baseapi/platformapi/mtwmapi" push "git.rosy.net.cn/jx-callback/business/jxutils/unipush"
// "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/globals/api"
// push "git.rosy.net.cn/jx-callback/business/jxutils/unipush" "github.com/gorilla/websocket"
// "git.rosy.net.cn/jx-callback/globals/api" )
// "github.com/gorilla/websocket"
//) // SendToVendor 向平台发消息
// func SendToVendor(msg []byte) {
//// SendToVendor 向平台发消息 var (
//func SendToVendor(msg []byte) {
// var (
//w http.ResponseWriter //w http.ResponseWriter
// sendData SendData sendData SendData
// err error err error
// elmAppID = api.EbaiAPI.GetSource() elmAppID = api.EbaiAPI.GetSource()
// ) )
//
// //解析数据 //解析数据
// if err = json.Unmarshal(msg, &sendData); err != nil { if err = json.Unmarshal(msg, &sendData); err != nil {
return
}
//存储数据
ReadMsgFromClient(sendData.VendorID, elmAppID, sendData.Data)
//发送信息
if sendData.VendorID == VendorIDMT {
temp, _ := json.Marshal(sendData.Data)
Send(temp)
}
if sendData.VendorID == VendorIDELM {
param := sendData.Data.(ebaiapi.BusinessSendMsgReq)
if err := api.EbaiAPI.BusinessSendMsg(&param); err != nil {
globals.SugarLogger.Debugf("elm发送信息错误：%v", err)
return
}
}
if err != nil {
ClientRender(Fail, FailMsg, map[string]string{
"errMsg": fmt.Sprintf("%v", err),
})
return
} else {
ClientRender(SuccessCode, SuccessMsg, map[string]interface{}{
"vendorID": sendData.VendorID,
"msg": "ok",
})
return
}
}
func Send(data []byte) {
//生成完整url
fullUrl := GenFullUrl() //clientID暂时不用
conn, resp, err := websocket.DefaultDialer.Dial(fullUrl, nil)
if err != nil || resp.StatusCode != 101 {
fmt.Printf("连接失败：%v http响应不成功", err)
}
//关闭
defer func(conn *websocket.Conn) {
err := conn.Close()
if err != nil {
return
}
}(conn)
err = conn.WriteMessage(websocket.TextMessage, data)
if err != nil {
fmt.Println(err)
}
for {
_, msg, err := conn.ReadMessage()
if err != nil {
break
} else {
temp := string(msg)
if temp != HeartCheckSuccess {
ReadMsgFromVendor(VendorIDMT, "", msg)
}
}
fmt.Printf("%s receive: %s\n", conn.RemoteAddr(), string(msg))
}
return
}
// ReadMsgFromClient 存储客户端发送的消息
func ReadMsgFromClient(vendorID int, elmAppID string, msg interface{}) {
var (
err error
jxMsg = &JXMsg{}
userList = &UserMessageList{}
)
data, err := json.Marshal(msg)
if err != nil {
return
}
if vendorID == VendorIDMT {
var MtSingleChat = mtwmapi.SingleChat{}
err = json.Unmarshal(data, &MtSingleChat)
jxMsg = &JXMsg{
SendType: SendTypeJx,
MsgContent: MtSingleChat,
}
userList = &UserMessageList{
VendorID: VendorIDMT,
UserID: utils.Int2Str(MtSingleChat.OpenUserID),
LatestMsg: MtSingleChat.MsgContent,
LatestTime: MtSingleChat.Cts,
}
}
if vendorID == VendorIDELM {
var ElmData = ebaiapi.ImMessageSend{}
err = json.Unmarshal(data, &ElmData)
jxMsg = &JXMsg{
SendType: SendTypeJx,
MsgContent: ElmData,
}
userList = &UserMessageList{
VendorID: VendorIDMT,
UserID: ElmData.PayLoad.GroupID,
LatestMsg: ElmData.PayLoad.Content,
LatestTime: int(ElmData.PayLoad.CreateTime),
}
}
//1 存储详细聊天记录list
if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil {
globals.SugarLogger.Debugf("ReadMsgFromClient SetMessageDetail err:=%v\n", err)
//return //return
// } }
// //2 存储展示列表时单条数据
// //存储数据 if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil {
// ReadMsgFromClient(sendData.VendorID, elmAppID, sendData.Data) globals.SugarLogger.Debugf("ReadMsgFromClient SetUserList err:=%v\n", err)
//
// //发送信息
// if sendData.VendorID == VendorIDMT {
// temp, _ := json.Marshal(sendData.Data)
// Send(temp)
// }
// if sendData.VendorID == VendorIDELM {
// param := sendData.Data.(ebaiapi.BusinessSendMsgReq)
// if err := api.EbaiAPI.BusinessSendMsg(&param); err != nil {
// globals.SugarLogger.Debugf("elm发送信息错误：%v", err)
//return //return
// } }
// } }
//
// if err != nil { // ReadMsgFromVendor 读取数据并存储到redis
// ClientRender(w, Fail, FailMsg, map[string]string{ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) {
// "errMsg": fmt.Sprintf("%v", err), if string(msg) == "" {
// }) return
// } else { }
// ClientRender(w, SuccessCode, SuccessMsg, map[string]interface{}{ var (
// "vendorID": sendData.VendorID, err error
// "msg": "ok", vendorStoreID string
// }) jxMsg = &JXMsg{}
// } userList = &UserMessageList{}
)
if vendorID == VendorIDMT {
var MtSingleChat = mtwmapi.SingleChat{}
err = json.Unmarshal(msg, &MtSingleChat)
jxMsg = &JXMsg{
SendType: SendTypeMt,
MsgContent: MtSingleChat,
}
userList = &UserMessageList{
VendorID: VendorIDMT,
UserID: utils.Int2Str(MtSingleChat.OpenUserID),
LatestMsg: MtSingleChat.MsgContent,
LatestTime: MtSingleChat.Cts,
}
vendorStoreID = MtSingleChat.AppPoiCode
}
if vendorID == VendorIDELM {
var ElmData = ebaiapi.ImMessageSend{}
err = json.Unmarshal(msg, &ElmData)
jxMsg = &JXMsg{
SendType: SendTypeElm,
MsgContent: ElmData,
}
userList = &UserMessageList{
VendorID: VendorIDMT,
UserID: ElmData.PayLoad.GroupID,
LatestMsg: ElmData.PayLoad.Content,
LatestTime: int(ElmData.PayLoad.CreateTime),
}
}
//1 存储详细聊天记录list
if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil {
globals.SugarLogger.Debugf("ReadMsgFromVendor SetMessageDetail err:=%v\n", err)
//return //return
//} }
// //2 存储展示列表时单条数据
//func Send(data []byte) { if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil {
// //生成完整url globals.SugarLogger.Debugf("ReadMsgFromVendor SetUserList err:=%v\n", err)
// fullUrl := GenFullUrl() //clientID暂时不用
//
// conn, resp, err := websocket.DefaultDialer.Dial(fullUrl, nil)
// if err != nil || resp.StatusCode != 101 {
// fmt.Printf("连接失败：%v http响应不成功", err)
// }
// //关闭
// defer func(conn *websocket.Conn) {
// err := conn.Close()
// if err != nil {
//return //return
// } }
// }(conn) //3 cid推送新消息
// err = PushMsgByCid(vendorStoreID, vendorID)
// err = conn.WriteMessage(websocket.TextMessage, data) //4 长链接通知给客户端
// if err != nil { ToClientChan <- clientInfo{Code: SuccessCode, Msg: fmt.Sprintf("%v", err), Data: jxMsg}
// fmt.Println(err) return
// } }
//
// for { // PushMsgByCid 通过cid push用户
// _, msg, err := conn.ReadMessage() func PushMsgByCid(vendorStoreID string, vendorID int) error {
// if err != nil { if err := push.NotifyImNewMessage(vendorStoreID, vendorID); err != nil {
// break return err
// } else { }
// temp := string(msg) return nil
// if temp != HeartCheckSuccess { }
// ReadMsgFromVendor(VendorIDMT, "", msg)
// } // SetMessageDetail 赋值
// } //格式 AppID:AppPoiCode:10:OpenUserID
// fmt.Printf("%s receive: %s\n", conn.RemoteAddr(), string(msg)) func SetMessageDetail(req *JXMsg, vendorID int, elmAppID string) error {
// } //生成京西消息ID detail
//} msgID := GenMsgDetailID(req, vendorID, elmAppID)
//
//// ReadMsgFromClient 存储客户端发送的消息 data, _ := json.Marshal(req)
//func ReadMsgFromClient(vendorID int, elmAppID string, msg interface{}) { err := rdb.RPush(msgID, string(data))
// var ( ok, err := rdb.ExpireResult(msgID, ExpireTimeDay)
// err error if err != nil || !ok {
// jxMsg = &JXMsg{} return err
// userList = &UserMessageList{} }
// ) return nil
// }
// data, err := json.Marshal(msg)
// if err != nil { // SetUserList 赋值
// return //AppPoiCode:10 [userid1:{SingleChat},userid2:{}]
// } func SetUserList(jxMsg *JXMsg, userList *UserMessageList, vendorID int, elmAppID string) error {
// //生成msgID
// if vendorID == VendorIDMT { msgID := GenMsgListID(jxMsg, vendorID, elmAppID)
// var MtSingleChat = mtwmapi.SingleChat{}
// err = json.Unmarshal(data, &MtSingleChat) //获取未读消息条数并删除旧数据
// jxMsg = &JXMsg{ cnt, err := GetNewAndTrim(msgID, userList.UserID)
// SendType: SendTypeJx, if cnt > 0 {
// Data: MtSingleChat, userList.NewMessageNum = cnt
// } } else {
// userList = &UserMessageList{ userList.NewMessageNum = 1
// VendorID: VendorIDMT, }
// UserID: utils.Int2Str(MtSingleChat.OpenUserID), //存储当前数据
// LatestMsg: MtSingleChat.MsgContent, data, _ := json.Marshal(userList)
// LatestTime: MtSingleChat.Cts, err = rdb.RPush(msgID, string(data))
// }
// } ok, err := rdb.ExpireResult(msgID, ExpireTimeDay)
// if vendorID == VendorIDELM { if err != nil || !ok {
// var ElmData = ebaiapi.ImMessageSend{} return err
// err = json.Unmarshal(data, &ElmData) }
// jxMsg = &JXMsg{ return nil
// SendType: SendTypeJx, }
// Data: ElmData,
// } // GetNewAndTrim 获取未读条数并清除旧数据
// userList = &UserMessageList{ func GetNewAndTrim(key string, flag string) (cnt int, err error) {
// VendorID: VendorIDMT, cnt = 0
// UserID: ElmData.PayLoad.GroupID, if n, err := rdb.Exists(key); n > 0 && err == nil {
// LatestMsg: ElmData.PayLoad.Content, s2 := rdb.LRange(key)
// LatestTime: int(ElmData.PayLoad.CreateTime), for i := 0; i < len(s2); i++ {
// } v := UserMessageList{}
// } _ = json.Unmarshal([]byte(s2[i]), &v)
// if v.UserID == flag {
// //1 存储详细聊天记录list err = rdb.LSet(key, i, "del")
// if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil { err = rdb.LRem(key, 0, "del")
// return s2 = append(s2[:i], s2[i+1:]...)
// } i--
// //2 存储展示列表时单条数据 if v.NewMessageNum == 0 { //目前为首条
// if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { cnt++ //赋值1
// return } else {
// } cnt = v.NewMessageNum
//} }
// }
//// ReadMsgFromVendor 读取数据并存储到redis }
//func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) { } else {
// if string(msg) == "" { return 0, nil
// return }
// } return cnt, err
// var ( }
// err error
// vendorStoreID string // GenMsgDetailID 生成查询详细聊天记录ID
// jxMsg = &JXMsg{} func GenMsgDetailID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) {
// userList = &UserMessageList{} if vendorID == VendorIDMT {
// ) var d1 = jxMsg.MsgContent.(mtwmapi.SingleChat)
// if vendorID == VendorIDMT { msgID = utils.Int2Str(d1.AppID) + ":" + d1.AppPoiCode + ":10:" + utils.Int2Str(d1.OpenUserID)
// var MtSingleChat = mtwmapi.SingleChat{} }
// err = json.Unmarshal(msg, &MtSingleChat) if vendorID == VendorIDELM {
// jxMsg = &JXMsg{ var d2 = jxMsg.MsgContent.(ebaiapi.ImMessageSend)
// SendType: SendTypeMt, msgID = elmAppID + ":" + d2.PlatformShopID + ":11:" + d2.PayLoad.GroupID
// Data: MtSingleChat, }
// } return msgID
// userList = &UserMessageList{ }
// VendorID: VendorIDMT,
// UserID: utils.Int2Str(MtSingleChat.OpenUserID), // GenMsgListID 生成展示列表时单条数据ID（部分）
// LatestMsg: MtSingleChat.MsgContent, func GenMsgListID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) {
// LatestTime: MtSingleChat.Cts, if vendorID == VendorIDMT {
// } var d1 = jxMsg.MsgContent.(mtwmapi.SingleChat)
// vendorStoreID = MtSingleChat.AppPoiCode msgID = utils.Int2Str(d1.AppID) + ":" + d1.AppPoiCode + ":10"
// } }
// if vendorID == VendorIDELM { if vendorID == VendorIDELM {
// var ElmData = ebaiapi.ImMessageSend{} var d2 = jxMsg.MsgContent.(ebaiapi.ImMessageSend)
// err = json.Unmarshal(msg, &ElmData) msgID = elmAppID + ":" + d2.PlatformShopID + ":11"
// jxMsg = &JXMsg{ }
// SendType: SendTypeElm, return msgID
// Data: ElmData, }
// }
// userList = &UserMessageList{ // GetImUserList 获取门店用户聊天列表
// VendorID: VendorIDMT, func GetImUserList(req []RelInfo) (retVal []interface{}, err error) {
// UserID: ElmData.PayLoad.GroupID, if len(req) == 0 {
// LatestMsg: ElmData.PayLoad.Content, return nil, errors.New("msgID不允许为空")
// LatestTime: int(ElmData.PayLoad.CreateTime), }
// } var keys []string
// } for _, i := range req {
// key := i.AppID + ":" + i.VendorStoreID + ":" + i.VendorID
// //1 存储详细聊天记录list keys = append(keys, key)
// if err = SetMessageDetail(jxMsg, vendorID, elmAppID); err != nil { }
// return for _, j := range keys {
// } temp := rdb.Get(j)
// //2 存储展示列表时单条数据 retVal = append(retVal, temp)
// if err = SetUserList(jxMsg, userList, vendorID, elmAppID); err != nil { }
// return return retVal, err
// } }
// //3 cid推送新消息
// err = PushMsgByCid(vendorStoreID, vendorID) // GetImChatDetail 获取门店用户聊天详情
// //4 长链接通知给客户端 func GetImChatDetail(req []UserRelInfo) (retVal []interface{}, err error) {
// ToClientChan <- clientInfo{Code: SuccessCode, Msg: fmt.Sprintf("%v", err), Data: jxMsg} if len(req) == 0 {
//} return nil, errors.New("msgID不允许为空")
// }
//// PushMsgByCid 通过cid push用户 var keys []string
//func PushMsgByCid(vendorStoreID string, vendorID int) error { for _, i := range req {
// if err := push.NotifyImNewMessage(vendorStoreID, vendorID); err != nil { key := i.AppID + ":" + i.VendorStoreID + ":" + i.VendorID + ":" + i.UserID
// return err keys = append(keys, key)
// } }
// return nil for _, j := range keys {
//} temp := rdb.Get(j)
// retVal = append(retVal, temp)
//// SetMessageDetail 赋值 }
////格式 AppID:AppPoiCode:10:OpenUserID return retVal, err
//func SetMessageDetail(req *JXMsg, vendorID int, elmAppID string) error { }
// //生成京西消息ID detail
// msgID := GenMsgDetailID(req, vendorID, elmAppID) // SetJxMsgRead 设置jx消息已读 userID(美团：openUserID;饿了么：groupID)
// func SetJxMsgRead(appID, vendorStoreID, vendorID, userID string) error {
// data, _ := json.Marshal(req) key := appID + ":" + vendorStoreID + ":" + vendorID
// err := rdb.RPush(msgID, string(data)) if n, err := rdb.Exists(key); n > 0 && err == nil {
// ok, err := rdb.ExpireResult(msgID, ExpireTimeDay) s2 := rdb.LRange(key)
// if err != nil || !ok { for i := 0; i < len(s2); i++ {
// return err v := UserMessageList{}
// } _ = json.Unmarshal([]byte(s2[i]), &v)
// return nil if v.UserID == userID {
//} err = rdb.LSet(key, i, "del")
// err = rdb.LRem(key, 0, "del")
//// SetUserList 赋值 s2 = append(s2[:i], s2[i+1:]...)
////AppPoiCode:10 [userid1:{SingleChat},userid2:{}] i--
//func SetUserList(jxMsg *JXMsg, userList *UserMessageList, vendorID int, elmAppID string) error { }
// //生成msgID }
// msgID := GenMsgListID(jxMsg, vendorID, elmAppID) }
// return nil
// //获取未读消息条数并删除旧数据 }
// cnt, err := GetNewAndTrim(msgID, userList.UserID)
// if cnt > 0 {
// userList.NewMessageNum = cnt
// } else {
// userList.NewMessageNum = 1
// }
// //存储当前数据
// data, _ := json.Marshal(userList)
// err = rdb.RPush(msgID, string(data))
//
// ok, err := rdb.ExpireResult(msgID, ExpireTimeDay)
// if err != nil || !ok {
// return err
// }
// return nil
//}
//
//// GetNewAndTrim 获取未读条数并清除旧数据
//func GetNewAndTrim(key string, flag string) (cnt int, err error) {
// cnt = 0
// if n, err := rdb.Exists(key); n > 0 && err == nil {
// s2 := rdb.LRange(key)
// for i := 0; i < len(s2); i++ {
// v := UserMessageList{}
// _ = json.Unmarshal([]byte(s2[i]), &v)
// if v.UserID == flag {
// err = rdb.LSet(key, i, "del")
// err = rdb.LRem(key, 0, "del")
// s2 = append(s2[:i], s2[i+1:]...)
// i--
// if v.NewMessageNum == 0 { //目前为首条
// cnt++ //赋值1
// } else {
// cnt = v.NewMessageNum
// }
// }
// }
// } else {
// return 0, nil
// }
// return cnt, err
//}
//
//// GenMsgDetailID 生成查询详细聊天记录ID
//func GenMsgDetailID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) {
// if vendorID == VendorIDMT {
// var d1 = jxMsg.Data.(mtwmapi.SingleChat)
// msgID = utils.Int2Str(d1.AppID) + ":" + d1.AppPoiCode + ":10:" + utils.Int2Str(d1.OpenUserID)
// }
// if vendorID == VendorIDELM {
// var d2 = jxMsg.Data.(ebaiapi.ImMessageSend)
// msgID = elmAppID + ":" + d2.PlatformShopID + ":11:" + d2.PayLoad.GroupID
// }
// return msgID
//}
//
//// GenMsgListID 生成展示列表时单条数据ID（部分）
//func GenMsgListID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) {
// if vendorID == VendorIDMT {
// var d1 = jxMsg.Data.(mtwmapi.SingleChat)
// msgID = utils.Int2Str(d1.AppID) + ":" + d1.AppPoiCode + ":10"
// }
// if vendorID == VendorIDELM {
// var d2 = jxMsg.Data.(ebaiapi.ImMessageSend)
// msgID = elmAppID + ":" + d2.PlatformShopID + ":11"
// }
// return msgID
//}
//
//// GetImUserList 获取门店用户聊天列表
//func GetImUserList(req []RelInfo) (retVal []interface{}, err error) {
// if len(req) == 0 {
// return nil, errors.New("msgID不允许为空")
// }
// var keys []string
// for _, i := range req {
// key := i.AppID + ":" + i.VendorStoreID + ":" + i.VendorID
// keys = append(keys, key)
// }
// for _, j := range keys {
// temp := rdb.Get(j)
// retVal = append(retVal, temp)
// }
// return retVal, err
//}
//
//// GetImChatDetail 获取门店用户聊天详情
//func GetImChatDetail(req []UserRelInfo) (retVal []interface{}, err error) {
// if len(req) == 0 {
// return nil, errors.New("msgID不允许为空")
// }
// var keys []string
// for _, i := range req {
// key := i.AppID + ":" + i.VendorStoreID + ":" + i.VendorID + ":" + i.UserID
// keys = append(keys, key)
// }
// for _, j := range keys {
// temp := rdb.Get(j)
// retVal = append(retVal, temp)
// }
// return retVal, err
//}
//
//// SetJxMsgRead 设置jx消息已读 userID(美团：openUserID;饿了么：groupID)
//func SetJxMsgRead(appID, vendorStoreID, vendorID, userID string) error {
// key := appID + ":" + vendorStoreID + ":" + vendorID
// if n, err := rdb.Exists(key); n > 0 && err == nil {
// s2 := rdb.LRange(key)
// for i := 0; i < len(s2); i++ {
// v := UserMessageList{}
// _ = json.Unmarshal([]byte(s2[i]), &v)
// if v.UserID == userID {
// err = rdb.LSet(key, i, "del")
// err = rdb.LRem(key, 0, "del")
// s2 = append(s2[:i], s2[i+1:]...)
// i--
// }
// }
// }
// return nil
//}

556
business/partner/purchase/im/im_model.go
View File

@@ -1,276 +1,286 @@
package im package im
// import (
//import ( "encoding/json"
// "encoding/json" "flag"
// "flag" "fmt"
// "fmt" "io"
// "git.rosy.net.cn/baseapi/utils" "log"
// "io" "net"
// "log" "net/http/httptest"
// "net" "sync"
// "net/http" "time"
// "sync"
// "time" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
// "git.rosy.net.cn/jx-callback/globals/api"
// "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "github.com/gazeboxu/mapstructure"
// "git.rosy.net.cn/jx-callback/globals/api" "github.com/gorilla/websocket"
// "github.com/gazeboxu/mapstructure" "gopkg.in/ini.v1"
// "github.com/gorilla/websocket" )
// "gopkg.in/ini.v1"
//) // ClientManager 连接管理
// type ClientManager struct {
//// ClientManager 连接管理 ClientIdMap map[string]*Client // 全部的连接
//type ClientManager struct { ClientIdMapLock sync.RWMutex // 读写锁
// ClientIdMap map[string]*Client // 全部的连接
// ClientIdMapLock sync.RWMutex // 读写锁 Connect chan *Client // 连接处理
// DisConnect chan *Client // 断开连接处理
// Connect chan *Client // 连接处理
// DisConnect chan *Client // 断开连接处理 GroupLock sync.RWMutex
// Groups map[string][]string
// GroupLock sync.RWMutex
// Groups map[string][]string SystemClientsLock sync.RWMutex
// SystemClients map[string][]string
// SystemClientsLock sync.RWMutex }
// SystemClients map[string][]string
//} // Client 客户端连接信息
// type Client struct {
//// Client 客户端连接信息 ClientId string // 标识ID
//type Client struct { Socket *websocket.Conn // 用户连接
// ClientId string // 标识ID ConnectTime uint64 // 首次连接时间
// Socket *websocket.Conn // 用户连接 IsDeleted bool // 是否删除或下线
// ConnectTime uint64 // 首次连接时间 UserId string // 业务端标识用户ID
// IsDeleted bool // 是否删除或下线 //Extend string // 扩展字段，用户可以自定义
// UserId string // 业务端标识用户ID //GroupList []string
// //Extend string // 扩展字段，用户可以自定义 }
// //GroupList []string
//} //channel通道结构体
// type clientInfo struct {
////channel通道结构体 ClientId string `json:"clientId" validate:"required"` //链接ID
//type clientInfo struct { Data interface{}
SendUserId string
MessageId string
Code int
Msg string
}
// RetData 统一返回值结构体
type RetData struct {
Code int `json:"code"` //响应code
Msg string `json:"msg"` //响应msg success/fail
//MsgType string `json:"msgType"` //发送消息方类型：mt;elm;jx
Data interface{} `json:"data"` //信息
//MessageType string `json:"messageType"` //消息类型 heart-心跳检测；send-发送消息；receive-接收消息
//MessageId string `json:"messageId"` //发送/接收信息 id
//UserId string `json:"userId"` //必须是平台方userID
}
type global struct {
LocalHost string //本机内网IP
ServerList map[string]string
ServerListLock sync.RWMutex
}
type commonConf struct {
HttpPort string
RPCPort string
Cluster bool
CryptoKey string
}
// SendData 客户端写入参数
type SendData struct {
//ClientId string `json:"clientId" validate:"required"` //链接ID //ClientId string `json:"clientId" validate:"required"` //链接ID
// Data interface{} VendorID int `json:"vendorID"` //消息来源平台ID 10-美团 11-饿了么
// SendUserId string Data interface{} `json:"data"` //发送给平台 美团/饿了么消息结构体
// MessageId string //返回值
// Code int //Code int `json:"code"`
// Msg string //Msg string `json:"msg"`
//} //SendUserId string `json:"sendUserId"`
// }
//// RetData 统一返回值结构体
//type RetData struct { // JXMsg 京西消息结构体
// Code int `json:"code"` //响应code type JXMsg struct {
// Msg string `json:"msg"` //响应msg success/fail SendType string `json:"sendType"` //消息发送方 jx-商家；mt-美团；elm-饿了么
// Data interface{} `json:"data"` //信息 MsgContent interface{} `json:"msgContent"` //美团/饿了么 单聊消息
// }
// //MessageType string `json:"messageType"` //消息类型 heart-心跳检测；send-发送消息；receive-接收消息
// //MessageId string `json:"messageId"` //发送/接收信息 id // GetUserListReq 获取门店用户聊天列表
// //UserId string `json:"userId"` //必须是平台方userID type GetUserListReq struct {
//} VendorStoreID string `json:"vendorStoreID"` //平台门店id
// VendorID string `json:"vendorID"` //平台标识id
//type global struct { AppID string `json:"appID"` //应用ID
// LocalHost string //本机内网IP }
// ServerList map[string]string
// ServerListLock sync.RWMutex type GetChatDetailReq struct {
//} VendorStoreID string `json:"vendorStoreID"` //平台门店id
//type commonConf struct { VendorID string `json:"vendorID"` //平台标识id
// HttpPort string AppID string `json:"appID"` //应用ID
// RPCPort string UserID string `json:"userID"` //userID/groupID
// Cluster bool }
// CryptoKey string
//} // UserMessageList 用户消息列表
// type UserMessageList struct {
//// SendData 客户端写入参数 VendorID int `json:"vendorID"` //平台品牌 10-美团 11-饿了么
//type SendData struct { UserID string `json:"userID"` //用户ID
// //ClientId string `json:"clientId" validate:"required"` //链接ID NewMessageNum int `json:"NewMessageNum"` //新消息数量
// VendorID int `json:"vendorID"` //消息来源平台ID LatestMsg string `json:"latestMsg"` //最新一条消息
// Data interface{} `json:"data"` //发送给平台 美团/饿了么消息结构体 LatestTime int `json:"latestTime"` //最新一条消息发送时间
// //返回值 }
// //Code int `json:"code"`
// //Msg string `json:"msg"` type RelInfo struct {
// //SendUserId string `json:"sendUserId"` VendorStoreID string `json:"vendorStoreID"` //平台门店id
//} VendorID string `json:"vendorID"` //平台标识id
// AppID string `json:"appID"` //应用ID
//// JXMsg 京西消息结构体 }
//type JXMsg struct {
// SendType string `json:"sendType"` //消息发送方 jx-商家；mt-美团；elm-饿了么 type UserRelInfo struct {
// Data interface{} `json:"data"` //美团/饿了么 单聊消息 VendorStoreID string `json:"vendorStoreID"` //平台门店id
//} VendorID string `json:"vendorID"` //平台标识id
// AppID string `json:"appID"` //应用ID
//// GetUserListReq 获取门店用户聊天列表 UserID string `json:"userID"` //用户id/groupID
//type GetUserListReq struct { }
// VendorStoreID string `json:"vendorStoreID"` //平台门店id
// VendorID string `json:"vendorID"` //平台标识id var (
// AppID string `json:"appID"` //应用ID cfg *ini.File
//} rdb = api.Cacher
// Manager = NewClientManager() // 管理者
//type GetChatDetailReq struct { CommonSetting = &commonConf{}
// VendorStoreID string `json:"vendorStoreID"` //平台门店id GlobalSetting = &global{}
// VendorID string `json:"vendorID"` //平台标识id ToClientChan chan clientInfo
// AppID string `json:"appID"` //应用ID heartbeatInterval = 60 * time.Second // 心跳间隔
// UserID string `json:"userID"` //userID/groupID HeartCheckMsg = "~#HHHBBB#~" //心跳检测消息
//} HeartCheckSuccess = "HB" //成功发送返回心跳消息
// VendorIDMT = 10 //im美团
//// UserMessageList 用户消息列表 VendorIDELM = 11 //im饿了么
//type UserMessageList struct { SendTypeJx = "jx" //京西客户端发送方标识
// VendorID int `json:"vendorID"` //平台品牌 10-美团 11-饿了么 SendTypeMt = "mt" //美团用户发送方标识符
// UserID string `json:"userID"` //用户ID SendTypeElm = "elm" //饿了么用户发送方标识符
// NewMessageNum int `json:"NewMessageNum"` //新消息数量 MTIMPushUrl = "wss://wpush.meituan.com/websocket" //buildPushConnect建立长连接
// LatestMsg string `json:"latestMsg"` //最新一条消息 )
// LatestTime int `json:"latestTime"` //最新一条消息发送时间
//} const (
// ExpireTimeDay = 24 * time.Hour //redis一天过期时间
//type RelInfo struct { maxMessageSize = 8192 // 最大的消息大小
// VendorStoreID string `json:"vendorStoreID"` //平台门店id )
// VendorID string `json:"vendorID"` //平台标识id
// AppID string `json:"appID"` //应用ID type renderData struct {
//} ClientId string `json:"clientId"`
// }
//type UserRelInfo struct {
// VendorStoreID string `json:"vendorStoreID"` //平台门店id const (
// VendorID string `json:"vendorID"` //平台标识id SuccessCode = 0
// AppID string `json:"appID"` //应用ID SuccessMsg = "success"
// UserID string `json:"userID"` //用户id/groupID Fail = -1
//} FailMsg = "fail"
//
//var ( SYSTEM_ID_ERROR = -1001
// cfg *ini.File ONLINE_MESSAGE_CODE = 1001
// rdb = api.Cacher OFFLINE_MESSAGE_CODE = 1002
// Manager = NewClientManager() // 管理者 )
// CommonSetting = &commonConf{}
// GlobalSetting = &global{} // Render 统一返回值
// ToClientChan chan clientInfo func Render(conn *websocket.Conn, messageId string, code int, message string, data interface{}) error {
// heartbeatInterval = 60 * time.Second // 心跳间隔 if data != nil {
// HeartCheckMsg = "~#HHHBBB#~" //心跳检测消息 str, _ := json.Marshal(data)
// HeartCheckSuccess = "HB" //成功发送返回心跳消息 temp := string(str)
// VendorIDMT = 10 //im美团 return conn.WriteJSON(RetData{
// VendorIDELM = 11 //im饿了么 Code: code,
// SendTypeJx = "jx" //京西客户端发送方标识 Msg: message,
// SendTypeMt = "mt" //美团用户发送方标识符 //MsgType: temp.SendType,
// SendTypeElm = "elm" //饿了么用户发送方标识符 Data: temp,
// MTIMPushUrl = "wss://wpush.meituan.com/websocket" //buildPushConnect建立长连接 })
//) } else {
// return conn.WriteJSON(RetData{
//const ( Code: code,
// ExpireTimeDay = 24 * time.Hour //redis一天过期时间 Msg: message,
// maxMessageSize = 8192 // 最大的消息大小 })
//) }
// }
//type renderData struct {
// ClientId string `json:"clientId"` func ClientRender(code int, msg string, data interface{}) (str string) {
//} var retData RetData
//
//const ( retData.Code = code
// SuccessCode = 0 retData.Msg = msg
// SuccessMsg = "success" retData.Data = data
// Fail = -1
// FailMsg = "fail" retJson, _ := json.Marshal(retData)
// str = string(retJson)
// SYSTEM_ID_ERROR = -1001
// ONLINE_MESSAGE_CODE = 1001 w := httptest.NewRecorder()
// OFFLINE_MESSAGE_CODE = 1002 w.Header().Set("Content-Type", "application/json; charset=utf-8")
//) _, _ = io.WriteString(w, str)
// return
//// Render 统一返回值 }
//func Render(conn *websocket.Conn, messageId string, code int, message string, data interface{}) error {
// return conn.WriteJSON(RetData{ func ConnRender(conn *websocket.Conn, data interface{}) (err error) {
// Code: code, err = conn.WriteJSON(RetData{
// Msg: message, Code: SuccessCode,
// Data: data, Msg: "success",
// }) Data: data,
//} })
// return
//func ClientRender(w http.ResponseWriter, code int, msg string, data interface{}) (str string) { }
// var retData RetData
// // Default 给默认值
// retData.Code = code func Default() {
// retData.Msg = msg CommonSetting = &commonConf{
// retData.Data = data HttpPort: "6000",
// RPCPort: "7000",
// retJson, _ := json.Marshal(retData) Cluster: false,
// str = string(retJson) CryptoKey: "Adba723b7fe06819",
// }
// w.Header().Set("Content-Type", "application/json; charset=utf-8")
// _, _ = io.WriteString(w, str) GlobalSetting = &global{
// return LocalHost: getIntranetIp(),
//} ServerList: make(map[string]string),
// }
//func ConnRender(conn *websocket.Conn, data interface{}) (err error) { }
// err = conn.WriteJSON(RetData{
// Code: SuccessCode, // Setup 初始化全局设置变量
// Msg: "success", func Setup() {
// Data: data, configFile := flag.String("c", "conf/app.ini", "-c conf/app.ini")
// })
// return var err error
//} cfg, err = ini.Load(*configFile)
// if err != nil {
//// Default 给默认值 log.Fatalf("setting.Setup, fail to parse 'conf/app.ini': %v", err)
//func Default() { }
// CommonSetting = &commonConf{
// HttpPort: "6000", mapTo("common", CommonSetting)
// RPCPort: "7000",
// Cluster: false, GlobalSetting = &global{
// CryptoKey: "Adba723b7fe06819", LocalHost: getIntranetIp(),
// } ServerList: make(map[string]string),
// }
// GlobalSetting = &global{ fmt.Printf("LocalHost=%s\n ", GlobalSetting.LocalHost)
// LocalHost: getIntranetIp(), }
// ServerList: make(map[string]string),
// } // mapTo map section
//} func mapTo(section string, v interface{}) {
// err := cfg.Section(section).MapTo(v)
//// Setup 初始化全局设置变量 if err != nil {
//func Setup() { log.Fatalf("Cfg.MapTo %s err: %v", section, err)
// configFile := flag.String("c", "conf/app.ini", "-c conf/app.ini") }
// }
// var err error
// cfg, err = ini.Load(*configFile) //获取本机IP
// if err != nil { func getIntranetIp() string {
// log.Fatalf("setting.Setup, fail to parse 'conf/app.ini': %v", err) addrs, _ := net.InterfaceAddrs()
// } for _, addr := range addrs {
// // 检查ip地址判断是否回环地址
// mapTo("common", CommonSetting) if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
// if ipnet.IP.To4() != nil {
// GlobalSetting = &global{ return ipnet.IP.String()
// LocalHost: getIntranetIp(), }
// ServerList: make(map[string]string),
// } }
// fmt.Printf("LocalHost=%s\n ServerList=%s\n", GlobalSetting.LocalHost, utils.Format4Output(GlobalSetting.ServerList, false)) }
//} return ""
// }
//// mapTo map section
//func mapTo(section string, v interface{}) { // GenFullUrl 组装完整websocket url以及生成clientID
// err := cfg.Section(section).MapTo(v) func GenFullUrl() (fullUrl string) {
// if err != nil { resp, err := api.MtwmAPI.GetConnectionToken()
// log.Fatalf("Cfg.MapTo %s err: %v", section, err) if err != nil {
// } return ""
//} }
// retVal := mtwmapi.GetConnTokenResp{}
////获取本机IP err = mapstructure.Decode(resp, &retVal)
//func getIntranetIp() string { fullUrl = MTIMPushUrl + "/" + retVal.AppKey + "/" + retVal.ConnectionToken
// addrs, _ := net.InterfaceAddrs() //clientID = api.MtwmAPI.GetAppID() + ":" + retVal.ConnectionToken
// for _, addr := range addrs { //打印输出
// // 检查ip地址判断是否回环地址 //fmt.Printf("Create websocket connect failCount:%d", retVal.UserCount)
// if ipnet, ok := addr.(*net.IPNet); ok && !ipnet.IP.IsLoopback() { return fullUrl
// if ipnet.IP.To4() != nil { }
// return ipnet.IP.String()
// }
//
// }
// }
// return ""
//}
//
//// GenFullUrl 组装完整websocket url以及生成clientID
//func GenFullUrl() (fullUrl string) {
// resp, err := api.MtwmAPI.GetConnectionToken()
// if err != nil {
// return ""
// }
// retVal := mtwmapi.GetConnTokenResp{}
// err = mapstructure.Decode(resp, &retVal)
// fullUrl = MTIMPushUrl + "/" + retVal.AppKey + "/" + retVal.ConnectionToken
// //clientID = api.MtwmAPI.GetAppID() + ":" + retVal.ConnectionToken
// //打印输出
// //fmt.Printf("Create websocket connect failCount:%d", retVal.UserCount)
// return fullUrl
//}

511
business/partner/purchase/im/im_server.go
View File

@@ -1,264 +1,263 @@
package im package im
// import (
//import ( "errors"
// "errors" "fmt"
// "fmt" "net/http"
// "net/http" "time"
// "time"
// "git.rosy.net.cn/baseapi/utils"
// "git.rosy.net.cn/baseapi/utils"
// "git.rosy.net.cn/jx-callback/globals"
// "git.rosy.net.cn/jx-callback/globals" "github.com/gorilla/websocket"
// "github.com/gorilla/websocket" )
//)
// func Init() {
//func Init() { //初始化
// //初始化 ToClientChan = make(chan clientInfo, 1000)
// ToClientChan = make(chan clientInfo, 1000) //写入全局变量
// //写入全局变量 Setup()
// //Default() //建立长链接
// go Send([]byte(HeartCheckMsg))
// Setup()
// //建立长链接 //启动定时器
// //StartWebSocket(res, req) PingTimer()
// Send([]byte(HeartCheckMsg))
// go WriteMessage()
// //启动定时器
// PingTimer() go Manager.Start()
//
// go WriteMessage()
//
// go Manager.Start()
//
//fmt.Printf("服务器启动成功，端口号：%s\n", CommonSetting.HttpPort) //fmt.Printf("服务器启动成功，端口号：%s\n", CommonSetting.HttpPort)
//} }
//
//func Run(w http.ResponseWriter, r *http.Request) { func Run(w http.ResponseWriter, r *http.Request) {
// conn, err := (&websocket.Upgrader{ conn, err := (&websocket.Upgrader{
// ReadBufferSize: 1024, ReadBufferSize: 1024,
// WriteBufferSize: 1024, WriteBufferSize: 1024,
// // 允许所有CORS跨域请求 // 允许所有CORS跨域请求
// CheckOrigin: func(r *http.Request) bool { CheckOrigin: func(r *http.Request) bool {
// return true return true
// }, },
// }).Upgrade(w, r, nil) }).Upgrade(w, r, nil)
// if err != nil { if err != nil {
// globals.SugarLogger.Debugf("upgrade error: %v", err) globals.SugarLogger.Debugf("upgrade error: %v", err)
// http.NotFound(w, r) http.NotFound(w, r)
// return return
// } }
//
// //设置读取消息大小上线 //设置读取消息大小上线
// conn.SetReadLimit(maxMessageSize) conn.SetReadLimit(maxMessageSize)
//
//clientID := r.FormValue("clientId") //clientID := r.FormValue("clientId")
// clientSocket := NewClient(clientID, conn) clientID := r.Header.Get("Clientid")
// clientSocket := NewClient(clientID, conn)
// //读取客户端消息
// clientSocket.Read() //读取客户端消息
// clientSocket.Read()
// if err = ConnRender(conn, renderData{ClientId: clientID}); err != nil {
// _ = conn.Close() if err = ConnRender(conn, renderData{ClientId: clientID}); err != nil {
// return _ = conn.Close()
// } return
// }
// // 用户连接事件
// Manager.Connect <- clientSocket // 用户连接事件
//} Manager.Connect <- clientSocket
// }
//func StartWebSocket(conn *websocket.Conn, clientID string, err error) {
// func StartWebSocket(conn *websocket.Conn, clientID string, err error) {
// //设置读取消息大小上线
// conn.SetReadLimit(maxMessageSize) //设置读取消息大小上线
// conn.SetReadLimit(maxMessageSize)
// clientSocket := NewClient(clientID, conn)
// clientSocket := NewClient(clientID, conn)
// //读取客户端消息
// clientSocket.Read() //读取客户端消息
// clientSocket.Read()
// if err = ConnRender(conn, renderData{ClientId: clientID}); err != nil {
// _ = conn.Close() if err = ConnRender(conn, renderData{ClientId: clientID}); err != nil {
// return _ = conn.Close()
// } return
// }
// // 用户连接事件
// Manager.Connect <- clientSocket // 用户连接事件
// Manager.Connect <- clientSocket
//}
// }
//// PingTimer 定时器发送心跳
//func PingTimer() { // PingTimer 定时器发送心跳
// go func() { func PingTimer() {
// ticker := time.NewTicker(heartbeatInterval) go func() {
// defer ticker.Stop() ticker := time.NewTicker(heartbeatInterval)
// //测试用 defer ticker.Stop()
// i := 0 //测试用
// for { i := 0
// i++ for {
// <-ticker.C i++
// for clientId, conn := range Manager.AllClient() { <-ticker.C
// if err := conn.Socket.WriteControl(websocket.PingMessage, []byte{}, time.Now().Add(time.Second)); err != nil { for clientId, conn := range Manager.AllClient() {
// Manager.DisConnect <- conn if err := conn.Socket.WriteControl(websocket.PingMessage, []byte{}, time.Now().Add(time.Second)); err != nil {
// globals.SugarLogger.Debugf("发送心跳失败: %s 总连接数：%d", clientId, Manager.Count()) Manager.DisConnect <- conn
// } globals.SugarLogger.Debugf("发送心跳失败: %s 总连接数：%d", clientId, Manager.Count())
// if err := ConnRender(conn.Socket, renderData{ClientId: clientId}); err != nil { }
// return if err := ConnRender(conn.Socket, renderData{ClientId: clientId}); err != nil {
// } return
// globals.SugarLogger.Debugf("clientId=%s,i=%d", clientId, i) }
// } globals.SugarLogger.Debugf("clientId=%s,i=%d", clientId, i)
// } }
// }() }
//} }()
// }
//// WriteMessage 监听并发送给客户端信息
//func WriteMessage() { // WriteMessage 监听并发送给客户端信息
// i := 0 func WriteMessage() {
// for { i := 0
// clientInfo := <-ToClientChan for {
// //广播发送通知所有客户端 clientInfo := <-ToClientChan
// i++ //广播发送通知所有客户端
// fmt.Printf("WriteMessage clientInfo=%s i=%d", utils.Format4Output(clientInfo, false), i) i++
// if Manager.AllClient() != nil { fmt.Printf("WriteMessage clientInfo=%s i=%d", utils.Format4Output(clientInfo, false), i)
// for _, conn := range Manager.AllClient() { if Manager.AllClient() != nil {
for _, conn := range Manager.AllClient() {
globals.SugarLogger.Debugf("WriteMessage conn.ClientId=%s", conn.ClientId)
if err := Render(conn.Socket, clientInfo.MessageId, clientInfo.Code, clientInfo.Msg, clientInfo.Data); err != nil {
Manager.DisConnect <- conn
}
}
} else {
globals.SugarLogger.Debugf("无客户端连接，请检查")
return
}
//if conn, err := Manager.GetByClientId(clientInfo.ClientId); err == nil && conn != nil {
// if err := Render(conn.Socket, clientInfo.MessageId, clientInfo.Code, clientInfo.Msg, clientInfo.Data); err != nil { // if err := Render(conn.Socket, clientInfo.MessageId, clientInfo.Code, clientInfo.Msg, clientInfo.Data); err != nil {
// Manager.DisConnect <- conn // Manager.DisConnect <- conn
// } // }
//} //}
// } else { }
// globals.SugarLogger.Debugf("无客户端连接，请检查") }
// return
// } // Start 管道处理程序
// //if conn, err := Manager.GetByClientId(clientInfo.ClientId); err == nil && conn != nil { func (manager *ClientManager) Start() {
// // if err := Render(conn.Socket, clientInfo.MessageId, clientInfo.Code, clientInfo.Msg, clientInfo.Data); err != nil { for {
// // Manager.DisConnect <- conn select {
// // } case client := <-manager.Connect:
// //} // 建立连接事件
// } manager.EventConnect(client)
//} case conn := <-manager.DisConnect:
// // 断开连接事件
//// Start 管道处理程序 manager.EventDisconnect(conn)
//func (manager *ClientManager) Start() { }
// for { }
// select { }
// case client := <-manager.Connect:
// // 建立连接事件 //从客户端读取数据
// manager.EventConnect(client) func (c *Client) Read() {
// case conn := <-manager.DisConnect: go func() {
// // 断开连接事件 for {
// manager.EventDisconnect(conn) messageType, msg, err := c.Socket.ReadMessage()
// } if err != nil {
// } if messageType == -1 && websocket.IsCloseError(err, websocket.CloseGoingAway, websocket.CloseNormalClosure, websocket.CloseNoStatusReceived) {
//} Manager.DisConnect <- c
// return
////从客户端读取数据 } else if messageType != websocket.PingMessage {
//func (c *Client) Read() { return
// go func() { }
// for { } else {
// messageType, msg, err := c.Socket.ReadMessage() SendToVendor(msg)
// if err != nil { return
// if messageType == -1 && websocket.IsCloseError(err, websocket.CloseGoingAway, websocket.CloseNormalClosure, websocket.CloseNoStatusReceived) { }
// Manager.DisConnect <- c }
// return }()
// } else if messageType != websocket.PingMessage { }
// return
// } // 以下为连接事件操作*******************************************
// } else {
// SendToVendor(msg) // EventConnect 建立连接事件
// } func (manager *ClientManager) EventConnect(client *Client) {
// } manager.AddClient(client)
// }() }
//}
// // EventDisconnect 断开连接事件
//// 以下为连接事件操作******************************************* func (manager *ClientManager) EventDisconnect(client *Client) {
// //关闭连接
//// EventConnect 建立连接事件 _ = client.Socket.Close()
//func (manager *ClientManager) EventConnect(client *Client) { manager.DelClient(client)
// manager.AddClient(client) //标记销毁
//} client.IsDeleted = true
// client = nil
//// EventDisconnect 断开连接事件 }
//func (manager *ClientManager) EventDisconnect(client *Client) {
// //关闭连接 //以下为客户端Client操作*******************************************
// _ = client.Socket.Close()
// manager.DelClient(client) // NewClient 初始化Client
// //标记销毁 func NewClient(clientId string, socket *websocket.Conn) *Client {
// client.IsDeleted = true return &Client{
// client = nil ClientId: clientId,
//} Socket: socket,
// ConnectTime: uint64(time.Now().Unix()),
////以下为客户端Client操作******************************************* IsDeleted: false,
// }
//// NewClient 初始化Client }
//func NewClient(clientId string, socket *websocket.Conn) *Client {
// return &Client{ // AddClient 添加客户端
// ClientId: clientId, func (manager *ClientManager) AddClient(client *Client) {
// Socket: socket, manager.ClientIdMapLock.Lock()
// ConnectTime: uint64(time.Now().Unix()), defer manager.ClientIdMapLock.Unlock()
// IsDeleted: false,
// } manager.ClientIdMap[client.ClientId] = client
//} }
//
//// AddClient 添加客户端 // DelClient 删除客户端
//func (manager *ClientManager) AddClient(client *Client) { func (manager *ClientManager) DelClient(client *Client) {
// manager.ClientIdMapLock.Lock() manager.delClientIdMap(client.ClientId)
// defer manager.ClientIdMapLock.Unlock()
// }
// manager.ClientIdMap[client.ClientId] = client
//} // 删除clientIdMap
// func (manager *ClientManager) delClientIdMap(clientId string) {
//// DelClient 删除客户端 manager.ClientIdMapLock.Lock()
//func (manager *ClientManager) DelClient(client *Client) { defer manager.ClientIdMapLock.Unlock()
// manager.delClientIdMap(client.ClientId)
// delete(manager.ClientIdMap, clientId)
//} }
//
//// 删除clientIdMap // GetByClientId 通过clientId获取client
//func (manager *ClientManager) delClientIdMap(clientId string) { func (manager *ClientManager) GetByClientId(clientId string) (*Client, error) {
// manager.ClientIdMapLock.Lock() manager.ClientIdMapLock.RLock()
// defer manager.ClientIdMapLock.Unlock() defer manager.ClientIdMapLock.RUnlock()
//
// delete(manager.ClientIdMap, clientId) if client, ok := manager.ClientIdMap[clientId]; !ok {
//} return nil, errors.New("客户端不存在")
// } else {
//// GetByClientId 通过clientId获取client return client, nil
//func (manager *ClientManager) GetByClientId(clientId string) (*Client, error) { }
// manager.ClientIdMapLock.RLock() }
// defer manager.ClientIdMapLock.RUnlock()
// // AllClient 获取所有的客户端
// if client, ok := manager.ClientIdMap[clientId]; !ok { func (manager *ClientManager) AllClient() map[string]*Client {
// return nil, errors.New("客户端不存在") manager.ClientIdMapLock.RLock()
// } else { defer manager.ClientIdMapLock.RUnlock()
// return client, nil
// } return manager.ClientIdMap
//} }
//
//// AllClient 获取所有的客户端 //与客户端的交互操作*************************
//func (manager *ClientManager) AllClient() map[string]*Client {
// manager.ClientIdMapLock.RLock() // NewClientManager 初始化客户端管理
// defer manager.ClientIdMapLock.RUnlock() func NewClientManager() (clientManager *ClientManager) {
// clientManager = &ClientManager{
// return manager.ClientIdMap ClientIdMap: make(map[string]*Client),
//} Connect: make(chan *Client, 10000),
// DisConnect: make(chan *Client, 10000),
////与客户端的交互操作************************* Groups: make(map[string][]string, 100),
// SystemClients: make(map[string][]string, 100),
//// NewClientManager 初始化客户端管理 }
//func NewClientManager() (clientManager *ClientManager) {
// clientManager = &ClientManager{ return
// ClientIdMap: make(map[string]*Client), }
// Connect: make(chan *Client, 10000),
// DisConnect: make(chan *Client, 10000), // Count 获取客户端数量
// Groups: make(map[string][]string, 100), func (manager *ClientManager) Count() int {
// SystemClients: make(map[string][]string, 100), manager.ClientIdMapLock.RLock()
// } defer manager.ClientIdMapLock.RUnlock()
// return len(manager.ClientIdMap)
// return }
//}
//
//// Count 获取客户端数量
//func (manager *ClientManager) Count() int {
// manager.ClientIdMapLock.RLock()
// defer manager.ClientIdMapLock.RUnlock()
// return len(manager.ClientIdMap)
//}

3
controllers/event.go
View File

@@ -146,6 +146,9 @@ func (c *EventController) TestWebsocket() {
log.Fatal(err) log.Fatal(err)
} }
defer ws.Close() defer ws.Close()
//var clientID = c.GetString("clientID")
//fmt.Printf("clientID=%s", clientID)
var ( var (
vendorOrderID = c.GetString("vendorOrderID") vendorOrderID = c.GetString("vendorOrderID")
msgMap = make(map[string]*model.ImMessageRecord) msgMap = make(map[string]*model.ImMessageRecord)

188
controllers/im.go
View File

@@ -1,106 +1,122 @@
package controllers package controllers
import (
"encoding/json"
"git.rosy.net.cn/jx-callback/business/partner/purchase/im"
"github.com/astaxie/beego/server/web"
)
type IMController struct {
web.Controller
}
var maxMessageSize = int64(8192) // 最大的消息大小
// @Title IM初始化长链接
// @Description IM初始化长链接
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /StartWebSocket [get]
func (c *IMController) StartWebSocket() {
im.Run(c.Ctx.ResponseWriter, c.Ctx.Request)
// //
//import (
// "encoding/json"
// "net/http"
//
// "git.rosy.net.cn/jx-callback/globals"
//
// "git.rosy.net.cn/jx-callback/business/partner/purchase/im"
// "github.com/astaxie/beego/server/web"
//)
//
//type IMController struct {
// web.Controller
//}
//
//// @Title IM初始化长链接
//// @Description IM初始化长链接
//// @Success 200 {object} controllers.CallResult
//// @Failure 200 {object} controllers.CallResult
//// @router /StartWebSocket [get]
//func (c *IMController) StartWebSocket() {
//upgrader.CheckOrigin = func(r *http.Request) bool { //upgrader.CheckOrigin = func(r *http.Request) bool {
// return true // return true
//} //}
// ws, err := upgrader.Upgrade(c.Ctx.ResponseWriter, c.Ctx.Request, nil) //conn, err := upgrader.Upgrade(c.Ctx.ResponseWriter, c.Ctx.Request, nil)
//if err != nil { //if err != nil {
// globals.SugarLogger.Errorf("upgrade error: %v", err) // globals.SugarLogger.Errorf("upgrade error: %v", err)
// return // return
//} //}
// defer ws.Close() //defer conn.Close()
// //
//clientID := c.GetString("clientID") //clientID := c.GetString("clientID")
//globals.SugarLogger.Debugf("clientID=%s", clientID) //globals.SugarLogger.Debugf("clientID=%s", clientID)
// //
// im.StartWebSocket(ws, clientID, err) ////设置读取消息大小上线
//conn.SetReadLimit(maxMessageSize)
//
//clientSocket := im.NewClient(clientID, conn)
//
////读取客户端消息
//clientSocket.Read()
//
//if err = im.ConnRender(conn, im.RetData{Data: clientID}); err != nil {
// _ = conn.Close()
// return
//} //}
// //
//// @Title IM获取门店用户聊天列表 //// 用户连接事件
//// @Description IM获取门店用户聊天列表 //im.Manager.Connect <- clientSocket
//// @Param token header string true "认证token"
//// @Param payLoad formData string true "平台应用映射关系" }
//// @Success 200 {object} controllers.CallResult
//// @Failure 200 {object} controllers.CallResult // @Title IM获取门店用户聊天列表
//// @router /GetIMUserList [get] // @Description IM获取门店用户聊天列表
//func (c *IMController) GetIMUserList() { // @Param token header string true "认证token"
// c.callGetIMUserList(func(params *tImGetIMUserListParams) (retVal interface{}, errCode string, err error) { // @Param payLoad formData string true "平台应用映射关系"
// var relInfo []im.RelInfo // @Success 200 {object} controllers.CallResult
// if err = json.Unmarshal([]byte(params.PayLoad), &relInfo); err != nil { // @Failure 200 {object} controllers.CallResult
// retVal, err = im.GetImUserList(relInfo) // @router /GetIMUserList [get]
func (c *IMController) GetIMUserList() {
c.callGetIMUserList(func(params *tImGetIMUserListParams) (retVal interface{}, errCode string, err error) {
var relInfo []im.RelInfo
if err = json.Unmarshal([]byte(params.PayLoad), &relInfo); err != nil {
retVal, err = im.GetImUserList(relInfo)
}
return retVal, "", err
})
}
// @Title IM获取单个用户聊天详情
// @Description IM获取单个用户聊天详情
// @Param token header string true "认证token"
// @Param payLoad formData string true "平台用户应用映射关系"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /GetImChatDetail [get]
func (c *IMController) GetImChatDetail() {
c.callGetImChatDetail(func(params *tImGetImChatDetailParams) (retVal interface{}, errCode string, err error) {
var temp []im.UserRelInfo
if err = json.Unmarshal([]byte(params.PayLoad), &temp); err == nil {
retVal, err = im.GetImChatDetail(temp)
}
return retVal, "", err
})
}
// @Title IM设置门店与单个用户已读
// @Description IM设置门店与单个用户已读
// @Param token header string true "认证token"
// @Param appID formData string true "应用id"
// @Param vendorStoreID formData string true "平台门店id"
// @Param vendorID formData string true "平台id"
// @Param userID formData string true "用户id/会话id"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /SetImMsgRead [post]
func (c *IMController) SetImMsgRead() {
c.callSetImMsgRead(func(params *tImSetImMsgReadParams) (retVal interface{}, errCode string, err error) {
err = im.SetJxMsgRead(params.AppID, params.VendorStoreID, params.VendorID, params.UserID)
return nil, "", err
})
}
// @Title 向平台商发送信息
// @Description 向平台商发送信息
// @Param token header string true "认证token"
// @Param sendData formData string true "平台商消息结构体"
// @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult
// @router /SendToVendor [post]
//func (c *IMController) SendToVendor() {
// c.callSendToVendor(func(params *tImSendToVendorParams) (retVal interface{}, errCode string, err error) {
// var sendData im.SendData
// if err = json.Unmarshal([]byte(params.SendData), &sendData); err == nil {
// im.SendToVendor(sendData)
// } // }
// return retVal, "", err
// })
//}
//
//// @Title IM获取单个用户聊天详情
//// @Description IM获取单个用户聊天详情
//// @Param token header string true "认证token"
//// @Param payLoad formData string true "平台用户应用映射关系"
//// @Success 200 {object} controllers.CallResult
//// @Failure 200 {object} controllers.CallResult
//// @router /GetImChatDetail [get]
//func (c *IMController) GetImChatDetail() {
// c.callGetImChatDetail(func(params *tImGetImChatDetailParams) (retVal interface{}, errCode string, err error) {
// var temp []im.UserRelInfo
// if err = json.Unmarshal([]byte(params.PayLoad), &temp); err == nil {
// retVal, err = im.GetImChatDetail(temp)
// }
// return retVal, "", err
// })
//}
//
//// @Title IM设置门店与单个用户已读
//// @Description IM设置门店与单个用户已读
//// @Param token header string true "认证token"
//// @Param appID formData string true "应用id"
//// @Param vendorStoreID formData string true "平台门店id"
//// @Param vendorID formData string true "平台id"
//// @Param userID formData string true "用户id/会话id"
//// @Success 200 {object} controllers.CallResult
//// @Failure 200 {object} controllers.CallResult
//// @router /SetImMsgRead [post]
//func (c *IMController) SetImMsgRead() {
// c.callSetImMsgRead(func(params *tImSetImMsgReadParams) (retVal interface{}, errCode string, err error) {
// err = im.SetJxMsgRead(params.AppID, params.VendorStoreID, params.VendorID, params.UserID)
// return nil, "", err // return nil, "", err
// }) // })
//} //}
//
//// @Title 向平台商发送信息
//// @Description 向平台商发送信息
//// @Param token header string true "认证token"
//// @Param sendData formData string true "平台商消息结构体"
//// @Success 200 {object} controllers.CallResult
//// @Failure 200 {object} controllers.CallResult
//// @router /SendToVendor [post]
////func (c *IMController) SendToVendor() {
//// c.callSendToVendor(func(params *tImSendToVendorParams) (retVal interface{}, errCode string, err error) {
//// var sendData im.SendData
//// if err = json.Unmarshal([]byte(params.SendData), &sendData); err == nil {
//// im.SendToVendor(sendData)
//// }
//// return nil, "", err
//// })
////}

4
globals/api/api.go
View File

@@ -294,9 +294,9 @@ func Init() {
QiniuAPI = qbox.NewMac(beego.AppConfig.DefaultString("qiniuAK", ""), beego.AppConfig.DefaultString("qiniuSK", "")) QiniuAPI = qbox.NewMac(beego.AppConfig.DefaultString("qiniuAK", ""), beego.AppConfig.DefaultString("qiniuSK", ""))
ShowAPI = showapi.New(beego.AppConfig.DefaultInt("showAppID", 0), beego.AppConfig.DefaultString("showAppSecret", "")) ShowAPI = showapi.New(beego.AppConfig.DefaultInt("showAppID", 0), beego.AppConfig.DefaultString("showAppSecret", ""))
//Cacher = redis.New(beego.AppConfig.DefaultString("redisHost", ""), beego.AppConfig.DefaultInt("redisPort", ""), beego.AppConfig.DefaultString("redisPassword", "")) Cacher = redis.New(beego.AppConfig.DefaultString("redisHost", "localhost"), beego.AppConfig.DefaultInt("redisPort", 0), beego.AppConfig.DefaultString("redisPassword", ""))
//Todo 本地测试用 //Todo 本地测试用
Cacher = redis.New(beego.AppConfig.DefaultString("redisHost", "127.0.0.1"), beego.AppConfig.DefaultInt("redisPort", 6379), beego.AppConfig.DefaultString("redisPassword", "123456")) //Cacher = redis.New(beego.AppConfig.DefaultString("redisHost", "127.0.0.1"), beego.AppConfig.DefaultInt("redisPort", 6379), beego.AppConfig.DefaultString("redisPassword", "123456"))
AliUpcAPI = aliupcapi.New(beego.AppConfig.DefaultString("aliUpcAppCode", "")) AliUpcAPI = aliupcapi.New(beego.AppConfig.DefaultString("aliUpcAppCode", ""))

8
main.go
View File

@@ -8,6 +8,8 @@ import (
"os" "os"
"time" "time"
"git.rosy.net.cn/jx-callback/business/partner/purchase/im"
"git.rosy.net.cn/jx-callback/business/enterprise" "git.rosy.net.cn/jx-callback/business/enterprise"
"git.rosy.net.cn/jx-callback/business/jxcallback/auto_delivery" "git.rosy.net.cn/jx-callback/business/jxcallback/auto_delivery"
@@ -94,12 +96,12 @@ func Init() {
enterprise.Init() // 初始化enterprise key enterprise.Init() // 初始化enterprise key
auto_delivery.Init() // 初始化骑手列表 auto_delivery.Init() // 初始化骑手列表
//im.Init() //初始化ws连接 im.Init() //初始化ws连接
//go http.HandleFunc("/v2/im/StartWebSocket", im.Run) //http.HandleFunc("/ws", im.Run)
//test //test
//mux := http.NewServeMux() //mux := http.NewServeMux()
//mux.HandleFunc("/v2/im/StartWebSocket", im.StartWebSocket) //mux.HandleFunc("/v2/im/Run", im.Run)
//go http.ListenAndServe(":8082", mux) //go http.ListenAndServe(":8082", mux)
} }

48
routers/commentsRouter_controllers.go
View File

@@ -4342,30 +4342,30 @@ func init() {
Filters: nil, Filters: nil,
Params: nil}) Params: nil})
//im //im
//web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"], web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"],
// web.ControllerComments{ web.ControllerComments{
// Method: "GetIMUserList", Method: "GetIMUserList",
// Router: `/GetIMUserList`, Router: `/GetIMUserList`,
// AllowHTTPMethods: []string{"get"}, AllowHTTPMethods: []string{"get"},
// MethodParams: param.Make(), MethodParams: param.Make(),
// Filters: nil, Filters: nil,
// Params: nil}) Params: nil})
//web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"], web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"],
// web.ControllerComments{ web.ControllerComments{
// Method: "GetImChatDetail", Method: "GetImChatDetail",
// Router: `/GetImChatDetail`, Router: `/GetImChatDetail`,
// AllowHTTPMethods: []string{"get"}, AllowHTTPMethods: []string{"get"},
// MethodParams: param.Make(), MethodParams: param.Make(),
// Filters: nil, Filters: nil,
// Params: nil}) Params: nil})
//web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"], web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"],
// web.ControllerComments{ web.ControllerComments{
// Method: "SetImMsgRead", Method: "SetImMsgRead",
// Router: `/SetImMsgRead`, Router: `/SetImMsgRead`,
// AllowHTTPMethods: []string{"post"}, AllowHTTPMethods: []string{"post"},
// MethodParams: param.Make(), MethodParams: param.Make(),
// Filters: nil, Filters: nil,
// Params: nil}) Params: nil})
web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"], web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"],
web.ControllerComments{ web.ControllerComments{
Method: "StartWebSocket", Method: "StartWebSocket",

10
routers/router.go
View File

@@ -165,11 +165,11 @@ func init() {
&controllers.VersionController{}, &controllers.VersionController{},
), ),
), ),
//web.NSNamespace("/im", web.NSNamespace("/im",
// web.NSInclude( web.NSInclude(
// &controllers.IMController{}, &controllers.IMController{},
// ), ),
//), ),
) )
web.AddNamespace(ns) web.AddNamespace(ns)