fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of gitee.com:fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
laodaming
2023-08-29 16:25:03 +08:00
parent 20ebe02e4e 631a87abf1
commit 7bc05d393e
2 changed files with 46 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
server/auth/internal/logic/useremailconfirmationlogic.go
View File

@@ -6,6 +6,7 @@ import (
"fusenapi/utils/auth"
"fusenapi/utils/basic"
"fusenapi/utils/wevent"
"net/http"
"time"
"context"
@@ -15,6 +16,7 @@ import (
"github.com/474420502/requests"
"github.com/zeromicro/go-zero/core/logx"
"github.com/zeromicro/go-zero/rest/httpx"
"gorm.io/gorm"
)
@@ -111,7 +113,10 @@ func (l *UserEmailConfirmationLogic) UserEmailConfirmation(req *types.RequestEma
return resp.SetStatus(basic.CodeDbSqlErr)
}
FinishRegister(l.svcCtx, user, token)
err = FinishRegister(l.svcCtx, user, token)
if err != nil {
logx.Error(err)
}
logx.Info("success", token.TraceId)
case "facebook":
@@ -120,11 +125,13 @@ func (l *UserEmailConfirmationLogic) UserEmailConfirmation(req *types.RequestEma
user, err := l.svcCtx.AllModels.FsUser.RegisterByFusen(l.ctx, token)
if err != nil && err != gorm.ErrRecordNotFound {
logx.Error(err, ":", token.TraceId)
return resp.SetStatus(basic.CodeDbSqlErr)
return resp.SetStatus(basic.CodeDbSqlErr, err.Error())
}
FinishRegister(l.svcCtx, user, token)
logx.Info("success", token.TraceId)
err = FinishRegister(l.svcCtx, user, token)
if err != nil {
logx.Error(err)
}
logx.Info("success:", token.TraceId)
}
default:
@@ -135,6 +142,24 @@ func (l *UserEmailConfirmationLogic) UserEmailConfirmation(req *types.RequestEma
}
// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
// func (l *UserEmailConfirmationLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
// // httpx.OkJsonCtx(r.Context(), w, resp)
// }
func (l *UserEmailConfirmationLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
successHtml := `<!DOCTYPE html>
<html>
<head>
<title>注册成功</title>
</head>
<body>
<h1>恭喜!您的注册成功。</h1>
<p>感谢您在我们网站进行注册。您的账号已经激活。</p>
<p>您现在可以使用您的邮箱地址和密码登录我们的网站,享受完整的服务和功能。</p>
<p>再次感谢您的信任和支持。如果您有任何问题,请随时联系我们。</p>
<p>祝您使用愉快!</p>
</body>
</html>`
w.Write([]byte(successHtml))
httpx.OkJsonCtx(r.Context(), w, nil)
}