升级zlt-register/nacos到2.0.1

zlt-register/nacos/conf/application.properties

@@ -18,7 +18,6 @@
 ### Default web context path:
 server.servlet.contextPath=/nacos
 ### Default web server port:
-server.port=8848
 
 #*************** Network Related Configurations ***************#
 ### If prefer hostname over ip for Nacos server addresses in cluster.conf:
@@ -40,20 +39,14 @@ server.port=8848
 # db.user.0=nacos
 # db.password.0=nacos
 
-### Connection pool configuration: hikariCP
-db.pool.config.connectionTimeout=30000
-db.pool.config.validationTimeout=10000
-db.pool.config.maximumPoolSize=20
-db.pool.config.minimumIdle=2
-
 #*************** Naming Module Related Configurations ***************#
-### Data dispatch task execution period in milliseconds:
+### Data dispatch task execution period in milliseconds: Will removed on v2.1.X, replace with nacos.core.protocol.distro.data.sync.delayMs
 # nacos.naming.distro.taskDispatchPeriod=200
 
-### Data count of batch sync task:
+### Data count of batch sync task: Will removed on v2.1.X. Deprecated
 # nacos.naming.distro.batchSyncKeyCount=1000
 
-### Retry delay in milliseconds if sync task failed:
+### Retry delay in milliseconds if sync task failed: Will removed on v2.1.X, replace with nacos.core.protocol.distro.data.sync.retryDelayMs
 # nacos.naming.distro.syncRetryDelay=5000
 
 ### If enable data warmup. If set to false, the server would accept request without local data preparation:
@@ -66,18 +59,6 @@ nacos.naming.empty-service.auto-clean=true
 nacos.naming.empty-service.clean.initial-delay-ms=50000
 nacos.naming.empty-service.clean.period-time-ms=30000
 
-### Add in 2.0.0
-### The interval to clean empty service
-# nacos.naming.clean.empty-service.interval=60000
-
-### The expired time to clean empty service
-# nacos.naming.clean.empty-service.expired-time=60000
-
-### The interval to clean expired metadata
-# nacos.naming.clean.expired-metadata.interval=5000
-
-### The expired time to clean metadata
-# nacos.naming.clean.expired-metadata.expired-time=60000
 
 #*************** CMDB Module Related Configurations ***************#
 ### The interval to dump external CMDB in seconds:
@@ -95,7 +76,7 @@ nacos.naming.empty-service.clean.period-time-ms=30000
 
 #*************** Metrics Related Configurations ***************#
 ### Metrics for prometheus
-#management.endpoints.web.exposure.include=*
+management.endpoints.web.exposure.include=*
 
 ### Metrics for elastic search
 management.metrics.export.elastic.enabled=false
@@ -109,7 +90,6 @@ management.metrics.export.influx.enabled=false
 #management.metrics.export.influx.consistency=one
 #management.metrics.export.influx.compressed=true
 
-
 #*************** Access Log Related Configurations ***************#
 ### If turn on the access log:
 server.tomcat.accesslog.enabled=true
@@ -119,8 +99,11 @@ server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D %{User-Agent}i %{Reque
 
 ### The directory of access log:
 server.tomcat.basedir=
-
-
+#spring.datasource.platform=mysql
+#db.num=1
+#db.url.0=jdbc:mysql://10.101.167.27:3306/acm?characterEncoding=utf8&connectTimeout=1000&socketTimeout=10000&autoReconnect=true
+#db.user=root
+#db.password=root
 #*************** Access Control Related Configurations ***************#
 ### If enable spring security, this option is deprecated in 1.2.0:
 #spring.security.enabled=false
@@ -128,12 +111,16 @@ server.tomcat.basedir=
 ### The ignore urls of auth, is deprecated in 1.2.0:
 nacos.security.ignore.urls=/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
 
-### The auth system to use, currently only 'nacos' is supported:
+### The auth system to use, currently only 'nacos' and 'ldap' is supported:
 nacos.core.auth.system.type=nacos
 
 ### If turn on auth system:
 nacos.core.auth.enabled=false
 
+### worked when nacos.core.auth.system.type=ldap，{0} is Placeholder,replace login username
+# nacos.core.auth.ldap.url=ldap://localhost:389
+# nacos.core.auth.ldap.userdn=cn={0},ou=user,dc=company,dc=com
+
 ### The token expiration in seconds:
 nacos.core.auth.default.token.expire.seconds=18000
 
@@ -144,22 +131,17 @@ nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789
 nacos.core.auth.caching.enabled=true
 
 ### Since 1.4.1, Turn on/off white auth for user-agent: nacos-server, only for upgrade from old version.
-nacos.core.auth.enable.userAgentAuthWhite=true
+nacos.core.auth.enable.userAgentAuthWhite=false
 
 ### Since 1.4.1, worked when nacos.core.auth.enabled=true and nacos.core.auth.enable.userAgentAuthWhite=false.
 ### The two properties is the white list for auth and used by identity the request from other server.
-nacos.core.auth.server.identity.key=
-nacos.core.auth.server.identity.value=
+nacos.core.auth.server.identity.key=serverIdentity
+nacos.core.auth.server.identity.value=security
 
 #*************** Istio Related Configurations ***************#
 ### If turn on the MCP server:
 nacos.istio.mcp.server.enabled=false
 
-
-
-###*************** Add from 1.3.0 ***************###
-
-
 #*************** Core Related Configurations ***************#
 
 ### set the WorkerID manually
@@ -199,3 +181,23 @@ nacos.istio.mcp.server.enabled=false
 # nacos.core.protocol.raft.data.read_index_type=ReadOnlySafe
 ### rpc request timeout, default 5 seconds
 # nacos.core.protocol.raft.data.rpc_request_timeout_ms=5000
+
+#*************** Distro Related Configurations ***************#
+
+### Distro data sync delay time, when sync task delayed, task will be merged for same data key. Default 1 second.
+# nacos.core.protocol.distro.data.sync.delayMs=1000
+
+### Distro data sync timeout for one sync data, default 3 seconds.
+# nacos.core.protocol.distro.data.sync.timeoutMs=3000
+
+### Distro data sync retry delay time when sync data failed or timeout, same behavior with delayMs, default 3 seconds.
+# nacos.core.protocol.distro.data.sync.retryDelayMs=3000
+
+### Distro data verify interval time, verify synced data whether expired for a interval. Default 5 seconds.
+# nacos.core.protocol.distro.data.verify.intervalMs=5000
+
+### Distro data verify timeout for one verify, default 3 seconds.
+# nacos.core.protocol.distro.data.verify.timeoutMs=3000
+
+### Distro data load retry delay when load snapshot data failed, default 30 seconds.
+# nacos.core.protocol.distro.data.load.retryDelayMs=30000