From b135ece7113b63e48bb601ac262f35888d6440e0 Mon Sep 17 00:00:00 2001
From: Meng Sen <qyg2297248353@gmail.com>
Date: Tue, 29 Apr 2025 11:30:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E7=BC=AE=20Nacos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Meng Sen <qyg2297248353@gmail.com>
---
 apps/nacos/3.0.0/data.yml           | 38 +++++++++--------------------
 apps/nacos/3.0.0/docker-compose.yml | 11 +++++----
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/apps/nacos/3.0.0/data.yml b/apps/nacos/3.0.0/data.yml
index e60115e23..6ce0f1bfa 100644
--- a/apps/nacos/3.0.0/data.yml
+++ b/apps/nacos/3.0.0/data.yml
@@ -3,14 +3,14 @@ additionalProperties:
     - child:
         default: ""
         envKey: PANEL_DB_HOST
-        required: true
+        required: false
         type: service
       default: mysql
       edit: true
       envKey: PANEL_DB_TYPE
       labelZh: MySQL 服务 (前置检查)
       labelEn: Database Service (Pre-check)
-      required: true
+      required: false
       type: apps
       values:
         - label: MySQL
@@ -19,22 +19,6 @@ additionalProperties:
           value: mariadb
         - label: Percona
           value: percona
-    - default: "host"
-      edit: true
-      envKey: NETWORK_MODE
-      labelEn: Drive path
-      labelZh: 网络模式
-      required: true
-      type: select
-      values:
-        - label: 主机网络模式
-          value: "host"
-        - label: 桥接网络模式
-          value: "bridge"
-        - label: 无网络模式
-          value: "none"
-        - label: 1panel-network
-          value: "1panel-network"
     - default: "/home/nacos"
       edit: true
       envKey: NACOS_ROOT_PATH
@@ -42,7 +26,7 @@ additionalProperties:
       labelEn: Data persistence path
       required: true
       type: text
-    - default: 8848
+    - default: 8080
       edit: true
       envKey: PANEL_APP_PORT_HTTP
       labelZh: WebUI 端口
@@ -50,19 +34,19 @@ additionalProperties:
       required: true
       rule: paramPort
       type: number
-    - default: 9848
+    - default: 8848
       edit: true
-      envKey: PANEL_APP_PORT_GRPC_CLIENT
-      labelZh: Nacos gRPC 客户端端口
-      labelEn: Nacos gRPC client port
+      envKey: PANEL_APP_PORT_API
+      labelZh: WebUI API 端口
+      labelEn: WebUI API port
       required: true
       rule: paramPort
       type: number
-    - default: 9849
+    - default: 9848
       edit: true
-      envKey: PANEL_APP_PORT_GRPC_SERVER
-      labelZh: Nacos gRPC 服务端端口
-      labelEn: Nacos gRPC server port
+      envKey: PANEL_APP_PORT_GRPC
+      labelZh: Nacos gRPC 端口
+      labelEn: Nacos gRPC port
       required: true
       rule: paramPort
       type: number
diff --git a/apps/nacos/3.0.0/docker-compose.yml b/apps/nacos/3.0.0/docker-compose.yml
index 611790af7..b49cdef38 100644
--- a/apps/nacos/3.0.0/docker-compose.yml
+++ b/apps/nacos/3.0.0/docker-compose.yml
@@ -9,11 +9,12 @@ services:
     restart: always
     labels:
       createdBy: "Apps"
-    network_mode: ${NETWORK_MODE}
+    networks:
+      - 1panel-network
     ports:
-      - ${PANEL_APP_PORT_HTTP}:8848
-      - ${PANEL_APP_PORT_GRPC_CLIENT}:9848
-      - ${PANEL_APP_PORT_GRPC_SERVER}:9849
+      - ${PANEL_APP_PORT_HTTP}:8080
+      - ${PANEL_APP_PORT_API}:8848
+      - ${PANEL_APP_PORT_GRPC}:9848
     env_file:
       - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
       - ${ENV_FILE:-/etc/1panel/envs/default.env}
@@ -22,6 +23,6 @@ services:
       - ${NACOS_ROOT_PATH}/data:/home/nacos/data
     environment:
       - MODE=standalone
-      - NACOS_SERVER_PORT=8848
+      - NACOS_SERVER_PORT=${PANEL_APP_PORT_API:-8848}
       - NACOS_AUTH_ENABLE=true
       - SPRING_DATASOURCE_PLATFORM=mysql