From e5e75fcbb5b5115da6e5069817a4bfdd892b95bb Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 19 七月 2023 14:23:17 +0800
Subject: [PATCH] fix
---
api/v1/user.go | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/api/v1/user.go b/api/v1/user.go
index a791a7d..9cd713c 100644
--- a/api/v1/user.go
+++ b/api/v1/user.go
@@ -59,7 +59,7 @@
return
}
// 璧嬪�艰彍鍗旾D鍒楄〃
- //user.MenuIds, _ = menuService.GetUserMenuIds(user.ID, user.UserType)
+ //user.MenuIds, _ = menuService.GetUserMenuIds(user.UUID, user.UserType)
slf.TokenNext(ctx, *user)
return
//}
@@ -74,7 +74,7 @@
logx.Infof("TokenNext user:%+v", user)
j := &utils.JWT{SigningKey: []byte(conf.Conf.JWT.SigningKey)} // 鍞竴绛惧悕
claims := j.CreateClaims(request.BaseClaims{
- UserId: user.ID,
+ UserId: user.UUID,
Username: user.Username,
UserType: user.UserType,
AuthorityId: user.AuthorityId,
@@ -157,7 +157,7 @@
var passWord = encrypt.BcryptHash(params.Password)
var userType constvar.UserType
- user := &model.User{ID: userId, Username: params.Username, UserType: userType, NickName: params.NickName, Password: passWord, HeaderImg: params.HeaderImg, Phone: params.Phone, Email: params.Email, DepartmentId: params.DepartmentId, AuthorityId: params.AuthorityId}
+ user := &model.User{UUID: userId, Username: params.Username, UserType: userType, NickName: params.NickName, Password: passWord, HeaderImg: params.HeaderImg, Phone: params.Phone, Email: params.Email, DepartmentId: params.DepartmentId, AuthorityId: params.AuthorityId}
userReturn, errCode := userService.Register(user)
if errCode != ecode.OK {
ctx.Fail(errCode)
@@ -197,7 +197,7 @@
return
}
- u := &model.User{ID: utils.GetUserID(c), Password: params.Password}
+ u := &model.User{UUID: utils.GetUserID(c), Password: params.Password}
_, errCode := userService.ChangePassword(u, params.NewPassword)
if errCode != ecode.OK {
ctx.Fail(errCode)
@@ -284,7 +284,7 @@
}
err := userService.SetUserInfo(model.User{
- ID: params.ID,
+ UUID: params.ID,
NickName: params.NickName,
HeaderImg: params.HeaderImg,
Phone: params.Phone,
@@ -316,7 +316,7 @@
params.ID = utils.GetUserID(c)
err := userService.SetUserInfo(model.User{
- ID: params.ID,
+ UUID: params.ID,
NickName: params.NickName,
HeaderImg: params.HeaderImg,
Phone: params.Phone,
@@ -371,7 +371,7 @@
return
}
- err := userService.ResetPassword(params.ID)
+ err := userService.ResetPassword(params.UUID)
if err != nil {
logx.Errorf("閲嶇疆澶辫触! err:%v", err)
ctx.Fail(ecode.DBErr)
--
Gitblit v1.8.0