diff --git a/README.md b/README.md index 87d0e17..5f15901 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,9 @@ This project contains a Docker image meant to facilitate the deployment of [Naco reasons, refer to [Removing the Master-Slave Image Configuration](https://github.com/nacos-group/nacos-docker/wiki/%E7%A7%BB%E9%99%A4%E6%95%B0%E6%8D%AE%E5%BA%93%E4%B8%BB%E4%BB%8E%E9%95%9C%E5%83%8F%E9%85%8D%E7%BD%AE) * Since Nacos 1.3.1 version, the database storage has been upgraded to 8.0, and it is backward compatible -* If you use a custom database, you need to initialize the [database script](https://github.com/alibaba/nacos/blob/master/distribution/conf/mysql-schema.sql) yourself for the first time. +* If you use a custom database, you need to initialize + the [database script](https://github.com/alibaba/nacos/blob/master/distribution/conf/mysql-schema.sql) yourself for + the first time. ## Quick Start @@ -99,41 +101,41 @@ Run the following command： ## Common property configuration -| name | description | option | -| ----------------------------- | -------------------------------------- | -------------------------------------- | -| MODE | cluster/standalone | cluster/standalone default **cluster** | -| NACOS_SERVERS | nacos cluster address | eg. ip1:port1 ip2:port2 ip3:port3 | -| PREFER_HOST_MODE | Whether hostname are supported | hostname/ip default **ip** | -| NACOS_APPLICATION_PORT | nacos server port | default **8848** | -| NACOS_SERVER_IP | custom nacos server ip when network was mutil-network | | -| SPRING_DATASOURCE_PLATFORM | standalone support mysql | mysql / empty default empty | -| MYSQL_SERVICE_HOST | mysql host | | -| MYSQL_SERVICE_PORT | mysql database port | default : **3306** | -| MYSQL_SERVICE_DB_NAME | mysql database name | | -| MYSQL_SERVICE_USER | username of database | | -| MYSQL_SERVICE_PASSWORD | password of database | | -| MYSQL_DATABASE_NUM | It indicates the number of database | default :**1** | -| MYSQL_SERVICE_DB_PARAM | Database url parameter |default:** -characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false** | -| JVM_XMS | -Xms | default :1g | -| JVM_XMX | -Xmx | default :1g | -| JVM_XMN | -Xmn | default :512m | -| JVM_MS | -XX:MetaspaceSize | default :128m | -| JVM_MMS | -XX:MaxMetaspaceSize | default :320m | -| NACOS_DEBUG | enable remote debug | y/n default :n | -| TOMCAT_ACCESSLOG_ENABLED | server.tomcat.accesslog.enabled | default :false | -| NACOS_AUTH_SYSTEM_TYPE | The auth system to use, currently only 'nacos' is supported | default :nacos | -| NACOS_AUTH_ENABLE | If turn on auth system | default :false | -| NACOS_AUTH_TOKEN_EXPIRE_SECONDS | The token expiration in seconds | default :18000 | -| NACOS_AUTH_TOKEN | The default token | default :SecretKey012345678901234567890123456789012345678901234567890123456789 | -| NACOS_AUTH_CACHE_ENABLE | Turn on/off caching of auth information. By turning on this switch, the update of auth information would have a 15 seconds delay. | default : false | -| MEMBER_LIST | Set the cluster list with a configuration file or command-line argument | eg:192.168.16.101:8847?raft_port=8807,192.168.16.101?raft_port=8808,192.168.16.101:8849?raft_port=8809 | -| EMBEDDED_STORAGE | Use embedded storage in cluster mode without mysql | `embedded` default : none | -| NACOS_AUTH_CACHE_ENABLE | nacos.core.auth.caching.enabled | default : false | -| NACOS_AUTH_USER_AGENT_AUTH_WHITE_ENABLE | nacos.core.auth.enable.userAgentAuthWhite | default : false | -| NACOS_AUTH_IDENTITY_KEY | nacos.core.auth.server.identity.key | default : serverIdentity | -| NACOS_AUTH_IDENTITY_VALUE | nacos.core.auth.server.identity.value | default : security | -| NACOS_SECURITY_IGNORE_URLS | nacos.security.ignore.urls | default : `/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**` | +| name | description | option | +|-------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| MODE | cluster/standalone | cluster/standalone default **cluster** | +| NACOS_SERVERS | nacos cluster address | eg. ip1:port1 ip2:port2 ip3:port3 | +| PREFER_HOST_MODE | Whether hostname are supported | hostname/ip default **ip** | +| NACOS_APPLICATION_PORT | nacos server port | default **8848** | +| NACOS_SERVER_IP | custom nacos server ip when network was mutil-network | | +| SPRING_DATASOURCE_PLATFORM | standalone support mysql | mysql / empty default empty | +| MYSQL_SERVICE_HOST | mysql host | | +| MYSQL_SERVICE_PORT | mysql database port | default : **3306** | +| MYSQL_SERVICE_DB_NAME | mysql database name | | +| MYSQL_SERVICE_USER | username of database | | +| MYSQL_SERVICE_PASSWORD | password of database | | +| MYSQL_DATABASE_NUM | It indicates the number of database | default :**1** | +| MYSQL_SERVICE_DB_PARAM | Database url parameter | default:** + characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useSSL=false** | +| JVM_XMS | -Xms | default :1g | +| JVM_XMX | -Xmx | default :1g | +| JVM_XMN | -Xmn | default :512m | +| JVM_MS | -XX:MetaspaceSize | default :128m | +| JVM_MMS | -XX:MaxMetaspaceSize | default :320m | +| NACOS_DEBUG | enable remote debug | y/n default :n | +| TOMCAT_ACCESSLOG_ENABLED | server.tomcat.accesslog.enabled | default :false | +| NACOS_AUTH_SYSTEM_TYPE | The auth system to use, currently only 'nacos' is supported | default :nacos | +| NACOS_AUTH_ENABLE | If turn on auth system | default :false | +| NACOS_AUTH_TOKEN_EXPIRE_SECONDS | The token expiration in seconds | default :18000 | +| NACOS_AUTH_TOKEN | | | +| NACOS_AUTH_CACHE_ENABLE | Turn on/off caching of auth information. By turning on this switch, the update of auth information would have a 15 seconds delay. | default : false | +| MEMBER_LIST | Set the cluster list with a configuration file or command-line argument | eg:192.168.16.101:8847?raft_port=8807,192.168.16.101?raft_port=8808,192.168.16.101:8849?raft_port=8809 | +| EMBEDDED_STORAGE | Use embedded storage in cluster mode without mysql | `embedded` default : none | +| NACOS_AUTH_CACHE_ENABLE | nacos.core.auth.caching.enabled | default : false | +| NACOS_AUTH_USER_AGENT_AUTH_WHITE_ENABLE | nacos.core.auth.enable.userAgentAuthWhite | default : false | +| NACOS_AUTH_IDENTITY_KEY | nacos.core.auth.server.identity.key | | +| NACOS_AUTH_IDENTITY_VALUE | nacos.core.auth.server.identity.value | | +| NACOS_SECURITY_IGNORE_URLS | nacos.security.ignore.urls | default : `/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**` | ## Advanced configuration diff --git a/README_ZH.md b/README_ZH.md index 8485c3a..7ea84ea 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -153,14 +153,14 @@ | NACOS_AUTH_SYSTEM_TYPE | 权限系统类型选择,目前只支持nacos类型 | 默认 :nacos | | NACOS_AUTH_ENABLE | 是否开启权限系统 | 默认 :false | | NACOS_AUTH_TOKEN_EXPIRE_SECONDS | token 失效时间 | 默认 :18000 | -| NACOS_AUTH_TOKEN | token | 默认 :SecretKey012345678901234567890123456789012345678901234567890123456789 | +| NACOS_AUTH_TOKEN | token | | | NACOS_AUTH_CACHE_ENABLE | 权限缓存开关 ,开启后权限缓存的更新默认有15秒的延迟 | 默认 : false | | MEMBER_LIST | 通过环境变量的方式设置集群地址 | 例子:192.168.16.101:8847?raft_port=8807,192.168.16.101?raft_port=8808,192.168.16.101:8849?raft_port=8809 | | EMBEDDED_STORAGE | 是否开启集群嵌入式存储模式 | `embedded` 默认 : none | | NACOS_AUTH_CACHE_ENABLE | nacos.core.auth.caching.enabled | default : false | | NACOS_AUTH_USER_AGENT_AUTH_WHITE_ENABLE | nacos.core.auth.enable.userAgentAuthWhite | default : false | -| NACOS_AUTH_IDENTITY_KEY | nacos.core.auth.server.identity.key | default : serverIdentity | -| NACOS_AUTH_IDENTITY_VALUE | nacos.core.auth.server.identity.value | default : security | +| NACOS_AUTH_IDENTITY_KEY | nacos.core.auth.server.identity.key | | +| NACOS_AUTH_IDENTITY_VALUE | nacos.core.auth.server.identity.value | | | NACOS_SECURITY_IGNORE_URLS | nacos.security.ignore.urls | default : `/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**` | ## 高级配置 diff --git a/build/Dockerfile b/build/Dockerfile index 33a43b7..0bbbcfd 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -20,7 +20,7 @@ ENV MODE="cluster" \ TOMCAT_ACCESSLOG_ENABLED="false" \ TIME_ZONE="Asia/Shanghai" -ARG NACOS_VERSION=2.2.0.1 +ARG NACOS_VERSION=2.2.1 ARG HOT_FIX_FLAG="" WORKDIR $BASE_DIR diff --git a/build/Dockerfile.Slim b/build/Dockerfile.Slim index efa41bc..88447c1 100644 --- a/build/Dockerfile.Slim +++ b/build/Dockerfile.Slim @@ -1,6 +1,6 @@ FROM amd64/buildpack-deps:buster-curl as installer -ARG NACOS_VERSION=2.2.0.1 +ARG NACOS_VERSION=2.2.1 ARG HOT_FIX_FLAG="" RUN set -x \ diff --git a/build/conf/application.properties b/build/conf/application.properties index ec6619e..36663b9 100644 --- a/build/conf/application.properties +++ b/build/conf/application.properties @@ -25,12 +25,12 @@ nacos.core.auth.system.type=${NACOS_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} +nacos.core.auth.plugin.nacos.token.secret.key=${NACOS_AUTH_TOKEN} ### 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} +nacos.core.auth.server.identity.key=${NACOS_AUTH_IDENTITY_KEY} +nacos.core.auth.server.identity.value=${NACOS_AUTH_IDENTITY_VALUE} ## 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/**} diff --git a/changlog b/changlog index f41670b..b68ad3d 100644 --- a/changlog +++ b/changlog @@ -1 +1,4 @@ -version: 2.2.0.1 \ No newline at end of file +version: 2.2.1 +移除 NACOS_AUTH_TOKEN 默认值 +移除 NACOS_AUTH_IDENTITY_KEY 默认值 +移除 NACOS_AUTH_IDENTITY_VALUE 默认值 \ No newline at end of file diff --git a/example/.env b/example/.env index 1904f72..5f66880 100644 --- a/example/.env +++ b/example/.env @@ -1 +1 @@ -NACOS_VERSION=v2.2.0.1 +NACOS_VERSION=v2.2.1