From cd065fae28bda7172d5353f87fc7b39b2806c9bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=8C=E6=A3=AE?= <qyg2297248353@163.com>
Date: Sat, 20 Jul 2024 13:43:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E6=8A=A4=20Nacos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 萌森 <qyg2297248353@163.com>
---
 nacos/2.3.1/docker-compose.yml | 5 +++--
 nacos/2.3.1/scripts/init.sh    | 4 ++++
 nacos/2.3.1/scripts/upgrade.sh | 4 ++++
 nacos/data.yml                 | 5 ++---
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/nacos/2.3.1/docker-compose.yml b/nacos/2.3.1/docker-compose.yml
index 3848a1233..bac188779 100644
--- a/nacos/2.3.1/docker-compose.yml
+++ b/nacos/2.3.1/docker-compose.yml
@@ -16,6 +16,9 @@ services:
     ports:
       - ${PANEL_APP_PORT_HTTP}:8848
       - ${NACOS_COMMUNICATION_PORT}:9848
+    env_file:
+      - /etc/1panel/envs/global.env
+      - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
       - ${NACOS_ROOT_PATH}/logs:/home/nacos/logs
       - ${NACOS_ROOT_PATH}/data:/home/nacos/data
@@ -24,5 +27,3 @@ services:
       - NACOS_SERVER_PORT=8848
       - NACOS_AUTH_ENABLE=true
       - SPRING_DATASOURCE_PLATFORM=mysql
-    env_file:
-      - .env
diff --git a/nacos/2.3.1/scripts/init.sh b/nacos/2.3.1/scripts/init.sh
index 88691a0f2..110cebce9 100644
--- a/nacos/2.3.1/scripts/init.sh
+++ b/nacos/2.3.1/scripts/init.sh
@@ -3,6 +3,10 @@
 if [ -f .env ]; then
   source .env
 
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+
   if command -v mysql &> /dev/null; then
     if [[ -f ./init/mysql-schema.sql ]]; then
       mysql -u"$MYSQL_SERVICE_USER" -p"$MYSQL_SERVICE_PASSWORD" -h"$MYSQL_SERVICE_HOST" -P"$MYSQL_SERVICE_PORT" --protocol=TCP "$MYSQL_SERVICE_DB_NAME" < ./init/mysql-schema.sql
diff --git a/nacos/2.3.1/scripts/upgrade.sh b/nacos/2.3.1/scripts/upgrade.sh
index c86c4fbca..c211154a7 100644
--- a/nacos/2.3.1/scripts/upgrade.sh
+++ b/nacos/2.3.1/scripts/upgrade.sh
@@ -3,6 +3,10 @@
 if [ -f .env ]; then
   source .env
 
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+
   echo "Check Finish."
 
 else
diff --git a/nacos/data.yml b/nacos/data.yml
index bdf915003..cb1c482bc 100644
--- a/nacos/data.yml
+++ b/nacos/data.yml
@@ -17,7 +17,6 @@ additionalProperties:
   type: website
   crossVersionUpdate: true
   limit: 0
-  recommend: 0
   website: https://nacos.io/
-  github: https://github.com/alibaba/nacos
-  document: https://github.com/alibaba/nacos/blob/develop/README.md
+  github: https://github.com/alibaba/nacos/
+  document: https://nacos.io/docs/latest/what-is-nacos/