From 2053cbec323dc9e212a1363abdb2b155274bcdea Mon Sep 17 00:00:00 2001
From: qaq <1937228092@qq.com>
Date: Tue, 25 Nov 2025 09:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=89=88=E6=9C=AC=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docker-build.yml | 16 ++++++---
 README.md                          | 52 ++++++++----------------------
 2 files changed, 25 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 769d56a..a1b22e3 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -38,11 +38,19 @@ jobs:
             
             # 检查从tag到现在，go-gost目录下的文件是否有变化
             TAG_COMMIT=$(git rev-list -n 1 "${{ env.VERSION }}")
-            if git diff --quiet $TAG_COMMIT HEAD -- go-gost/; then
-              echo "✅ GOST files unchanged since tag"
+            echo "Tag commit: $TAG_COMMIT"
+            echo "Current HEAD: $(git rev-parse HEAD)"
+            
+            # 检查 go-gost 目录下是否有实际的文件内容变化
+            # 使用 --ignore-all-space 和 --ignore-blank-lines 来忽略空白差异
+            # 使用 --exit-code: 0表示无差异，1表示有差异
+            if git diff --quiet --ignore-all-space --ignore-blank-lines $TAG_COMMIT HEAD -- go-gost/ 2>/dev/null; then
+              echo "✅ GOST files unchanged since tag (no content changes)"
               echo "should_build_gost=false" >> $GITHUB_OUTPUT
             else
-              echo "🔄 GOST files changed since tag, will rebuild GOST binary"
+              # 显示差异以便调试
+              echo "🔄 Detected changes in go-gost directory:"
+              git diff --stat $TAG_COMMIT HEAD -- go-gost/ || true
               echo "should_build_gost=true" >> $GITHUB_OUTPUT
             fi
           else
@@ -327,4 +335,4 @@ jobs:
           gh release upload "${VERSION}" ./docker-compose-v6.yml --clobber
           
           echo "✅ 文件更新完成！Release ${VERSION} 中的脚本和配置已更新"
-          echo "ℹ️ Docker 镜像和 GOST 二进制未重新构建"
+          echo "ℹ️ Docker 镜像和 GOST 二进制未重新构建"
\ No newline at end of file
diff --git a/README.md b/README.md
index e265627..291a8d4 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,3 @@
-## 尽量不要安装2.0版本使用下方1.×的去安装稳定版。2.0版本现在有很多小问题在改架构，想回退版本，但是有很多2.0的用户，所以不能强制回退。。
-
 # flux-panel转发面板 哆啦A梦转发面板
 
 # 赞助商
@@ -13,28 +11,6 @@
   </a>
 </p>
 
-# 1.x无法无损升级到2.x请备份好数据
-1.x迁移2.x流程如下
-1.进入1.x的后台在转发页面导出所有转发保存
-2.使用1.x节点脚本卸载所有节点
-```
-curl -L https://github.com/bqlpfy/flux-panel/releases/download/1.4.2/install.sh -o install.sh && chmod +x install.sh && ./install.sh
-```
-3.使用1.x面版脚本卸载面板
-
-```
-curl -L https://github.com/bqlpfy/flux-panel/releases/download/1.4.2/panel_install.sh -o panel_install.sh && chmod +x panel_install.sh && ./panel_install.sh
-```
-4.使用2.x脚本安装面板
-
-```
-curl -L https://raw.githubusercontent.com/bqlpfy/flux-panel/refs/heads/main/panel_install.sh -o panel_install.sh && chmod +x panel_install.sh && ./panel_install.sh
-```
-
-
-使用1.x版本的请使用上面给出的脚本，不要使用最新的，最新的默认2.x
-嫌弃麻烦或者想稳定的我不推荐你升级到2.x版本 目前还在beta阶段，很多问题。
-
 
 本项目基于 [go-gost/gost](https://github.com/go-gost/gost) 和 [go-gost/x](https://github.com/go-gost/x) 两个开源库，实现了转发面板。
 ---
@@ -52,26 +28,26 @@ curl -L https://raw.githubusercontent.com/bqlpfy/flux-panel/refs/heads/main/pane
 ---
 ### Docker Compose部署
 #### 快速部署
-面板端(1.x)：
-```bash
-curl -L https://github.com/bqlpfy/flux-panel/releases/download/1.4.2/panel_install.sh -o panel_install.sh && chmod +x panel_install.sh && ./panel_install.sh
-```
-节点端(1.x)：
-```bash
-curl -L https://github.com/bqlpfy/flux-panel/releases/download/1.4.2/install.sh -o install.sh && chmod +x install.sh && ./install.sh
-
-```
-
-面板端(2.x)：
+面板端(稳定版)：
 ```bash
 curl -L https://raw.githubusercontent.com/bqlpfy/flux-panel/refs/heads/main/panel_install.sh -o panel_install.sh && chmod +x panel_install.sh && ./panel_install.sh
 ```
-节点端(2.x)：
+节点端(稳定版)：
 ```bash
 curl -L https://raw.githubusercontent.com/bqlpfy/flux-panel/refs/heads/main/install.sh -o install.sh && chmod +x install.sh && ./install.sh
 
 ```
 
+面板端(开发版)：
+```bash
+curl -L https://raw.githubusercontent.com/bqlpfy/flux-panel/refs/heads/beta/panel_install.sh -o panel_install.sh && chmod +x panel_install.sh && ./panel_install.sh
+```
+节点端(开发版)：
+```bash
+curl -L https://raw.githubusercontent.com/bqlpfy/flux-panel/refs/heads/beta/install.sh -o install.sh && chmod +x install.sh && ./install.sh
+
+```
+
 #### 默认管理员账号
 
 - **账号**: admin_user
@@ -113,6 +89,4 @@ curl -L https://raw.githubusercontent.com/bqlpfy/flux-panel/refs/heads/main/inst
 | TRC20      | `TYh2L3xxXpuJhAcBWnt3yiiADiCSJLgUm7`                                  |
 | Aptos      | `0xf2f9fb14749457748506a8281628d556e8540d1eb586d202cd8b02b99d369ef8`  |
 
-[![Star History Chart](https://api.star-history.com/svg?repos=bqlpfy/flux-panel&type=Date)](https://www.star-history.com/#bqlpfy/flux-panel&Date)
-
-
+[![Star History Chart](https://api.star-history.com/svg?repos=bqlpfy/flux-panel&type=Date)](https://www.star-history.com/#bqlpfy/flux-panel&Date)
\ No newline at end of file