From 0e4fe65d271d367c24eaaf4cec59b679832ea0a0 Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Fri, 24 Nov 2023 10:15:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/auth/internal/logic/userresetpasswordlogic.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/auth/internal/logic/userresetpasswordlogic.go b/server/auth/internal/logic/userresetpasswordlogic.go index 1560d55d..bba0a1fb 100644 --- a/server/auth/internal/logic/userresetpasswordlogic.go +++ b/server/auth/internal/logic/userresetpasswordlogic.go @@ -39,8 +39,8 @@ func (l *UserResetPasswordLogic) UserResetPassword(req *types.RequestUserResetPa // 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data) // userinfo 传入值时, 一定不为null - if len(req.NewPassword) > 30 { - return resp.SetStatusWithMessage(basic.CodePasswordErr, "password len must < 30") + if len(req.NewPassword) > 64 { + return resp.SetStatusWithMessage(basic.CodePasswordErr, "password len must < 64") } rt, err := l.svcCtx.ResetTokenManger.Decrypt(req.ResetToken) // ResetToken From f97d4d9c6d0e75852c006a7f2954311950a56821 Mon Sep 17 00:00:00 2001 From: eson <9673575+githubcontent@user.noreply.gitee.com> Date: Fri, 24 Nov 2023 10:17:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=20email=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/gmodel/fs_user_info_logic.go | 3 +-- server/info/internal/handler/usergetprofilehandler.go | 3 --- server/info/internal/logic/usergetprofilelogic.go | 2 -- server_api/info.api | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/model/gmodel/fs_user_info_logic.go b/model/gmodel/fs_user_info_logic.go index 435e6b99..b94c561a 100644 --- a/model/gmodel/fs_user_info_logic.go +++ b/model/gmodel/fs_user_info_logic.go @@ -8,7 +8,6 @@ import ( "fmt" "fusenapi/utils/fssql" "fusenapi/utils/handlers" - "log" "gorm.io/gorm" ) @@ -101,7 +100,7 @@ func (m *FsUserInfoModel) GetProfile(ctx context.Context, pkey string, userId in if !ok { return m.getDefaultProfile(ctx, tname) } - log.Println(v, guestId, userId) + var info map[string]any err = json.Unmarshal([]byte(v), &info) if err != nil { diff --git a/server/info/internal/handler/usergetprofilehandler.go b/server/info/internal/handler/usergetprofilehandler.go index 1426f663..28dafeca 100644 --- a/server/info/internal/handler/usergetprofilehandler.go +++ b/server/info/internal/handler/usergetprofilehandler.go @@ -1,7 +1,6 @@ package handler import ( - "log" "net/http" "reflect" @@ -21,8 +20,6 @@ func UserGetProfileHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { return } - log.Println(userinfo) - // 创建一个业务逻辑层实例 l := logic.NewUserGetProfileLogic(r.Context(), svcCtx) diff --git a/server/info/internal/logic/usergetprofilelogic.go b/server/info/internal/logic/usergetprofilelogic.go index ee0119bc..b94f5caa 100644 --- a/server/info/internal/logic/usergetprofilelogic.go +++ b/server/info/internal/logic/usergetprofilelogic.go @@ -3,7 +3,6 @@ package logic import ( "fusenapi/utils/auth" "fusenapi/utils/basic" - "log" "context" @@ -35,7 +34,6 @@ func (l *UserGetProfileLogic) UserGetProfile(req *types.QueryProfileRequest, use // 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data) // userinfo 传入值时, 一定不为null - log.Println(userinfo) profileBase, err := l.svcCtx.AllModels.FsUserInfo.GetProfile(l.ctx, req.TopKey, userinfo.UserId, userinfo.GuestId) if err != nil { return resp.SetStatusWithMessage(basic.CodeApiErr, err.Error()) diff --git a/server_api/info.api b/server_api/info.api index b1e72d37..8e7b2b33 100644 --- a/server_api/info.api +++ b/server_api/info.api @@ -112,7 +112,7 @@ type ( FirstName *string `json:"first_name,optional"` // 首名 LastName *string `json:"last_name,optional"` // 后名 // UserName *string `json:"user_name,optional"` // 用户名 - Email *string `json:"email,optional"` // email + Email *string `json:"email,optional,omitempty"` // email Mobile *string `json:"mobile,optional"` // 电话 Resetaurant *string `json:"resetaurant,optional"` // 不知道干什么 Company *string `json:"company,optional"` // 公司 From 47aefb5e001fb59f63cc9e0a8c6bee78bd35d576 Mon Sep 17 00:00:00 2001 From: eson <9673575+githubcontent@user.noreply.gitee.com> Date: Fri, 24 Nov 2023 10:25:43 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=BA=E5=88=B6?= =?UTF-8?q?=E7=BB=99=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/info/internal/logic/usergetprofilelogic.go | 8 ++++++++ server_api/info.api | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/server/info/internal/logic/usergetprofilelogic.go b/server/info/internal/logic/usergetprofilelogic.go index b94f5caa..15f840ac 100644 --- a/server/info/internal/logic/usergetprofilelogic.go +++ b/server/info/internal/logic/usergetprofilelogic.go @@ -39,6 +39,14 @@ func (l *UserGetProfileLogic) UserGetProfile(req *types.QueryProfileRequest, use return resp.SetStatusWithMessage(basic.CodeApiErr, err.Error()) } + user, err := l.svcCtx.AllModels.FsUser.FindUserById(context.TODO(), userinfo.UserId) + if err != nil { + logx.Error(err) // 日志记录错误 + return resp.SetStatus(basic.CodeDbSqlErr, err) // 返回数据库创建错误 + } + + profileBase["email"] = *user.Email + return resp.SetStatus(basic.CodeOK, profileBase) } diff --git a/server_api/info.api b/server_api/info.api index 8e7b2b33..b1e72d37 100644 --- a/server_api/info.api +++ b/server_api/info.api @@ -112,7 +112,7 @@ type ( FirstName *string `json:"first_name,optional"` // 首名 LastName *string `json:"last_name,optional"` // 后名 // UserName *string `json:"user_name,optional"` // 用户名 - Email *string `json:"email,optional,omitempty"` // email + Email *string `json:"email,optional"` // email Mobile *string `json:"mobile,optional"` // 电话 Resetaurant *string `json:"resetaurant,optional"` // 不知道干什么 Company *string `json:"company,optional"` // 公司 From 9ffd7226f90b2e2f7f308eeab19bb8c00fe05add Mon Sep 17 00:00:00 2001 From: eson <9673575+githubcontent@user.noreply.gitee.com> Date: Fri, 24 Nov 2023 10:38:05 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/info/internal/logic/usergetprofilelogic.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/info/internal/logic/usergetprofilelogic.go b/server/info/internal/logic/usergetprofilelogic.go index 15f840ac..be80d866 100644 --- a/server/info/internal/logic/usergetprofilelogic.go +++ b/server/info/internal/logic/usergetprofilelogic.go @@ -45,7 +45,9 @@ func (l *UserGetProfileLogic) UserGetProfile(req *types.QueryProfileRequest, use return resp.SetStatus(basic.CodeDbSqlErr, err) // 返回数据库创建错误 } - profileBase["email"] = *user.Email + if bmap, ok := profileBase["base"].(map[string]any); ok { + bmap["email"] = *user.Email + } return resp.SetStatus(basic.CodeOK, profileBase) }