From aac65c0c1007cb95755f238cf182c579f99484dd Mon Sep 17 00:00:00 2001
From: zhanglong <huangmnlove@163.com>
Date: Wed, 4 Mar 2020 20:10:07 +0800
Subject: [PATCH] Release 1.2.0

---
 README.md                         |  5 +++++
 README_ZH.md                      |  5 +++++
 build/Dockerfile                  |  2 +-
 build/conf/application.properties | 17 +++++++++++++++++
 changlog                          |  5 +++--
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c7a4847..791977d 100644
--- a/README.md
+++ b/README.md
@@ -114,6 +114,11 @@ Run the following command：
 | 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                          |
 
 
 
diff --git a/README_ZH.md b/README_ZH.md
index f3643cf..73b5c14 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -114,6 +114,11 @@
 | JVM_MMS                           | -XX:MaxMetaspaceSize                                         | 默认 :320m                     |
 | NACOS_DEBUG                       | enable remote debug                                          | y/n 默认 :n                      |
 | TOMCAT_ACCESSLOG_ENABLED          | server.tomcat.accesslog.enabled                              | 默认 :false                      |
+| NACOS_AUTH_SYSTEM_TYPE      |  权限系统类型选择,目前只支持nacos类型       | 默认 :nacos                          |
+| NACOS_AUTH_ENABLE      |  是否开启权限系统       | 默认 :false                          |
+| NACOS_AUTH_TOKEN_EXPIRE_SECONDS      |  token 失效时间        | 默认 :18000                          |
+| NACOS_AUTH_TOKEN      |  token       | 默认 :SecretKey012345678901234567890123456789012345678901234567890123456789                          |
+| NACOS_AUTH_CACHE_ENABLE      |  权限缓存开关 ,开启后权限缓存的更新默认有15秒的延迟      | 默认 : false                          |
 
 
 
diff --git a/build/Dockerfile b/build/Dockerfile
index a4c777b..52a2efe 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=1.1.4
+ARG NACOS_VERSION=1.2.0
 
 WORKDIR /$BASE_DIR
 
diff --git a/build/conf/application.properties b/build/conf/application.properties
index 3f2e1cd..5a975aa 100644
--- a/build/conf/application.properties
+++ b/build/conf/application.properties
@@ -12,6 +12,21 @@ 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}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true
 db.user=${MYSQL_SERVICE_USER}
 db.password=${MYSQL_SERVICE_PASSWORD}
+### The auth system to use, currently only 'nacos' is supported:
+nacos.core.auth.system.type=${NACOS_AUTH_SYSTEM_TYPE:nacos}
+
+### If turn on auth system:
+nacos.core.auth.enabled=${NACOS_AUTH_ENABLE:false}
+
+### The token expiration in seconds:
+nacos.core.auth.default.token.expire.seconds=${NACOS_AUTH_TOKEN_EXPIRE_SECONDS:18000}
+
+### The default token:
+nacos.core.auth.default.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}
+
 server.tomcat.accesslog.enabled=${TOMCAT_ACCESSLOG_ENABLED:false}
 server.tomcat.accesslog.pattern=%h %l %u %t "%r" %s %b %D
 # default current work dir
@@ -31,3 +46,5 @@ nacos.naming.distro.initDataRatio=0.9
 nacos.naming.distro.syncRetryDelay=5000
 nacos.naming.data.warmup=true
 
+
+
diff --git a/changlog b/changlog
index 23cc7f8..e26f027 100644
--- a/changlog
+++ b/changlog
@@ -1,2 +1,3 @@
-version:1.0.1
-1.构建nacos 1.0.1 最新镜像
\ No newline at end of file
+version:1.2.0
+1.构建nacos 1.2.0 最新镜像
+2.增加权限相关属性配置
\ No newline at end of file