✨ 优化忽略规则配置和 Agent 获取 IP

cmd/dashboard/controller/member_api.go

@@ -15,7 +15,6 @@ import (
 	"github.com/naiba/nezha/model"
 	"github.com/naiba/nezha/pkg/mygin"
 	"github.com/naiba/nezha/pkg/utils"
-	pb "github.com/naiba/nezha/proto"
 	"github.com/naiba/nezha/service/dao"
 )
 
@@ -196,6 +195,7 @@ type monitorForm struct {
 	Name           string
 	Target         string
 	Type           uint8
+	Cover          uint8
 	Notify         string
 	SkipServersRaw string
 }
@@ -210,6 +210,7 @@ func (ma *memberAPI) addOrEditMonitor(c *gin.Context) {
 		m.Type = mf.Type
 		m.ID = mf.ID
 		m.SkipServersRaw = mf.SkipServersRaw
+		m.Cover = mf.Cover
 		m.Notify = mf.Notify == "on"
 	}
 	if err == nil {
@@ -239,6 +240,7 @@ type cronForm struct {
 	Scheduler      string
 	Command        string
 	ServersRaw     string
+	Cover          uint8
 	PushSuccessful string
 }
 
@@ -253,6 +255,7 @@ func (ma *memberAPI) addOrEditCron(c *gin.Context) {
 		cr.ServersRaw = cf.ServersRaw
 		cr.PushSuccessful = cf.PushSuccessful == "on"
 		cr.ID = cf.ID
+		cr.Cover = cf.Cover
 		err = json.Unmarshal([]byte(cf.ServersRaw), &cr.Servers)
 	}
 	if err == nil {
@@ -281,21 +284,7 @@ func (ma *memberAPI) addOrEditCron(c *gin.Context) {
 		dao.Cron.Remove(crOld.CronID)
 	}
 
-	cr.CronID, err = dao.Cron.AddFunc(cr.Scheduler, func() {
-		dao.ServerLock.RLock()
-		defer dao.ServerLock.RUnlock()
-		for j := 0; j < len(cr.Servers); j++ {
-			if dao.ServerList[cr.Servers[j]].TaskStream != nil {
-				dao.ServerList[cr.Servers[j]].TaskStream.Send(&pb.Task{
-					Id:   cr.ID,
-					Data: cr.Command,
-					Type: model.TaskTypeCommand,
-				})
-			} else {
-				dao.SendNotification(fmt.Sprintf("计划任务：%s，服务器：%s 离线，无法执行。", cr.Name, dao.ServerList[cr.Servers[j]].Name), false)
-			}
-		}
-	})
+	cr.CronID, err = dao.Cron.AddFunc(cr.Scheduler, dao.CronTrigger(cr))
 	if err != nil {
 		panic(err)
 	}
@@ -318,7 +307,7 @@ func (ma *memberAPI) manualTrigger(c *gin.Context) {
 		return
 	}
 
-	dao.CronTrigger(&cr)
+	dao.ManualTrigger(&cr)
 
 	c.JSON(http.StatusOK, model.Response{
 		Code: http.StatusOK,