alter callback fg

config/config.yaml

@@ -193,7 +193,7 @@ iospush:
   badgeCount: true
 
 callback:
-  callbackUrl : "http://127.0.0.1:8080"
+  callbackUrl : "http://127.0.0.1:8080/callback"
   # 开启关闭操作前后回调的配置
   callbackbeforeSendSingleMsg:
     enable: false # 回调是否启用

internal/demo/register/login.go

@@ -53,7 +53,7 @@ func Login(c *gin.Context) {
 	openIMGetUserToken.Secret = config.Config.Secret
 	openIMGetUserToken.UserID = account
 	openIMGetUserTokenResp := api.UserTokenResp{}
-	bMsg, err := http2.Post(url, openIMGetUserToken, config.Config.MessageCallBack.CallBackTimeOut)
+	bMsg, err := http2.Post(url, openIMGetUserToken, 2)
 	if err != nil {
 		log.NewError(params.OperationID, "request openIM get user token error", account, "err", err.Error())
 		c.JSON(http.StatusOK, gin.H{"errCode": constant.GetIMTokenErr, "errMsg": err.Error()})

internal/demo/register/set_password.go

@@ -57,7 +57,7 @@ func SetPassword(c *gin.Context) {
 	openIMRegisterReq.Nickname = account
 	openIMRegisterReq.Secret = config.Config.Secret
 	openIMRegisterResp := api.UserRegisterResp{}
-	bMsg, err := http2.Post(url, openIMRegisterReq, config.Config.MessageCallBack.CallBackTimeOut)
+	bMsg, err := http2.Post(url, openIMRegisterReq, 2)
 	if err != nil {
 		log.NewError(params.OperationID, "request openIM register error", account, "err", err.Error())
 		c.JSON(http.StatusOK, gin.H{"errCode": constant.RegisterFailed, "errMsg": err.Error()})

internal/rpc/msg/callback.go

@@ -11,10 +11,10 @@ import (
 )
 
 func callbackBeforeSendSingleMsg(msg *pbChat.SendMsgReq) (canSend bool, err error) {
-	log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), msg)
 	if !config.Config.Callback.CallbackbeforeSendSingleMsg.Enable {
 		return true, nil
 	}
+	log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), msg)
 	req := cbApi.CallbackBeforeSendSingleMsgReq{CommonCallbackReq:cbApi.CommonCallbackReq{
 	}}
 	resp := &cbApi.CallbackBeforeSendSingleMsgResp{CommonCallbackResp:cbApi.CommonCallbackResp{
@@ -36,10 +36,10 @@ func callbackBeforeSendSingleMsg(msg *pbChat.SendMsgReq) (canSend bool, err erro
 
 
 func callbackAfterSendSingleMsg(msg *pbChat.SendMsgReq) error {
-	log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), msg)
 	if !config.Config.Callback.CallbackAfterSendSingleMsg.Enable {
 		return nil
 	}
+	log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), msg)
 	req := cbApi.CallbackAfterSendSingleMsgReq{CommonCallbackReq: cbApi.CommonCallbackReq{}}
 	resp := &cbApi.CallbackAfterSendSingleMsgResp{CommonCallbackResp: cbApi.CommonCallbackResp{}}
 	defer log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), req, resp)
@@ -53,10 +53,10 @@ func callbackAfterSendSingleMsg(msg *pbChat.SendMsgReq) error {
 
 
 func callbackBeforeSendGroupMsg(msg *pbChat.SendMsgReq) (canSend bool, err error) {
-	log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), msg)
 	if !config.Config.Callback.CallbackBeforeSendGroupMsg.Enable {
 		return true, nil
 	}
+	log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), msg)
 	req := cbApi.CallbackBeforeSendSingleMsgReq{CommonCallbackReq: cbApi.CommonCallbackReq{}}
 	resp := &cbApi.CallbackBeforeSendGroupMsgResp{CommonCallbackResp: cbApi.CommonCallbackResp{}}
 	defer log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), req, resp)
@@ -75,10 +75,10 @@ func callbackBeforeSendGroupMsg(msg *pbChat.SendMsgReq) (canSend bool, err error
 }
 
 func callbackAfterSendGroupMsg(msg *pbChat.SendMsgReq) error {
-	log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), msg)
 	if !config.Config.Callback.CallbackAfterSendGroupMsg.Enable {
 		return nil
 	}
+	log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), msg)
 	req := cbApi.CallbackAfterSendGroupMsgReq{CommonCallbackReq: cbApi.CommonCallbackReq{}}
 	resp := &cbApi.CallbackAfterSendGroupMsgResp{CommonCallbackResp: cbApi.CommonCallbackResp{}}
 	defer log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), req, resp)
@@ -92,10 +92,10 @@ func callbackAfterSendGroupMsg(msg *pbChat.SendMsgReq) error {
 
 
 func callBackWordFilter(msg *pbChat.SendMsgReq) (canSend bool, err error) {
-	log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), msg)
 	if !config.Config.Callback.CallbackWordFilter.Enable || msg.MsgData.ContentType != constant.Text {
 		return true, nil
 	}
+	log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), msg)
 	req := cbApi.CallbackWordFilterReq{CommonCallbackReq: cbApi.CommonCallbackReq{}}
 	resp := &cbApi.CallbackWordFilterResp{CommonCallbackResp: cbApi.CommonCallbackResp{}}
 	defer log.NewDebug(msg.OperationID, utils.GetSelfFuncName(), req, resp)