From c20a78a19635131924208628416cf6bce2329c30 Mon Sep 17 00:00:00 2001 From: qaq <1937228092@qq.com> Date: Tue, 6 Jan 2026 11:23:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E9=87=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/docker-build.yml | 2 +- docker-compose-v4.yml | 4 +-- docker-compose-v6.yml | 4 +-- install.sh | 2 +- panel_install.sh | 4 +-- .../com/admin/controller/FlowController.java | 25 +++++++++++-------- .../admin/service/impl/NodeServiceImpl.java | 2 +- vite-frontend/src/config/site.ts | 2 +- 8 files changed, 24 insertions(+), 21 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index a1b22e3..abf3fb6 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -2,7 +2,7 @@ name: Build and Push Images Based on Version # 在这里定义统一版本号 env: - VERSION: "2.0.6-beta" + VERSION: "2.0.7-beta" on: push: diff --git a/docker-compose-v4.yml b/docker-compose-v4.yml index c1dd655..22067ab 100644 --- a/docker-compose-v4.yml +++ b/docker-compose-v4.yml @@ -1,6 +1,6 @@ services: backend: - image: bqlpfy/springboot-backend:2.0.6-beta + image: bqlpfy/springboot-backend:2.0.7-beta container_name: springboot-backend restart: unless-stopped environment: @@ -25,7 +25,7 @@ services: start_period: 60s frontend: - image: bqlpfy/vite-frontend:2.0.6-beta + image: bqlpfy/vite-frontend:2.0.7-beta container_name: vite-frontend restart: unless-stopped ports: diff --git a/docker-compose-v6.yml b/docker-compose-v6.yml index 76a8fee..0b5156e 100644 --- a/docker-compose-v6.yml +++ b/docker-compose-v6.yml @@ -1,6 +1,6 @@ services: backend: - image: bqlpfy/springboot-backend:2.0.6-beta + image: bqlpfy/springboot-backend:2.0.7-beta container_name: springboot-backend restart: unless-stopped environment: @@ -25,7 +25,7 @@ services: start_period: 60s frontend: - image: bqlpfy/vite-frontend:2.0.6-beta + image: bqlpfy/vite-frontend:2.0.7-beta container_name: vite-frontend restart: unless-stopped ports: diff --git a/install.sh b/install.sh index d3d96a4..7d74d63 100644 --- a/install.sh +++ b/install.sh @@ -19,7 +19,7 @@ get_architecture() { # 构建下载地址 build_download_url() { local ARCH=$(get_architecture) - echo "https://github.com/bqlpfy/flux-panel/releases/download/2.0.6-beta/gost-${ARCH}" + echo "https://github.com/bqlpfy/flux-panel/releases/download/2.0.7-beta/gost-${ARCH}" } # 下载地址 diff --git a/panel_install.sh b/panel_install.sh index 6b320fa..68855ce 100755 --- a/panel_install.sh +++ b/panel_install.sh @@ -8,8 +8,8 @@ export LC_ALL=C # 全局下载地址配置 -DOCKER_COMPOSEV4_URL="https://github.com/bqlpfy/flux-panel/releases/download/2.0.6-beta/docker-compose-v4.yml" -DOCKER_COMPOSEV6_URL="https://github.com/bqlpfy/flux-panel/releases/download/2.0.6-beta/docker-compose-v6.yml" +DOCKER_COMPOSEV4_URL="https://github.com/bqlpfy/flux-panel/releases/download/2.0.7-beta/docker-compose-v4.yml" +DOCKER_COMPOSEV6_URL="https://github.com/bqlpfy/flux-panel/releases/download/2.0.7-beta/docker-compose-v6.yml" COUNTRY=$(curl -s https://ipinfo.io/country) if [ "$COUNTRY" = "CN" ]; then diff --git a/springboot-backend/src/main/java/com/admin/controller/FlowController.java b/springboot-backend/src/main/java/com/admin/controller/FlowController.java index 854361e..7760ae7 100644 --- a/springboot-backend/src/main/java/com/admin/controller/FlowController.java +++ b/springboot-backend/src/main/java/com/admin/controller/FlowController.java @@ -7,11 +7,13 @@ import com.admin.common.task.CheckGostConfigAsync; import com.admin.common.utils.AESCrypto; import com.admin.common.utils.GostUtil; import com.admin.entity.*; +import com.admin.service.ChainTunnelService; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import org.springframework.context.annotation.Lazy; import org.springframework.web.bind.annotation.*; import lombok.extern.slf4j.Slf4j; @@ -64,6 +66,10 @@ public class FlowController extends BaseController { @Resource CheckGostConfigAsync checkGostConfigAsync; + @Resource + @Lazy + ChainTunnelService chainTunnelService; + /** * 加密消息包装器 */ @@ -306,17 +312,14 @@ public class FlowController extends BaseController { } public void pauseService(List forwardList, String name) { -// for (Forward forward : forwardList) { -// Tunnel tunnel = tunnelService.getById(forward.getTunnelId()); -// if (tunnel != null) { -// GostUtil.PauseService(tunnel.getInNodeId(), name); -// if (tunnel.getType() == 2) { -// GostUtil.PauseRemoteService(tunnel.getOutNodeId(), name); -// } -// } -// forward.setStatus(0); -// forwardService.updateById(forward); -// } + for (Forward forward : forwardList) { + List chainTunnels = chainTunnelService.list(new QueryWrapper().eq("tunnel_id", forward.getTunnelId()).eq("chain_type", 1)); + for (ChainTunnel chainTunnel : chainTunnels) { + GostUtil.PauseAndResumeService(chainTunnel.getNodeId(), name, "PauseService"); + } + forward.setStatus(0); + forwardService.updateById(forward); + } } private void updateForwardFlow(String forwardId, FlowDto flowStats) { diff --git a/springboot-backend/src/main/java/com/admin/service/impl/NodeServiceImpl.java b/springboot-backend/src/main/java/com/admin/service/impl/NodeServiceImpl.java index 3f4c0b0..c291f8e 100644 --- a/springboot-backend/src/main/java/com/admin/service/impl/NodeServiceImpl.java +++ b/springboot-backend/src/main/java/com/admin/service/impl/NodeServiceImpl.java @@ -126,7 +126,7 @@ public class NodeServiceImpl extends ServiceImpl implements No ViteConfig viteConfig = viteConfigService.getOne(new QueryWrapper().eq("name", "ip")); if (viteConfig == null) return R.err("请先前往网站配置中设置ip"); StringBuilder command = new StringBuilder(); - command.append("curl -L https://github.com/bqlpfy/flux-panel/releases/download/2.0.6-beta/install.sh") + command.append("curl -L https://github.com/bqlpfy/flux-panel/releases/download/2.0.7-beta/install.sh") .append(" -o ./install.sh && chmod +x ./install.sh && "); String processedServerAddr = GostUtil.processServerAddress(viteConfig.getValue()); command.append("./install.sh") diff --git a/vite-frontend/src/config/site.ts b/vite-frontend/src/config/site.ts index 389238c..a6c2f0a 100644 --- a/vite-frontend/src/config/site.ts +++ b/vite-frontend/src/config/site.ts @@ -4,7 +4,7 @@ export type SiteConfig = typeof siteConfig; // 缓存相关常量 const CACHE_PREFIX = 'vite_config_'; -const VERSION = "2.0.6-beta"; +const VERSION = "2.0.7-beta"; const APP_VERSION = "1.0.3"; const getInitialConfig = () => {