lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-09-23 04:36:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat:实现团队功能

Browse Source
This commit is contained in:
lifei6671
2018-11-05 18:50:01 +08:00
parent 1d8d74afb1
commit b897c87476
20 changed files with 1411 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
models/Member.go
View File

@@ -21,7 +21,7 @@ import (
type Member struct {
MemberId int `orm:"pk;auto;unique;column(member_id)" json:"member_id"`
Account string `orm:"size(100);unique;column(account)" json:"account"`
RealName string `orm:"size(255);column(real_name)" json:"real_name"`
RealName string `orm:"size(255);column(real_name)" json:"real_name"`
Password string `orm:"size(1000);column(password)" json:"-"`
//认证方式: local 本地数据库 /ldap LDAP
AuthMethod string `orm:"column(auth_method);default(local);size(50);" json:"auth_method"`
@@ -30,12 +30,12 @@ type Member struct {
Phone string `orm:"size(255);column(phone);null;default(null)" json:"phone"`
Avatar string `orm:"size(1000);column(avatar)" json:"avatar"`
//用户角色：0 超级管理员 /1 管理员/ 2 普通用户 .
Role int `orm:"column(role);type(int);default(1);index" json:"role"`
RoleName string `orm:"-" json:"role_name"`
Status int `orm:"column(status);type(int);default(0)" json:"status"` //用户状态：0 正常/1 禁用
CreateTime time.Time `orm:"type(datetime);column(create_time);auto_now_add" json:"create_time"`
CreateAt int `orm:"type(int);column(create_at)" json:"create_at"`
LastLoginTime time.Time `orm:"type(datetime);column(last_login_time);null" json:"last_login_time"`
Role conf.SystemRole `orm:"column(role);type(int);default(1);index" json:"role"`
RoleName string `orm:"-" json:"role_name"`
Status int `orm:"column(status);type(int);default(0)" json:"status"` //用户状态：0 正常/1 禁用
CreateTime time.Time `orm:"type(datetime);column(create_time);auto_now_add" json:"create_time"`
CreateAt int `orm:"type(int);column(create_at)" json:"create_at"`
LastLoginTime time.Time `orm:"type(datetime);column(last_login_time);null" json:"last_login_time"`
}
// TableName 获取对应数据库表名.
@@ -63,7 +63,7 @@ func (m *Member) Login(account string, password string) (*Member, error) {
member := &Member{}
//err := o.QueryTable(m.TableNameWithPrefix()).Filter("account", account).Filter("status", 0).One(member)
err := o.Raw("select * from md_members where (account = ? or email = ?) and status = 0 limit 1;",account,account).QueryRow(member)
err := o.Raw("select * from md_members where (account = ? or email = ?) and status = 0 limit 1;", account, account).QueryRow(member)
if err != nil {
if beego.AppConfig.DefaultBool("ldap_enable", false) == true {
@@ -100,13 +100,13 @@ func (m *Member) ldapLogin(account string, password string) (*Member, error) {
var err error
lc, err := ldap.Dial("tcp", fmt.Sprintf("%s:%d", beego.AppConfig.String("ldap_host"), beego.AppConfig.DefaultInt("ldap_port", 3268)))
if err != nil {
beego.Error("绑定 LDAP 用户失败 ->",err)
beego.Error("绑定 LDAP 用户失败 ->", err)
return m, ErrLDAPConnect
}
defer lc.Close()
err = lc.Bind(beego.AppConfig.String("ldap_user"), beego.AppConfig.String("ldap_password"))
if err != nil {
beego.Error("绑定 LDAP 用户失败 ->",err)
beego.Error("绑定 LDAP 用户失败 ->", err)
return m, ErrLDAPFirstBind
}
searchRequest := ldap.NewSearchRequest(
@@ -119,7 +119,7 @@ func (m *Member) ldapLogin(account string, password string) (*Member, error) {
)
searchResult, err := lc.Search(searchRequest)
if err != nil {
beego.Error("绑定 LDAP 用户失败 ->",err)
beego.Error("绑定 LDAP 用户失败 ->", err)
return m, ErrLDAPSearch
}
if len(searchResult.Entries) != 1 {
@@ -128,7 +128,7 @@ func (m *Member) ldapLogin(account string, password string) (*Member, error) {
userdn := searchResult.Entries[0].DN
err = lc.Bind(userdn, password)
if err != nil {
beego.Error("绑定 LDAP 用户失败 ->",err)
beego.Error("绑定 LDAP 用户失败 ->", err)
return m, ErrorMemberPasswordError
}
if m.Account == "" {
@@ -136,7 +136,7 @@ func (m *Member) ldapLogin(account string, password string) (*Member, error) {
m.Email = searchResult.Entries[0].GetAttributeValue("mail")
m.AuthMethod = "ldap"
m.Avatar = "/static/images/headimgurl.jpg"
m.Role = beego.AppConfig.DefaultInt("ldap_user_role", 2)
m.Role = conf.SystemRole(beego.AppConfig.DefaultInt("ldap_user_role", 2))
m.CreateTime = time.Now()
err = m.Add()
@@ -174,7 +174,7 @@ func (m *Member) Add() error {
hash, err := utils.PasswordHash(m.Password)
if err != nil {
beego.Error("加密用户密码失败 =>",err)
beego.Error("加密用户密码失败 =>", err)
return errors.New("加密用户密码失败")
}
@@ -185,7 +185,7 @@ func (m *Member) Add() error {
_, err = o.Insert(m)
if err != nil {
beego.Error("保存用户数据到数据时失败 =>",err)
beego.Error("保存用户数据到数据时失败 =>", err)
return errors.New("保存用户失败")
}
m.ResolveRoleName()
@@ -199,26 +199,27 @@ func (m *Member) Update(cols ...string) error {
if m.Email == "" {
return errors.New("邮箱不能为空")
}
if c, err := o.QueryTable(m.TableNameWithPrefix()).Filter("email", m.Email).Exclude("member_id",m.MemberId).Count(); err == nil && c > 0 {
if c, err := o.QueryTable(m.TableNameWithPrefix()).Filter("email", m.Email).Exclude("member_id", m.MemberId).Count(); err == nil && c > 0 {
return errors.New("邮箱已被使用")
}
if _, err := o.Update(m, cols...); err != nil {
beego.Error("保存用户信息失败=>",err)
beego.Error("保存用户信息失败=>", err)
return errors.New("保存用户信息失败")
}
return nil
}
func (m *Member) Find(id int,cols ...string) (*Member, error) {
func (m *Member) Find(id int, cols ...string) (*Member, error) {
o := orm.NewOrm()
if err := o.QueryTable(m.TableNameWithPrefix()).Filter("member_id",id).One(m,cols...); err != nil {
if err := o.QueryTable(m.TableNameWithPrefix()).Filter("member_id", id).One(m, cols...); err != nil {
return m, err
}
m.ResolveRoleName()
return m, nil
}
func (m *Member) ResolveRoleName() {
if m.Role == conf.MemberSuperRole {
m.RoleName = "超级管理员"
@@ -240,15 +241,16 @@ func (m *Member) FindByAccount(account string) (*Member, error) {
}
return m, err
}
//批量查询用户
func (m *Member) FindByAccountList(accounts ...string) ([]*Member,error) {
func (m *Member) FindByAccountList(accounts ...string) ([]*Member, error) {
o := orm.NewOrm()
var members []*Member
_,err := o.QueryTable(m.TableNameWithPrefix()).Filter("account__in", accounts).All(&members)
_, err := o.QueryTable(m.TableNameWithPrefix()).Filter("account__in", accounts).All(&members)
if err == nil {
for _,item := range members {
for _, item := range members {
item.ResolveRoleName()
}
}
@@ -354,7 +356,6 @@ func (m *Member) Valid(is_hash_password bool) error {
}
//删除一个用户.
func (m *Member) Delete(oldId int, newId int) error {
o := orm.NewOrm()
@@ -401,7 +402,7 @@ func (m *Member) Delete(oldId int, newId int) error {
o.Rollback()
return err
}
_,err = o.Raw("UPDATE md_blogs SET member_id = ? WHERE member_id = ?;", newId, oldId).Exec()
_, err = o.Raw("UPDATE md_blogs SET member_id = ? WHERE member_id = ?;", newId, oldId).Exec()
if err != nil {
o.Rollback()
@@ -424,6 +425,13 @@ func (m *Member) Delete(oldId int, newId int) error {
o.Rollback()
return err
}
_,err = o.QueryTable(NewTeamMember()).Filter("member_id",oldId).Delete()
if err != nil {
o.Rollback()
return err
}
//_,err = o.Raw("UPDATE md_relationship SET member_id = ? WHERE member_id = ?",newId,oldId).Exec()
//if err != nil {
//