From 886846486a64e7a2fc095cb7d63334a71db9e2ea Mon Sep 17 00:00:00 2001
From: liuxiaobo <1224730913@qq.com>
Date: Sat, 21 Jun 2025 11:48:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/server/build.sh  | 13 +++++++++++++
 admin/supervisor.conf  |  9 ---------
 server/supervisor.conf | 10 ++++++++++
 3 files changed, 23 insertions(+), 9 deletions(-)
 delete mode 100644 admin/supervisor.conf

diff --git a/admin/server/build.sh b/admin/server/build.sh
index 8ab47ca..cb74193 100644
--- a/admin/server/build.sh
+++ b/admin/server/build.sh
@@ -1,6 +1,18 @@
 #!/bin/bash
 
+# Get Git commit hash
+GIT_COMMIT_HASH=$(git rev-parse HEAD)
 
+# Get Git branch name
+GIT_BRANCH=$(git branch --show-current)
+
+# Get build date in YYYYMMDDHHMMSS format
+BUILD_DATE=$(date +"%Y%m%d%H%M%S")
+
+# Output linker flags
+echo "-X main.GitCommitHash=$GIT_COMMIT_HASH"
+echo "-X main.GitBranch=$GIT_BRANCH"
+echo "-X main.BuildDate=$BUILD_DATE"
 
 # Set Go environment variables
 export GOARCH=amd64
@@ -20,6 +32,7 @@ FILE="admin"
 # 删除旧的编译文件
 rm -f bin/$FILE
 go build   -o bin/$FILE main.go
+go build -ldflags "-X main.GitBranch=$GIT_BRANCH -X main.GitCommit=$GIT_COMMIT_HASH -X main.BuildDate=$BUILD_DATE" -o bin/$FILE main.go
 
 # 检查编译是否成功
 if [ ! -f "bin/$FILE" ]; then
diff --git a/admin/supervisor.conf b/admin/supervisor.conf
deleted file mode 100644
index 8b1936d..0000000
--- a/admin/supervisor.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-; /etc/supervisor/conf.d/your_program.conf
-[program:admin]
-command=/home/ubuntu/admin/admin ; 完整命令参数
-directory=/home/ubuntu/admin ; 程序工作目录
-user=ubuntu ; 运行用户
-autostart=true ; 随 Supervisor 启动
-autorestart=false ; 自动重启
-startsecs=10 ; 启动等待时间
-startretries=3 ; 启动重试次数
diff --git a/server/supervisor.conf b/server/supervisor.conf
index b62b24f..255fb1e 100644
--- a/server/supervisor.conf
+++ b/server/supervisor.conf
@@ -8,6 +8,16 @@ autorestart=false ; 自动重启
 startsecs=10 ; 启动等待时间
 startretries=3 ; 启动重试次数
 
+[program:admin]
+command=/home/ubuntu/admin/admin -redis_host="114.132.124.145" -redis_port="6379" -redis_password="fox379@@zyxi" -sid=1 -num=1 -v_mod="dev" ; 完整命令参数
+directory=/home/ubuntu/admin ; 程序工作目录
+user=ubuntu ; 运行用户
+autostart=true ; 随 Supervisor 启动
+autorestart=false ; 自动重启
+startsecs=10 ; 启动等待时间
+startretries=3 ; 启动重试次数
+
+
 [program:lobby]
 command=/home/ubuntu/game/lobby -redis_host="114.132.124.145" -redis_port="6379" -redis_password="fox379@@zyxi" -sid=1 -num=1 -v_mod="dev" ; 完整命令参数
 directory=/home/ubuntu/game ; 程序工作目录