修复应用 rustdesk-api

Signed-off-by: Meng Sen <qyg2297248353@gmail.com>

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

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}