lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2026-02-27 17:03:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1、实现超级管理员用户管理功能

Browse Source 
2、实现超级管理员项目列表功能
3、实现项目成员列表功能
This commit is contained in:
Minho
2017-04-24 18:25:17 +08:00
parent d1b2c52124
commit 1afb119bde
29 changed files with 1152 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
models/attachment.go Normal file
View File

@@ -0,0 +1,62 @@
package models
import (
"time"
"github.com/lifei6671/godoc/conf"
"github.com/astaxie/beego/orm"
)
// Attachment struct .
type Attachment struct {
AttachmentId int `orm:"column(attachment_id);pk;auto;unique" json:"attachment_id"`
DocumentId int `orm:"column(document_id);type(int)" json:"document_id"`
FileName string `orm:"column(file_name);size(2000)" json:"file_name"`
FileSize float64 `orm:"column(file_size);type(float)" json:"file_size"`
FileExt string `orm:"column(file_ext);size(50)" json:"file_ext"`
CreateTime time.Time `orm:"type(datetime);column(create_time);auto_now_add"`
CreateAt int `orm:"column(create_at);type(int)" json:"create_at"`
}
// TableName 获取对应数据库表名.
func (m *Attachment) TableName() string {
return "attachment"
}
// TableEngine 获取数据使用的引擎.
func (m *Attachment) TableEngine() string {
return "INNODB"
}
func (m *Attachment) TableNameWithPrefix() string {
return conf.GetDatabasePrefix() + m.TableName()
}
func NewAttachment() *Attachment {
return &Attachment{}
}
func (m *Attachment) Insert() error {
o := orm.NewOrm()
_,err := o.Insert(m)
return err
}
func (m *Attachment) Find(id int) (*Attachment,error) {
if id <= 0 {
return m,ErrInvalidParameter
}
o := orm.NewOrm()
err := o.QueryTable(m.TableNameWithPrefix()).Filter("attachment_id",id).One(m)
return m,err
}

33
models/book.go
View File

