From c1f622048645f7ea6f8b9bcb14a0987ef9374039 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Wed, 9 Aug 2023 14:48:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=20rustdesk=20sftpgo?=
 =?UTF-8?q?=20=E7=9A=84=E7=AB=AF=E5=8F=A3=E5=AD=97=E6=AE=B5=20(#313)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/rustdesk/s6-latest/data.yml           | 10 +++++-----
 apps/rustdesk/s6-latest/docker-compose.yml | 14 +++++++-------
 apps/sftpgo/v2.5.4/data.yml                |  6 +++---
 apps/sftpgo/v2.5.4/docker-compose.yml      | 12 ++++++------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/apps/rustdesk/s6-latest/data.yml b/apps/rustdesk/s6-latest/data.yml
index 92fbd1aa..e56f6563 100644
--- a/apps/rustdesk/s6-latest/data.yml
+++ b/apps/rustdesk/s6-latest/data.yml
@@ -2,7 +2,7 @@ additionalProperties:
     formFields:
         - default: 21115
           edit: true
-          envKey: NAT_TEST_PORT
+          envKey: PANEL_APP_PORT_HTTP_NAT
           labelEn: NAT type test port
           labelZh: NAT类型测试端口
           required: true
@@ -10,7 +10,7 @@ additionalProperties:
           type: number
         - default: 21116
           edit: true
-          envKey: HBBS_PORT
+          envKey: PANEL_APP_PORT_HBBS
           labelEn: hbbs port (used with IP/domain)
           labelZh: hbbs端口(配合IP/域名使用)
           required: true
@@ -18,7 +18,7 @@ additionalProperties:
           type: number
         - default: 21117
           edit: true
-          envKey: HBBR_PORT
+          envKey: PANEL_APP_PORT_HBBR
           labelEn: hbbr port (client relay server port)
           labelZh: hbbr端口(客户端中继服务器端口)
           required: true
@@ -26,7 +26,7 @@ additionalProperties:
           type: number
         - default: 21118
           edit: true
-          envKey: WEB_CLIENT_PORT1
+          envKey: PANEL_APP_PORT_WEB_CLIENT_1
           labelEn: Web Client Support Port 1
           labelZh: 网页客户端支持端口1
           required: true
@@ -34,7 +34,7 @@ additionalProperties:
           type: number
         - default: 21119
           edit: true
-          envKey: WEB_CLIENT_PORT2
+          envKey: PANEL_APP_PORT_WEB_CLIENT_2
           labelEn: Web Client Support Port 2
           labelZh: 网页客户端支持端口2
           required: true
diff --git a/apps/rustdesk/s6-latest/docker-compose.yml b/apps/rustdesk/s6-latest/docker-compose.yml
index 49bb96c4..7364da6d 100644
--- a/apps/rustdesk/s6-latest/docker-compose.yml
+++ b/apps/rustdesk/s6-latest/docker-compose.yml
@@ -6,16 +6,16 @@ services:
     networks:
       - 1panel-network
     ports:
-      - "${NAT_TEST_PORT}:21115"
-      - "${HBBS_PORT}:21116"
-      - "${HBBS_PORT}:21116/udp"
-      - "${HBBR_PORT}:21117"
-      - "${WEB_CLIENT_PORT1}:21118"
-      - "${WEB_CLIENT_PORT2}:21119"
+      - "${PANEL_APP_PORT_NAT}:21115"
+      - "${PANEL_APP_PORT_HBBS}:21116"
+      - "${PANEL_APP_PORT_HBBS}:21116/udp"
+      - "${PANEL_APP_PORT_HBBR}:21117"
+      - "${PANEL_APP_PORT_WEB_CLIENT_1}:21118"
+      - "${PANEL_APP_PORT_WEB_CLIENT_2}:21119"
     volumes:
       - "./data/hbbs:/data"
     environment:
-      - "RELAY=${HOST_ADDRESS}:${HBBR_PORT}"
+      - "RELAY=${HOST_ADDRESS}:${PANEL_APP_PORT_HBBR}"
       - "ENCRYPTED_ONLY=1"
     image: rustdesk/rustdesk-server-s6:latest
     labels:  
diff --git a/apps/sftpgo/v2.5.4/data.yml b/apps/sftpgo/v2.5.4/data.yml
index 33e70ff9..66f2be6e 100755
--- a/apps/sftpgo/v2.5.4/data.yml
+++ b/apps/sftpgo/v2.5.4/data.yml
@@ -10,7 +10,7 @@ additionalProperties:
           type: number
         - default: 2022
           edit: true
-          envKey: SFTP_PORT
+          envKey: PANEL_APP_PORT_SFTP
           labelEn: SFTP Port
           labelZh: SFTP 端口
           required: true
@@ -18,7 +18,7 @@ additionalProperties:
           type: number
         - default: 2121
           edit: true
-          envKey: FTP_PORT
+          envKey: PANEL_APP_PORT_FTP
           labelEn: FTP Port
           labelZh: FTP 端口
           required: true
@@ -50,7 +50,7 @@ additionalProperties:
           type: text
         - default: 10080
           edit: true
-          envKey: WEBDAV_PORT
+          envKey: PANEL_APP_PORT_WEBDAV
           labelEn: WebDAV Port
           labelZh: WebDAV 端口
           required: true
diff --git a/apps/sftpgo/v2.5.4/docker-compose.yml b/apps/sftpgo/v2.5.4/docker-compose.yml
index f51d4eb1..6b4dec2f 100644
--- a/apps/sftpgo/v2.5.4/docker-compose.yml
+++ b/apps/sftpgo/v2.5.4/docker-compose.yml
@@ -7,14 +7,14 @@ services:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:8080
-      - ${SFTP_PORT}:${SFTP_PORT}
-      - ${FTP_PORT}:${FTP_PORT}
+      - ${PANEL_APP_PORT_SFTP}:${PANEL_APP_PORT_SFTP}
+      - ${PANEL_APP_PORT_FTP}:${PANEL_APP_PORT_FTP}
       - ${PASSIVE_PORT_RANGE_START}-${PASSIVE_PORT_RANGE_END}:${PASSIVE_PORT_RANGE_START}-${PASSIVE_PORT_RANGE_END}
-      - ${WEBDAV_PORT}:${WEBDAV_PORT}
+      - ${PANEL_APP_PORT_WEBDAV}:${PANEL_APP_PORT_WEBDAV}
     environment:
-      SFTPGO_FTPD__BINDINGS__0__PORT: ${FTP_PORT}
-      SFTPGO_WEBDAVD__BINDINGS__0__PORT: ${WEBDAV_PORT}
-      SFTPGO_SFTPD__BINDINGS__0__PORT: ${SFTP_PORT}
+      SFTPGO_FTPD__BINDINGS__0__PORT: ${PANEL_APP_PORT_FTP}
+      SFTPGO_WEBDAVD__BINDINGS__0__PORT: ${PANEL_APP_PORT_WEBDAV}
+      SFTPGO_SFTPD__BINDINGS__0__PORT: ${PANEL_APP_PORT_SFTP}
       SFTPGO_FTPD__BINDINGS__0__FORCE_PASSIVE_IP: ${FTP_EXTERNAL_IP}
       SFTPGO_FTPD__PASSIVE_PORT_RANGE__START: ${PASSIVE_PORT_RANGE_START}
       SFTPGO_FTPD__PASSIVE_PORT_RANGE__END: ${PASSIVE_PORT_RANGE_END}