From b666aba4c8d75b2a1b3d977c70518fca3278c1d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cdc=E2=80=9D?= <413331538@qq.com>
Date: Tue, 22 Nov 2022 02:30:10 +0800
Subject: [PATCH] fix #9020, prefix CUSTOM_SEARCH_LOCATIONS with 'optional:'

---
 distribution/bin/startup.cmd | 2 +-
 distribution/bin/startup.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribution/bin/startup.cmd b/distribution/bin/startup.cmd
index c9910877229..303649bd5d5 100755
--- a/distribution/bin/startup.cmd
+++ b/distribution/bin/startup.cmd
@@ -83,7 +83,7 @@ set "NACOS_OPTS=%NACOS_OPTS% -Dnacos.home=%BASE_DIR%"
 set "NACOS_OPTS=%NACOS_OPTS% -jar %BASE_DIR%\target\%SERVER%.jar"
 
 rem set nacos spring config location
-set "NACOS_CONFIG_OPTS=--spring.config.additional-location=%CUSTOM_SEARCH_LOCATIONS%"
+set "NACOS_CONFIG_OPTS=--spring.config.additional-location=optional:%CUSTOM_SEARCH_LOCATIONS%"
 
 rem set nacos log4j file location
 set "NACOS_LOG4J_OPTS=--logging.config=%BASE_DIR%/conf/nacos-logback.xml"
diff --git a/distribution/bin/startup.sh b/distribution/bin/startup.sh
index f16c5e6c7d0..9ae85c4e9c0 100644
--- a/distribution/bin/startup.sh
+++ b/distribution/bin/startup.sh
@@ -116,7 +116,7 @@ JAVA_OPT="${JAVA_OPT} -Dloader.path=${BASE_DIR}/plugins/health,${BASE_DIR}/plugi
 JAVA_OPT="${JAVA_OPT} -Dnacos.home=${BASE_DIR}"
 JAVA_OPT="${JAVA_OPT} -jar ${BASE_DIR}/target/${SERVER}.jar"
 JAVA_OPT="${JAVA_OPT} ${JAVA_OPT_EXT}"
-JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=${CUSTOM_SEARCH_LOCATIONS}"
+JAVA_OPT="${JAVA_OPT} --spring.config.additional-location=optional:${CUSTOM_SEARCH_LOCATIONS}"
 JAVA_OPT="${JAVA_OPT} --logging.config=${BASE_DIR}/conf/nacos-logback.xml"
 JAVA_OPT="${JAVA_OPT} --server.max-http-header-size=524288"