edit process kill

internal/app/logic/process_base.go

@@ -1,6 +1,7 @@
 package logic
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"strconv"
@@ -320,6 +321,10 @@ func (p *ProcessBase) initPsutil() {
 }
 
 func (p *ProcessBase) Kill() error {
+	if p.State.State != eum.ProcessStateRunning {
+		return errors.New("can't kill not running process")
+	}
+	p.State.manualStopFlag = true
 	p.op.Signal(syscall.SIGINT)
 	select {
 	case <-p.StopChan:

internal/app/logic/process_logic.go

@@ -37,10 +37,6 @@ func (p *processCtlLogic) KillProcess(uuid int) error {
 	if !ok {
 		return errors.New("进程类型错误")
 	}
-	if result.State.State != eum.ProcessStateRunning {
-		return nil
-	}
-	result.State.manualStopFlag = true
 	return result.Kill()
 }
 
@@ -61,13 +57,9 @@ func (p *processCtlLogic) KillAllProcess() {
 	wg := sync.WaitGroup{}
 	p.processMap.Range(func(key, value any) bool {
 		process := value.(*ProcessBase)
-		if process.State.State != eum.ProcessStateRunning {
-			return true
-		}
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
-			process.State.manualStopFlag = true
 			process.Kill()
 		}()
 		return true

internal/app/logic/task_exec.go

@@ -61,7 +61,6 @@ var OperationHandle = map[eum.TaskOperation]operationFunc{
 			return false
 		}
 		log.Logger.Debugw("异步停止任务", "proc", proc.Name)
-		proc.State.manualStopFlag = true
 		go proc.Kill()
 		return true
 	},
@@ -72,7 +71,6 @@ var OperationHandle = map[eum.TaskOperation]operationFunc{
 			return false
 		}
 		log.Logger.Debugw("停止任务并等待结束", "proc", proc.Name)
-		proc.State.manualStopFlag = true
 		return proc.Kill() == nil
 	},
 }