From 9a7e0a7da01a9f9625ceaca0c61a59c540c6438f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 18 八月 2023 17:32:10 +0800
Subject: [PATCH] fix
---
api/v1/user.go | 70 ++++++++++++----------------------
1 files changed, 25 insertions(+), 45 deletions(-)
diff --git a/api/v1/user.go b/api/v1/user.go
index baf9e7e..9cd713c 100644
--- a/api/v1/user.go
+++ b/api/v1/user.go
@@ -58,15 +58,8 @@
ctx.Fail(errCode)
return
}
- if !user.Enable {
- logx.Errorf("鐧婚檰澶辫触! 鐢ㄦ埛琚姝㈢櫥褰�!")
- // 楠岃瘉鐮佹鏁�+1
- _ = constvar.BlackCache.Increment(key, 1)
- ctx.Fail(ecode.UserForbidden)
- return
- }
// 璧嬪�艰彍鍗旾D鍒楄〃
- //user.MenuIds, _ = menuService.GetUserMenuIds(user.ID, user.UserType)
+ //user.MenuIds, _ = menuService.GetUserMenuIds(user.UUID, user.UserType)
slf.TokenNext(ctx, *user)
return
//}
@@ -81,10 +74,10 @@
logx.Infof("TokenNext user:%+v", user)
j := &utils.JWT{SigningKey: []byte(conf.Conf.JWT.SigningKey)} // 鍞竴绛惧悕
claims := j.CreateClaims(request.BaseClaims{
- UserId: user.ID,
- Username: user.Username,
- ParentId: user.ParentName,
- UserType: user.UserType,
+ UserId: user.UUID,
+ Username: user.Username,
+ UserType: user.UserType,
+ AuthorityId: user.AuthorityId,
})
token, err := j.CreateToken(claims)
if err != nil {
@@ -155,7 +148,7 @@
return
}
- if len(params.Username) == 0 || len(params.Password) == 0 || len(params.Phone) == 0 || len(params.NickName) == 0 {
+ if len(params.Username) == 0 || len(params.Password) == 0 || len(params.NickName) == 0 || params.AuthorityId == 0 || len(params.RePassword) == 0 || params.DepartmentId == 0 {
ctx.Fail(ecode.ParamsErr)
return
}
@@ -163,41 +156,28 @@
var userId = fmt.Sprintf("u%v", snowflake.GenerateId())
var passWord = encrypt.BcryptHash(params.Password)
var userType constvar.UserType
- var parentId string
- var parentName string
- if userInfo.UserType == constvar.UserTypeSuper {
- userType = constvar.UserTypePrimary //銆�涓昏处鎴风殑鐖剁敤鎴稩D鏄嚜宸�
- parentId = userId
- parentName = params.Username
- } else if userInfo.UserType == constvar.UserTypePrimary {
- userType = constvar.UserTypeSub
- parentId = userInfo.UserId
- parentName = userInfo.ParentId
- } else {
- ctx.Fail(ecode.NoPowerErr)
- return
- }
- user := &model.User{ID: userId, Username: params.Username, UserType: userType, NickName: params.NickName, Password: passWord, HeaderImg: params.HeaderImg, Enable: true, ParentId: parentId, ParentName: parentName, Phone: params.Phone, Email: params.Email}
+ 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)
return
}
- if user.UserType == constvar.UserTypePrimary { // 涓昏处鎴峰垱寤哄搴旂殑鏁版嵁搴撶敤鎴峰拰鎺掔▼鏁版嵁搴�
- err := model.NewMysql().CreateDatabase(user.Username)
- if err != nil {
- ctx.Fail(ecode.CreateDatabaseErr)
- return
- }
- defaultPwd := fmt.Sprintf("%v@Basic2023", user.Username)
- err = model.NewMysql().CreateUser(user.Username, defaultPwd, user.Username)
- if err != nil {
- ctx.Fail(ecode.CreateDatabaseUserErr)
- return
- }
- }
+ //if user.UserType == constvar.UserTypePrimary { // 涓昏处鎴峰垱寤哄搴旂殑鏁版嵁搴撶敤鎴峰拰鎺掔▼鏁版嵁搴�
+ // err := model.NewMysql().CreateDatabase(user.Username)
+ // if err != nil {
+ // ctx.Fail(ecode.CreateDatabaseErr)
+ // return
+ // }
+ //
+ // defaultPwd := fmt.Sprintf("%v@Basic2023", user.Username)
+ // err = model.NewMysql().CreateUser(user.Username, defaultPwd, user.Username)
+ // if err != nil {
+ // ctx.Fail(ecode.CreateDatabaseUserErr)
+ // return
+ // }
+ //}
ctx.OkWithDetailed(response.UserResponse{User: *userReturn})
}
@@ -217,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)
@@ -304,7 +284,7 @@
}
err := userService.SetUserInfo(model.User{
- ID: params.ID,
+ UUID: params.ID,
NickName: params.NickName,
HeaderImg: params.HeaderImg,
Phone: params.Phone,
@@ -336,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,
@@ -391,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