From 59c12e775e9625f35e6fa385c069ca79df7b28b3 Mon Sep 17 00:00:00 2001 From: Meng Sen Date: Fri, 11 Jul 2025 11:33:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8=20rustdesk?= =?UTF-8?q?-api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Meng Sen --- .../{2.6.24 => 2.6.25}/conf/hbbr/run | 0 .../{2.6.24 => 2.6.25}/conf/hbbs/run | 0 apps/rustdesk-api/{2.6.24 => 2.6.25}/data.yml | 62 +++++++++++++++++-- .../{2.6.24 => 2.6.25}/docker-compose.yml | 25 +++----- .../{2.6.24 => 2.6.25}/envs/default.env | 0 .../{2.6.24 => 2.6.25}/envs/global.env | 0 .../{2.6.24 => 2.6.25}/scripts/init.sh | 0 .../{2.6.24 => 2.6.25}/scripts/uninstall.sh | 0 .../{2.6.24 => 2.6.25}/scripts/upgrade.sh | 0 9 files changed, 68 insertions(+), 19 deletions(-) rename apps/rustdesk-api/{2.6.24 => 2.6.25}/conf/hbbr/run (100%) rename apps/rustdesk-api/{2.6.24 => 2.6.25}/conf/hbbs/run (100%) rename apps/rustdesk-api/{2.6.24 => 2.6.25}/data.yml (69%) rename apps/rustdesk-api/{2.6.24 => 2.6.25}/docker-compose.yml (63%) rename apps/rustdesk-api/{2.6.24 => 2.6.25}/envs/default.env (100%) rename apps/rustdesk-api/{2.6.24 => 2.6.25}/envs/global.env (100%) rename apps/rustdesk-api/{2.6.24 => 2.6.25}/scripts/init.sh (100%) rename apps/rustdesk-api/{2.6.24 => 2.6.25}/scripts/uninstall.sh (100%) rename apps/rustdesk-api/{2.6.24 => 2.6.25}/scripts/upgrade.sh (100%) diff --git a/apps/rustdesk-api/2.6.24/conf/hbbr/run b/apps/rustdesk-api/2.6.25/conf/hbbr/run similarity index 100% rename from apps/rustdesk-api/2.6.24/conf/hbbr/run rename to apps/rustdesk-api/2.6.25/conf/hbbr/run diff --git a/apps/rustdesk-api/2.6.24/conf/hbbs/run b/apps/rustdesk-api/2.6.25/conf/hbbs/run similarity index 100% rename from apps/rustdesk-api/2.6.24/conf/hbbs/run rename to apps/rustdesk-api/2.6.25/conf/hbbs/run diff --git a/apps/rustdesk-api/2.6.24/data.yml b/apps/rustdesk-api/2.6.25/data.yml similarity index 69% rename from apps/rustdesk-api/2.6.24/data.yml rename to apps/rustdesk-api/2.6.25/data.yml index 59692032e..85393a6bd 100644 --- a/apps/rustdesk-api/2.6.24/data.yml +++ b/apps/rustdesk-api/2.6.25/data.yml @@ -15,11 +15,65 @@ additionalProperties: required: true rule: paramPort type: number - - default: "http://127.0.0.1" + - default: 21115 + edit: true + envKey: PANEL_APP_PORT_SERVER_1 + labelZh: 服务端口 21115 + labelEn: 服务端口 21115 + required: true + rule: paramPort + type: number + - default: 21116 + edit: true + envKey: PANEL_APP_PORT_ID + labelZh: ID 服务端口 + labelEn: ID Server Port + required: true + rule: paramPort + type: number + - default: 21117 + edit: true + envKey: PANEL_APP_PORT_SERVER + labelZh: 中继服务端口 + labelEn: Intermediate Service Port + required: true + rule: paramPort + type: number + - default: 21118 + edit: true + envKey: PANEL_APP_PORT_SERVER_2 + labelZh: 服务端口 21118 + labelEn: Server Port 21118 + required: true + rule: paramPort + type: number + - default: 21119 + edit: true + envKey: PANEL_APP_PORT_SERVER_3 + labelZh: 服务端口 21119 + labelEn: Server Port 21119 + required: true + rule: paramPort + type: number + - default: "http://127.0.0.1:21117" edit: true envKey: RUSTDESK_SERVER_URL - labelZh: RustDesk 服务地址 - labelEn: RustDesk server address + labelZh: RustDesk 中级服务地址 + labelEn: RustDesk Intermediate service address + required: true + type: text + - default: "http://127.0.0.1:21116" + edit: true + envKey: RUSTDESK_API_RUSTDESK_ID_SERVER + labelZh: RustDesk ID 服务地址 + labelEn: RustDesk ID server address + required: true + type: text + - default: "http://127.0.0.1:21114" + edit: true + envKey: RUSTDESK_API_RUSTDESK_API_SERVER + labelZh: RustDesk API 服务地址 + labelEn: RustDesk API server address required: true type: text - default: "RustDesk API Admin" @@ -121,7 +175,7 @@ additionalProperties: - label: sqlite value: "sqlite" - label: MySQL - value: "false" + value: "mysql" - default: "127.0.0.1:3306" edit: true envKey: RUSTDESK_API_MYSQL_ADDR diff --git a/apps/rustdesk-api/2.6.24/docker-compose.yml b/apps/rustdesk-api/2.6.25/docker-compose.yml similarity index 63% rename from apps/rustdesk-api/2.6.24/docker-compose.yml rename to apps/rustdesk-api/2.6.25/docker-compose.yml index d26dc8845..e4344fb9d 100644 --- a/apps/rustdesk-api/2.6.24/docker-compose.yml +++ b/apps/rustdesk-api/2.6.25/docker-compose.yml @@ -4,7 +4,7 @@ networks: services: rustdesk-api: - image: lejianwen/rustdesk-api:v2.6.24 + image: lejianwen/rustdesk-api:v2.6.25 container_name: ${CONTAINER_NAME} labels: createdBy: "Apps" @@ -17,14 +17,10 @@ services: - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - - ${RUSTDESK_API_ROOT_PATH}/data:/data + - ${RUSTDESK_API_ROOT_PATH}/api-data:/app/data environment: - TZ=Asia/Shanghai - RUSTDESK_API_LANG=zh-CN - - RUSTDESK_API_RUSTDESK_ID_SERVER=${RUSTDESK_SERVER_URL}:21116 - - RUSTDESK_API_RUSTDESK_RELAY_SERVER=${RUSTDESK_SERVER_URL}:21117 - - RUSTDESK_API_RUSTDESK_API_SERVER=${RUSTDESK_SERVER_URL}:${PANEL_APP_PORT_HTTP:-21114} - - RUSTDESK_API_RUSTDESK_KEY=${KEY} rustdesk-server-s6: image: rustdesk/rustdesk-server-s6:latest container_name: server-${CONTAINER_NAME} @@ -34,22 +30,21 @@ services: networks: - 1panel-network ports: - - 21115:21115 - - 21116:21116 - - 21116:21116/udp - - 21117:21117 - - 21118:21118 - - 21119:21119 + - ${PANEL_APP_PORT_SERVER_1}:21115 + - ${PANEL_APP_PORT_ID}:21116 + - ${PANEL_APP_PORT_ID}:21116/udp + - ${PANEL_APP_PORT_SERVER}:21117 + - ${PANEL_APP_PORT_SERVER_2}:21118 + - ${PANEL_APP_PORT_SERVER_3}:21119 env_file: - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env} - ${ENV_FILE:-/etc/1panel/envs/default.env} volumes: - - ${RUSTDESK_API_ROOT_PATH}/data:/data + - ${RUSTDESK_API_ROOT_PATH}/server-data:/data - ${HBBR_RUN_FILE:-./conf/hbbr/run}:/etc/s6-overlay/s6-rc.d/hbbr/run - ${HBBS_RUN_FILE:-./conf/hbbs/run}:/etc/s6-overlay/s6-rc.d/hbbs/run environment: - TZ=Asia/Shanghai - RUSTDESK_API_LANG=zh-CN - - RELAY=${RUSTDESK_SERVER_URL}:21117 + - RELAY=${RUSTDESK_SERVER_URL} - ENCRYPTED_ONLY=1 - - RUSTDESK_API_RUSTDESK_KEY=${KEY} diff --git a/apps/rustdesk-api/2.6.24/envs/default.env b/apps/rustdesk-api/2.6.25/envs/default.env similarity index 100% rename from apps/rustdesk-api/2.6.24/envs/default.env rename to apps/rustdesk-api/2.6.25/envs/default.env diff --git a/apps/rustdesk-api/2.6.24/envs/global.env b/apps/rustdesk-api/2.6.25/envs/global.env similarity index 100% rename from apps/rustdesk-api/2.6.24/envs/global.env rename to apps/rustdesk-api/2.6.25/envs/global.env diff --git a/apps/rustdesk-api/2.6.24/scripts/init.sh b/apps/rustdesk-api/2.6.25/scripts/init.sh similarity index 100% rename from apps/rustdesk-api/2.6.24/scripts/init.sh rename to apps/rustdesk-api/2.6.25/scripts/init.sh diff --git a/apps/rustdesk-api/2.6.24/scripts/uninstall.sh b/apps/rustdesk-api/2.6.25/scripts/uninstall.sh similarity index 100% rename from apps/rustdesk-api/2.6.24/scripts/uninstall.sh rename to apps/rustdesk-api/2.6.25/scripts/uninstall.sh diff --git a/apps/rustdesk-api/2.6.24/scripts/upgrade.sh b/apps/rustdesk-api/2.6.25/scripts/upgrade.sh similarity index 100% rename from apps/rustdesk-api/2.6.24/scripts/upgrade.sh rename to apps/rustdesk-api/2.6.25/scripts/upgrade.sh