TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-05 01:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

[系统用户]系统用户可以设置启用/禁用

Browse Source
This commit is contained in:
GoEdgeLab
2020-12-03 19:14:35 +08:00
parent 0df86527c8
commit 2a47ca7021
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/db/models/admin_dao.go
View File

@@ -88,6 +88,7 @@ func (this *AdminDAO) CheckAdminPassword(username string, encryptedPassword stri
Attr("username", username). Attr("username", username).
Attr("password", encryptedPassword). Attr("password", encryptedPassword).
Attr("state", AdminStateEnabled). Attr("state", AdminStateEnabled).
Attr("isOn", true).
ResultPk(). ResultPk().
FindInt64Col(0) FindInt64Col(0)
} }
@@ -154,7 +155,7 @@ func (this *AdminDAO) UpdateAdminInfo(adminId int64, fullname string) error {
} }
// 修改管理员详细信息 // 修改管理员详细信息
func (this *AdminDAO) UpdateAdmin(adminId int64, username string, password string, fullname string, isSuper bool, modulesJSON []byte) error { func (this *AdminDAO) UpdateAdmin(adminId int64, username string, password string, fullname string, isSuper bool, modulesJSON []byte, isOn bool) error {
if adminId <= 0 { if adminId <= 0 {
return errors.New("invalid adminId") return errors.New("invalid adminId")
} }
@@ -171,6 +172,7 @@ func (this *AdminDAO) UpdateAdmin(adminId int64, username string, password strin
} else { } else {
op.Modules = "[]" op.Modules = "[]"
} }
op.IsOn = isOn
_, err := this.Save(op) _, err := this.Save(op)
return err return err
} }

2
internal/rpc/services/service_admin.go
View File

@@ -286,7 +286,7 @@ func (this *AdminService) UpdateAdmin(ctx context.Context, req *pb.UpdateAdminRe
// TODO 检查权限 // TODO 检查权限
err = models.SharedAdminDAO.UpdateAdmin(req.AdminId, req.Username, req.Password, req.Fullname, req.IsSuper, req.ModulesJSON) err = models.SharedAdminDAO.UpdateAdmin(req.AdminId, req.Username, req.Password, req.Fullname, req.IsSuper, req.ModulesJSON, req.IsOn)
if err != nil { if err != nil {
return nil, err return nil, err
} }