From 4f16131a4cc6709e6316495a20d656c74514ee9d Mon Sep 17 00:00:00 2001
From: pader <huangmnlove@163.com>
Date: Fri, 12 Aug 2022 17:47:51 +0800
Subject: [PATCH] Fix 2.1.1

---
 build/bin/docker-startup.sh       | 4 ++--
 build/conf/application.properties | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/build/bin/docker-startup.sh b/build/bin/docker-startup.sh
index 2531537..ac3ff07 100755
--- a/build/bin/docker-startup.sh
+++ b/build/bin/docker-startup.sh
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 set -x
-export CUSTOM_SEARCH_NAMES="application,custom"
-export CUSTOM_SEARCH_LOCATIONS=${BASE_DIR}/init.d/,file:${BASE_DIR}/conf/
+export CUSTOM_SEARCH_NAMES="application"
+export CUSTOM_SEARCH_LOCATIONS=file:${BASE_DIR}/conf/
 export MEMBER_LIST=""
 PLUGINS_DIR="/home/nacos/plugins/peer-finder"
 function print_servers() {
diff --git a/build/conf/application.properties b/build/conf/application.properties
index 35f8fb9..ac357a5 100644
--- a/build/conf/application.properties
+++ b/build/conf/application.properties
@@ -2,6 +2,8 @@
 server.servlet.contextPath=${SERVER_SERVLET_CONTEXTPATH:/nacos}
 server.contextPath=/nacos
 server.port=${NACOS_APPLICATION_PORT:8848}
+server.tomcat.accesslog.max-days=30
+server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Request-Source}i
 spring.datasource.platform=${SPRING_DATASOURCE_PLATFORM:""}
 nacos.cmdb.dumpTaskInterval=3600
 nacos.cmdb.eventTaskInterval=10
@@ -12,32 +14,27 @@ db.url.0=jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT:3306}/${MYSQL_S
 db.url.1=jdbc:mysql://${MYSQL_SERVICE_HOST}:${MYSQL_SERVICE_PORT:3306}/${MYSQL_SERVICE_DB_NAME}?${MYSQL_SERVICE_DB_PARAM:characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false}
 db.user=${MYSQL_SERVICE_USER}
 db.password=${MYSQL_SERVICE_PASSWORD}
-
 ### The auth system to use, currently only 'nacos' and 'ldap' is supported:
 nacos.core.auth.system.type=${NACOS_AUTH_SYSTEM_TYPE:nacos}
-
 ### worked when nacos.core.auth.system.type=nacos
 ### The token expiration in seconds:
 nacos.core.auth.plugin.nacos.token.expire.seconds=${NACOS_AUTH_TOKEN_EXPIRE_SECONDS:18000}
 ### The default token:
 nacos.core.auth.plugin.nacos.token.secret.key=${NACOS_AUTH_TOKEN:SecretKey012345678901234567890123456789012345678901234567890123456789}
-
 ### Turn on/off caching of auth information. By turning on this switch, the update of auth information would have a 15 seconds delay.
 nacos.core.auth.caching.enabled=${NACOS_AUTH_CACHE_ENABLE:false}
 nacos.core.auth.enable.userAgentAuthWhite=${NACOS_AUTH_USER_AGENT_AUTH_WHITE_ENABLE:false}
 nacos.core.auth.server.identity.key=${NACOS_AUTH_IDENTITY_KEY:serverIdentity}
 nacos.core.auth.server.identity.value=${NACOS_AUTH_IDENTITY_VALUE:security}
 server.tomcat.accesslog.enabled=${TOMCAT_ACCESSLOG_ENABLED:false}
-server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D
 # default current work dir
-server.tomcat.basedir=
+server.tomcat.basedir=file:.
 ## spring security config
 ### turn off security
 nacos.security.ignore.urls=${NACOS_SECURITY_IGNORE_URLS:/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**}
 # metrics for elastic search
 management.metrics.export.elastic.enabled=false
 management.metrics.export.influx.enabled=false
-
 nacos.naming.distro.taskDispatchThreadCount=10
 nacos.naming.distro.taskDispatchPeriod=200
 nacos.naming.distro.batchSyncKeyCount=1000