add address book name &

add share address book

http/request/admin/addressBook.go

@@ -23,6 +23,7 @@ type AddressBookForm struct {
 	Online           bool     `json:"online"`
 	LoginName        string   `json:"loginName" `
 	SameServer       bool     `json:"sameServer"`
+	CollectionId     uint     `json:"collection_id"`
 }
 
 func (a AddressBookForm) ToAddressBook() *model.AddressBook {
@@ -46,6 +47,7 @@ func (a AddressBookForm) ToAddressBook() *model.AddressBook {
 		Online:           a.Online,
 		LoginName:        a.LoginName,
 		SameServer:       a.SameServer,
+		CollectionId:     a.CollectionId,
 	}
 
 }
@@ -72,17 +74,19 @@ func (a AddressBookForm) ToAddressBooks() []*model.AddressBook {
 			Online:           a.Online,
 			LoginName:        a.LoginName,
 			SameServer:       a.SameServer,
+			CollectionId:     a.CollectionId,
 		})
 	}
 	return abs
 }
 
 type AddressBookQuery struct {
-	UserId   int    `form:"user_id"`
-	IsMy     int    `form:"is_my"`
-	Username string `form:"username"`
-	Hostname string `form:"hostname"`
-	Id       string `form:"id"`
+	UserId       int    `form:"user_id"`
+	CollectionId *int   `form:"collection_id"`
+	IsMy         int    `form:"is_my"`
+	Username     string `form:"username"`
+	Hostname     string `form:"hostname"`
+	Id           string `form:"id"`
 	PageQuery
 }
 
@@ -102,3 +106,19 @@ func (sbwcf ShareByWebClientForm) ToShareRecord() *model.ShareRecord {
 		Expire:       sbwcf.Expire,
 	}
 }
+
+type AddressBookCollectionQuery struct {
+	UserId int `form:"user_id"`
+	IsMy   int `form:"is_my"`
+	PageQuery
+}
+
+type AddressBookCollectionSimpleListQuery struct {
+	UserIds []uint `form:"user_ids"`
+}
+type AddressBookCollectionRuleQuery struct {
+	UserId       int `form:"user_id"`
+	CollectionId int `form:"collection_id"`
+	IsMy         int `form:"is_my"`
+	PageQuery
+}

http/request/admin/tag.go

@@ -3,10 +3,11 @@ package admin
 import "Gwen/model"
 
 type TagForm struct {
-	Id     uint   `json:"id"`
-	Name   string `json:"name" validate:"required"`
-	Color  uint   `json:"color" validate:"required"`
-	UserId uint   `json:"user_id"`
+	Id           uint   `json:"id"`
+	Name         string `json:"name" validate:"required"`
+	Color        uint   `json:"color" validate:"required"`
+	UserId       uint   `json:"user_id"`
+	CollectionId uint   `json:"collection_id"`
 }
 
 func (f *TagForm) FromTag(group *model.Tag) *TagForm {
@@ -14,6 +15,7 @@ func (f *TagForm) FromTag(group *model.Tag) *TagForm {
 	f.Name = group.Name
 	f.Color = group.Color
 	f.UserId = group.UserId
+	f.CollectionId = group.CollectionId
 	return f
 }
 
@@ -23,11 +25,13 @@ func (f *TagForm) ToTag() *model.Tag {
 	i.Name = f.Name
 	i.Color = f.Color
 	i.UserId = f.UserId
+	i.CollectionId = f.CollectionId
 	return i
 }
 
 type TagQuery struct {
-	UserId int `form:"user_id"`
-	IsMy   int `form:"is_my"`
+	UserId       int  `form:"user_id"`
+	IsMy         int  `form:"is_my"`
+	CollectionId *int `form:"collection_id"`
 	PageQuery
 }

http/request/admin/user.go

@@ -55,3 +55,7 @@ type ChangeCurPasswordForm struct {
 	OldPassword string `json:"old_password" validate:"required,gte=4,lte=20"`
 	NewPassword string `json:"new_password" validate:"required,gte=4,lte=20"`
 }
+type GroupUsersQuery struct {
+	IsMy   int  `json:"is_my"`
+	UserId uint `json:"user_id"`
+}