A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
fix(user): Does not intercept the registered login interface when in private mode
LinkinStar456c8207db58
diff --git a/internal/base/validator/validator.go b/internal/base/validator/validator.goindex 554d079c..9c9b8017 100644--- a/internal/base/validator/validator.go+++ b/internal/base/validator/validator.go@@ -124,9 +124,13 @@ func (m *MyValidator) Check(value interface{}) (errFields []*FormErrorField, errif v, ok := value.(Checker); ok {errFields, err = v.Check()- if err != nil {- return errFields, err+ if err == nil {+ return nil, nil}+ for _, errField := range errFields {+ errField.ErrorMsg = translator.GlobalTrans.Tr(m.Lang, errField.ErrorMsg)+ }+ return errFields, err}return nil, nil}diff --git a/internal/controller/user_controller.go b/internal/controller/user_controller.goindex 0f7f2975..5ab30a52 100644--- a/internal/controller/user_controller.go+++ b/internal/controller/user_controller.go@@ -56,16 +56,20 @@ func NewUserController(// @Success 200 {object} handler.RespBody{data=schema.GetUserToSetShowResp}// @Router /answer/api/v1/user/info [get]func (uc *UserController) GetUserInfoByUserID(ctx *gin.Context) {- userID := middleware.GetLoginUserIDFromContext(ctx)token := middleware.ExtractToken(ctx)+ if len(token) == 0 {+ handler.HandleResponse(ctx, nil, nil)+ return+ }// if user is no login return null in data- if len(token) == 0 || len(userID) == 0 {+ userInfo, _ := uc.authService.GetUserCacheInfo(ctx, token)+ if userInfo == nil {handler.HandleResponse(ctx, nil, nil)return}- resp, err := uc.userService.GetUserInfoByUserID(ctx, token, userID)+ resp, err := uc.userService.GetUserInfoByUserID(ctx, token, userInfo.UserID)handler.HandleResponse(ctx, err, resp)}diff --git a/internal/router/answer_api_router.go b/internal/router/answer_api_router.goindex b691eb39..3fb10bcc 100644--- a/internal/router/answer_api_router.go+++ b/internal/router/answer_api_router.go@@ -95,27 +95,23 @@ func (a *AnswerAPIRouter) RegisterMustUnAuthAnswerAPIRouter(r *gin.RouterGroup)//siteinfor.GET("/siteinfo", a.siteinfoController.GetSiteInfo)r.GET("/siteinfo/legal", a.siteinfoController.GetSiteLegalInfo)-}--func (a *AnswerAPIRouter) RegisterUnAuthAnswerAPIRouter(r *gin.RouterGroup) {- // comment- r.GET("/comment/page", a.commentController.GetCommentWithPage)- r.GET("/personal/comment/page", a.commentController.GetCommentPersonalWithPage)- r.GET("/comment", a.commentController.GetComment)// user- r.GET("/user/info", a.userController.GetUserInfoByUserID)- r.GET("/user/action/record", a.userController.ActionRecord)r.POST("/user/login/email", a.userController.UserEmailLogin)r.POST("/user/register/email", a.userController.UserRegisterByEmail)r.POST("/user/email/verification", a.userController.UserVerifyEmail)+ r.PUT("/user/email", a.userController.UserChangeEmailVerify)+ r.GET("/user/action/record", a.userController.ActionRecord)r.POST("/user/password/reset", a.userController.RetrievePassWord)r.POST("/user/password/replacement", a.userController.UseRePassWord)- r.GET("/personal/user/info", a.userController.GetOtherUserInfoByUsername)- r.POST("/user/email/verification/send", a.userController.UserVerifyEmailSend)- r.GET("/user/logout", a.userController.UserLogout)- r.PUT("/user/email", a.userController.UserChangeEmailVerify)+ r.GET("/user/info", a.userController.GetUserInfoByUserID)+}++func (a *AnswerAPIRouter) RegisterUnAuthAnswerAPIRouter(r *gin.RouterGroup) {+ // userr.POST("/user/email/change/code", a.userController.UserChangeEmailSendCode)+ r.POST("/user/email/verification/send", a.userController.UserVerifyEmailSend)+ r.GET("/personal/user/info", a.userController.GetOtherUserInfoByUsername)r.GET("/user/ranking", a.userController.UserRanking)//answer@@ -131,6 +127,11 @@ func (a *AnswerAPIRouter) RegisterUnAuthAnswerAPIRouter(r *gin.RouterGroup) {r.GET("/personal/qa/top", a.questionController.UserTop)r.GET("/personal/question/page", a.questionController.UserList)+ // comment+ r.GET("/comment/page", a.commentController.GetCommentWithPage)+ r.GET("/personal/comment/page", a.commentController.GetCommentPersonalWithPage)+ r.GET("/comment", a.commentController.GetComment)+//revisionr.GET("/revisions", a.revisionController.GetRevisionList)@@ -195,6 +196,7 @@ func (a *AnswerAPIRouter) RegisterAnswerAPIRouter(r *gin.RouterGroup) {r.DELETE("/answer", a.answerController.RemoveAnswer)// user+ r.GET("/user/logout", a.userController.UserLogout)r.PUT("/user/password", a.userController.UserModifyPassWord)r.PUT("/user/info", a.userController.UserUpdateInfo)r.PUT("/user/interface", a.userController.UserUpdateInterface)