diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 19045db..5be4dfc 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.5-beta" + VERSION: "2.0.6-beta" on: push: diff --git a/docker-compose-v4.yml b/docker-compose-v4.yml index 77c21d6..c1dd655 100644 --- a/docker-compose-v4.yml +++ b/docker-compose-v4.yml @@ -1,6 +1,6 @@ services: backend: - image: bqlpfy/springboot-backend:2.0.5-beta + image: bqlpfy/springboot-backend:2.0.6-beta container_name: springboot-backend restart: unless-stopped environment: @@ -25,7 +25,7 @@ services: start_period: 60s frontend: - image: bqlpfy/vite-frontend:2.0.5-beta + image: bqlpfy/vite-frontend:2.0.6-beta container_name: vite-frontend restart: unless-stopped ports: diff --git a/docker-compose-v6.yml b/docker-compose-v6.yml index bbd54a7..76a8fee 100644 --- a/docker-compose-v6.yml +++ b/docker-compose-v6.yml @@ -1,6 +1,6 @@ services: backend: - image: bqlpfy/springboot-backend:2.0.5-beta + image: bqlpfy/springboot-backend:2.0.6-beta container_name: springboot-backend restart: unless-stopped environment: @@ -25,7 +25,7 @@ services: start_period: 60s frontend: - image: bqlpfy/vite-frontend:2.0.5-beta + image: bqlpfy/vite-frontend:2.0.6-beta container_name: vite-frontend restart: unless-stopped ports: diff --git a/install.sh b/install.sh index 7e3e859..d3d96a4 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.5-beta/gost-${ARCH}" + echo "https://github.com/bqlpfy/flux-panel/releases/download/2.0.6-beta/gost-${ARCH}" } # 下载地址 diff --git a/panel_install.sh b/panel_install.sh index 805b949..6b320fa 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.5-beta/docker-compose-v4.yml" -DOCKER_COMPOSEV6_URL="https://github.com/bqlpfy/flux-panel/releases/download/2.0.5-beta/docker-compose-v6.yml" +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" COUNTRY=$(curl -s https://ipinfo.io/country) if [ "$COUNTRY" = "CN" ]; then diff --git a/springboot-backend/src/main/java/com/admin/common/utils/GostUtil.java b/springboot-backend/src/main/java/com/admin/common/utils/GostUtil.java index eba8cbc..f2557f8 100644 --- a/springboot-backend/src/main/java/com/admin/common/utils/GostUtil.java +++ b/springboot-backend/src/main/java/com/admin/common/utils/GostUtil.java @@ -53,7 +53,7 @@ public class GostUtil { Node node_info = node_s.get(chainTunnel.getNodeId()); JSONObject node = new JSONObject(); node.put("name", "node_" + chainTunnel.getInx()); - node.put("addr", processServerAddress(node_info.getServerIp()) + ":" + chainTunnel.getPort()); + node.put("addr", processServerAddress(node_info.getServerIp() + ":" + chainTunnel.getPort())); node.put("connector", connector); node.put("dialer", dialer); 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 62a0e27..3f4c0b0 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.5-beta/install.sh") + command.append("curl -L https://github.com/bqlpfy/flux-panel/releases/download/2.0.6-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 75a0794..389238c 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.5-beta"; +const VERSION = "2.0.6-beta"; const APP_VERSION = "1.0.3"; const getInitialConfig = () => {