feat: add exec env point

internal/services/env_service.go

@@ -1,6 +1,9 @@
 package services
 
 import (
+	"strconv"
+	"strings"
+
 	"baihu/internal/database"
 	"baihu/internal/models"
 )
@@ -66,3 +69,32 @@ func (es *EnvService) DeleteEnvVar(id int) bool {
 	result := database.DB.Delete(&models.EnvironmentVariable{}, id)
 	return result.RowsAffected > 0
 }
+
+// GetEnvVarsByIDs 根据逗号分隔的ID字符串获取环境变量列表，返回 NAME=VALUE 格式
+func (es *EnvService) GetEnvVarsByIDs(envIDs string) []string {
+	if envIDs == "" {
+		return nil
+	}
+
+	var envVars []string
+	ids := splitEnvIDs(envIDs)
+	for _, id := range ids {
+		env := es.GetEnvVarByID(id)
+		if env != nil {
+			envVars = append(envVars, env.Name+"="+env.Value)
+		}
+	}
+	return envVars
+}
+
+// splitEnvIDs 解析逗号分隔的ID字符串
+func splitEnvIDs(envIDs string) []int {
+	var ids []int
+	for _, s := range strings.Split(envIDs, ",") {
+		s = strings.TrimSpace(s)
+		if id, err := strconv.Atoi(s); err == nil {
+			ids = append(ids, id)
+		}
+	}
+	return ids
+}

internal/services/executor_service.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"os"
 	"os/exec"
 	"sync"
 	"time"
@@ -179,12 +180,16 @@ func (es *ExecutorService) ExecuteTask(taskID int) *ExecutionResult {
 	es.runningTasks[taskID] = true
 	es.mu.Unlock()
 
+	// 加载环境变量
+	envService := NewEnvService()
+	envVars := envService.GetEnvVarsByIDs(task.Envs)
+
 	// 使用任务配置的超时时间
 	timeout := task.Timeout
 	if timeout <= 0 {
 		timeout = constant.DefaultTaskTimeout
 	}
-	result := es.ExecuteCommandWithTimeout(task.Command, time.Duration(timeout)*time.Minute)
+	result := es.ExecuteCommandWithEnv(task.Command, time.Duration(timeout)*time.Minute, envVars)
 	result.TaskID = taskID
 
 	// 标记任务结束
@@ -212,6 +217,11 @@ func (es *ExecutorService) ExecuteCommand(command string) *ExecutionResult {
 
 // ExecuteCommandWithTimeout executes a shell command with specified timeout
 func (es *ExecutorService) ExecuteCommandWithTimeout(command string, timeout time.Duration) *ExecutionResult {
+	return es.ExecuteCommandWithEnv(command, timeout, nil)
+}
+
+// ExecuteCommandWithEnv executes a shell command with specified timeout and environment variables
+func (es *ExecutorService) ExecuteCommandWithEnv(command string, timeout time.Duration, envVars []string) *ExecutionResult {
 	result := &ExecutionResult{
 		Success: false,
 		Start:   time.Now(),
@@ -226,6 +236,11 @@ func (es *ExecutorService) ExecuteCommandWithTimeout(command string, timeout tim
 	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
 
+	// 设置环境变量：继承系统环境变量 + 自定义环境变量
+	if len(envVars) > 0 {
+		cmd.Env = append(os.Environ(), envVars...)
+	}
+
 	err := cmd.Run()
 	result.End = time.Now()
 

internal/services/task_service.go

@@ -11,13 +11,14 @@ func NewTaskService() *TaskService {
 	return &TaskService{}
 }
 
-func (ts *TaskService) CreateTask(name, command, schedule string, timeout int, cleanConfig string) *models.Task {
+func (ts *TaskService) CreateTask(name, command, schedule string, timeout int, cleanConfig, envs string) *models.Task {
 	task := &models.Task{
 		Name:        name,
 		Command:     command,
 		Schedule:    schedule,
 		Timeout:     timeout,
 		CleanConfig: cleanConfig,
+		Envs:        envs,
 		Enabled:     true,
 	}
 	database.DB.Create(task)
@@ -54,7 +55,7 @@ func (ts *TaskService) GetTaskByID(id int) *models.Task {
 	return &task
 }
 
-func (ts *TaskService) UpdateTask(id int, name, command, schedule string, timeout int, cleanConfig string, enabled bool) *models.Task {
+func (ts *TaskService) UpdateTask(id int, name, command, schedule string, timeout int, cleanConfig, envs string, enabled bool) *models.Task {
 	var task models.Task
 	if err := database.DB.First(&task, id).Error; err != nil {
 		return nil
@@ -64,6 +65,7 @@ func (ts *TaskService) UpdateTask(id int, name, command, schedule string, timeou
 	task.Schedule = schedule
 	task.Timeout = timeout
 	task.CleanConfig = cleanConfig
+	task.Envs = envs
 	task.Enabled = enabled
 	database.DB.Save(&task)
 	return &task