blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-05 05:12:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Details optimization (#1293)

Browse Source 
* Details optimization

* Optimize the control structure

* Optimize the control structure, Fix setting HTTP request setting URL parameter error
This commit is contained in:
醉墨居士 2023-11-05 18:36:01 +08:00 committed by GitHub
parent 450fe26cc0
commit a9e590109c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/msggateway/client.go
View File

@ -135,7 +135,7 @@ func (c *Client) readMessage() {
return return
} }
log.ZDebug(c.ctx, "readMessage", "messageType", messageType) log.ZDebug(c.ctx, "readMessage", "messageType", messageType)
if c.closed == true { // 连接刚置位已经关闭，但是协程还没退出的场景 if c.closed { // 连接刚置位已经关闭，但是协程还没退出的场景
c.closedErr = ErrConnClosed c.closedErr = ErrConnClosed
return return
} }
@ -282,10 +282,10 @@ func (c *Client) KickOnlineMessage() error {
func (c *Client) writeBinaryMsg(resp Resp) error { func (c *Client) writeBinaryMsg(resp Resp) error {
c.w.Lock() c.w.Lock()
defer c.w.Unlock() defer c.w.Unlock()
if c.closed == true { if c.closed {
return nil return nil
} }
encodedBuf := bufferPool.Get().([]byte)
resultBuf := bufferPool.Get().([]byte) resultBuf := bufferPool.Get().([]byte)
encodedBuf, err := c.longConnServer.Encode(resp) encodedBuf, err := c.longConnServer.Encode(resp)
if err != nil { if err != nil {
@ -307,9 +307,12 @@ func (c *Client) writeBinaryMsg(resp Resp) error {
func (c *Client) writePongMsg() error { func (c *Client) writePongMsg() error {
c.w.Lock() c.w.Lock()
defer c.w.Unlock() defer c.w.Unlock()
if c.closed == true { if c.closed {
return nil return nil
} }
_ = c.conn.SetWriteDeadline(writeWait) err := c.conn.SetWriteDeadline(writeWait)
if err != nil {
return utils.Wrap(err, "")
}
return c.conn.WriteMessage(PongMessage, nil) return c.conn.WriteMessage(PongMessage, nil)
} }

4
internal/msggateway/context.go
View File

@ -124,7 +124,9 @@ func (c *UserConnContext) GetOperationID() string {
} }
func (c *UserConnContext) SetOperationID(operationID string) { func (c *UserConnContext) SetOperationID(operationID string) {
c.Req.URL.Query().Set(OperationID, operationID) values := c.Req.URL.Query()
values.Set(OperationID, operationID)
c.Req.URL.RawQuery = values.Encode()
} }
func (c *UserConnContext) GetToken() string { func (c *UserConnContext) GetToken() string {

10
internal/rpc/msg/message_interceptor.go
View File

@ -30,17 +30,15 @@ type MessageInterceptorFunc func(ctx context.Context, req *msg.SendMsgReq) (*sdk
func MessageHasReadEnabled(_ context.Context, req *msg.SendMsgReq) (*sdkws.MsgData, error) { func MessageHasReadEnabled(_ context.Context, req *msg.SendMsgReq) (*sdkws.MsgData, error) {
switch { switch {
case req.MsgData.ContentType == constant.HasReadReceipt && req.MsgData.SessionType == constant.SingleChatType: case req.MsgData.ContentType == constant.HasReadReceipt && req.MsgData.SessionType == constant.SingleChatType:
if config.Config.SingleMessageHasReadReceiptEnable { if !config.Config.SingleMessageHasReadReceiptEnable {
return req.MsgData, nil
} else {
return nil, errs.ErrMessageHasReadDisable.Wrap() return nil, errs.ErrMessageHasReadDisable.Wrap()
} }
return req.MsgData, nil
case req.MsgData.ContentType == constant.HasReadReceipt && req.MsgData.SessionType == constant.SuperGroupChatType: case req.MsgData.ContentType == constant.HasReadReceipt && req.MsgData.SessionType == constant.SuperGroupChatType:
if config.Config.GroupMessageHasReadReceiptEnable { if !config.Config.GroupMessageHasReadReceiptEnable {
return req.MsgData, nil
} else {
return nil, errs.ErrMessageHasReadDisable.Wrap() return nil, errs.ErrMessageHasReadDisable.Wrap()
} }
return req.MsgData, nil
} }
return req.MsgData, nil return req.MsgData, nil
} }

5
pkg/msgprocessor/conversation.go
View File

@ -118,10 +118,9 @@ func GetNotificationConversationIDByConversationID(conversationID string) string
l := strings.Split(conversationID, "_") l := strings.Split(conversationID, "_")
if len(l) > 1 { if len(l) > 1 {
l[0] = "n" l[0] = "n"
return strings.Join(l, "_") return conversationID
} else {
return ""
} }
return ""
} }
func GetNotificationConversationID(sessionType int, ids ...string) string { func GetNotificationConversationID(sessionType int, ids ...string) string {