From 5fac03fb857cf9a160e1736a25de2c5f95f5e44f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 18 七月 2023 17:18:18 +0800
Subject: [PATCH] add
---
api/v1/user.go | 53 ++++++++++++++++-------------------------------------
1 files changed, 16 insertions(+), 37 deletions(-)
diff --git a/api/v1/user.go b/api/v1/user.go
index bd53901..a791a7d 100644
--- a/api/v1/user.go
+++ b/api/v1/user.go
@@ -58,13 +58,6 @@
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)
slf.TokenNext(ctx, *user)
@@ -83,7 +76,6 @@
claims := j.CreateClaims(request.BaseClaims{
UserId: user.ID,
Username: user.Username,
- ParentId: user.ParentName,
UserType: user.UserType,
AuthorityId: user.AuthorityId,
})
@@ -156,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
}
@@ -164,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{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}
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})
}
--
Gitblit v1.8.0