修复格式问题,重构嵌套层数过深的函数
This commit is contained in:
@@ -112,7 +112,7 @@ func GetAuthorityInfoList(info request.PageInfo) (err error, list interface{}, t
|
||||
var authority []model.SysAuthority
|
||||
err = db.Limit(limit).Offset(offset).Preload("DataAuthorityId").Where("parent_id = 0").Find(&authority).Error
|
||||
if len(authority) > 0 {
|
||||
for k, _ := range authority {
|
||||
for k := range authority {
|
||||
err = findChildrenAuthority(&authority[k])
|
||||
}
|
||||
}
|
||||
@@ -166,7 +166,7 @@ func SetMenuAuthority(auth *model.SysAuthority) error {
|
||||
func findChildrenAuthority(authority *model.SysAuthority) (err error) {
|
||||
err = global.GVA_DB.Preload("DataAuthorityId").Where("parent_id = ?", authority.AuthorityId).Find(&authority.Children).Error
|
||||
if len(authority.Children) > 0 {
|
||||
for k, _ := range authority.Children {
|
||||
for k := range authority.Children {
|
||||
err = findChildrenAuthority(&authority.Children[k])
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,16 +43,16 @@ func CreateTemp(autoCode model.AutoCodeStruct) (err error) {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
//自动化总目录
|
||||
// 自动化总目录
|
||||
_autoCode := "./autoCode/"
|
||||
//自动化后台代码目录
|
||||
// 自动化后台代码目录
|
||||
_te := "./autoCode/te/"
|
||||
_dir := _te + autoCode.PackageName
|
||||
_modeldir := _te + autoCode.PackageName + "/model"
|
||||
_apidir := _te + autoCode.PackageName + "/api"
|
||||
_routerdir := _te + autoCode.PackageName + "/router"
|
||||
_servicedir := _te + autoCode.PackageName + "/service"
|
||||
//自动化前台代码目录
|
||||
// 自动化前台代码目录
|
||||
_fe := "./autoCode/fe/"
|
||||
_fe_dir := _fe + autoCode.PackageName
|
||||
_fe_apidir := _fe + autoCode.PackageName + "/api"
|
||||
|
||||
@@ -117,7 +117,7 @@ func Casbin() *casbin.Enforcer {
|
||||
|
||||
func ParamsMatch(fullNameKey1 string, key2 string) bool {
|
||||
key1 := strings.Split(fullNameKey1, "?")[0]
|
||||
//剥离路径后再使用casbin的keyMatch2
|
||||
// 剥离路径后再使用casbin的keyMatch2
|
||||
return util.KeyMatch2(key1, key2)
|
||||
}
|
||||
|
||||
@@ -132,5 +132,5 @@ func ParamsMatchFunc(args ...interface{}) (interface{}, error) {
|
||||
name1 := args[0].(string)
|
||||
name2 := args[1].(string)
|
||||
|
||||
return (bool)(ParamsMatch(name1, name2)), nil
|
||||
return ParamsMatch(name1, name2), nil
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ func getBaseChildrenList(menu *model.SysBaseMenu, treeMap map[string][]model.Sys
|
||||
// @auth (2020/04/05 20:22)
|
||||
// @param menu *model.SysBaseMenu
|
||||
// @return err error
|
||||
//增加基础路由
|
||||
// 增加基础路由
|
||||
|
||||
func AddBaseMenu(menu model.SysBaseMenu) (err error) {
|
||||
findOne := global.GVA_DB.Where("name = ?", menu.Name).Find(&model.SysBaseMenu{}).Error
|
||||
|
||||
@@ -18,9 +18,9 @@ import (
|
||||
|
||||
func Register(u model.SysUser) (err error, userInter model.SysUser) {
|
||||
var user model.SysUser
|
||||
//判断用户名是否注册
|
||||
// 判断用户名是否注册
|
||||
notRegister := global.GVA_DB.Where("username = ?", u.Username).First(&user).RecordNotFound()
|
||||
//notRegister为false表明读取到了 不能注册
|
||||
// notRegister为false表明读取到了 不能注册
|
||||
if !notRegister {
|
||||
return errors.New("用户名已注册"), userInter
|
||||
} else {
|
||||
@@ -60,7 +60,7 @@ func Login(u *model.SysUser) (err error, userInter *model.SysUser) {
|
||||
|
||||
func ChangePassword(u *model.SysUser, newPassword string) (err error, userInter *model.SysUser) {
|
||||
var user model.SysUser
|
||||
//后期修改jwt+password模式
|
||||
// TODO:后期修改jwt+password模式
|
||||
u.Password = utils.MD5V([]byte(u.Password))
|
||||
err = global.GVA_DB.Where("username = ? AND password = ?", u.Username, u.Password).First(&user).Update("password", utils.MD5V([]byte(newPassword))).Error
|
||||
return err, u
|
||||
|
||||
Reference in New Issue
Block a user