feat: message notify

server/internal/machine/api/machine_script.go

@@ -71,7 +71,9 @@ func (m *MachineScript) RunMachineScript(rc *req.Ctx) {
 	script := ms.Script
 	// 如果有脚本参数，则用脚本参数替换脚本中的模板占位符参数
 	if params := rc.Query("params"); params != "" {
-		script, err = stringx.TemplateParse(ms.Script, jsonx.ToMap(params))
+		p, err := jsonx.ToMap(params)
+		biz.ErrIsNil(err)
+		script, err = stringx.TemplateParse(ms.Script, p)
 		biz.ErrIsNilAppendErr(err, "failed to parse the script template parameter: %s")
 	}
 	cli, err := m.machineApp.GetCliByAc(ac)

server/internal/machine/application/application.go

@@ -1,11 +1,6 @@
 package application
 
 import (
-	"context"
-	"mayfly-go/internal/event"
-	"mayfly-go/internal/machine/domain/entity"
-	"mayfly-go/pkg/eventbus"
-	"mayfly-go/pkg/global"
 	"mayfly-go/pkg/ioc"
 	"sync"
 )
@@ -26,16 +21,6 @@ func Init() {
 		GetMachineApp().TimerUpdateStats()
 
 		GetMachineTermOpApp().TimerDeleteTermOp()
-
-		global.EventBus.Subscribe(event.EventTopicDeleteMachine, "machineFile", func(ctx context.Context, event *eventbus.Event) error {
-			me := event.Val.(*entity.Machine)
-			return GetMachineFileApp().DeleteByCond(ctx, &entity.MachineFile{MachineId: me.Id})
-		})
-
-		global.EventBus.Subscribe(event.EventTopicDeleteMachine, "machineScript", func(ctx context.Context, event *eventbus.Event) error {
-			me := event.Val.(*entity.Machine)
-			return GetMachineScriptApp().DeleteByCond(ctx, &entity.MachineScript{MachineId: me.Id})
-		})
 	})()
 }
 

server/internal/machine/application/machine.go

@@ -3,7 +3,6 @@ package application
 import (
 	"context"
 	"fmt"
-	"mayfly-go/internal/event"
 	"mayfly-go/internal/machine/application/dto"
 	"mayfly-go/internal/machine/domain/entity"
 	"mayfly-go/internal/machine/domain/repository"
@@ -15,7 +14,6 @@ import (
 	tagentity "mayfly-go/internal/tag/domain/entity"
 	"mayfly-go/pkg/base"
 	"mayfly-go/pkg/errorx"
-	"mayfly-go/pkg/global"
 	"mayfly-go/pkg/logx"
 	"mayfly-go/pkg/model"
 	"mayfly-go/pkg/scheduler"
@@ -65,6 +63,9 @@ type machineAppImpl struct {
 
 	tagApp              tagapp.TagTree          `inject:"T"`
 	resourceAuthCertApp tagapp.ResourceAuthCert `inject:"T"`
+
+	machineScriptApp MachineScript `inject:"T"`
+	machineFileApp   MachineFile   `inject:"T"`
 }
 
 var _ (Machine) = (*machineAppImpl)(nil)
@@ -198,12 +199,15 @@ func (m *machineAppImpl) Delete(ctx context.Context, id uint64) error {
 	// 关闭连接
 	mcm.DeleteCli(id)
 
-	// 发布机器删除事件
-	global.EventBus.Publish(ctx, event.EventTopicDeleteMachine, machine)
-
 	resourceType := tagentity.TagTypeMachine
 	return m.Tx(ctx,
 		func(ctx context.Context) error {
+			if err := m.machineFileApp.DeleteByCond(ctx, &entity.MachineFile{MachineId: id}); err != nil {
+				return err
+			}
+			if err := m.machineScriptApp.DeleteByCond(ctx, &entity.MachineScript{MachineId: id}); err != nil {
+				return err
+			}
 			return m.DeleteById(ctx, id)
 		}, func(ctx context.Context) error {
 			return m.tagApp.SaveResourceTag(ctx, &tagdto.SaveResourceTag{