From 09c94ac0cc851fa51b5ecd4c3e8950afbd1b75e4 Mon Sep 17 00:00:00 2001
From: okxlin <okxlin@gmail.com>
Date: Fri, 9 Jun 2023 01:08:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9rustdesk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/rustdesk/latest/data.yml           | 24 ++++++++++++++++++++++++
 apps/rustdesk/latest/docker-compose.yml |  7 ++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/apps/rustdesk/latest/data.yml b/apps/rustdesk/latest/data.yml
index 2c96f2e4..92fbd1aa 100644
--- a/apps/rustdesk/latest/data.yml
+++ b/apps/rustdesk/latest/data.yml
@@ -1,5 +1,13 @@
 additionalProperties:
     formFields:
+        - default: 21115
+          edit: true
+          envKey: NAT_TEST_PORT
+          labelEn: NAT type test port
+          labelZh: NAT类型测试端口
+          required: true
+          rule: paramPort
+          type: number
         - default: 21116
           edit: true
           envKey: HBBS_PORT
@@ -16,6 +24,22 @@ additionalProperties:
           required: true
           rule: paramPort
           type: number
+        - default: 21118
+          edit: true
+          envKey: WEB_CLIENT_PORT1
+          labelEn: Web Client Support Port 1
+          labelZh: 网页客户端支持端口1
+          required: true
+          rule: paramPort
+          type: number
+        - default: 21119
+          edit: true
+          envKey: WEB_CLIENT_PORT2
+          labelEn: Web Client Support Port 2
+          labelZh: 网页客户端支持端口2
+          required: true
+          rule: paramPort
+          type: number
         - default: 172.17.0.1
           edit: true
           envKey: HOST_ADDRESS
diff --git a/apps/rustdesk/latest/docker-compose.yml b/apps/rustdesk/latest/docker-compose.yml
index d7ca772c..9566dd77 100644
--- a/apps/rustdesk/latest/docker-compose.yml
+++ b/apps/rustdesk/latest/docker-compose.yml
@@ -4,10 +4,11 @@ services:
     container_name: ${CONTAINER_NAME}_hbbs
     restart: always
     ports:
-      - "21115:21115" #NAT类型测试
+      - "${NAT_TEST_PORT}:21115" #NAT类型测试
       - "${HBBS_PORT}:21116" # 自定义 hbbs 映射端口
       - "${HBBS_PORT}:21116/udp" #自定义 hbbs 映射端口
-      - "21118:21118" #网页客户端支持端口
+      - "${WEB_CLIENT_PORT1}:21118" #网页客户端支持端口
+      - "${WEB_CLIENT_PORT2}:21119" #网页客户端支持端口
     command: hbbs -r ${HOST_ADDRESS}:${HBBS_PORT} -k _ # 填入个人域名或 IP +  暴露端口
     volumes:
       - "./data/hbbs:/root" # 自定义挂载目录
@@ -45,5 +46,5 @@ services:
 
 networks:  
   1panel-network:  
-    external: false
+    external: true