加入用户设置与邮件通知

backend/model/schedule.go

@@ -23,6 +23,7 @@ type Schedule struct {
 	NodeIds     []bson.ObjectId `json:"node_ids" bson:"node_ids"`
 	Status      string          `json:"status" bson:"status"`
 	Enabled     bool            `json:"enabled" bson:"enabled"`
+	UserId      bson.ObjectId   `json:"user_id" bson:"user_id"`
 
 	// 前端展示
 	SpiderName string `json:"spider_name" bson:"spider_name"`
@@ -49,27 +50,6 @@ func (sch *Schedule) Delete() error {
 	return c.RemoveId(sch.Id)
 }
 
-//func (sch *Schedule) SyncNodeIdAndSpiderId(node Node, spider Spider) {
-//	sch.syncNodeId(node)
-//	sch.syncSpiderId(spider)
-//}
-
-//func (sch *Schedule) syncNodeId(node Node) {
-//	if node.Id.Hex() == sch.NodeId.Hex() {
-//		return
-//	}
-//	sch.NodeId = node.Id
-//	_ = sch.Save()
-//}
-
-//func (sch *Schedule) syncSpiderId(spider Spider) {
-//	if spider.Id.Hex() == sch.SpiderId.Hex() {
-//		return
-//	}
-//	sch.SpiderId = spider.Id
-//	_ = sch.Save()
-//}
-
 func GetScheduleList(filter interface{}) ([]Schedule, error) {
 	s, c := database.GetCol("schedules")
 	defer s.Close()
@@ -125,13 +105,8 @@ func UpdateSchedule(id bson.ObjectId, item Schedule) error {
 	if err := c.FindId(id).One(&result); err != nil {
 		return err
 	}
-	//node, err := GetNode(item.NodeId)
-	//if err != nil {
-	//	return err
-	//}
 
 	item.UpdateTs = time.Now()
-	//item.NodeKey = node.Key
 	if err := item.Save(); err != nil {
 		return err
 	}
@@ -142,15 +117,9 @@ func AddSchedule(item Schedule) error {
 	s, c := database.GetCol("schedules")
 	defer s.Close()
 
-	//node, err := GetNode(item.NodeId)
-	//if err != nil {
-	//	return err
-	//}
-
 	item.Id = bson.NewObjectId()
 	item.CreateTs = time.Now()
 	item.UpdateTs = time.Now()
-	//item.NodeKey = node.Key
 
 	if err := c.Insert(&item); err != nil {
 		debug.PrintStack()

backend/model/task.go

@@ -25,6 +25,7 @@ type Task struct {
 	RuntimeDuration float64       `json:"runtime_duration" bson:"runtime_duration"`
 	TotalDuration   float64       `json:"total_duration" bson:"total_duration"`
 	Pid             int           `json:"pid" bson:"pid"`
+	UserId          bson.ObjectId `json:"user_id" bson:"user_id"`
 
 	// 前端数据
 	SpiderName string `json:"spider_name"`

backend/model/user.go

@@ -16,11 +16,17 @@ type User struct {
 	Username string        `json:"username" bson:"username"`
 	Password string        `json:"password" bson:"password"`
 	Role     string        `json:"role" bson:"role"`
+	Email    string        `json:"email" bson:"email"`
+	Setting  UserSetting   `json:"setting" bson:"setting"`
 
 	CreateTs time.Time `json:"create_ts" bson:"create_ts"`
 	UpdateTs time.Time `json:"update_ts" bson:"update_ts"`
 }
 
+type UserSetting struct {
+	NotificationTrigger string `json:"notification_trigger" bson:"notification_trigger"`
+}
+
 func (user *User) Save() error {
 	s, c := database.GetCol("users")
 	defer s.Close()