From 1b6ae38cfb3a2ec46ed7baf5f1483c87ee96bd5a Mon Sep 17 00:00:00 2001
From: engigu <sayheya@qq.com>
Date: Mon, 29 Dec 2025 22:13:03 +0800
Subject: [PATCH] fix:  agent page and agent cms

---
 agent/main.go    | 142 +++++++++++++++++++++++++++++++++++++++++++++--
 agent/service.go |  22 +++++---
 2 files changed, 151 insertions(+), 13 deletions(-)

diff --git a/agent/main.go b/agent/main.go
index b345880..86b3e3c 100644
--- a/agent/main.go
+++ b/agent/main.go
@@ -6,6 +6,7 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"os/exec"
 	"os/signal"
 	"path/filepath"
 	"syscall"
@@ -56,12 +57,16 @@ func main() {
 				logFile = os.Args[i+1]
 				i++
 			}
+		case "-d", "--daemon":
+			isDaemon = true
 		}
 	}
 
 	switch cmd {
 	case "start":
 		cmdStart()
+	case "run":
+		cmdRun()
 	case "stop":
 		cmdStop()
 	case "status":
@@ -92,7 +97,8 @@ func printUsage() {
 用法: baihu-agent <命令> [选项]
 
 命令:
-  start       启动 Agent
+  start       启动 Agent（后台运行）
+  run         前台运行 Agent
   stop        停止 Agent
   status      查看运行状态
   tasks       查看已下发的任务列表
@@ -107,6 +113,7 @@ func printUsage() {
 
 示例:
   baihu-agent start
+  baihu-agent run
   baihu-agent start -c /etc/baihu/config.ini
   baihu-agent install
   baihu-agent status
@@ -114,7 +121,24 @@ func printUsage() {
 `, Version)
 }
 
+// daemon 模式标记
+var isDaemon = false
+
 func cmdStart() {
+	// 检查是否已经在运行
+	pid := readPidFile()
+	if pid != 0 && isProcessRunning(pid) {
+		fmt.Printf("Agent 已在运行 (PID: %d)\n", pid)
+		return
+	}
+
+	// 如果不是 daemon 子进程，则启动 daemon
+	if !isDaemon {
+		startDaemon()
+		return
+	}
+
+	// 以下是 daemon 子进程的逻辑
 	initLogger(logFile)
 
 	config := &Config{Interval: 30}
@@ -163,6 +187,110 @@ func cmdStart() {
 	removePidFile()
 }
 
+// cmdRun 前台运行
+func cmdRun() {
+	// 检查是否已经在运行
+	pid := readPidFile()
+	if pid != 0 && isProcessRunning(pid) {
+		fmt.Printf("Agent 已在运行 (PID: %d)\n", pid)
+		return
+	}
+
+	initLogger(logFile)
+
+	config := &Config{Interval: 30}
+	if err := loadConfigFile(configFile, config); err != nil {
+		if !os.IsNotExist(err) {
+			log.Warnf("加载配置文件失败: %v", err)
+		}
+	}
+
+	if v := os.Getenv("AGENT_SERVER"); v != "" {
+		config.ServerURL = v
+	}
+	if v := os.Getenv("AGENT_NAME"); v != "" {
+		config.Name = v
+	}
+
+	if config.ServerURL == "" {
+		log.Fatal("请在配置文件中设置 server_url")
+	}
+	if config.Name == "" {
+		hostname, _ := os.Hostname()
+		config.Name = hostname
+	}
+
+	log.Infof("Baihu Agent Version: %s", Version)
+	if BuildTime != "" {
+		log.Infof("构建时间: %s", BuildTime)
+	}
+	log.Infof("服务器: %s", config.ServerURL)
+	log.Infof("名称: %s", config.Name)
+
+	writePidFile()
+
+	agent := NewAgent(config, configFile)
+	if err := agent.Start(); err != nil {
+		log.Fatalf("启动失败: %v", err)
+	}
+
+	quit := make(chan os.Signal, 1)
+	signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
+	<-quit
+
+	log.Info("正在停止...")
+	agent.Stop()
+	removePidFile()
+}
+
+func startDaemon() {
+	exePath, err := os.Executable()
+	if err != nil {
+		fmt.Printf("获取可执行文件路径失败: %v\n", err)
+		return
+	}
+
+	// 构建子进程参数，添加 --daemon 标记
+	args := []string{"start", "--daemon"}
+	for i := 2; i < len(os.Args); i++ {
+		if os.Args[i] != "--daemon" && os.Args[i] != "-d" {
+			args = append(args, os.Args[i])
+		}
+	}
+
+	// 打开日志文件用于重定向输出
+	os.MkdirAll(filepath.Dir(logFile), 0755)
+	logFd, err := os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
+	if err != nil {
+		fmt.Printf("打开日志文件失败: %v\n", err)
+		return
+	}
+
+	// 启动子进程
+	cmd := &exec.Cmd{
+		Path:   exePath,
+		Args:   append([]string{exePath}, args...),
+		Dir:    filepath.Dir(exePath),
+		Stdout: logFd,
+		Stderr: logFd,
+	}
+
+	// 设置进程组，使子进程独立运行
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		Setsid: true,
+	}
+
+	if err := cmd.Start(); err != nil {
+		fmt.Printf("启动失败: %v\n", err)
+		logFd.Close()
+		return
+	}
+
+	logFd.Close()
+	fmt.Printf("Agent 已启动 (PID: %d)\n", cmd.Process.Pid)
+	fmt.Printf("日志文件: %s\n", logFile)
+}
+
 func cmdTasks() {
 	config := &Config{Interval: 30}
 	if err := loadConfigFile(configFile, config); err != nil {
@@ -170,6 +298,11 @@ func cmdTasks() {
 		return
 	}
 
+	if config.ServerURL == "" {
+		fmt.Println("错误: 缺少服务器地址，请在配置文件中设置 server_url")
+		return
+	}
+
 	if config.Token == "" {
 		fmt.Println("错误: 缺少令牌，请在配置文件中设置 token")
 		return
@@ -188,16 +321,17 @@ func cmdTasks() {
 	}
 	defer resp.Body.Close()
 
+	body, _ := io.ReadAll(resp.Body)
+
 	if resp.StatusCode != http.StatusOK {
-		body, _ := io.ReadAll(resp.Body)
-		fmt.Printf("获取任务列表失败: %s\n", string(body))
+		fmt.Printf("获取任务列表失败 (HTTP %d): %s\n", resp.StatusCode, string(body))
 		return
 	}
 
 	var result struct {
 		Tasks []AgentTask `json:"tasks"`
 	}
-	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
+	if err := json.Unmarshal(body, &result); err != nil {
 		fmt.Printf("解析响应失败: %v\n", err)
 		return
 	}
diff --git a/agent/service.go b/agent/service.go
index a2cbed7..6be1342 100644
--- a/agent/service.go
+++ b/agent/service.go
@@ -74,25 +74,29 @@ func cmdStatus() {
 		return
 	}
 
-	// 检查进程是否存在
-	process, err := os.FindProcess(pid)
-	if err != nil {
+	if !isProcessRunning(pid) {
 		fmt.Println("状态: 未运行")
 		removePidFile()
 		return
 	}
 
+	fmt.Printf("状态: 运行中 (PID: %d)\n", pid)
+}
+
+func isProcessRunning(pid int) bool {
+	process, err := os.FindProcess(pid)
+	if err != nil {
+		return false
+	}
+
 	// Unix 系统发送信号 0 检查进程
 	if runtime.GOOS != "windows" {
 		err = process.Signal(syscall.Signal(0))
-		if err != nil {
-			fmt.Println("状态: 未运行")
-			removePidFile()
-			return
-		}
+		return err == nil
 	}
 
-	fmt.Printf("状态: 运行中 (PID: %d)\n", pid)
+	// Windows 下 FindProcess 成功即表示进程存在
+	return true
 }
 
 func cmdInstall() {