mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-10-26 05:02:11 +08:00
chore: msg
This commit is contained in:
parent
eab8b137b2
commit
398e26b96c
@ -195,3 +195,7 @@ func (m *msgServer) sendMsgSingleChat(ctx context.Context, req *pbmsg.SendMsgReq
|
|||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *msgServer) SendSimpleMsg(ctx context.Context, req *pbmsg.SendMsgReq) (*pbmsg.SendMsgResp, error) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
@ -17,6 +17,9 @@ package webhook
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/callbackstruct"
|
"github.com/openimsdk/open-im-server/v3/pkg/callbackstruct"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
|
||||||
"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
|
"github.com/openimsdk/open-im-server/v3/pkg/common/servererrs"
|
||||||
@ -25,7 +28,6 @@ import (
|
|||||||
"github.com/openimsdk/tools/mcontext"
|
"github.com/openimsdk/tools/mcontext"
|
||||||
"github.com/openimsdk/tools/mq/memamq"
|
"github.com/openimsdk/tools/mq/memamq"
|
||||||
"github.com/openimsdk/tools/utils/httputil"
|
"github.com/openimsdk/tools/utils/httputil"
|
||||||
"net/http"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type Client struct {
|
type Client struct {
|
||||||
@ -66,6 +68,12 @@ func (c *Client) AsyncPost(ctx context.Context, command string, req callbackstru
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Client) AsyncPostWithKey(ctx context.Context, command string, req callbackstruct.CallbackReq, resp callbackstruct.CallbackResp, after *config.AfterConfig) {
|
||||||
|
if after.Enable {
|
||||||
|
c.queue.Push(func() { c.post(ctx, command, req, resp, after.Timeout) })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (c *Client) post(ctx context.Context, command string, input interface{}, output callbackstruct.CallbackResp, timeout int) error {
|
func (c *Client) post(ctx context.Context, command string, input interface{}, output callbackstruct.CallbackResp, timeout int) error {
|
||||||
ctx = mcontext.WithMustInfoCtx([]string{mcontext.GetOperationID(ctx), mcontext.GetOpUserID(ctx), mcontext.GetOpUserPlatform(ctx), mcontext.GetConnID(ctx)})
|
ctx = mcontext.WithMustInfoCtx([]string{mcontext.GetOperationID(ctx), mcontext.GetOpUserID(ctx), mcontext.GetOpUserPlatform(ctx), mcontext.GetConnID(ctx)})
|
||||||
fullURL := c.url + "/" + command
|
fullURL := c.url + "/" + command
|
||||||
@ -84,3 +92,41 @@ func (c *Client) post(ctx context.Context, command string, input interface{}, ou
|
|||||||
log.ZInfo(ctx, "webhook success", "url", fullURL, "input", input, "response", string(b))
|
log.ZInfo(ctx, "webhook success", "url", fullURL, "input", input, "response", string(b))
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Client) postWithQuery(ctx context.Context, command string, input interface{}, output callbackstruct.CallbackResp, timeout int, queryParams map[string]string) error {
|
||||||
|
ctx = mcontext.WithMustInfoCtx([]string{mcontext.GetOperationID(ctx), mcontext.GetOpUserID(ctx), mcontext.GetOpUserPlatform(ctx), mcontext.GetConnID(ctx)})
|
||||||
|
fullURL := c.url + "/" + command
|
||||||
|
|
||||||
|
parsedURL, err := url.Parse(fullURL)
|
||||||
|
if err != nil {
|
||||||
|
return servererrs.ErrNetwork.WrapMsg(err.Error(), "failed to parse URL", fullURL)
|
||||||
|
}
|
||||||
|
|
||||||
|
query := parsedURL.Query()
|
||||||
|
|
||||||
|
operationID, _ := ctx.Value(constant.OperationID).(string)
|
||||||
|
|
||||||
|
for key, value := range queryParams {
|
||||||
|
query.Set(key, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
parsedURL.RawQuery = query.Encode()
|
||||||
|
|
||||||
|
fullURL = parsedURL.String()
|
||||||
|
log.ZInfo(ctx, "webhook", "url", fullURL, "input", input, "config", timeout)
|
||||||
|
|
||||||
|
b, err := c.client.Post(ctx, fullURL, map[string]string{constant.OperationID: operationID}, input, timeout)
|
||||||
|
if err != nil {
|
||||||
|
return servererrs.ErrNetwork.WrapMsg(err.Error(), "post url", fullURL)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = json.Unmarshal(b, output); err != nil {
|
||||||
|
return servererrs.ErrData.WithDetail(err.Error() + " response format error")
|
||||||
|
}
|
||||||
|
if err := output.Parse(); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
log.ZInfo(ctx, "webhook success", "url", fullURL, "input", input, "response", string(b))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user