@@ -5,6 +5,7 @@ import (
"github.com/astaxie/beego/orm"
"github.com/lifei6671/godoc/conf"
"github.com/astaxie/beego/logs"
)
// Book struct .
@@ -32,7 +33,7 @@ type Book struct {
Cover string `orm:"column();size(1000)" json:"cover"`
// CreateTime 创建时间 .
CreateTime time.Time `orm:"type(datetime);column(create_time);auto_now_add"`
CreateTime time.Time `orm:"type(datetime);column(create_time);auto_now_add" json:"create_time"`
MemberId int `orm:"column(member_id);size(100)" json:"member_id"`
ModifyTime time.Time `orm:"type(datetime);column(modify_time);null;auto_now" json:"modify_time"`
Version int64 `orm:"type(bigint);column(version)" json:"version"`
@@ -59,6 +60,14 @@ func (m *Book) Insert() error {
o := orm.NewOrm()
_,err := o.Insert(m)
if err == nil {
relationship := NewRelationship()
relationship.BookId = m.BookId
relationship.RoleId = 0
relationship.MemberId = m.MemberId
err = relationship.Insert()
}
return err
}
@@ -87,7 +96,15 @@ func (m *Book) FindByField(field string,value interface{}) ([]Book,error) {
return books,err
}
func (m *Book) FindToPager(pageIndex, pageSize ,memberId int) (books []BookResult,totalCount int,err error){
func (m *Book) FindByFieldFirst(field string,value interface{})(*Book,error) {
o := orm.NewOrm()
err := o.QueryTable(conf.GetDatabasePrefix() + m.TableName()).Filter(field,value).One(m)
return m,err
}
func (m *Book) FindToPager(pageIndex, pageSize ,memberId int) (books []*BookResult,totalCount int,err error){
relationship := NewRelationship()
@@ -116,12 +133,16 @@ func (m *Book) FindToPager(pageIndex, pageSize ,memberId int) (books []BookResul
On("book.book_id=rel.book_id").
LeftJoin(NewMember().TableNameWithPrefix() + " AS m").On("rel.member_id=m.member_id AND rel.role_id=0").
Where("rel.member_id=?").
OrderBy("book.order_index").Desc().
OrderBy("book.order_index DESC ","book.book_id").Desc().
Limit(pageSize).
Offset(offset)
//logs.Info("",qb2.String())
_,err = o.Raw(qb2.String(),memberId).QueryRows(&books)
if err != nil {
logs.Error("分页查询项目列表 => ",err)
return
}
sql := "SELECT m.account,doc.modify_time FROM md_documents AS doc LEFT JOIN md_members AS m ON doc.modify_at=m.member_id WHERE book_id = ? LIMIT 1 ORDER BY doc.modify_time DESC"
if err == nil && len(books) > 0{
@@ -142,7 +163,7 @@ func (m *Book) FindToPager(pageIndex, pageSize ,memberId int) (books []BookResul
book.RoleName = "管理员"
}else if book.RoleId == 2 {
book.RoleName = "编辑者"
}else if book.RoleId == 2 {
}else if book.RoleId == 3 {
book.RoleName = "观察者"
}
}
@@ -186,7 +207,7 @@ func (m *Book) ThoroughDeleteBook(id int) error {
o.Rollback()
return err
}
sql4 := "DELETE FROM " + NewRelationship() + " WHERE book_id = ?"
sql4 := "DELETE FROM " + NewRelationship().TableNameWithPrefix() + " WHERE book_id = ?"
_,err = o.Raw(sql4).Exec()

43
models/book_result.go
View File

@@ -4,6 +4,7 @@ import (
"time"
"github.com/astaxie/beego/orm"
"strings"
"github.com/astaxie/beego/logs"
)
type BookResult struct {
@@ -23,6 +24,8 @@ type BookResult struct {
Cover string `json:"cover"`
Label string `json:"label"`
MemberId int `json:"member_id"`
RelationshipId int `json:"relationship_id"`
RoleId int `json:"role_id"`
RoleName string `json:"role_name"`
Status int
@@ -34,6 +37,7 @@ func NewBookResult() *BookResult {
return &BookResult{}
}
// 根据项目标识查询项目以及指定用户权限的信息.
func (m *BookResult) FindByIdentify(identify string,member_id int) (*BookResult,error) {
o := orm.NewOrm()
@@ -57,6 +61,7 @@ func (m *BookResult) FindByIdentify(identify string,member_id int) (*BookResult,
err = o.QueryTable(relationship.TableNameWithPrefix()).Filter("book_id",book.BookId).Filter("role_id",0).One(&relationship2)
if err != nil {
logs.Error("根据项目标识查询项目以及指定用户权限的信息 => ",err)
return m,ErrPermissionDenied
}
@@ -86,6 +91,7 @@ func (m *BookResult) FindByIdentify(identify string,member_id int) (*BookResult,
m.MemberId = relationship.MemberId
m.RoleId = relationship.RoleId
m.RelationshipId = relationship.RelationshipId
if m.RoleId == 0{
m.RoleName = "创始人"
@@ -112,3 +118,40 @@ func (m *BookResult) FindByIdentify(identify string,member_id int) (*BookResult,
return m,nil
}
func (m *BookResult) FindToPager(pageIndex, pageSize int) (books []*BookResult,totalCount int,err error) {
o := orm.NewOrm()
count,err := o.QueryTable(NewBook().TableNameWithPrefix()).Count()
if err != nil {
return
}
totalCount = int(count)
sql := "SELECT book.*,rel.relationship_id,rel.role_id,m.account AS create_name FROM md_books AS book LEFT JOIN md_relationship AS rel ON rel.book_id = book.book_id AND rel.role_id = 0 LEFT JOIN md_members AS m ON rel.member_id = m.member_id ORDER BY book.order_index DESC ,book.book_id DESC LIMIT ?,?"
offset := (pageIndex -1 )* pageSize
_,err = o.Raw(sql,offset,pageSize).QueryRows(&books)
return
}

2
models/comment.go
View File

@@ -58,7 +58,7 @@ func (m *Comment) Find(id int) error {
func (m *Comment) Update(cols... string) error {
o := orm.NewOrm()
_,err := o.Update(m,cols)
_,err := o.Update(m,cols...)
return err
}

55
models/logs.go Normal file
View File

@@ -0,0 +1,55 @@
package models
import (
"time"
"github.com/lifei6671/godoc/conf"
)
const (
Logger_Operate = "operate"
Logger_System = "system"
Logger_Exception = "exception"
)
// Logger struct .
type Logger struct {
LoggerId int64 `orm:"pk;auto;unique;column(logger_id)" json:"logger_id"`
MemberId int `orm:"column(member_id);type(int)" json:"member_id"`
// 日志类别：operate 操作日志/ system 系统日志/ exception 异常日志
Category string `orm:"column(category);size(255);default(operate)" json:"category"`
Content string `orm:"column(content);type(text)" json:"content"`
OriginalData string `orm:"column(original_data);type(text)" json:"original_data"`
PresentData string `orm:"column(present_data);type(text)" json:"present_data"`
CreateTime time.Time `orm:"type(datetime);column(create_time);auto_now_add" json:"create_time"`
UserAgent string `orm:"column(user_agent);size(500)" json:"user_agent"`
IPAddress string `orm:"column(ip_address);size(255)" json:"ip_address"`
}
// TableName 获取对应数据库表名.
func (m *Logger) TableName() string {
return "logs"
}
// TableEngine 获取数据使用的引擎.
func (m *Logger) TableEngine() string {
return "INNODB"
}
func (m *Logger) TableNameWithPrefix() string {
return conf.GetDatabasePrefix() + m.TableName()
}

68
models/member.go
View File

@@ -6,21 +6,25 @@ import (
"github.com/astaxie/beego/orm"
"github.com/lifei6671/godoc/utils"
"github.com/lifei6671/godoc/conf"
"github.com/astaxie/beego/logs"
)
type Member struct {
MemberId int `orm:"pk;auto;unique;column(member_id)"`
Account string `orm:"size(100);unique;column(account)"`
Password string `orm:"size(1000);column(password)"`
MemberId int `orm:"pk;auto;unique;column(member_id)" json:"member_id"`
Account string `orm:"size(100);unique;column(account)" json:"account"`
Password string `orm:"size(1000);column(password)" json:"-"`
Description string `orm:"column(description);size(2000)" json:"description"`
Email string `orm:"size(255);column(email);null;default(null)"`
Phone string `orm:"size(255);column(phone);null;default(null)"`
Avatar string `orm:"size(1000);column(avatar)"`
Role int `orm:"column(role);type(int);default(1);index"` //用户角色：0 管理员/ 1 普通用户
Status int `orm:"column(status);type(int);default(0)"` //用户状态：0 正常/1 禁用
CreateTime time.Time `orm:"type(datetime);column(create_time);auto_now_add"`
CreateAt int `orm:"type(int);column(create_at)"`
LastLoginTime time.Time `orm:"type(datetime);column(last_login_time);null"`
Email string `orm:"size(255);column(email);null;default(null)" json:"email"`
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"`
}
// TableName 获取对应数据库表名.
@@ -46,9 +50,10 @@ func (m *Member) Login(account string,password string) (*Member,error) {
member := &Member{}
err := o.QueryTable("md_" + m.TableName()).Filter("account",account).Filter("status",0).One(member);
err := o.QueryTable(m.TableNameWithPrefix()).Filter("account",account).Filter("status",0).One(member);
if err != nil {
logs.Error("用户登录 => ",err)
return member,ErrMemberNoExist
}
@@ -98,6 +103,13 @@ func (m *Member) Find(id int) error{
if err := o.Read(m); err != nil {
return err
}
if m.Role == 0 {
m.RoleName = "超级管理员"
}else if m.Role == 1 {
m.RoleName = "管理员"
}else if m.Role == 2 {
m.RoleName = "普通用户"
}
return nil
}
@@ -106,13 +118,22 @@ func (m *Member) FindByAccount (account string) error {
err := o.QueryTable(m.TableNameWithPrefix()).Filter("account",account).One(m)
if err == nil {
if m.Role == 0 {
m.RoleName = "超级管理员"
}else if m.Role == 1 {
m.RoleName = "管理员"
}else if m.Role == 2 {
m.RoleName = "普通用户"
}
}
return err
}
func (m *Member) FindToPager(pageIndex, pageSize int) ([]Member,int,error) {
func (m *Member) FindToPager(pageIndex, pageSize int) ([]*Member,int64,error) {
o := orm.NewOrm()
var members []Member
var members []*Member
offset := (pageIndex - 1) * pageSize
@@ -122,16 +143,33 @@ func (m *Member) FindToPager(pageIndex, pageSize int) ([]Member,int,error) {
return members,0,err
}
_,err = o.QueryTable(m.TableNameWithPrefix()).Offset(offset).Limit(pageSize).All(&members)
_,err = o.QueryTable(m.TableNameWithPrefix()).OrderBy("-member_id").Offset(offset).Limit(pageSize).All(&members)
if err != nil {
return members,0,err
}
for _,m := range members {
if m.Role == 0 {
m.RoleName = "超级管理员"
}else if m.Role == 1 {
m.RoleName = "管理员"
}else if m.Role == 2 {
m.RoleName = "普通用户"
}
}
return members,totalCount,nil
}
func (c *Member) IsAdministrator() bool {
if c == nil || c.MemberId <= 0{
return false
}
return c.Role == 0 || c.Role == 1
}

35
models/member_result.go
View File

@@ -3,6 +3,7 @@ package models
import (
"time"
"github.com/astaxie/beego/orm"
"github.com/lifei6671/godoc/conf"
)
type MemberRelationshipResult struct {
@@ -20,16 +21,43 @@ type MemberRelationshipResult struct {
BookId int `json:"book_id"`
// RoleId 角色：0 创始人(创始人不能被移除) / 1 管理员/2 编辑者/3 观察者
RoleId int `json:"role_id"`
RoleName string `json:"role_name"`
}
func NewMemberRelationshipResult() *MemberRelationshipResult {
return &MemberRelationshipResult{}
}
func (m *MemberRelationshipResult) FindForUsersByBookId(book_id ,pageIndex, pageSize int) ([]MemberRelationshipResult,int,error) {
func (m *MemberRelationshipResult) FromMember(member *Member) *MemberRelationshipResult {
m.MemberId = member.MemberId
m.Account = member.Account
m.Description = member.Description
m.Email = member.Email
m.Phone = member.Phone
m.Avatar = member.Avatar
m.Role = member.Role
m.Status = member.Status
m.CreateTime = member.CreateTime
m.CreateAt = member.CreateAt
return m
}
func (m *MemberRelationshipResult) ResolveRoleName () *MemberRelationshipResult {
if m.RoleId == conf.BookAdmin {
m.RoleName = "管理者"
}else if m.RoleId == conf.BookEditor {
m.RoleName = "编辑者"
}else if m.RoleId == conf.BookObserver {
m.RoleName = "观察者"
}
return m
}
func (m *MemberRelationshipResult) FindForUsersByBookId(book_id ,pageIndex, pageSize int) ([]*MemberRelationshipResult,int,error) {
o := orm.NewOrm()
var members []MemberRelationshipResult
var members []*MemberRelationshipResult
sql1 := "SELECT * FROM md_relationship AS rel LEFT JOIN md_members as member ON rel.member_id = member.member_id WHERE rel.book_id = ? ORDER BY rel.relationship_id DESC LIMIT ?,?"
@@ -51,6 +79,9 @@ func (m *MemberRelationshipResult) FindForUsersByBookId(book_id ,pageIndex, page
return members,0,err
}
for _,item := range members {
item.ResolveRoleName()
}
return members,total_count,nil
}

77
models/relationship.go
View File

@@ -3,6 +3,8 @@ package models
import (
"github.com/lifei6671/godoc/conf"
"github.com/astaxie/beego/orm"
"errors"
"github.com/astaxie/beego/logs"
)
type Relationship struct {
@@ -38,6 +40,42 @@ func NewRelationship() *Relationship {
return &Relationship{}
}
func (m *Relationship) Find(id int) (*Relationship,error) {
o := orm.NewOrm()
err := o.QueryTable(m.TableNameWithPrefix()).Filter("relationship_id",id).One(m)
return m,err
}
func (m *Relationship) UpdateRoleId(book_id,member_id, role_id int) (*Relationship,error) {
o := orm.NewOrm()
book := NewBook()
book.BookId = book_id
if err := o.Read(book); err != nil {
logs.Error("UpdateRoleId => ", err)
return m,errors.New("项目不存在")
}
err := o.QueryTable(m.TableNameWithPrefix()).Filter("member_id",member_id).Filter("book_id",book_id).One(m)
if err == orm.ErrNoRows {
m = NewRelationship()
m.BookId = book_id
m.MemberId = member_id
m.RoleId = role_id
}else if err != nil {
return m,err
}else if m.RoleId == conf.BookFounder{
return m,errors.New("不能变更创始人的权限")
}
m.RoleId = role_id
_,err = o.InsertOrUpdate(m)
return m,err
}
func (m *Relationship) FindForRoleId(book_id ,member_id int) (int,error) {
o := orm.NewOrm()
@@ -46,6 +84,7 @@ func (m *Relationship) FindForRoleId(book_id ,member_id int) (int,error) {
err := o.QueryTable(m.TableNameWithPrefix()).Filter("book_id",book_id).Filter("member_id",member_id).One(relationship)
if err != nil {
return 0,err
}
return relationship.RoleId,nil
@@ -67,5 +106,43 @@ func (m *Relationship) Update() error {
return err
}
func (m *Relationship) DeleteByBookIdAndMemberId(book_id,member_id int) error {
o := orm.NewOrm()
err := o.QueryTable(m.TableNameWithPrefix()).Filter("book_id",book_id).Filter("member_id",member_id).One(m)
if err == orm.ErrNoRows {
return errors.New("用户未参与该项目")
}
if m.RoleId == conf.BookFounder {
return errors.New("不能删除创始人")
}
_,err = o.Delete(m)
if err != nil {
logs.Error("删除项目参与者 => ",err)
return errors.New("删除失败")
}
return nil
}