From 4342e09699ede96a002a11d17a4f00a8a8d5d703 Mon Sep 17 00:00:00 2001 From: eson <9673575+githubcontent@user.noreply.gitee.com> Date: Tue, 5 Sep 2023 17:24:46 +0800 Subject: [PATCH] fix --- server/auth/internal/logic/useremailconfirmationlogic.go | 9 +++++++-- server/auth/internal/logic/userresetpasswordlogic.go | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/server/auth/internal/logic/useremailconfirmationlogic.go b/server/auth/internal/logic/useremailconfirmationlogic.go index 1183f8a2..53be665f 100644 --- a/server/auth/internal/logic/useremailconfirmationlogic.go +++ b/server/auth/internal/logic/useremailconfirmationlogic.go @@ -67,7 +67,8 @@ func FinishRegister(svcCtx *svc.ServiceContext, user *gmodel.FsUser, token *auth } func CommonNotify(WebsocketAddr, wid string, event *wevent.WebsocketEvent) error { - tp := requests.Post(fmt.Sprintf("%s/api/websocket/common_notify", WebsocketAddr)) + reqWebsocketAddr := fmt.Sprintf("%s/api/websocket/common_notify", WebsocketAddr) + tp := requests.Post(reqWebsocketAddr) tp.SetBodyJson(requests.M{ "wid": wid, "data": event, @@ -80,7 +81,11 @@ func CommonNotify(WebsocketAddr, wid string, event *wevent.WebsocketEvent) error } result := wresp.Json() - logx.Error(result.String()) + + if !result.Get("code").Exists() { + return fmt.Errorf("send %s is error", reqWebsocketAddr) + } + if result.Get("code").Int() != 200 { return fmt.Errorf("%s", result.String()) } diff --git a/server/auth/internal/logic/userresetpasswordlogic.go b/server/auth/internal/logic/userresetpasswordlogic.go index 4bd392b6..7f0c943c 100644 --- a/server/auth/internal/logic/userresetpasswordlogic.go +++ b/server/auth/internal/logic/userresetpasswordlogic.go @@ -79,7 +79,7 @@ func (l *UserResetPasswordLogic) UserResetPassword(req *types.RequestUserResetPa } event := wevent.NewWebsocketEventSuccess(wevent.UserResetToken, rt.TraceId) - err = CommonNotify(l.svcCtx.Config.MainAddress, rt.Wid, event) + err = CommonNotify(l.svcCtx.Config.WebsocketAddr, rt.Wid, event) if err != nil { logx.Error(err, rt.TraceId) return resp.SetStatusWithMessage(basic.CodeResetPasswordErr, err.Error())