fixed conflict

.editorconfig

@@ -0,0 +1,16 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[{package.json,.travis.yml}]
+indent_size = 2

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,5 +18,5 @@ Follow this checklist to help us incorporate your contribution quickly and easil
 * [ ] Format the pull request title like `[ISSUE #123] Fix UnknownException when host config not exist`. Each commit in the pull request should have a meaningful subject line and body.
 * [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
 * [ ] Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in [test module](https://github.com/alibaba/nacos/tree/master/test).
-* [ ] Run `mvn -B clean apache-rat:check findbugs:findbugs` to make sure basic checks pass. Run `mvn clean install -DskipITs` to make sure unit-test pass. Run `mvn clean test-compile failsafe:integration-test`  to make sure integration-test pass.
+* [ ] Run `mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true` to make sure basic checks pass. Run `mvn clean install -DskipITs` to make sure unit-test pass. Run `mvn clean test-compile failsafe:integration-test`  to make sure integration-test pass.
 

.gitignore

@@ -5,8 +5,11 @@
 target
 .project
 .idea
+.vscode
 .DS_Store
+.factorypath
 /logs
 *.iml
 node_modules
 test/derby.log
+derby.log

.travis.yml

@@ -4,6 +4,7 @@ notifications:
       - xchaos8@126.com
       - nacos_dev@linux.alibaba.com
       - dev-nacos@googlegroups.com
+      - mw_configcenter@list.alibaba-inc.com
   on_success: change
   on_failure: always
 
@@ -24,7 +25,9 @@ before_install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then jdk_switcher use "$CUSTOM_JDK"; fi
 
 script:
-
+  - mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true
+  - mvn -Prelease-nacos clean install -U
+  - mvn clean package -Pit-test
 after_success:
-  - mvn clean install -Pit-test
+  - mvn clean package -Pit-test
   - mvn sonar:sonar -Psonar-apache

CHANGELOG.md

@@ -1,3 +1,108 @@
+## 0.7.0(Dec, 2018)
+
+* [ #461 ] Registration failed when instance port is set to 0
+* [ #455 ] The console can't change the change code
+* [ #447 ] 集群模式server挂掉一台后，提供方注册失败
+* [ #445 ] 0.6.1控制台创建配置发布提交时，提示信息有问题
+* [ #442 ] Typos in class names and variables.
+* [ #413 ] The console has some uncaught exceptions
+* [ #395 ] nacos surport mysql in the case of stand-alone mode
+* [ #393 ] Support operation of selector on console
+* [ #365 ] NodeJs SDK support
+* [ #362 ] The metadata will lost when online or offline instance through web ui
+* [ #187 ] Provide Label ability for Naming Service into NACOS for complex multi-DC scenario.
+
+## 0.6.1(Dec, 2018)
+
+* [#421] NamingService's serivce name can't use colon(:) in Windows
+* [#432] When packing nacos-core, ${user.home} is replaced in the logback configuration file (nacos.xml)
+
+## 0.6.0(Dec, 2018)
+
+* [#388] Cluster name should be provided in the Instance
+* [#377] Clean up messy code in Naming module
+* [#369] Support instance list persisted on disk
+* [#366] findbugs-maven-plugin version
+* [#362] The metadata will lost when online or offline instance through web ui
+* [#352] Refactoring internationalization Nacos console
+* [#278] Nacos docker img
+* [#243] optimize the efficiency of integration testing, it’s taking too long now
+
+## 0.5.0(Nov, 2018)
+
+* [#148] Naming write performace.
+* [#175] Support deregistering instance automatically.
+* [#176] Naming client query instance method should bypass local cache at client start.
+* [#177] Console supports registering new empty service and delete empty service.
+* [#181] NPE when adding a instance if no leader in the raft cluster.
+* [#193] Configure host domain name cause nacos server cluster is unavailable.
+* [#209] Disable service and cluster level customization in client registerInstance method.
+* [#214] Please support Java 11.
+* [#222] print more nacos server start status info in start.log.
+* [#231] Refactoring: Parsing the Nacos home directory and the cluster.conf file.
+* [#246] "mvn -B clean apache-rat:check findbugs:findbugs" did not work as expected.
+* [#251] Console Editor Optimization.
+* [#254] DataId and group are required in historical version and listener query.
+* [#256] Whether the service discovery data needs to add a newline link symbol.
+* [#257] Listening query switching query dimension data is not refreshed.
+* [#258] Remove the Balloon of DataId/Group.
+* [#259] Listening query paging size problem.
+* [#272] "#it is ip" is also parsed into an instance IP.
+* [#275] nacos coredns plugin to support DNS.
+* [#281] We should lint the console code.
+* [#302] Maven build project supports java 11.
+* [#316] In stand alone mode, Nacos still checks the cluster.conf.
+
+## 0.4.0(Nov 7, 2018)
+
+* [#216] Fix tenant dir problem
+* [#197] Service update ignored some properties
+* [#190] Client beat lose weight info and metadata info
+* [#188] Console delete data cannot be updated in time
+* [#179] Listening query fail when namespace is not blank
+* [#157] Lack information in readme.md to describe the related project repositories for Nacos echosystem
+* [#144] There have a error and something are not clear
+* [#106] Snapshot file create error
+* [#92] Eliminate warnings, refactor code, show start.log detail
+
+
+## 0.3.0(Oct 26, 2018)
+
+* [#171] UI debug errors
+* [#156] Web UI 404 problem
+* [#155] use local resource
+* [#145] nacos-example not found :org.apache.logging.log4j.core.Logger
+* [#142] UI console show Group
+* [#149] Fix naming client beat process failed bug.
+* [#150] Fix naming service registration hangs bug.
+
+## 0.3.0-RC1(Oct 19, 2018)
+
+* [#33] Support console for config management.
+* [#51] Support console for naming service.
+* [#121] Fix get instance method hanging bug.
+* [#138] Add a flag to indicate if instance is offline.
+* [#130] Fix health check disabled if machine has one CPU core bug.
+* [#139] Fix still get instance with zero weight bug.
+* [#128] Fix console layout bug.
+
+
+
+## 0.2.1-release(Sept 28, 2018)
+
+* FIx deregister last instance failed error.
+* Fix url pattern error.
+* Fully integrate with and seamlessly support Spring framework, Spring Boot and Spring Cloud
+* Separate nacos-api from nacos client implementation
+* Support high available cluster mode
+* Fix cluster node health check abnormality
+* Fix stand-alone mode gets the change history list exception
+* Fix Pulling does not exist configuration print io exception
+* Optimized log framework
+* Service Discovery: Client support getting server status.
+* Service Discovery: Client support get all service names of server.
+* Service Discovery: Client support get all subscribed services.
+
 ## 0.2.0 (Sept 17, 2018)
 
 #### FEATURES:

CODE_OF_CONDUCT.md

@@ -0,0 +1,73 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+education, socio-economic status, nationality, personal appearance, race,
+religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at users-nacos@googlegroups.com. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

CONTRIBUTING.md

@@ -1,31 +1,124 @@
-## How To Contribute
+# Contributing to Nacos
 
-We are always very happy to have contributions, whether for trivial cleanups or big new features.
+Welcome to Nacos! This document is a guideline about how to contribute to Nacos.
-We want to have high quality, well documented codes for each programming language.
 
-Nor is code the only way to contribute to the project. We strongly value documentation, integration with other project, and gladly accept improvements for these aspects.
+If you find something incorrect or missing, please leave comments / suggestions.
 
-## Contributing code
+## Before you get started
 
-To submit a change for inclusion, please do the following:
+### Code of Conduct
 
-#### If the change is non-trivial please include some unit tests that cover the new functionality.
+Please make sure to read and observe our [Code of Conduct](./CODE_OF_CONDUCT.md).
-#### If you are introducing a completely new feature or API it is a good idea to start a wiki and get consensus on the basic design first.
-#### It is our job to follow up on patches in a timely fashion. Nag us if we aren't doing our job (sometimes we drop things).
 
-## Becoming a Committer
+## Contributing
 
-We are always interested in adding new contributors. What we look for are series of contributions, good taste and ongoing interest in the project. If you are interested in becoming a committer, please let one of the existing committers know and they can help you walk through the process.
+Nacos welcome new participants of any role, including user, contributor, committer and PMC.
 
-Nowadays,we have several important contribution points:
+![](http://acm-public.oss-cn-hangzhou.aliyuncs.com/contributor_definition.png)
-#### Wiki & JavaDoc
-#### Nacos Console
-#### Nacos SDK(C++\.Net\Php\Python\Go\Node.js)
 
-##### Prerequisite
-If you want to contribute the above listing points, you must abide our some prerequisites:
 
-###### Readability - API must have Javadoc,some very important methods also must have javadoc
+We encourage new comers actively join in Nacos projects and involving from user role to committer role, and even PMC role. In order to accomplish this, new comers needs to actively contribute in Nacos project. The following paragraph introduce how to contribute in Nacos way.
-###### Testability - 80% above unit test coverage about main process
+
-###### Maintainability - Comply with our [PMD spec](style/codeStyle.xml), and at least 3 month update frequency
+#### Open / pickup an issue for preparation
-###### Deployability - We encourage you to deploy into [maven repository](http://search.maven.org/)
+
+If you find a typo in document, find a bug in code, or want new features, or want to give suggestions, you can [open an issue on GitHub](https://github.com/alibaba/Nacos/issues/new) to report it.
+
+If you just want to contribute directly you can choose the issue below.
+
+-   [Contribution Welcome](https://github.com/alibaba/nacos/labels/contribution%20welcome): Heavily needed issue, but currently short of hand.
+    
+-   [good first issue](https://github.com/alibaba/nacos/labels/good%20first%20issue): Good for newcomers, new comer can pickup one for warm-up.
+    
+
+We strongly value documentation and integration with other projects such as Spring Cloud, Kubernetes, Dubbo, etc. We are very glad to work on any issue for these aspects.
+
+Please note that any PR must be associated with a valid issue. Otherwise the PR will be rejected.
+
+#### Begin your contribute
+
+Now if you want to contribute, please create a new pull request.
+
+We use the `develop` branch as the development branch, which indicates that this is a unstable branch.
+
+Further more, our branching model complies to [https://nvie.com/posts/a-successful-git-branching-model/](https://nvie.com/posts/a-successful-git-branching-model/). We strongly suggest new comers walk through the above article before creating PR.
+
+Now, if you are ready to create PR, here is the workflow for contributors:
+
+1.  Fork to your own
+    
+2.  Clone fork to local repository
+    
+3.  Create a new branch and work on it
+    
+4.  Keep your branch in sync
+    
+5.  Commit your changes (make sure your commit message concise)
+    
+6.  Push your commits to your forked repository
+    
+7.  Create a pull request to **develop** branch.
+    
+
+When creating pull request:
+
+1.  Please follow [the pull request template](./.github/PULL_REQUEST_TEMPLATE.md).
+    
+2.  Please create the request to **develop** branch.
+    
+3.  Please make sure the PR has a corresponding issue.
+    
+4.  If your PR contains large changes, e.g. component refactor or new components, please write detailed documents about its design and usage.
+    
+5.  Note that a single PR should not be too large. If heavy changes are required, it's better to separate the changes to a few individual PRs.
+    
+6.  After creating a PR, one or more reviewers will be assigned to the pull request.
+    
+7.  Before merging a PR, squash any fix review feedback, typo, merged, and rebased sorts of commits. The final commit message should be clear and concise.
+    
+
+If your PR contains large changes, e.g. component refactor or new components, please write detailed documents about its design and usage.
+
+### Code review guidance
+
+Committers will rotate reviewing the code to make sure all the PR will be reviewed timely and by at least one committer before merge. If we aren't doing our job (sometimes we drop things). And as always, we welcome volunteers for code review.
+
+Some principles:
+
+-   Readability - Important code should be well-documented. API should have Javadoc. Code style should be complied with the existing one.
+    
+-   Elegance: New functions, classes or components should be well designed.
+    
+-   Testability - 80% of the new code should be covered by unit test cases.
+    
+-   Maintainability - Comply with our [PMD spec](style/codeStyle.xml), and 3-month-frequency update should be maintained at least.
+    
+
+### Now how about try become a committer?
+
+Generally speaking, contribute 8 non-trivial patches and get at least three different people to review them (you'll need three people to support you). Then ask someone to nominate you. You're demonstrating your:
+
+-   at least 8 PR and the associated issues to the project,
+    
+-   ability to collaborate with the team,
+    
+-   understanding of the projects' code base and coding style, and
+    
+-   ability to write good code (last but certainly not least)
+    
+
+A current committer nominates you by slacking the team on the Nacos issue with label "nomination"
+
+-   your first and last name
+    
+-   a link to your Git profile
+    
+-   an explanation of why you should be a committer,
+    
+-   Elaborate the top 3 PR and the associated issues the nominator has worked with you that can demonstrate your ability.
+    
+
+Two other committer need to second your nomination. If no one objects in 5 working days (China), you're a committer. If anyone objects or wants more information, the committers discuss and usually come to a consensus (within the 5 working days). If issues cannot be resolved, there's a vote among current committers.
+
+![](http://acm-public.oss-cn-hangzhou.aliyuncs.com/nomination_process.png)
+
+In the worst case, this can drag out for two weeks. Keep contributing! Even in the rare cases where a nomination fails, the objection is usually something easy to address like "more patches" or "not enough people are familiar with this person's work."

README.md

@@ -1,12 +1,16 @@
-## Nacos 
 
+<img src="doc/Nacos_Logo.png" width="50%" height="50%" />
+
+# Nacos: Dynamic  *Na*ming and *Co*nfiguration *S*ervice
 
 [![Gitter](https://badges.gitter.im/alibaba/nacos.svg)](https://gitter.im/alibaba/nacos?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)   [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![Gitter](https://travis-ci.org/alibaba/nacos.svg?branch=master)](https://travis-ci.org/alibaba/nacos)
 
 -------
-<img src="doc/Nacos_Logo.png" width="50%" height="50%" />
+
-Nacos is an easy-to-use platform designed for dynamic service discovery and configuration and service management. It helps you to build cloud native applications and microservices platform easily.
+## What does it do
+
+Nacos (official site: [http://nacos.io](http://nacos.io)) is an easy-to-use platform designed for dynamic service discovery and configuration and service management. It helps you to build cloud native applications and microservices platform easily.
 
 Service is a first-class citizen in Nacos. Nacos supports almost all type of services，for example，[Dubbo/gRPC service](https://nacos.io/en-us/docs/use-nacos-with-dubbo.html)、[Spring Cloud RESTFul service](https://nacos.io/en-us/docs/use-nacos-with-springcloud.html) or [Kubernetes service](https://nacos.io/en-us/docs/use-nacos-with-kubernetes.html).
 
@@ -29,60 +33,70 @@ Nacos provides four major functions.
 	Nacos provides an easy-to-use service dashboard to help you manage your services metadata, configuration, kubernetes DNS, service health and metrics statistics.
  
 
-### Quick Start
+## Quick Start
 It is super easy to get started with your first project.
 
-1. #### Download run package 
+#### Step 1: Download the binary package 
-[Download](https://github.com/alibaba/nacos/releases/download/0.2.1/nacos-server-0.2.1.zip)
 
+You can download the package from the  [latest stable release](https://github.com/alibaba/nacos/releases).  
+
+Take release nacos-server-0.6.1.zip for example.
 ```
-unzip nacos-server-0.2.1.zip
+unzip nacos-server-0.6.1.zip
 cd nacos/bin 
 ``` 
 
-2. #### Start Server
+#### Step 2: Start Server
-* ##### Linux/Unix/Mac
 
+On the **Linux/Unix/Mac** platform, run the following command to start server with standalone mode: 
 ```
-Run the following command to start (standalone means non-cluster mode): 
-
 sh startup.sh -m standalone
 ```
 
-* ##### Windows
+On the **Windows** platform, run the following command to start server with standalone mode.  Alternatively, you can also double-click the startup.cmd to run NacosServer.
 ```
-Run the following command to start:
+cmd startup.cmd -m standalone
-
-cmd startup.cmd
-
-Or double-click the startup.cmd to run NacosServer.
 ```
 
 For more details, see [quick-start.](https://nacos.io/en-us/docs/quick-start.html)
 
-3. #### Quick start for other open-source projects:
+## Quick start for other open-source projects:
+* [Quick start with Nacos command and console](https://nacos.io/en-us/docs/quick-start.html)
 
-* [quick start with spring cloud](https://nacos.io/en-us/docs/use-nacos-with-springcloud.html)
+* [Quick start with dubbo](https://nacos.io/en-us/docs/use-nacos-with-dubbo.html)
 
-* [quick start with dubbo](https://nacos.io/en-us/docs/use-nacos-with-dubbo.html)
+* [Quick start with spring cloud](https://nacos.io/en-us/docs/quick-start-spring-cloud.html)
 
-* [quick start with kubernetes](https://nacos.io/en-us/docs/use-nacos-with-kubernetes.html)
+* [Quick start with kubernetes](https://nacos.io/en-us/docs/use-nacos-with-kubernetes.html)
 
-* [more...](https://nacos.io/)
 
-### Documentation
+## Documentation
 
-You can view full documentation on the Nacos website:
+You can view the full documentation from the [Nacos website](https://nacos.io/en-us/docs/what-is-nacos.html).
 
-* [nacos.io](https://nacos.io/en-us/docs/what-is-nacos.html)
+All the latest and long-term notice can also be found here from [Github notice issue](https://github.com/alibaba/nacos/labels/notice)
 
-### Contact
 
-* #### Gitter-[Nacos Gitter](https://gitter.im/alibaba/nacos)
+## Contributing
 
-* #### Weibo-[Nacos Weibo](https://weibo.com/u/6574374908)
+Contributors are welcomed to join Nacos project. Please check [CONTRIBUTING](./CONTRIBUTING.md) about how to contribute to this project.
 
-* #### Segmentfault-[Nacos Segmentfault](https://segmentfault.com/t/nacos)
+## Other Related Project Repositories
 
-* #### Mailing list-[nacos\_dev@linux.alibaba.com](mailto:nacos_dev@linux.alibaba.com).
+* [nacos-spring-project](https://github.com/nacos-group/nacos-spring-project) provides the integration functionality for Spring.
+* [nacos-group](https://github.com/nacos-group) is the reposity that hosts the eco tools for Nacos, such as SDK, synchronization tool, etc.
+* [spring-cloud-alibaba](https://github.com/spring-cloud-incubator/spring-cloud-alibaba) provides the one-stop solution for application development over Alibaba middleware which includes Nacos.
 
+## Contact
+
+* [Gitter](https://gitter.im/alibaba/nacos): Nacos's IM tool for community messaging, collaboration and discovery.
+* [Twitter](https://twitter.com/nacos2): Follow along for latest nacos news on Twitter.
+* [Weibo](https://weibo.com/u/6574374908): Follow along for latest nacos news on Weibo (Twitter of China version).
+* [Nacos Segmentfault](https://segmentfault.com/t/nacos): Get latest notice and prompt help from Segmentfault.
+* Email Group:
+     * users-nacos@googlegroups.com: Nacos usage general discussion.
+     * dev-nacos@googlegroups.com: Nacos developer discussion (APIs, feature design, etc).
+     * commits-nacos@googlegroups.com: Commits notice, very high frequency.
+* Join us from wechat. Welcome words: Nacos.
+
+![cwex](http://acm-public.oss-cn-hangzhou.aliyuncs.com/xuc.png)

REPORTING-BUGS.md

@@ -21,7 +21,7 @@ We might ask for further information to locate a bug. A duplicated bug report wi
 
 # 如何提交错误报告
 
-如果Nacos项目的任何部分存在问题或文档问题，请通过[opening an issue][Nacos-issue]告诉我们。我们非常认真地对待错误和错误，在产品面前没有不重要的问题。不过在创建错误报告之前，请检查是否存在报告相同问题的issues。
+如果Nacos项目的任何部分存在问题或文档问题，请通过[opening an issue][Nacos-issue]告诉我们。我们非常认真地对待错误和缺陷，在产品面前没有不重要的问题。不过在创建错误报告之前，请检查是否存在报告相同问题的issues。
 
 为了使错误报告准确且易于理解，请尝试创建以下错误报告：
 
@@ -36,4 +36,4 @@ We might ask for further information to locate a bug. A duplicated bug report wi
 我们可能会要求您提供更多信息以查找错误。将关闭重复的错误报告。
 
 [etcd-issue]：https：//github.com/etcd-io/etcd/issues/new
-[filing-good-bugs]：http：//fantasai.inkedblade.net/style/talks/filing-good-bugs/
+[filing-good-bugs]：http：//fantasai.inkedblade.net/style/talks/filing-good-bugs/

api/pom.xml

@@ -12,30 +12,55 @@
   limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
+    <parent>
-		<groupId>com.alibaba.nacos</groupId>
+        <groupId>com.alibaba.nacos</groupId>
-		<artifactId>nacos-all</artifactId>
+        <artifactId>nacos-all</artifactId>
-		<version>0.2.1</version>
+        <version>0.7.0</version>
-	</parent>
+    </parent>
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<artifactId>nacos-api</artifactId>
+    <artifactId>nacos-api</artifactId>
-	<packaging>jar</packaging>
+    <packaging>jar</packaging>
 
-	<name>nacos-api ${project.version}</name>
+    <name>nacos-api ${project.version}</name>
-	<url>http://maven.apache.org</url>
+    <url>http://maven.apache.org</url>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>7</source>
+                    <target>7</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-	<properties>
+    <properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+    </properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-		</dependency>
-	</dependencies> 
 
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

api/src/main/java/com/alibaba/nacos/api/NacosFactory.java

@@ -31,7 +31,7 @@ import com.alibaba.nacos.api.naming.NamingService;
 public class NacosFactory {
 
     /**
-     * create config service
+     * Create config service
      *
      * @param properties init param
      * @return config
@@ -42,7 +42,7 @@ public class NacosFactory {
     }
 
     /**
-     * create config service
+     * Create config service
      *
      * @param serverAddr server list
      * @return config
@@ -53,7 +53,7 @@ public class NacosFactory {
     }
 
     /**
-     * create naming service
+     * Create naming service
      *
      * @param serverAddr server list
      * @return Naming
@@ -64,7 +64,7 @@ public class NacosFactory {
     }
 
     /**
-     * create naming service
+     * Create naming service
      *
      * @param properties init param
      * @return Naming

api/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java

@@ -38,4 +38,6 @@ public class PropertyKeyConst {
 
     public final static String ENCODE = "encode";
 
+    public final static String NAMING_LOAD_CACHE_AT_START = "namingLoadCacheAtStart";
+
 }

api/src/main/java/com/alibaba/nacos/api/annotation/NacosInjected.java

@@ -1,12 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

api/src/main/java/com/alibaba/nacos/api/annotation/NacosProperties.java

@@ -1,12 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/Entity.java

@@ -13,41 +13,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.alibaba.nacos.core;
+package com.alibaba.nacos.api.cmdb.pojo;
 
-import junit.framework.Test;
+import java.util.Map;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
- * Unit test for simple App.
+ * @author <a href="mailto:zpf.073@gmail.com">nkorange</a>
  */
-public class AppTest 
+public class Entity {
-    extends TestCase
+
-{
+    private String type;
-    /**
+    private String name;
-     * Create the test case
+    private Map<String, String> labels;
-     *
+
-     * @param testName name of the test case
+    public String getType() {
-     */
+        return type;
-    public AppTest( String testName )
-    {
-        super( testName );
     }
 
-    /**
+    public void setType(String type) {
-     * @return the suite of tests being tested
+        this.type = type;
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
     }
 
-    /**
+    public String getName() {
-     * Rigourous Test :-)
+        return name;
-     */
+    }
-    public void testApp()
+
-    {
+    public void setName(String name) {
-        assertTrue( true );
+        this.name = name;
+    }
+
+    public Map<String, String> getLabels() {
+        return labels;
+    }
+
+    public void setLabels(Map<String, String> labels) {
+        this.labels = labels;
     }
 }

api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/EntityEvent.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.nacos.api.cmdb.pojo;
+
+/**
+ * @author <a href="mailto:zpf.073@gmail.com">nkorange</a>
+ */
+public class EntityEvent {
+
+    private EntityEventType type;
+    private String entityName;
+    private String entityType;
+
+    public EntityEventType getType() {
+        return type;
+    }
+
+    public void setType(EntityEventType type) {
+        this.type = type;
+    }
+
+    public String getEntityName() {
+        return entityName;
+    }
+
+    public void setEntityName(String entityName) {
+        this.entityName = entityName;
+    }
+
+    public String getEntityType() {
+        return entityType;
+    }
+
+    public void setEntityType(String entityType) {
+        this.entityType = entityType;
+    }
+}

api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/EntityEventType.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.nacos.api.cmdb.pojo;
+
+/**
+ * @author <a href="mailto:zpf.073@gmail.com">nkorange</a>
+ */
+public enum EntityEventType {
+    /**
+     *
+     */
+    ENTITY_ADD_OR_UPDATE,
+    /**
+     *
+     */
+    ENTITY_REMOVE
+}

api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/Label.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.nacos.api.cmdb.pojo;
+
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:zpf.073@gmail.com">nkorange</a>
+ */
+public class Label {
+
+    private String name;
+    private Set<String> values;
+    private String description;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Set<String> getValues() {
+        return values;
+    }
+
+    public void setValues(Set<String> values) {
+        this.values = values;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

api/src/main/java/com/alibaba/nacos/api/cmdb/pojo/PreservedEntityTypes.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.nacos.api.cmdb.pojo;
+
+/**
+ * @author <a href="mailto:zpf.073@gmail.com">nkorange</a>
+ */
+public enum PreservedEntityTypes {
+    /**
+     * Ip
+     */
+    ip,
+    /**
+     * Service
+     */
+    service
+}

api/src/main/java/com/alibaba/nacos/api/cmdb/spi/CmdbService.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.nacos.api.cmdb.spi;
+
+import com.alibaba.nacos.api.cmdb.pojo.Entity;
+import com.alibaba.nacos.api.cmdb.pojo.EntityEvent;
+import com.alibaba.nacos.api.cmdb.pojo.Label;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Service to visit CMDB store
+ *
+ * @author <a href="mailto:zpf.073@gmail.com">nkorange</a>
+ */
+public interface CmdbService {
+
+    /**
+     * Get all label names stored in CMDB
+     *
+     * @return label name set
+     */
+    Set<String> getLabelNames();
+
+    /**
+     * Get all possible entity types in CMDB
+     *
+     * @return all entity types
+     */
+    Set<String> getEntityTypes();
+
+    /**
+     * Get label info
+     *
+     * @param labelName label name
+     * @return label info
+     */
+    Label getLabel(String labelName);
+
+    /**
+     * Get label value of label name of ip
+     *
+     * @param entityName entity name
+     * @param entityType  entity type
+     * @param labelName   target label name
+     * @return label value
+     */
+    String getLabelValue(String entityName, String entityType, String labelName);
+
+    /**
+     * Get all label value of ip
+     *
+     * @param entityName entity name
+     * @param entityType  entity type
+     * @return all label values
+     */
+    Map<String, String> getLabelValues(String entityName, String entityType);
+
+    /**
+     * Dump all entities in CMDB
+     *
+     * @return all entities
+     */
+    Map<String, Map<String, Entity>> getAllEntities();
+
+    /**
+     * get label change events
+     *
+     * @param timestamp start time of generated events
+     * @return label events
+     */
+    List<EntityEvent> getEntityEvents(long timestamp);
+
+    /**
+     * Get single entity
+     *
+     * @param entityName name of entity
+     * @param entityType type of entity
+     * @return
+     */
+    Entity getEntity(String entityName, String entityType);
+}

api/src/main/java/com/alibaba/nacos/api/common/Constants.java

@@ -85,11 +85,6 @@ public class Constants {
      */
     public static final int ONCE_TIMEOUT = 2000;
 
-    /**
-     * millisecond
-     */
-    public static final int CONN_TIMEOUT = 2000;
-
     /**
      * millisecond
      */
@@ -110,9 +105,9 @@ public class Constants {
 
     public static final int FLOW_CONTROL_INTERVAL = 1000;
 
-    public static final String LINE_SEPARATOR = Character.toString((char) 1);
+    public static final String LINE_SEPARATOR = Character.toString((char)1);
 
-    public static final String WORD_SEPARATOR = Character.toString((char) 2);
+    public static final String WORD_SEPARATOR = Character.toString((char)2);
 
     public static final String LONGPULLING_LINE_SEPARATOR = "\r\n";
 
@@ -124,4 +119,7 @@ public class Constants {
 
     public static final String NAMING_INSTANCE_ID_SPLITTER = "#";
     public static final int NAMING_INSTANCE_ID_SEG_COUNT = 4;
+    public static final String NAMING_HTTP_HEADER_SPILIER = "\\|";
+
+    public static final String NAMING_DEFAULT_CLUSTER_NAME = "DEFAULT";
 }

api/src/main/java/com/alibaba/nacos/api/config/ConfigFactory.java

@@ -29,7 +29,7 @@ import com.alibaba.nacos.api.exception.NacosException;
 public class ConfigFactory {
 
     /**
-     * create config service
+     * Create Config
      *
      * @param properties init param
      * @return ConfigService
@@ -47,11 +47,11 @@ public class ConfigFactory {
     }
 
     /**
-     * create config service
+     * Create Config
      *
-     * @param serverAddr serverlist
+     * @param serverAddr serverList
-     * @return ConfigService
+     * @return Config
-     * @throws NacosException Exception
+     * @throws ConfigService Exception
      */
     public static ConfigService createConfigService(String serverAddr) throws NacosException {
         Properties properties = new Properties();

api/src/main/java/com/alibaba/nacos/api/config/ConfigService.java

@@ -26,7 +26,7 @@ import com.alibaba.nacos.api.exception.NacosException;
 public interface ConfigService {
 
     /**
-     * get config
+     * Get config
      *
      * @param dataId    dataId
      * @param group     group
@@ -52,7 +52,7 @@ public interface ConfigService {
     void addListener(String dataId, String group, Listener listener) throws NacosException;
 
     /**
-     * publish config.
+     * Publish config.
      *
      * @param dataId  dataId
      * @param group   group
@@ -63,7 +63,7 @@ public interface ConfigService {
     boolean publishConfig(String dataId, String group, String content) throws NacosException;
 
     /**
-     * remove config
+     * Remove config
      *
      * @param dataId dataId
      * @param group  group
@@ -73,7 +73,7 @@ public interface ConfigService {
     boolean removeConfig(String dataId, String group) throws NacosException;
 
     /**
-     * remove listener
+     * Remove listener
      *
      * @param dataId   dataId
      * @param group    group
@@ -82,7 +82,7 @@ public interface ConfigService {
     void removeListener(String dataId, String group, Listener listener);
 
     /**
-     * get server status
+     * Get server status
      *
      * @return whether health
      */

api/src/main/java/com/alibaba/nacos/api/config/annotation/NacosConfigListener.java

@@ -1,12 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -57,8 +56,7 @@ public @interface NacosConfigListener {
     Class<? extends NacosConfigConverter> converter() default NacosConfigConverter.class;
 
     /**
-     * The {@link NacosProperties} attribute, If not specified, it will use
+     * The {@link NacosProperties} attribute, If not specified, it will use global Nacos Properties.
-     * global Nacos Properties.
      *
      * @return the default value is {@link NacosProperties}
      */

api/src/main/java/com/alibaba/nacos/api/config/annotation/NacosConfigurationProperties.java

@@ -1,12 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -24,7 +23,6 @@ import java.lang.annotation.*;
 
 import static com.alibaba.nacos.api.common.Constants.DEFAULT_GROUP;
 
-
 /**
  * An annotation for Nacos configuration Properties for binding POJO as Properties Object.
  *
@@ -52,51 +50,46 @@ public @interface NacosConfigurationProperties {
     String dataId();
 
     /**
-     * It indicates the properties of current doBind bean is auto-refreshed
+     * It indicates the properties of current doBind bean is auto-refreshed when Nacos configuration is changed.
-     * when Nacos configuration is changed.
      *
      * @return default value is <code>false</code>
      */
     boolean autoRefreshed() default false;
 
-
     /**
-     * Flag to indicate that when binding to this object invalid fields should be ignored.
+     * Flag to indicate that when binding to this object invalid fields should be ignored. Invalid means invalid
-     * Invalid means invalid according to the binder that is used, and usually this means
+     * according to the binder that is used, and usually this means fields of the wrong type (or that cannot be coerced
-     * fields of the wrong type (or that cannot be coerced into the correct type).
+     * into the correct type).
      *
      * @return the flag value (default false)
      */
     boolean ignoreInvalidFields() default false;
 
     /**
-     * Flag to indicate that when binding to this object fields with periods in their
+     * Flag to indicate that when binding to this object fields with periods in their names should be ignored.
-     * names should be ignored.
      *
      * @return the flag value (default false)
      */
     boolean ignoreNestedProperties() default false;
 
     /**
-     * Flag to indicate that when binding to this object unknown fields should be ignored.
+     * Flag to indicate that when binding to this object unknown fields should be ignored. An unknown field could be a
-     * An unknown field could be a sign of a mistake in the Properties.
+     * sign of a mistake in the Properties.
      *
      * @return the flag value (default true)
      */
     boolean ignoreUnknownFields() default true;
 
     /**
-     * Flag to indicate that an exception should be raised if a Validator is available and
+     * Flag to indicate that an exception should be raised if a Validator is available and validation fails. If it is
-     * validation fails. If it is set to false, validation errors will be swallowed. They
+     * set to false, validation errors will be swallowed. They will be logged, but not propagated to the caller.
-     * will be logged, but not propagated to the caller.
      *
      * @return the flag value (default true)
      */
     boolean exceptionIfInvalid() default true;
 
     /**
-     * The {@link NacosProperties} attribute, If not specified, it will use
+     * The {@link NacosProperties} attribute, If not specified, it will use global Nacos Properties.
-     * global Nacos Properties.
      *
      * @return the default value is {@link NacosProperties}
      */

api/src/main/java/com/alibaba/nacos/api/config/annotation/NacosIgnore.java

@@ -1,12 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,8 +18,7 @@ package com.alibaba.nacos.api.config.annotation;
 import java.lang.annotation.*;
 
 /**
- * An annotation for ignore field from annotated
+ * An annotation for ignore field from annotated {@link NacosConfigurationProperties} Properties Object.
- * {@link NacosConfigurationProperties} Properties Object.
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @see NacosConfigurationProperties

api/src/main/java/com/alibaba/nacos/api/config/annotation/NacosProperty.java

@@ -1,12 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -19,9 +18,8 @@ package com.alibaba.nacos.api.config.annotation;
 import java.lang.annotation.*;
 
 /**
- * An annotation for Nacos Property name of  Nacos Configuration to
+ * An annotation for Nacos Property name of  Nacos Configuration to bind a field from annotated {@link
- * bind a field from annotated {@link NacosConfigurationProperties}
+ * NacosConfigurationProperties} Properties Object.
- * Properties Object.
  *
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @see NacosConfigurationProperties

api/src/main/java/com/alibaba/nacos/api/config/annotation/NacosValue.java

@@ -1,12 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

api/src/main/java/com/alibaba/nacos/api/config/convert/NacosConfigConverter.java

@@ -1,12 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -41,5 +40,4 @@ public interface NacosConfigConverter<T> {
      */
     T convert(String config);
 
-
 }

api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigContext.java

@@ -22,7 +22,7 @@ package com.alibaba.nacos.api.config.filter;
  */
 public interface IConfigContext {
     /**
-     * get context param by key
+     * Get context param by key
      *
      * @param key
      * @return context
@@ -30,7 +30,7 @@ public interface IConfigContext {
     Object getParameter(String key);
 
     /**
-     * set context param
+     * Set context param
      *
      * @param key   key
      * @param value value

api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigFilter.java

@@ -24,7 +24,7 @@ import com.alibaba.nacos.api.exception.NacosException;
  */
 public interface IConfigFilter {
     /**
-     * init
+     * Init
      *
      * @param filterConfig Filter Config
      */
@@ -47,14 +47,14 @@ public interface IConfigFilter {
     void deploy();
 
     /**
-     * get order
+     * Get order
      *
      * @return order number
      */
     int getOrder();
 
     /**
-     * get filterName
+     * Get filterName
      *
      * @return filter name
      */

api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigFilterChain.java

@@ -24,7 +24,7 @@ import com.alibaba.nacos.api.exception.NacosException;
  */
 public interface IConfigFilterChain {
     /**
-     * filter aciton
+     * Filter aciton
      *
      * @param request  request
      * @param response response

api/src/main/java/com/alibaba/nacos/api/config/filter/IConfigResponse.java

@@ -30,7 +30,7 @@ public interface IConfigResponse {
     Object getParameter(String key);
 
     /**
-     * get config context
+     * Get config context
      *
      * @return configContext
      */

api/src/main/java/com/alibaba/nacos/api/config/filter/IFilterConfig.java

@@ -30,7 +30,7 @@ public interface IFilterConfig {
     String getFilterName();
 
     /**
-     * get init param
+     * Get init param
      *
      * @param name
      * @return param

api/src/main/java/com/alibaba/nacos/api/config/listener/AbstractListener.java

@@ -26,7 +26,7 @@ import java.util.concurrent.Executor;
 public abstract class AbstractListener implements Listener {
 
     /**
-     * use default executor
+     * Use default executor
      */
     @Override
     public Executor getExecutor() {

api/src/main/java/com/alibaba/nacos/api/config/listener/Listener.java

@@ -17,7 +17,6 @@ package com.alibaba.nacos.api.config.listener;
 
 import java.util.concurrent.Executor;
 
-
 /**
  * Listener for watch config
  *
@@ -26,15 +25,14 @@ import java.util.concurrent.Executor;
 public interface Listener {
 
     /**
-     * get executor for execute this receive
+     * Get executor for execute this receive
      *
      * @return Executor
      */
     Executor getExecutor();
 
-
     /**
-     * receive config info
+     * Receive config info
      *
      * @param configInfo config info
      */

api/src/main/java/com/alibaba/nacos/api/exception/NacosException.java

@@ -75,7 +75,6 @@ public class NacosException extends Exception {
      */
     public static final int CLIENT_OVER_THRESHOLD = -503;
 
-
     /**
      * server error code
      * 400 403 throw exception to user
@@ -107,5 +106,4 @@ public class NacosException extends Exception {
      */
     public static final int OVER_THRESHOLD = 503;
 
-
 }

api/src/main/java/com/alibaba/nacos/api/naming/NamingFactory.java

@@ -27,25 +27,25 @@ import com.alibaba.nacos.api.exception.NacosException;
  */
 public class NamingFactory {
 
-	public static NamingService createNamingService(String serverList) throws NacosException {
+    public static NamingService createNamingService(String serverList) throws NacosException {
-		try {
+        try {
-			Class<?> driverImplClass = Class.forName("com.alibaba.nacos.client.naming.NacosNamingService");
+            Class<?> driverImplClass = Class.forName("com.alibaba.nacos.client.naming.NacosNamingService");
-			Constructor constructor = driverImplClass.getConstructor(String.class);
+            Constructor constructor = driverImplClass.getConstructor(String.class);
-			NamingService vendorImpl = (NamingService) constructor.newInstance(serverList);
+            NamingService vendorImpl = (NamingService)constructor.newInstance(serverList);
-			return vendorImpl;
+            return vendorImpl;
-		} catch (Throwable e) {
+        } catch (Throwable e) {
-			throw new NacosException(-400, e.getMessage());
+            throw new NacosException(-400, e.getMessage());
-		}
+        }
-	}
+    }
 
-	public static NamingService createNamingService(Properties properties) throws NacosException {
+    public static NamingService createNamingService(Properties properties) throws NacosException {
-		try {
+        try {
-			Class<?> driverImplClass = Class.forName("com.alibaba.nacos.client.naming.NacosNamingService");
+            Class<?> driverImplClass = Class.forName("com.alibaba.nacos.client.naming.NacosNamingService");
-			Constructor constructor = driverImplClass.getConstructor(Properties.class);
+            Constructor constructor = driverImplClass.getConstructor(Properties.class);
-			NamingService vendorImpl = (NamingService) constructor.newInstance(properties);
+            NamingService vendorImpl = (NamingService)constructor.newInstance(properties);
-			return vendorImpl;
+            return vendorImpl;
-		} catch (Throwable e) {
+        } catch (Throwable e) {
-			throw new NacosException(-400, e.getMessage());
+            throw new NacosException(-400, e.getMessage());
-		}
+        }
-	}
+    }
 }

api/src/main/java/com/alibaba/nacos/api/naming/NamingService.java

@@ -20,6 +20,7 @@ import com.alibaba.nacos.api.naming.listener.EventListener;
 import com.alibaba.nacos.api.naming.pojo.Instance;
 import com.alibaba.nacos.api.naming.pojo.ListView;
 import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
+import com.alibaba.nacos.api.selector.AbstractSelector;
 
 import java.util.List;
 
@@ -189,7 +190,22 @@ public interface NamingService {
     ListView<String> getServicesOfServer(int pageNo, int pageSize) throws NacosException;
 
     /**
+<<<<<<< HEAD
      * get all subscribed services of current client
+=======
+     * Get all service names from server
+     *
+     * @param pageNo   page index
+     * @param pageSize page size
+     * @param selector selector to filter the resource
+     * @return list of service names
+     * @throws NacosException
+     */
+    ListView<String> getServicesOfServer(int pageNo, int pageSize, AbstractSelector selector) throws NacosException;
+
+    /**
+     * Get all subscribed services of current client
+>>>>>>> upstream/develop
      *
      * @return subscribed services
      * @throws NacosException

api/src/main/java/com/alibaba/nacos/api/naming/pojo/AbstractHealthChecker.java

@@ -15,10 +15,17 @@
  */
 package com.alibaba.nacos.api.naming.pojo;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.nacos.api.common.Constants;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Objects;
 
 /**
- * @author dungu.zpf
+ * @author <a href="mailto:zpf.073@gmail.com">nkorange</a>
  */
 public abstract class AbstractHealthChecker implements Cloneable {
 
@@ -32,6 +39,14 @@ public abstract class AbstractHealthChecker implements Cloneable {
         this.type = type;
     }
 
+    /**
+     * Clone all fields of this instance to another one
+     *
+     * @return Another instance with exactly the same fields.
+     * @throws CloneNotSupportedException
+     */
+    public abstract AbstractHealthChecker clone() throws CloneNotSupportedException;
+
     public static class Http extends AbstractHealthChecker {
         public static final String TYPE = "HTTP";
 
@@ -68,6 +83,25 @@ public abstract class AbstractHealthChecker implements Cloneable {
             this.headers = headers;
         }
 
+        @JSONField(serialize = false)
+        public Map<String, String> getCustomHeaders() {
+            if (StringUtils.isBlank(headers)) {
+                return Collections.emptyMap();
+            }
+
+            Map<String, String> headerMap = new HashMap<String, String>(16);
+            for (String s : headers.split(Constants.NAMING_HTTP_HEADER_SPILIER)) {
+                String[] splits = s.split(":");
+                if (splits.length != 2) {
+                    continue;
+                }
+
+                headerMap.put(StringUtils.trim(splits[0]), StringUtils.trim(splits[1]));
+            }
+
+            return headerMap;
+        }
+
         @Override
         public int hashCode() {
             return Objects.hash(path, headers, expectedResponseCode);
@@ -79,7 +113,7 @@ public abstract class AbstractHealthChecker implements Cloneable {
                 return false;
             }
 
-            Http other = (Http) obj;
+            Http other = (Http)obj;
 
             if (!strEquals(type, other.getType())) {
                 return false;
@@ -93,6 +127,18 @@ public abstract class AbstractHealthChecker implements Cloneable {
             }
             return expectedResponseCode == other.getExpectedResponseCode();
         }
+
+        @Override
+        public Http clone() throws CloneNotSupportedException {
+            Http config = new Http();
+
+            config.setPath(this.getPath());
+            config.setHeaders(this.getHeaders());
+            config.setType(this.getType());
+            config.setExpectedResponseCode(this.getExpectedResponseCode());
+
+            return config;
+        }
     }
 
     public static class Tcp extends AbstractHealthChecker {
@@ -112,6 +158,12 @@ public abstract class AbstractHealthChecker implements Cloneable {
             return obj instanceof Tcp;
 
         }
+
+        public Tcp clone() throws CloneNotSupportedException {
+            Tcp config = new Tcp();
+            config.setType(this.type);
+            return config;
+        }
     }
 
     public static class Mysql extends AbstractHealthChecker {
@@ -160,7 +212,7 @@ public abstract class AbstractHealthChecker implements Cloneable {
                 return false;
             }
 
-            Mysql other = (Mysql) obj;
+            Mysql other = (Mysql)obj;
 
             if (!strEquals(user, other.getUser())) {
                 return false;
@@ -173,6 +225,17 @@ public abstract class AbstractHealthChecker implements Cloneable {
             return strEquals(cmd, other.getCmd());
 
         }
+
+        @Override
+        public Mysql clone() throws CloneNotSupportedException {
+            Mysql config = new Mysql();
+            config.setUser(this.getUser());
+            config.setPwd(this.getPwd());
+            config.setCmd(this.getCmd());
+            config.setType(this.getType());
+
+            return config;
+        }
     }
 
     private static boolean strEquals(String str1, String str2) {

api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java

@@ -19,6 +19,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
+<<<<<<< HEAD
  *
  *
  * @author dungu.zpf
@@ -33,7 +34,7 @@ public class Cluster {
     /**
      * Name of cluster
      */
-    private String name = "";
+    private String name;
 
     /**
      * Health check config of this cluster
@@ -55,7 +56,6 @@ public class Cluster {
      */
     private boolean useIPPort4Check = true;
 
-
     private Map<String, String> metadata = new HashMap<String, String>();
 
     public Cluster() {

api/src/main/java/com/alibaba/nacos/api/naming/pojo/Instance.java

@@ -17,7 +17,6 @@ package com.alibaba.nacos.api.naming.pojo;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.annotation.JSONField;
-import com.alibaba.nacos.api.common.Constants;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -55,17 +54,17 @@ public class Instance {
     @JSONField(name = "valid")
     private boolean healthy = true;
 
+    private boolean enabled = true;
+
     /**
      * cluster information of instance
      */
-    @JSONField(serialize = false)
+    private String clusterName;
-    private Cluster cluster = new Cluster();
 
     /**
-     * service information of instance
+     * Service information of instance
      */
-    @JSONField(serialize = false)
+    private String serviceName;
-    private Service service;
 
     /**
      * user extended attributes
@@ -80,14 +79,6 @@ public class Instance {
         this.instanceId = instanceId;
     }
 
-    public String serviceName() {
-        String[] infos = instanceId.split(Constants.NAMING_INSTANCE_ID_SPLITTER);
-        if (infos.length < Constants.NAMING_INSTANCE_ID_SEG_COUNT) {
-            return null;
-        }
-        return infos[Constants.NAMING_INSTANCE_ID_SEG_COUNT - 1];
-    }
-
     public String getIp() {
         return ip;
     }
@@ -120,20 +111,20 @@ public class Instance {
         this.healthy = healthy;
     }
 
-    public Cluster getCluster() {
+    public String getClusterName() {
-        return cluster;
+        return clusterName;
     }
 
-    public void setCluster(Cluster cluster) {
+    public void setClusterName(String clusterName) {
-        this.cluster = cluster;
+        this.clusterName = clusterName;
     }
 
-    public Service getService() {
+    public String getServiceName() {
-        return service;
+        return serviceName;
     }
 
-    public void setService(Service service) {
+    public void setServiceName(String serviceName) {
-        this.service = service;
+        this.serviceName = serviceName;
     }
 
     public Map<String, String> getMetadata() {
@@ -148,6 +139,14 @@ public class Instance {
         this.metadata.put(key, value);
     }
 
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
     @Override
     public String toString() {
         return JSON.toJSONString(this);
@@ -163,7 +162,7 @@ public class Instance {
             return false;
         }
 
-        Instance host = (Instance) obj;
+        Instance host = (Instance)obj;
 
         return strEquals(toString(), host.toString());
     }

api/src/main/java/com/alibaba/nacos/api/naming/pojo/Service.java

@@ -15,6 +15,8 @@
  */
 package com.alibaba.nacos.api.naming.pojo;
 
+import com.alibaba.nacos.api.selector.AbstractSelector;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -41,21 +43,26 @@ public class Service {
     private String app;
 
     /**
-     * service group which is meant to classify services into different sets.
+     * Service group which is meant to classify services into different sets.
      */
     private String group;
 
     /**
-     * health check mode.
+     * Health check mode.
      */
     private String healthCheckMode;
 
+    /**
+     * Selector name of this service
+     */
+    private AbstractSelector selector;
+
+    private Map<String, String> metadata = new HashMap<String, String>();
+
     public Service(String name) {
         this.name = name;
     }
 
-    private Map<String, String> metadata = new HashMap<String, String>();
-
     public String getName() {
         return name;
     }
@@ -107,4 +114,12 @@ public class Service {
     public void addMetadata(String key, String value) {
         this.metadata.put(key, value);
     }
+
+    public AbstractSelector getSelector() {
+        return selector;
+    }
+
+    public void setSelector(AbstractSelector selector) {
+        this.selector = selector;
+    }
 }

api/src/main/java/com/alibaba/nacos/api/naming/pojo/ServiceInfo.java

@@ -17,6 +17,8 @@ package com.alibaba.nacos.api.naming.pojo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -193,6 +195,15 @@ public class ServiceInfo {
         return getKey(name, clusters, env, isAllIPs());
     }
 
+    @JSONField(serialize = false)
+    public String getKeyEncoded() {
+        try {
+            return getKey(URLEncoder.encode(name, "UTF-8"), clusters, env, isAllIPs());
+        } catch (UnsupportedEncodingException e) {
+            return getKey();
+        }
+    }
+
     @JSONField(serialize = false)
     public static String getKey(String name, String clusters, String unit) {
         return getKey(name, clusters, unit, false);
@@ -207,7 +218,7 @@ public class ServiceInfo {
 
         if (!isEmpty(clusters) && !isEmpty(unit)) {
             return isAllIPs ? name + SPLITER + clusters + SPLITER + unit + SPLITER + ALL_IPS
-                    : name + SPLITER + clusters + SPLITER + unit;
+                : name + SPLITER + clusters + SPLITER + unit;
         }
 
         if (!isEmpty(clusters)) {
@@ -216,7 +227,7 @@ public class ServiceInfo {
 
         if (!isEmpty(unit)) {
             return isAllIPs ? name + SPLITER + EMPTY + SPLITER + unit + SPLITER + ALL_IPS :
-                    name + SPLITER + EMPTY + SPLITER + unit;
+                name + SPLITER + EMPTY + SPLITER + unit;
         }
 
         return isAllIPs ? name + SPLITER + ALL_IPS : name;

api/src/main/java/com/alibaba/nacos/api/selector/AbstractSelector.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.nacos.api.selector;
+
+/**
+ * Abstract selector that only contains a type
+ *
+ * @author <a href="mailto:zpf.073@gmail.com">nkorange</a>
+ */
+public abstract class AbstractSelector {
+
+    /**
+     * The type of this selector, each child class should announce its own unique type.
+     */
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    protected void setType(String type) {
+        this.type = type;
+    }
+}

api/src/main/java/com/alibaba/nacos/api/selector/ExpressionSelector.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.nacos.api.selector;
+
+/**
+ * The selector to filter resource with flexible expression.
+ *
+ * @author <a href="mailto:zpf.073@gmail.com">nkorange</a>
+ */
+public class ExpressionSelector extends AbstractSelector {
+
+    /**
+     * Label expression of this selector.
+     */
+    private String expression;
+
+    public ExpressionSelector() {
+        this.setType(SelectorType.label.name());
+    }
+
+    public String getExpression() {
+        return expression;
+    }
+
+    public void setExpression(String expression) {
+        this.expression = expression;
+    }
+}

api/src/main/java/com/alibaba/nacos/api/selector/SelectorType.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.nacos.api.selector;
+
+/**
+ * The types of selector accepted by Nacos
+ *
+ * @author <a href="mailto:zpf.073@gmail.com">nkorange</a>
+ */
+public enum SelectorType {
+    /**
+     * not match any type
+     */
+    unknown,
+    /**
+     * not filter out any entity
+     */
+    none,
+    /**
+     * select by label
+     */
+    label
+}

api/src/test/java/com/alibaba/nacos/api/annotation/NacosPropertiesTest.java

@@ -1,12 +1,11 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
+ * Copyright 1999-2018 Alibaba Group Holding Ltd.
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

client/pom.xml

@@ -12,113 +12,100 @@
   limitations under the License.
  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
+    <parent>
-		<groupId>com.alibaba.nacos</groupId>
+        <groupId>com.alibaba.nacos</groupId>
-		<artifactId>nacos-all</artifactId>
+        <artifactId>nacos-all</artifactId>
-		<version>0.2.1</version>
+        <version>0.7.0</version>
-	</parent>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<artifactId>nacos-client</artifactId>
+    <artifactId>nacos-client</artifactId>
-	<packaging>jar</packaging>
+    <packaging>jar</packaging>
 
-	<name>nacos-client ${project.version}</name>
+    <name>nacos-client ${project.version}</name>
-	<url>http://maven.apache.org</url>
+    <url>http://maven.apache.org</url>
 
-	<properties>
+    <properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+    </properties>
 
-	<dependencies>
+    <dependencies>
-	    <dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>2.8.2</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-slf4j-impl</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>nacos-common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>nacos-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.alibaba</groupId>
-			<artifactId>fastjson</artifactId>
-		</dependency>
 
-		<dependency>
+        <dependency>
-			<groupId>ch.qos.logback</groupId>
+            <groupId>org.slf4j</groupId>
-			<artifactId>logback-classic</artifactId>
+            <artifactId>slf4j-api</artifactId>
-		</dependency>
+            <optional>true</optional>
-		<dependency>
+        </dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-		</dependency>
 
-		<dependency>
+        <dependency>
-			<groupId>com.google.guava</groupId>
+            <groupId>org.apache.logging.log4j</groupId>
-			<artifactId>guava</artifactId>
+            <artifactId>log4j-core</artifactId>
-		</dependency>
+            <version>2.8.2</version>
+            <optional>true</optional>
+        </dependency>
 
-		<dependency>
+        <dependency>
-			<artifactId>commons-codec</artifactId>
+            <groupId>org.apache.logging.log4j</groupId>
-			<groupId>commons-codec</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
-		</dependency>
+            <optional>true</optional>
+        </dependency>
 
-		<dependency>
+        <dependency>
-			<groupId>org.codehaus.jackson</groupId>
+            <groupId>${project.groupId}</groupId>
-			<artifactId>jackson-mapper-lgpl</artifactId>
+            <artifactId>nacos-common</artifactId>
-		</dependency>
+        </dependency>
-		<dependency>
-			<groupId>net.jcip</groupId>
-			<artifactId>jcip-annotations</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.github.spotbugs</groupId>
-			<artifactId>spotbugs-annotations</artifactId>
-			<optional>true</optional>
-		</dependency>
-	</dependencies>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>nacos-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <artifactId>commons-codec</artifactId>
+            <groupId>commons-codec</groupId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-lgpl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.jcip</groupId>
+            <artifactId>jcip-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
 </project>

client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java

@@ -44,233 +44,233 @@ import java.util.Properties;
 
 /**
  * Config Impl
- * @author Nacos
  *
+ * @author Nacos
  */
 @SuppressWarnings("PMD.ServiceOrDaoClassShouldEndWithImplRule")
 public class NacosConfigService implements ConfigService {
 
-	final static public Logger log = LogUtils.logger(NacosConfigService.class);
+    final static public Logger log = LogUtils.logger(NacosConfigService.class);
-	public final long POST_TIMEOUT = 3000L;
+    public final long POST_TIMEOUT = 3000L;
-	/**
+    /**
-	 * http agent
+     * http agent
-	 */
+     */
-	private ServerHttpAgent agent;
+    private ServerHttpAgent agent;
-	/**
+    /**
-	 * longpulling
+     * longpulling
-	 */
+     */
-	private ClientWorker worker;
+    private ClientWorker worker;
-	private String namespace;
+    private String namespace;
-	private String encode;
+    private String encode;
-	private ConfigFilterChainManager configFilterChainManager = new ConfigFilterChainManager();
+    private ConfigFilterChainManager configFilterChainManager = new ConfigFilterChainManager();
 
-	public NacosConfigService(Properties properties) throws NacosException {
+    public NacosConfigService(Properties properties) throws NacosException {
-		String encodeTmp = properties.getProperty(PropertyKeyConst.ENCODE);
+        String encodeTmp = properties.getProperty(PropertyKeyConst.ENCODE);
-		if (StringUtils.isBlank(encodeTmp)) {
+        if (StringUtils.isBlank(encodeTmp)) {
-			encode = Constants.ENCODE;
+            encode = Constants.ENCODE;
-		} else {
+        } else {
-			encode = encodeTmp.trim();
+            encode = encodeTmp.trim();
-		}
+        }
-		String namespaceTmp = properties.getProperty(PropertyKeyConst.NAMESPACE);
+        String namespaceTmp = properties.getProperty(PropertyKeyConst.NAMESPACE);
-		if (StringUtils.isBlank(namespaceTmp)) {
+        if (StringUtils.isBlank(namespaceTmp)) {
-			namespace = TenantUtil.getUserTenant();
+            namespace = TenantUtil.getUserTenant();
-			properties.put(PropertyKeyConst.NAMESPACE, namespace);
+            properties.put(PropertyKeyConst.NAMESPACE, namespace);
-		} else {
+        } else {
-			namespace = namespaceTmp;
+            namespace = namespaceTmp;
-			properties.put(PropertyKeyConst.NAMESPACE, namespace);
+            properties.put(PropertyKeyConst.NAMESPACE, namespace);
-		}
+        }
-		agent = new ServerHttpAgent(properties);
+        agent = new ServerHttpAgent(properties);
-		agent.start();
+        agent.start();
-		worker = new ClientWorker(agent, configFilterChainManager);
+        worker = new ClientWorker(agent, configFilterChainManager);
-	}
+    }
 
-	@Override
+    @Override
-	public String getConfig(String dataId, String group, long timeoutMs) throws NacosException {
+    public String getConfig(String dataId, String group, long timeoutMs) throws NacosException {
-		return getConfigInner(namespace, dataId, group, timeoutMs);
+        return getConfigInner(namespace, dataId, group, timeoutMs);
-	}
+    }
 
-	@Override
+    @Override
-	public void addListener(String dataId, String group, Listener listener) throws NacosException {
+    public void addListener(String dataId, String group, Listener listener) throws NacosException {
-		worker.addTenantListeners(dataId, group, Arrays.asList(listener));
+        worker.addTenantListeners(dataId, group, Arrays.asList(listener));
-	}
+    }
 
-	@Override
+    @Override
-	public boolean publishConfig(String dataId, String group, String content) throws NacosException {
+    public boolean publishConfig(String dataId, String group, String content) throws NacosException {
-		return publishConfigInner(namespace, dataId, group, null, null, null, content);
+        return publishConfigInner(namespace, dataId, group, null, null, null, content);
-	}
+    }
 
-	@Override
+    @Override
-	public boolean removeConfig(String dataId, String group) throws NacosException {
+    public boolean removeConfig(String dataId, String group) throws NacosException {
-		return removeConfigInner(namespace, dataId, group, null);
+        return removeConfigInner(namespace, dataId, group, null);
-	}
+    }
 
-	@Override
+    @Override
-	public void removeListener(String dataId, String group, Listener listener) {
+    public void removeListener(String dataId, String group, Listener listener) {
-		worker.removeTenantListener(dataId, group, listener);
+        worker.removeTenantListener(dataId, group, listener);
-	}
+    }
 
-	private String getConfigInner(String tenant, String dataId, String group, long timeoutMs) throws NacosException {
+    private String getConfigInner(String tenant, String dataId, String group, long timeoutMs) throws NacosException {
-		group = null2defaultGroup(group);
+        group = null2defaultGroup(group);
-		ParamUtils.checkKeyParam(dataId, group);
+        ParamUtils.checkKeyParam(dataId, group);
-		ConfigResponse cr = new ConfigResponse();
+        ConfigResponse cr = new ConfigResponse();
 
-		cr.setDataId(dataId);
+        cr.setDataId(dataId);
-		cr.setTenant(tenant);
+        cr.setTenant(tenant);
-		cr.setGroup(group);
+        cr.setGroup(group);
 
-		// 优先使用本地配置
+        // 优先使用本地配置
-		String content = LocalConfigInfoProcessor.getFailover(agent.getName(), dataId, group, tenant);
+        String content = LocalConfigInfoProcessor.getFailover(agent.getName(), dataId, group, tenant);
-		if (content != null) {
+        if (content != null) {
-			log.warn(agent.getName(), "[get-config] get failover ok, dataId={}, group={}, tenant={}, config={}", dataId,
+            log.warn(agent.getName(), "[get-config] get failover ok, dataId={}, group={}, tenant={}, config={}", dataId,
-					group, tenant, ContentUtils.truncateContent(content));
+                group, tenant, ContentUtils.truncateContent(content));
-			cr.setContent(content);
+            cr.setContent(content);
-			configFilterChainManager.doFilter(null, cr);
+            configFilterChainManager.doFilter(null, cr);
-			content = cr.getContent();
+            content = cr.getContent();
-			return content;
+            return content;
-		}
+        }
 
-		try {
+        try {
-			content = worker.getServerConfig(dataId, group, tenant, timeoutMs);
+            content = worker.getServerConfig(dataId, group, tenant, timeoutMs);
-			cr.setContent(content);
+            cr.setContent(content);
-			configFilterChainManager.doFilter(null, cr);
+            configFilterChainManager.doFilter(null, cr);
-			content = cr.getContent();
+            content = cr.getContent();
-			return content;
+            return content;
-		} catch (NacosException ioe) {
+        } catch (NacosException ioe) {
-			if (NacosException.NO_RIGHT == ioe.getErrCode()) {
+            if (NacosException.NO_RIGHT == ioe.getErrCode()) {
-				throw ioe;
+                throw ioe;
-			}
+            }
-			log.warn("NACOS-0003",
+            log.warn("NACOS-0003",
-					LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0003", "环境问题", "get from server error"));
+                LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0003", "环境问题", "get from server error"));
-			log.warn(agent.getName(), "[get-config] get from server error, dataId={}, group={}, tenant={}, msg={}",
+            log.warn(agent.getName(), "[get-config] get from server error, dataId={}, group={}, tenant={}, msg={}",
-					dataId, group, tenant, ioe.toString());
+                dataId, group, tenant, ioe.toString());
-		}
+        }
 
-		log.warn(agent.getName(), "[get-config] get snapshot ok, dataId={}, group={}, tenant={}, config={}", dataId,
+        log.warn(agent.getName(), "[get-config] get snapshot ok, dataId={}, group={}, tenant={}, config={}", dataId,
-				group, tenant, ContentUtils.truncateContent(content));
+            group, tenant, ContentUtils.truncateContent(content));
-		content = LocalConfigInfoProcessor.getSnapshot(agent.getName(), dataId, group, tenant);
+        content = LocalConfigInfoProcessor.getSnapshot(agent.getName(), dataId, group, tenant);
-		cr.setContent(content);
+        cr.setContent(content);
-		configFilterChainManager.doFilter(null, cr);
+        configFilterChainManager.doFilter(null, cr);
-		content = cr.getContent();
+        content = cr.getContent();
-		return content;
+        return content;
-	}
+    }
 
-	private String null2defaultGroup(String group) {
+    private String null2defaultGroup(String group) {
-		return (null == group) ? Constants.DEFAULT_GROUP : group.trim();
+        return (null == group) ? Constants.DEFAULT_GROUP : group.trim();
-	}
+    }
 
-	private boolean removeConfigInner(String tenant, String dataId, String group, String tag) throws NacosException {
+    private boolean removeConfigInner(String tenant, String dataId, String group, String tag) throws NacosException {
-		group = null2defaultGroup(group);
+        group = null2defaultGroup(group);
-		ParamUtils.checkKeyParam(dataId, group);
+        ParamUtils.checkKeyParam(dataId, group);
-		String url = Constants.CONFIG_CONTROLLER_PATH;
+        String url = Constants.CONFIG_CONTROLLER_PATH;
-		List<String> params = new ArrayList<String>();
+        List<String> params = new ArrayList<String>();
-		params.add("dataId");
+        params.add("dataId");
-		params.add(dataId);
+        params.add(dataId);
-		params.add("group");
+        params.add("group");
-		params.add(group);
+        params.add(group);
-		if (StringUtils.isNotEmpty(tenant)) {
+        if (StringUtils.isNotEmpty(tenant)) {
-			params.add("tenant");
+            params.add("tenant");
-			params.add(tenant);
+            params.add(tenant);
-		}
+        }
-		if (StringUtils.isNotEmpty(tag)) {
+        if (StringUtils.isNotEmpty(tag)) {
-			params.add("tag");
+            params.add("tag");
-			params.add(tag);
+            params.add(tag);
-		}
+        }
-		HttpResult result = null;
+        HttpResult result = null;
-		try {
+        try {
-			result = agent.httpDelete(url, null, params, encode, POST_TIMEOUT);
+            result = agent.httpDelete(url, null, params, encode, POST_TIMEOUT);
-		} catch (IOException ioe) {
+        } catch (IOException ioe) {
-			log.warn("[remove] error, " + dataId + ", " + group + ", " + tenant + ", msg: " + ioe.toString());
+            log.warn("[remove] error, " + dataId + ", " + group + ", " + tenant + ", msg: " + ioe.toString());
-			return false;
+            return false;
-		}
+        }
 
-		if (HttpURLConnection.HTTP_OK == result.code) {
+        if (HttpURLConnection.HTTP_OK == result.code) {
-			log.info(agent.getName(), "[remove] ok, dataId={}, group={}, tenant={}", dataId, group, tenant);
+            log.info(agent.getName(), "[remove] ok, dataId={}, group={}, tenant={}", dataId, group, tenant);
-			return true;
+            return true;
-		} else if (HttpURLConnection.HTTP_FORBIDDEN == result.code) {
+        } else if (HttpURLConnection.HTTP_FORBIDDEN == result.code) {
-			log.warn(agent.getName(), "[remove] error, dataId={}, group={}, tenant={}, code={}, msg={}", dataId, group,
+            log.warn(agent.getName(), "[remove] error, dataId={}, group={}, tenant={}, code={}, msg={}", dataId, group,
-					tenant, result.code, result.content);
+                tenant, result.code, result.content);
-			throw new NacosException(result.code, result.content);
+            throw new NacosException(result.code, result.content);
-		} else {
+        } else {
-			log.warn(agent.getName(), "[remove] error, dataId={}, group={}, tenant={}, code={}, msg={}", dataId, group,
+            log.warn(agent.getName(), "[remove] error, dataId={}, group={}, tenant={}, code={}, msg={}", dataId, group,
-					tenant, result.code, result.content);
+                tenant, result.code, result.content);
-			return false;
+            return false;
-		}
+        }
-	}
+    }
 
-	private boolean publishConfigInner(String tenant, String dataId, String group, String tag, String appName,
+    private boolean publishConfigInner(String tenant, String dataId, String group, String tag, String appName,
-			String betaIps, String content) throws NacosException {
+                                       String betaIps, String content) throws NacosException {
-		group = null2defaultGroup(group);
+        group = null2defaultGroup(group);
-		ParamUtils.checkParam(dataId, group, content);
+        ParamUtils.checkParam(dataId, group, content);
 
-		ConfigRequest cr = new ConfigRequest();
+        ConfigRequest cr = new ConfigRequest();
-		cr.setDataId(dataId);
+        cr.setDataId(dataId);
-		cr.setTenant(tenant);
+        cr.setTenant(tenant);
-		cr.setGroup(group);
+        cr.setGroup(group);
-		cr.setContent(content);
+        cr.setContent(content);
-		configFilterChainManager.doFilter(cr, null);
+        configFilterChainManager.doFilter(cr, null);
-		content = cr.getContent();
+        content = cr.getContent();
 
-		String url = Constants.CONFIG_CONTROLLER_PATH;
+        String url = Constants.CONFIG_CONTROLLER_PATH;
-		List<String> params = new ArrayList<String>();
+        List<String> params = new ArrayList<String>();
-		params.add("dataId");
+        params.add("dataId");
-		params.add(dataId);
+        params.add(dataId);
-		params.add("group");
+        params.add("group");
-		params.add(group);
+        params.add(group);
-		params.add("content");
+        params.add("content");
-		params.add(content);
+        params.add(content);
-		if (StringUtils.isNotEmpty(tenant)) {
+        if (StringUtils.isNotEmpty(tenant)) {
-			params.add("tenant");
+            params.add("tenant");
-			params.add(tenant);
+            params.add(tenant);
-		}
+        }
-		if (StringUtils.isNotEmpty(appName)) {
+        if (StringUtils.isNotEmpty(appName)) {
-			params.add("appName");
+            params.add("appName");
-			params.add(appName);
+            params.add(appName);
-		}
+        }
-		if (StringUtils.isNotEmpty(tag)) {
+        if (StringUtils.isNotEmpty(tag)) {
-			params.add("tag");
+            params.add("tag");
-			params.add(tag);
+            params.add(tag);
-		}
+        }
 
-		List<String> headers = new ArrayList<String>();
+        List<String> headers = new ArrayList<String>();
-		if (StringUtils.isNotEmpty(betaIps)) {
+        if (StringUtils.isNotEmpty(betaIps)) {
-			headers.add("betaIps");
+            headers.add("betaIps");
-			headers.add(betaIps);
+            headers.add(betaIps);
-		}
+        }
 
-		HttpResult result = null;
+        HttpResult result = null;
-		try {
+        try {
-			result = agent.httpPost(url, headers, params, encode, POST_TIMEOUT);
+            result = agent.httpPost(url, headers, params, encode, POST_TIMEOUT);
-		} catch (IOException ioe) {
+        } catch (IOException ioe) {
-			log.warn("NACOS-0006",
+            log.warn("NACOS-0006",
-					LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0006", "环境问题", "[publish-single] exception"));
+                LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0006", "环境问题", "[publish-single] exception"));
-			log.warn(agent.getName(), "[publish-single] exception, dataId={}, group={}, msg={}", dataId, group,
+            log.warn(agent.getName(), "[publish-single] exception, dataId={}, group={}, msg={}", dataId, group,
-					ioe.toString());
+                ioe.toString());
-			return false;
+            return false;
-		}
+        }
 
-		if (HttpURLConnection.HTTP_OK == result.code) {
+        if (HttpURLConnection.HTTP_OK == result.code) {
-			log.info(agent.getName(), "[publish-single] ok, dataId={}, group={}, tenant={}, config={}", dataId, group,
+            log.info(agent.getName(), "[publish-single] ok, dataId={}, group={}, tenant={}, config={}", dataId, group,
-					tenant, ContentUtils.truncateContent(content));
+                tenant, ContentUtils.truncateContent(content));
-			return true;
+            return true;
-		} else if (HttpURLConnection.HTTP_FORBIDDEN == result.code) {
+        } else if (HttpURLConnection.HTTP_FORBIDDEN == result.code) {
-			log.warn(agent.getName(), "[publish-single] error, dataId={}, group={}, tenant={}, code={}, msg={}", dataId,
+            log.warn(agent.getName(), "[publish-single] error, dataId={}, group={}, tenant={}, code={}, msg={}", dataId,
-					group, tenant, result.code, result.content);
+                group, tenant, result.code, result.content);
-			throw new NacosException(result.code, result.content);
+            throw new NacosException(result.code, result.content);
-		} else {
+        } else {
-			log.warn(agent.getName(), "[publish-single] error, dataId={}, group={}, tenant={}, code={}, msg={}", dataId,
+            log.warn(agent.getName(), "[publish-single] error, dataId={}, group={}, tenant={}, code={}, msg={}", dataId,
-					group, tenant, result.code, result.content);
+                group, tenant, result.code, result.content);
-			return false;
+            return false;
-		}
+        }
 
-	}
+    }
 
-	@Override
+    @Override
-	public String getServerStatus() {
+    public String getServerStatus() {
-		if (worker.isHealthServer()) {
+        if (worker.isHealthServer()) {
-			return "UP";
+            return "UP";
-		} else {
+        } else {
-			return "DOWN";
+            return "DOWN";
-		}
+        }
-	}
+    }
 
 }

client/src/main/java/com/alibaba/nacos/client/config/common/GroupKey.java

@@ -18,9 +18,8 @@ package com.alibaba.nacos.client.config.common;
 import com.alibaba.nacos.client.utils.StringUtils;
 
 /**
- * Synthesize the form of dataId+groupId. Escapes reserved characters in dataId
+ * Synthesize the form of dataId+groupId. Escapes reserved characters in dataId and groupId.
- * and groupId.
+ *
- * 
  * @author Nacos
  */
 public class GroupKey {
@@ -33,28 +32,28 @@ public class GroupKey {
         return sb.toString();
     }
 
-	static public String getKeyTenant(String dataId, String group, String tenant) {
+    static public String getKeyTenant(String dataId, String group, String tenant) {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
-		urlEncode(dataId, sb);
+        urlEncode(dataId, sb);
-		sb.append('+');
+        sb.append('+');
-		urlEncode(group, sb);
+        urlEncode(group, sb);
-		if (StringUtils.isNotEmpty(tenant)) {
+        if (StringUtils.isNotEmpty(tenant)) {
-			sb.append('+');
+            sb.append('+');
-			urlEncode(tenant, sb);
+            urlEncode(tenant, sb);
-		}
+        }
-		return sb.toString();
+        return sb.toString();
-	}
+    }
-    
+
-	static public String getKey(String dataId, String group, String datumStr) {
+    static public String getKey(String dataId, String group, String datumStr) {
-		StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
-		urlEncode(dataId, sb);
+        urlEncode(dataId, sb);
-		sb.append('+');
+        sb.append('+');
-		urlEncode(group, sb);
+        urlEncode(group, sb);
-		sb.append('+');
+        sb.append('+');
-		urlEncode(datumStr, sb);
+        urlEncode(datumStr, sb);
-		return sb.toString();
+        return sb.toString();
-	}
+    }
-    
+
     static public String[] parseKey(String groupKey) {
         StringBuilder sb = new StringBuilder();
         String dataId = null;
@@ -64,15 +63,15 @@ public class GroupKey {
         for (int i = 0; i < groupKey.length(); ++i) {
             char c = groupKey.charAt(i);
             if ('+' == c) {
-				if (null == dataId) {
+                if (null == dataId) {
-					dataId = sb.toString();
+                    dataId = sb.toString();
-					sb.setLength(0);
+                    sb.setLength(0);
-				} else if (null == group) {
+                } else if (null == group) {
-					group = sb.toString();
+                    group = sb.toString();
-					sb.setLength(0);
+                    sb.setLength(0);
-				} else {
+                } else {
-					throw new IllegalArgumentException("invalid groupkey:" + groupKey);
+                    throw new IllegalArgumentException("invalid groupkey:" + groupKey);
-				}
+                }
             } else if ('%' == c) {
                 char next = groupKey.charAt(++i);
                 char nextnext = groupKey.charAt(++i);
@@ -87,25 +86,24 @@ public class GroupKey {
                 sb.append(c);
             }
         }
-        
+
-		if (StringUtils.isBlank(group)) {
+        if (StringUtils.isBlank(group)) {
-			group = sb.toString();
+            group = sb.toString();
-			if (group.length() == 0) {
+            if (group.length() == 0) {
-				throw new IllegalArgumentException("invalid groupkey:" + groupKey);
+                throw new IllegalArgumentException("invalid groupkey:" + groupKey);
-			}
+            }
-		} else {
+        } else {
-			tenant = sb.toString();
+            tenant = sb.toString();
-			if (group.length() == 0) {
+            if (group.length() == 0) {
-				throw new IllegalArgumentException("invalid groupkey:" + groupKey);
+                throw new IllegalArgumentException("invalid groupkey:" + groupKey);
-			}
+            }
-		}
+        }
-       
+
-        return new String[] { dataId, group, tenant };
+        return new String[] {dataId, group, tenant};
     }
-    
+
     /**
-     * + -> %2B
+     * + -> %2B % -> %25
-     * % -> %25
      */
     static void urlEncode(String str, StringBuilder sb) {
         for (int idx = 0; idx < str.length(); ++idx) {

client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigContext.java

@@ -22,22 +22,21 @@ import com.alibaba.nacos.api.config.filter.IConfigContext;
 
 /**
  * Config Context
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class ConfigContext implements IConfigContext {
 
-	private Map<String, Object> param = new HashMap<String, Object>();
+    private Map<String, Object> param = new HashMap<String, Object>();
 
-	@Override
+    @Override
-	public Object getParameter(String key) {
+    public Object getParameter(String key) {
-		return param.get(key);
+        return param.get(key);
-	}
+    }
 
-	@Override
+    @Override
-	public void setParameter(String key, Object value) {
+    public void setParameter(String key, Object value) {
-		param.put(key, value);
+        param.put(key, value);
-	}
+    }
 
 }

client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigFilterChainManager.java

@@ -26,62 +26,60 @@ import com.google.common.collect.Lists;
 
 /**
  * Config Filter Chain Management
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class ConfigFilterChainManager implements IConfigFilterChain {
 
-	private List<IConfigFilter> filters = Lists.newArrayList();
+    private List<IConfigFilter> filters = Lists.newArrayList();
 
-	public synchronized ConfigFilterChainManager addFilter(IConfigFilter filter) {
+    public synchronized ConfigFilterChainManager addFilter(IConfigFilter filter) {
-		// 根据order大小顺序插入
+        // 根据order大小顺序插入
-		int i = 0;
+        int i = 0;
-		while (i < this.filters.size()) {
+        while (i < this.filters.size()) {
-			IConfigFilter currentValue = this.filters.get(i);
+            IConfigFilter currentValue = this.filters.get(i);
-			if (currentValue.getFilterName().equals(filter.getFilterName())) {
+            if (currentValue.getFilterName().equals(filter.getFilterName())) {
-				break;
+                break;
-			}
+            }
-			if (filter.getOrder() >= currentValue.getOrder() && i < this.filters.size()) {
+            if (filter.getOrder() >= currentValue.getOrder() && i < this.filters.size()) {
-				i++;
+                i++;
-			} else {
+            } else {
-				this.filters.add(i, filter);
+                this.filters.add(i, filter);
-				break;
+                break;
-			}
+            }
-		}
+        }
 
-		if (i == this.filters.size()) {
+        if (i == this.filters.size()) {
-			this.filters.add(i, filter);
+            this.filters.add(i, filter);
-		}
+        }
-		return this;
+        return this;
-	}
+    }
-	
 
-	@Override
+    @Override
-	public void doFilter(IConfigRequest request, IConfigResponse response) throws NacosException {
+    public void doFilter(IConfigRequest request, IConfigResponse response) throws NacosException {
-		new VirtualFilterChain(this.filters).doFilter(request, response);
+        new VirtualFilterChain(this.filters).doFilter(request, response);
-	}
+    }
 
-	private static class VirtualFilterChain implements IConfigFilterChain {
+    private static class VirtualFilterChain implements IConfigFilterChain {
 
-		private final List<? extends IConfigFilter> additionalFilters;
+        private final List<? extends IConfigFilter> additionalFilters;
 
-		private int currentPosition = 0;
+        private int currentPosition = 0;
 
-		public VirtualFilterChain(List<? extends IConfigFilter> additionalFilters) {
+        public VirtualFilterChain(List<? extends IConfigFilter> additionalFilters) {
-			this.additionalFilters = additionalFilters;
+            this.additionalFilters = additionalFilters;
-		}
+        }
 
-		@Override
+        @Override
-		public void doFilter(final IConfigRequest request, final IConfigResponse response) throws NacosException {
+        public void doFilter(final IConfigRequest request, final IConfigResponse response) throws NacosException {
-			if (this.currentPosition == this.additionalFilters.size()) {
+            if (this.currentPosition == this.additionalFilters.size()) {
-				return;
+                return;
-			} else {
+            } else {
-				this.currentPosition++;
+                this.currentPosition++;
-				IConfigFilter nextFilter = this.additionalFilters.get(this.currentPosition - 1);
+                IConfigFilter nextFilter = this.additionalFilters.get(this.currentPosition - 1);
-				nextFilter.doFilter(request, response, this);
+                nextFilter.doFilter(request, response, this);
-			}
+            }
-		}
+        }
-	}
+    }
 
 }

client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigRequest.java

@@ -23,56 +23,55 @@ import com.alibaba.nacos.api.config.filter.IConfigRequest;
 
 /**
  * Config Request
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class ConfigRequest implements IConfigRequest {
 
-	private Map<String, Object> param = new HashMap<String, Object>();
+    private Map<String, Object> param = new HashMap<String, Object>();
 
-	private IConfigContext configContext = new ConfigContext();
+    private IConfigContext configContext = new ConfigContext();
 
-	public String getTenant() {
+    public String getTenant() {
-		return (String) param.get("tenant");
+        return (String)param.get("tenant");
-	}
+    }
 
-	public void setTenant(String tenant) {
+    public void setTenant(String tenant) {
-		param.put("tenant", tenant);
+        param.put("tenant", tenant);
-	}
+    }
 
-	public String getDataId() {
+    public String getDataId() {
-		return (String) param.get("dataId");
+        return (String)param.get("dataId");
-	}
+    }
 
-	public void setDataId(String dataId) {
+    public void setDataId(String dataId) {
-		param.put("dataId", dataId);
+        param.put("dataId", dataId);
-	}
+    }
 
-	public String getGroup() {
+    public String getGroup() {
-		return (String) param.get("group");
+        return (String)param.get("group");
-	}
+    }
 
-	public void setGroup(String group) {
+    public void setGroup(String group) {
-		param.put("group", group);
+        param.put("group", group);
-	}
+    }
 
-	public String getContent() {
+    public String getContent() {
-		return (String) param.get("content");
+        return (String)param.get("content");
-	}
+    }
 
-	public void setContent(String content) {
+    public void setContent(String content) {
-		param.put("content", content);
+        param.put("content", content);
-	}
+    }
 
-	@Override
+    @Override
-	public Object getParameter(String key) {
+    public Object getParameter(String key) {
-		return param.get(key);
+        return param.get(key);
-	}
+    }
 
-	@Override
+    @Override
-	public IConfigContext getConfigContext() {
+    public IConfigContext getConfigContext() {
-		return configContext;
+        return configContext;
-	}
+    }
 
 }

client/src/main/java/com/alibaba/nacos/client/config/filter/impl/ConfigResponse.java

@@ -23,56 +23,55 @@ import com.alibaba.nacos.api.config.filter.IConfigResponse;
 
 /**
  * Config Response
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class ConfigResponse implements IConfigResponse {
 
-	private Map<String, Object> param = new HashMap<String, Object>();
+    private Map<String, Object> param = new HashMap<String, Object>();
 
-	private IConfigContext configContext = new ConfigContext();
+    private IConfigContext configContext = new ConfigContext();
 
-	public String getTenant() {
+    public String getTenant() {
-		return (String) param.get("tenant");
+        return (String)param.get("tenant");
-	}
+    }
 
-	public void setTenant(String tenant) {
+    public void setTenant(String tenant) {
-		param.put("tenant", tenant);
+        param.put("tenant", tenant);
-	}
+    }
 
-	public String getDataId() {
+    public String getDataId() {
-		return (String) param.get("dataId");
+        return (String)param.get("dataId");
-	}
+    }
 
-	public void setDataId(String dataId) {
+    public void setDataId(String dataId) {
-		param.put("dataId", dataId);
+        param.put("dataId", dataId);
-	}
+    }
 
-	public String getGroup() {
+    public String getGroup() {
-		return (String) param.get("group");
+        return (String)param.get("group");
-	}
+    }
 
-	public void setGroup(String group) {
+    public void setGroup(String group) {
-		param.put("group", group);
+        param.put("group", group);
-	}
+    }
 
-	public String getContent() {
+    public String getContent() {
-		return (String) param.get("content");
+        return (String)param.get("content");
-	}
+    }
 
-	public void setContent(String content) {
+    public void setContent(String content) {
-		param.put("content", content);
+        param.put("content", content);
-	}
+    }
 
-	@Override
+    @Override
-	public Object getParameter(String key) {
+    public Object getParameter(String key) {
-		return param.get(key);
+        return param.get(key);
-	}
+    }
 
-	@Override
+    @Override
-	public IConfigContext getConfigContext() {
+    public IConfigContext getConfigContext() {
-		return configContext;
+        return configContext;
-	}
+    }
 
 }

client/src/main/java/com/alibaba/nacos/client/config/impl/CacheData.java

@@ -32,56 +32,54 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 /**
  * Listner Management
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class CacheData {
 
-	final static public Logger log = LogUtils.logger(CacheData.class);
+    final static public Logger log = LogUtils.logger(CacheData.class);
-	
-	public boolean isInitializing() {
-		return isInitializing;
-	}
 
-	public void setInitializing(boolean isInitializing) {
+    public boolean isInitializing() {
-		this.isInitializing = isInitializing;
+        return isInitializing;
-	}
+    }
 
-	public String getMd5() {
+    public void setInitializing(boolean isInitializing) {
+        this.isInitializing = isInitializing;
+    }
+
+    public String getMd5() {
         return md5;
     }
-    
+
-	public String getTenant() {
+    public String getTenant() {
-		return tenant;
+        return tenant;
-	}
+    }
 
     public String getContent() {
         return content;
     }
-    
+
     public void setContent(String newContent) {
         this.content = newContent;
         this.md5 = getMd5String(content);
     }
-    
+
-	/**
+    /**
-	 * Add listener
+     * Add listener
-	 * 
+     *
-	 * @param listener
+     * @param listener listener
-	 *            listener
+     */
-	 */
+    public void addListener(Listener listener) {
-	public void addListener(Listener listener) {
+        if (null == listener) {
-		if (null == listener) {
+            throw new IllegalArgumentException("listener is null");
-			throw new IllegalArgumentException("listener is null");
+        }
-		}
+        ManagerListenerWrap wrap = new ManagerListenerWrap(listener);
-		ManagerListenerWrap wrap = new ManagerListenerWrap(listener);
+        if (listeners.addIfAbsent(wrap)) {
-		if (listeners.addIfAbsent(wrap)) {
+            log.info(name, "[add-listener] ok, tenant={}, dataId={}, group={}, cnt={}", tenant, dataId, group,
-			log.info(name, "[add-listener] ok, tenant={}, dataId={}, group={}, cnt={}", tenant, dataId, group,
+                listeners.size());
-					listeners.size());
+        }
-		}
+    }
-	}
+
-    
     public void removeListener(Listener listener) {
         if (null == listener) {
             throw new IllegalArgumentException("listener is null");
@@ -91,7 +89,7 @@ public class CacheData {
             log.info(name, "[remove-listener] ok, dataId={}, group={}, cnt={}", dataId, group, listeners.size());
         }
     }
-    
+
     /**
      * 返回监听器列表上的迭代器，只读。保证不返回NULL。
      */
@@ -103,32 +101,32 @@ public class CacheData {
         return result;
     }
 
-    
     public long getLocalConfigInfoVersion() {
         return localConfigLastModified;
     }
+
     public void setLocalConfigInfoVersion(long localConfigLastModified) {
         this.localConfigLastModified = localConfigLastModified;
     }
 
-
     public boolean isUseLocalConfigInfo() {
         return isUseLocalConfig;
     }
+
     public void setUseLocalConfigInfo(boolean useLocalConfigInfo) {
         this.isUseLocalConfig = useLocalConfigInfo;
         if (!useLocalConfigInfo) {
             localConfigLastModified = -1;
         }
     }
-    
-    public int getTaskId() {
-		return taskId;
-	}
 
-	public void setTaskId(int taskId) {
+    public int getTaskId() {
-		this.taskId = taskId;
+        return taskId;
-	}
+    }
+
+    public void setTaskId(int taskId) {
+        this.taskId = taskId;
+    }
 
     @Override
     public int hashCode() {
@@ -147,7 +145,7 @@ public class CacheData {
         if (this == obj) {
             return true;
         }
-        CacheData other = (CacheData) obj;
+        CacheData other = (CacheData)obj;
         return dataId.equals(other.dataId) && group.equals(other.group);
     }
 
@@ -155,7 +153,7 @@ public class CacheData {
     public String toString() {
         return "CacheData [" + dataId + ", " + group + "]";
     }
-    
+
     void checkListenerMd5() {
         for (ManagerListenerWrap wrap : listeners) {
             if (!md5.equals(wrap.lastCallMd5)) {
@@ -163,48 +161,46 @@ public class CacheData {
             }
         }
     }
-    
+
     private void safeNotifyListener(final String dataId, final String group, final String content,
-            final String md5, final ManagerListenerWrap listenerWrap) {
+                                    final String md5, final ManagerListenerWrap listenerWrap) {
         final Listener listener = listenerWrap.listener;
-        
+
         Runnable job = new Runnable() {
             public void run() {
-            	ClassLoader myClassLoader = Thread.currentThread().getContextClassLoader();
+                ClassLoader myClassLoader = Thread.currentThread().getContextClassLoader();
-            	ClassLoader appClassLoader= listener.getClass().getClassLoader();
+                ClassLoader appClassLoader = listener.getClass().getClassLoader();
                 try {
-                    if(listener instanceof AbstractSharedListener){
+                    if (listener instanceof AbstractSharedListener) {
-                        AbstractSharedListener adapter = (AbstractSharedListener) listener;
+                        AbstractSharedListener adapter = (AbstractSharedListener)listener;
                         adapter.fillContext(dataId, group);
                         log.info(name, "[notify-context] dataId={}, group={}, md5={}", dataId, group, md5);
                     }
                     // 执行回调之前先将线程classloader设置为具体webapp的classloader，以免回调方法中调用spi接口是出现异常或错用（多应用部署才会有该问题）。
                     Thread.currentThread().setContextClassLoader(appClassLoader);
-                    
+
-					ConfigResponse cr = new ConfigResponse();
+                    ConfigResponse cr = new ConfigResponse();
-					cr.setDataId(dataId);
+                    cr.setDataId(dataId);
-					cr.setGroup(group);
+                    cr.setGroup(group);
-					cr.setContent(content);
+                    cr.setContent(content);
-					configFilterChainManager.doFilter(null, cr);
+                    configFilterChainManager.doFilter(null, cr);
-					String contentTmp = cr.getContent();
+                    String contentTmp = cr.getContent();
-					listener.receiveConfigInfo(contentTmp);
+                    listener.receiveConfigInfo(contentTmp);
-					listenerWrap.lastCallMd5 = md5;
+                    listenerWrap.lastCallMd5 = md5;
-					log.info(
+                    log.info(
-							name,
+                        name,
-							"[notify-ok] dataId={}, group={}, md5={}, listener={} ",
+                        "[notify-ok] dataId={}, group={}, md5={}, listener={} ",
-							dataId, group, md5, listener);
+                        dataId, group, md5, listener);
-				} catch (NacosException de) {
+                } catch (NacosException de) {
-					log.error(name, "NACOS-XXXX",
+                    log.error(name, "NACOS-XXXX",
-							"[notify-error] dataId={}, group={}, md5={}, listener={} errCode={} errMsg={}", dataId,
+                        "[notify-error] dataId={}, group={}, md5={}, listener={} errCode={} errMsg={}", dataId,
-							group, md5, listener, de.getErrCode(), de.getErrMsg());
+                        group, md5, listener, de.getErrCode(), de.getErrMsg());
-				} catch (Throwable t) {
+                } catch (Throwable t) {
-					log.error(name, "NACOS-XXXX",
+                    log.error(name, "NACOS-XXXX",
-							"[notify-error] dataId={}, group={}, md5={}, listener={} tx={}", dataId, group, md5,
+                        "[notify-error] dataId={}, group={}, md5={}, listener={} tx={}", dataId, group, md5,
-							listener, t.getCause());
+                        listener, t.getCause());
-				}
+                } finally {
-                finally
+                    Thread.currentThread().setContextClassLoader(myClassLoader);
-                {
-                	Thread.currentThread().setContextClassLoader(myClassLoader);
                 }
             }
         };
@@ -217,57 +213,59 @@ public class CacheData {
                 job.run();
             }
         } catch (Throwable t) {
-			log.error(
+            log.error(
-					name,
+                name,
-					"NACOS-XXXX",
+                "NACOS-XXXX",
-					"[notify-error] dataId={}, group={}, md5={}, listener={} throwable={}",
+                "[notify-error] dataId={}, group={}, md5={}, listener={} throwable={}",
-					dataId, group, md5, listener, t.getCause());
+                dataId, group, md5, listener, t.getCause());
         }
         final long finishNotify = System.currentTimeMillis();
-        log.info(name, "[notify-listener] time cost={}ms in ClientWorker, dataId={}, group={}, md5={}, listener={} ",(finishNotify - startNotify), dataId ,group, md5, listener);
+        log.info(name, "[notify-listener] time cost={}ms in ClientWorker, dataId={}, group={}, md5={}, listener={} ",
+            (finishNotify - startNotify), dataId, group, md5, listener);
     }
-    
+
     static public String getMd5String(String config) {
         return (null == config) ? Constants.NULL : MD5.getInstance().getMD5String(config);
     }
 
     private String loadCacheContentFromDiskLocal(String name, String dataId, String group, String tenant) {
-		String content = LocalConfigInfoProcessor.getFailover(name, dataId, group, tenant);
+        String content = LocalConfigInfoProcessor.getFailover(name, dataId, group, tenant);
-		content = (null != content) ? content
+        content = (null != content) ? content
-				: LocalConfigInfoProcessor.getSnapshot(name, dataId, group, tenant);
+            : LocalConfigInfoProcessor.getSnapshot(name, dataId, group, tenant);
-		return content;
+        return content;
     }
-    
+
-	public CacheData(ConfigFilterChainManager configFilterChainManager, String name, String dataId, String group) {
+    public CacheData(ConfigFilterChainManager configFilterChainManager, String name, String dataId, String group) {
-		if (null == dataId || null == group) {
+        if (null == dataId || null == group) {
-			throw new IllegalArgumentException("dataId=" + dataId + ", group=" + group);
+            throw new IllegalArgumentException("dataId=" + dataId + ", group=" + group);
-		}
+        }
-		this.name = name;
+        this.name = name;
-		this.configFilterChainManager = configFilterChainManager;
+        this.configFilterChainManager = configFilterChainManager;
-		this.dataId = dataId;
+        this.dataId = dataId;
-		this.group = group;
+        this.group = group;
-		this.tenant = TenantUtil.getUserTenant();
+        this.tenant = TenantUtil.getUserTenant();
-		listeners = new CopyOnWriteArrayList<ManagerListenerWrap>();
+        listeners = new CopyOnWriteArrayList<ManagerListenerWrap>();
-		this.isInitializing = true;
+        this.isInitializing = true;
-		this.content = loadCacheContentFromDiskLocal(name, dataId, group, tenant);
+        this.content = loadCacheContentFromDiskLocal(name, dataId, group, tenant);
-		this.md5 = getMd5String(content);
+        this.md5 = getMd5String(content);
     }
-    
+
-    public CacheData(ConfigFilterChainManager configFilterChainManager, String name, String dataId, String group, String tenant) {
+    public CacheData(ConfigFilterChainManager configFilterChainManager, String name, String dataId, String group,
-    	if (null == dataId || null == group) {
+                     String tenant) {
-    		throw new IllegalArgumentException("dataId=" + dataId + ", group=" + group);
+        if (null == dataId || null == group) {
-    	}
+            throw new IllegalArgumentException("dataId=" + dataId + ", group=" + group);
-    	this.name = name;
+        }
-		this.configFilterChainManager = configFilterChainManager;
+        this.name = name;
-    	this.dataId = dataId;
+        this.configFilterChainManager = configFilterChainManager;
-    	this.group = group;
+        this.dataId = dataId;
-    	this.tenant = tenant;
+        this.group = group;
-    	listeners = new CopyOnWriteArrayList<ManagerListenerWrap>();
+        this.tenant = tenant;
-    	this.isInitializing = true;
+        listeners = new CopyOnWriteArrayList<ManagerListenerWrap>();
-    	this.content = loadCacheContentFromDiskLocal(name, dataId, group, tenant);
+        this.isInitializing = true;
-    	this.md5 = getMd5String(content);
+        this.content = loadCacheContentFromDiskLocal(name, dataId, group, tenant);
+        this.md5 = getMd5String(content);
     }
-    
+
     // ==================
 
     private final String name;
@@ -277,16 +275,16 @@ public class CacheData {
     public final String tenant;
     private final CopyOnWriteArrayList<ManagerListenerWrap> listeners;
 
-	private volatile String md5;
+    private volatile String md5;
-	/**
+    /**
-	 * whether use local config
+     * whether use local config
-	 */
+     */
-	private volatile boolean isUseLocalConfig = false;
+    private volatile boolean isUseLocalConfig = false;
-	/**
+    /**
-	 * last motify time
+     * last motify time
-	 */
+     */
-	private volatile long localConfigLastModified;
+    private volatile long localConfigLastModified;
-	private volatile String content;
+    private volatile String content;
     private int taskId;
     private volatile boolean isInitializing = true;
 }
@@ -307,13 +305,13 @@ class ManagerListenerWrap {
         if (obj == this) {
             return true;
         }
-        ManagerListenerWrap other = (ManagerListenerWrap) obj;
+        ManagerListenerWrap other = (ManagerListenerWrap)obj;
         return listener.equals(other.listener);
     }
 
-	@Override
+    @Override
-	public int hashCode() {
+    public int hashCode() {
-		return super.hashCode();
+        return super.hashCode();
-	}
+    }
 
 }

client/src/main/java/com/alibaba/nacos/client/config/impl/ClientWorker.java

@@ -44,24 +44,23 @@ import static com.alibaba.nacos.api.common.Constants.WORD_SEPARATOR;
 
 /**
  * Longpulling
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class ClientWorker {
-	
-	final static public Logger log = LogUtils.logger(ClientWorker.class);
 
-	public void addListeners(String dataId, String group, List<? extends Listener> listeners) {
+    final static public Logger log = LogUtils.logger(ClientWorker.class);
+
+    public void addListeners(String dataId, String group, List<? extends Listener> listeners) {
         group = null2defaultGroup(group);
         CacheData cache = addCacheDataIfAbsent(dataId, group);
         for (Listener listener : listeners) {
             cache.addListener(listener);
         }
-	}
+    }
-	
+
-	public void removeListener(String dataId, String group, Listener listener) {
+    public void removeListener(String dataId, String group, Listener listener) {
-		group = null2defaultGroup(group);
+        group = null2defaultGroup(group);
         CacheData cache = getCache(dataId, group);
         if (null != cache) {
             cache.removeListener(listener);
@@ -69,30 +68,30 @@ public class ClientWorker {
                 removeCache(dataId, group);
             }
         }
-	}
+    }
-	
+
-	public void addTenantListeners(String dataId, String group, List<? extends Listener> listeners) {
+    public void addTenantListeners(String dataId, String group, List<? extends Listener> listeners) {
-		group = null2defaultGroup(group);
+        group = null2defaultGroup(group);
-		String tenant = agent.getTenant();
+        String tenant = agent.getTenant();
-		CacheData cache = addCacheDataIfAbsent(dataId, group, tenant);
+        CacheData cache = addCacheDataIfAbsent(dataId, group, tenant);
-		for (Listener listener : listeners) {
+        for (Listener listener : listeners) {
-			cache.addListener(listener);
+            cache.addListener(listener);
-		}
+        }
-	}
+    }
-	
+
-	public void removeTenantListener(String dataId, String group, Listener listener) {
+    public void removeTenantListener(String dataId, String group, Listener listener) {
-		group = null2defaultGroup(group);
+        group = null2defaultGroup(group);
-		String tenant = agent.getTenant();
+        String tenant = agent.getTenant();
-		CacheData cache = getCache(dataId, group, tenant);
+        CacheData cache = getCache(dataId, group, tenant);
-		if (null != cache) {
+        if (null != cache) {
-			cache.removeListener(listener);
+            cache.removeListener(listener);
-			if (cache.getListeners().isEmpty()) {
+            if (cache.getListeners().isEmpty()) {
-				removeCache(dataId, group, tenant);
+                removeCache(dataId, group, tenant);
-			}
+            }
-		}
+        }
-	}
+    }
-	
+
-	@SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
+    @SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
     void removeCache(String dataId, String group) {
         String groupKey = GroupKey.getKey(dataId, group);
         synchronized (cacheMap) {
@@ -102,20 +101,20 @@ public class ClientWorker {
         }
         log.info(agent.getName(), "[unsubscribe] {}", groupKey);
     }
-	
+
-	@SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
+    @SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
     void removeCache(String dataId, String group, String tenant) {
-    	String groupKey = GroupKey.getKeyTenant(dataId, group, tenant);
+        String groupKey = GroupKey.getKeyTenant(dataId, group, tenant);
-    	synchronized (cacheMap) {
+        synchronized (cacheMap) {
-    		Map<String, CacheData> copy = new HashMap<String, CacheData>(cacheMap.get());
+            Map<String, CacheData> copy = new HashMap<String, CacheData>(cacheMap.get());
-    		copy.remove(groupKey);
+            copy.remove(groupKey);
-    		cacheMap.set(copy);
+            cacheMap.set(copy);
-    	}
+        }
-    	log.info(agent.getName(), "[unsubscribe] {}", groupKey);
+        log.info(agent.getName(), "[unsubscribe] {}", groupKey);
     }
-	
+
-	@SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
+    @SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
-	public CacheData addCacheDataIfAbsent(String dataId, String group) {
+    public CacheData addCacheDataIfAbsent(String dataId, String group) {
         CacheData cache = getCache(dataId, group);
         if (null != cache) {
             return cache;
@@ -123,408 +122,409 @@ public class ClientWorker {
 
         String key = GroupKey.getKey(dataId, group);
         cache = new CacheData(configFilterChainManager, agent.getName(), dataId, group);
-        
+
         synchronized (cacheMap) {
-        	CacheData cacheFromMap = getCache(dataId, group);
+            CacheData cacheFromMap = getCache(dataId, group);
-        	// multiple listeners on the same dataid+group and race condition,so double check again
+            // multiple listeners on the same dataid+group and race condition,so double check again
-        	//other listener thread beat me to set to cacheMap
+            //other listener thread beat me to set to cacheMap
-        	if(null != cacheFromMap) {
+            if (null != cacheFromMap) {
-        		cache = cacheFromMap;
+                cache = cacheFromMap;
-        		//reset so that server not hang this check
+                //reset so that server not hang this check
-        		cache.setInitializing(true); 
+                cache.setInitializing(true);
-			} else {
+            } else {
-				int taskId = cacheMap.get().size() / (int) ParamUtil.getPerTaskConfigSize();
+                int taskId = cacheMap.get().size() / (int)ParamUtil.getPerTaskConfigSize();
-				cache.setTaskId(taskId);
+                cache.setTaskId(taskId);
-			}
+            }
-        	
+
             Map<String, CacheData> copy = new HashMap<String, CacheData>(cacheMap.get());
             copy.put(key, cache);
             cacheMap.set(copy);
         }
-        
+
         log.info(agent.getName(), "[subscribe] {}", key);
-        
+
         return cache;
     }
-	@SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
-	public CacheData addCacheDataIfAbsent(String dataId, String group, String tenant) {
-		CacheData cache = getCache(dataId, group, tenant);
-		if (null != cache) {
-			return cache;
-		}
-		String key = GroupKey.getKeyTenant(dataId, group, tenant);
-		cache = new CacheData(configFilterChainManager, agent.getName(), dataId, group, tenant);
-		synchronized (cacheMap) {
-			CacheData cacheFromMap = getCache(dataId, group, tenant);
-			// multiple listeners on the same dataid+group and race condition,so
-			// double check again
-			// other listener thread beat me to set to cacheMap
-			if (null != cacheFromMap) {
-				cache = cacheFromMap;
-				// reset so that server not hang this check
-				cache.setInitializing(true);
-			}
 
-			Map<String, CacheData> copy = new HashMap<String, CacheData>(cacheMap.get());
+    @SuppressFBWarnings("JLM_JSR166_UTILCONCURRENT_MONITORENTER")
-			copy.put(key, cache);
+    public CacheData addCacheDataIfAbsent(String dataId, String group, String tenant) {
-			cacheMap.set(copy);
+        CacheData cache = getCache(dataId, group, tenant);
-		}
+        if (null != cache) {
-		log.info(agent.getName(), "[subscribe] {}", key);
+            return cache;
-		return cache;
+        }
-	}
+        String key = GroupKey.getKeyTenant(dataId, group, tenant);
-    
+        cache = new CacheData(configFilterChainManager, agent.getName(), dataId, group, tenant);
-	public CacheData getCache(String dataId, String group) {
+        synchronized (cacheMap) {
-		return getCache(dataId, group, TenantUtil.getUserTenant());
+            CacheData cacheFromMap = getCache(dataId, group, tenant);
-	}
+            // multiple listeners on the same dataid+group and race condition,so
-    
+            // double check again
-	public CacheData getCache(String dataId, String group, String tenant) {
+            // other listener thread beat me to set to cacheMap
-		if (null == dataId || null == group) {
+            if (null != cacheFromMap) {
-			throw new IllegalArgumentException();
+                cache = cacheFromMap;
-		}
+                // reset so that server not hang this check
-		return cacheMap.get().get(GroupKey.getKeyTenant(dataId, group, tenant));
+                cache.setInitializing(true);
-	}
+            }
-    
 
-	public String getServerConfig(String dataId, String group, String tenant, long readTimeout)
+            Map<String, CacheData> copy = new HashMap<String, CacheData>(cacheMap.get());
-			throws NacosException {
+            copy.put(key, cache);
-		if (StringUtils.isBlank(group)) {
+            cacheMap.set(copy);
-			group = Constants.DEFAULT_GROUP;
+        }
-		}
+        log.info(agent.getName(), "[subscribe] {}", key);
+        return cache;
+    }
 
-		HttpResult result = null;
+    public CacheData getCache(String dataId, String group) {
-		try {
+        return getCache(dataId, group, TenantUtil.getUserTenant());
-			List<String> params = null;
+    }
-			if (StringUtils.isBlank(tenant)) {
-				params = Arrays.asList("dataId", dataId, "group", group);
-			} else {
-				params = Arrays.asList("dataId", dataId, "group", group, "tenant", tenant);
-			}
-			result = agent.httpGet(Constants.CONFIG_CONTROLLER_PATH, null, params, agent.getEncode(), readTimeout);
-		} catch (IOException e) {
-			log.error(agent.getName(), "NACOS-XXXX",
-					"[sub-server] get server config exception, dataId={}, group={}, tenant={}, msg={}", dataId, group,
-					tenant, e.toString());
-			throw new NacosException(NacosException.SERVER_ERROR, e.getMessage());
-		}
 
-		switch (result.code) {
+    public CacheData getCache(String dataId, String group, String tenant) {
-		case HttpURLConnection.HTTP_OK:
+        if (null == dataId || null == group) {
-			LocalConfigInfoProcessor.saveSnapshot(agent.getName(), dataId, group, tenant, result.content);
+            throw new IllegalArgumentException();
-			return result.content;
+        }
-		case HttpURLConnection.HTTP_NOT_FOUND:
+        return cacheMap.get().get(GroupKey.getKeyTenant(dataId, group, tenant));
-			LocalConfigInfoProcessor.saveSnapshot(agent.getName(), dataId, group, tenant, null);
+    }
-			return null;
-		case HttpURLConnection.HTTP_CONFLICT: {
-			log.error(agent.getName(), "NACOS-XXXX",
-					"[sub-server-error] get server config being modified concurrently, dataId={}, group={}, tenant={}",
-					dataId, group, tenant);
-			throw new NacosException(NacosException.CONFLICT,
-					"data being modified, dataId=" + dataId + ",group=" + group + ",tenant=" + tenant);
-		}
-		case HttpURLConnection.HTTP_FORBIDDEN: {
-			log.error(agent.getName(), "NACOS-XXXX", "[sub-server-error] no right, dataId={}, group={}, tenant={}",
-					dataId, group, tenant);
-			throw new NacosException(result.code, result.content);
-		}
-		default: {
-			log.error(agent.getName(), "NACOS-XXXX", "[sub-server-error]  dataId={}, group={}, tenant={}, code={}",
-					dataId, group, tenant, result.code);
-			throw new NacosException(result.code,
-					"http error, code=" + result.code + ",dataId=" + dataId + ",group=" + group + ",tenant=" + tenant);
-		}
-		}
-	}
 
-	private void checkLocalConfig(CacheData cacheData) {
+    public String getServerConfig(String dataId, String group, String tenant, long readTimeout)
-		final String dataId = cacheData.dataId;
+        throws NacosException {
-		final String group = cacheData.group;
+        if (StringUtils.isBlank(group)) {
-		final String tenant = cacheData.tenant;
+            group = Constants.DEFAULT_GROUP;
-		File path = LocalConfigInfoProcessor.getFailoverFile(agent.getName(), dataId, group, tenant);
+        }
 
-		// 没有 -> 有
+        HttpResult result = null;
-		if (!cacheData.isUseLocalConfigInfo() && path.exists()) {
+        try {
-			String content = LocalConfigInfoProcessor.getFailover(agent.getName(), dataId, group, tenant);
+            List<String> params = null;
-			String md5 = MD5.getInstance().getMD5String(content);
+            if (StringUtils.isBlank(tenant)) {
-			cacheData.setUseLocalConfigInfo(true);
+                params = Arrays.asList("dataId", dataId, "group", group);
-			cacheData.setLocalConfigInfoVersion(path.lastModified());
+            } else {
-			cacheData.setContent(content);
+                params = Arrays.asList("dataId", dataId, "group", group, "tenant", tenant);
+            }
+            result = agent.httpGet(Constants.CONFIG_CONTROLLER_PATH, null, params, agent.getEncode(), readTimeout);
+        } catch (IOException e) {
+            log.error(agent.getName(), "NACOS-XXXX",
+                "[sub-server] get server config exception, dataId={}, group={}, tenant={}, msg={}", dataId, group,
+                tenant, e.toString());
+            throw new NacosException(NacosException.SERVER_ERROR, e.getMessage());
+        }
 
-			log.warn(agent.getName(),
+        switch (result.code) {
-					"[failover-change] failover file created. dataId={}, group={}, tenant={}, md5={}, content={}",
+            case HttpURLConnection.HTTP_OK:
-					dataId, group, tenant, md5, ContentUtils.truncateContent(content));
+                LocalConfigInfoProcessor.saveSnapshot(agent.getName(), dataId, group, tenant, result.content);
-			return;
+                return result.content;
-		}
+            case HttpURLConnection.HTTP_NOT_FOUND:
+                LocalConfigInfoProcessor.saveSnapshot(agent.getName(), dataId, group, tenant, null);
+                return null;
+            case HttpURLConnection.HTTP_CONFLICT: {
+                log.error(agent.getName(), "NACOS-XXXX",
+                    "[sub-server-error] get server config being modified concurrently, dataId={}, group={}, tenant={}",
+                    dataId, group, tenant);
+                throw new NacosException(NacosException.CONFLICT,
+                    "data being modified, dataId=" + dataId + ",group=" + group + ",tenant=" + tenant);
+            }
+            case HttpURLConnection.HTTP_FORBIDDEN: {
+                log.error(agent.getName(), "NACOS-XXXX", "[sub-server-error] no right, dataId={}, group={}, tenant={}",
+                    dataId, group, tenant);
+                throw new NacosException(result.code, result.content);
+            }
+            default: {
+                log.error(agent.getName(), "NACOS-XXXX", "[sub-server-error]  dataId={}, group={}, tenant={}, code={}",
+                    dataId, group, tenant, result.code);
+                throw new NacosException(result.code,
+                    "http error, code=" + result.code + ",dataId=" + dataId + ",group=" + group + ",tenant=" + tenant);
+            }
+        }
+    }
 
-		// 有 -> 没有。不通知业务监听器，从server拿到配置后通知。
+    private void checkLocalConfig(CacheData cacheData) {
-		if (cacheData.isUseLocalConfigInfo() && !path.exists()) {
+        final String dataId = cacheData.dataId;
-			cacheData.setUseLocalConfigInfo(false);
+        final String group = cacheData.group;
-			log.warn(agent.getName(), "[failover-change] failover file deleted. dataId={}, group={}, tenant={}", dataId,
+        final String tenant = cacheData.tenant;
-					group, tenant);
+        File path = LocalConfigInfoProcessor.getFailoverFile(agent.getName(), dataId, group, tenant);
-			return;
+
-		}
+        // 没有 -> 有
+        if (!cacheData.isUseLocalConfigInfo() && path.exists()) {
+            String content = LocalConfigInfoProcessor.getFailover(agent.getName(), dataId, group, tenant);
+            String md5 = MD5.getInstance().getMD5String(content);
+            cacheData.setUseLocalConfigInfo(true);
+            cacheData.setLocalConfigInfoVersion(path.lastModified());
+            cacheData.setContent(content);
+
+            log.warn(agent.getName(),
+                "[failover-change] failover file created. dataId={}, group={}, tenant={}, md5={}, content={}",
+                dataId, group, tenant, md5, ContentUtils.truncateContent(content));
+            return;
+        }
+
+        // 有 -> 没有。不通知业务监听器，从server拿到配置后通知。
+        if (cacheData.isUseLocalConfigInfo() && !path.exists()) {
+            cacheData.setUseLocalConfigInfo(false);
+            log.warn(agent.getName(), "[failover-change] failover file deleted. dataId={}, group={}, tenant={}", dataId,
+                group, tenant);
+            return;
+        }
+
+        // 有变更
+        if (cacheData.isUseLocalConfigInfo() && path.exists()
+            && cacheData.getLocalConfigInfoVersion() != path.lastModified()) {
+            String content = LocalConfigInfoProcessor.getFailover(agent.getName(), dataId, group, tenant);
+            String md5 = MD5.getInstance().getMD5String(content);
+            cacheData.setUseLocalConfigInfo(true);
+            cacheData.setLocalConfigInfoVersion(path.lastModified());
+            cacheData.setContent(content);
+            log.warn(agent.getName(),
+                "[failover-change] failover file changed. dataId={}, group={}, tenant={}, md5={}, content={}",
+                dataId, group, tenant, md5, ContentUtils.truncateContent(content));
+            return;
+        }
+    }
 
-		// 有变更
-		if (cacheData.isUseLocalConfigInfo() && path.exists()
-				&& cacheData.getLocalConfigInfoVersion() != path.lastModified()) {
-			String content = LocalConfigInfoProcessor.getFailover(agent.getName(), dataId, group, tenant);
-			String md5 = MD5.getInstance().getMD5String(content);
-			cacheData.setUseLocalConfigInfo(true);
-			cacheData.setLocalConfigInfoVersion(path.lastModified());
-			cacheData.setContent(content);
-			log.warn(agent.getName(),
-					"[failover-change] failover file changed. dataId={}, group={}, tenant={}, md5={}, content={}",
-					dataId, group, tenant, md5, ContentUtils.truncateContent(content));
-			return;
-		}
-	}
-	
     private String null2defaultGroup(String group) {
         return (null == group) ? Constants.DEFAULT_GROUP : group.trim();
     }
-    
-	public void checkConfigInfo() {
-		// 分任务
-		int listenerSize = cacheMap.get().size();
-		// 向上取整为批数
-		int longingTaskCount = (int) Math.ceil(listenerSize / ParamUtil.getPerTaskConfigSize());
-		if (longingTaskCount > currentLongingTaskCount) {
-			for (int i = (int) currentLongingTaskCount; i < longingTaskCount; i++) {
-				// 要判断任务是否在执行 这块需要好好想想。 任务列表现在是无序的。变化过程可能有问题
-				executorService.execute(new LongPullingRunnable(i));
-			}
-			currentLongingTaskCount = longingTaskCount;
-		}
-	}
 
-	/**
+    public void checkConfigInfo() {
-	 * 从Server获取值变化了的DataID列表。返回的对象里只有dataId和group是有效的。 保证不返回NULL。
+        // 分任务
-	 */
+        int listenerSize = cacheMap.get().size();
-	List<String> checkUpdateDataIds(List<CacheData> cacheDatas, List<String> inInitializingCacheList) {
+        // 向上取整为批数
-		StringBuilder sb = new StringBuilder();
+        int longingTaskCount = (int)Math.ceil(listenerSize / ParamUtil.getPerTaskConfigSize());
-		for (CacheData cacheData : cacheDatas) {
+        if (longingTaskCount > currentLongingTaskCount) {
-			if (!cacheData.isUseLocalConfigInfo()) {
+            for (int i = (int)currentLongingTaskCount; i < longingTaskCount; i++) {
-				sb.append(cacheData.dataId).append(WORD_SEPARATOR);
+                // 要判断任务是否在执行 这块需要好好想想。 任务列表现在是无序的。变化过程可能有问题
-				sb.append(cacheData.group).append(WORD_SEPARATOR);
+                executorService.execute(new LongPullingRunnable(i));
-				if (StringUtils.isBlank(cacheData.tenant)) {
+            }
-					sb.append(cacheData.getMd5()).append(LINE_SEPARATOR);
+            currentLongingTaskCount = longingTaskCount;
-				} else {
+        }
-					sb.append(cacheData.getMd5()).append(WORD_SEPARATOR);
+    }
-					sb.append(cacheData.getTenant()).append(LINE_SEPARATOR);
-				}
-				if (cacheData.isInitializing()) {
-					// cacheData 首次出现在cacheMap中&首次check更新
-					inInitializingCacheList
-							.add(GroupKey.getKeyTenant(cacheData.dataId, cacheData.group, cacheData.tenant));
-				}
-			}
-		}
-		boolean isInitializingCacheList = !inInitializingCacheList.isEmpty();
-		return checkUpdateConfigStr(sb.toString(), isInitializingCacheList);
-	}
 
-	/**
+    /**
-	 * 从Server获取值变化了的DataID列表。返回的对象里只有dataId和group是有效的。 保证不返回NULL。
+     * 从Server获取值变化了的DataID列表。返回的对象里只有dataId和group是有效的。 保证不返回NULL。
-	 */
+     */
-	List<String> checkUpdateConfigStr(String probeUpdateString, boolean isInitializingCacheList) {
+    List<String> checkUpdateDataIds(List<CacheData> cacheDatas, List<String> inInitializingCacheList) {
+        StringBuilder sb = new StringBuilder();
+        for (CacheData cacheData : cacheDatas) {
+            if (!cacheData.isUseLocalConfigInfo()) {
+                sb.append(cacheData.dataId).append(WORD_SEPARATOR);
+                sb.append(cacheData.group).append(WORD_SEPARATOR);
+                if (StringUtils.isBlank(cacheData.tenant)) {
+                    sb.append(cacheData.getMd5()).append(LINE_SEPARATOR);
+                } else {
+                    sb.append(cacheData.getMd5()).append(WORD_SEPARATOR);
+                    sb.append(cacheData.getTenant()).append(LINE_SEPARATOR);
+                }
+                if (cacheData.isInitializing()) {
+                    // cacheData 首次出现在cacheMap中&首次check更新
+                    inInitializingCacheList
+                        .add(GroupKey.getKeyTenant(cacheData.dataId, cacheData.group, cacheData.tenant));
+                }
+            }
+        }
+        boolean isInitializingCacheList = !inInitializingCacheList.isEmpty();
+        return checkUpdateConfigStr(sb.toString(), isInitializingCacheList);
+    }
 
-		List<String> params = Arrays.asList(Constants.PROBE_MODIFY_REQUEST, probeUpdateString);
+    /**
-		long timeout = TimeUnit.SECONDS.toMillis(30L);
+     * 从Server获取值变化了的DataID列表。返回的对象里只有dataId和group是有效的。 保证不返回NULL。
+     */
+    List<String> checkUpdateConfigStr(String probeUpdateString, boolean isInitializingCacheList) {
 
-		List<String> headers = new ArrayList<String>(2);
+        List<String> params = Arrays.asList(Constants.PROBE_MODIFY_REQUEST, probeUpdateString);
-		headers.add("Long-Pulling-Timeout");
+        long timeout = TimeUnit.SECONDS.toMillis(30L);
-		headers.add("" + timeout);
 
-		// told server do not hang me up if new initializing cacheData added in
+        List<String> headers = new ArrayList<String>(2);
-		if (isInitializingCacheList) {
+        headers.add("Long-Pulling-Timeout");
-			headers.add("Long-Pulling-Timeout-No-Hangup");
+        headers.add("" + timeout);
-			headers.add("true");
-		}
 
-		if (StringUtils.isBlank(probeUpdateString)) {
+        // told server do not hang me up if new initializing cacheData added in
-			return Collections.emptyList();
+        if (isInitializingCacheList) {
-		}
+            headers.add("Long-Pulling-Timeout-No-Hangup");
+            headers.add("true");
+        }
 
-		try {
+        if (StringUtils.isBlank(probeUpdateString)) {
-			HttpResult result = agent.httpPost(Constants.CONFIG_CONTROLLER_PATH + "/listener", headers, params,
+            return Collections.emptyList();
-					agent.getEncode(), timeout);
+        }
 
-			if (HttpURLConnection.HTTP_OK == result.code) {
+        try {
-				setHealthServer(true);
+            HttpResult result = agent.httpPost(Constants.CONFIG_CONTROLLER_PATH + "/listener", headers, params,
-				return parseUpdateDataIdResponse(result.content);
+                agent.getEncode(), timeout);
-			} else {
-				setHealthServer(false);
-				if (result.code == HttpURLConnection.HTTP_INTERNAL_ERROR) {
-					log.error("NACOS-0007", LoggerHelper.getErrorCodeStr("Nacos", "Nacos-0007", "环境问题",
-							"[check-update] get changed dataId error"));
-				}
-				log.error(agent.getName(), "NACOS-XXXX", "[check-update] get changed dataId error, code={}",
-						result.code);
-			}
-		} catch (IOException e) {
-			setHealthServer(false);
-			log.error(agent.getName(), "NACOS-XXXX", "[check-update] get changed dataId exception, msg={}",
-					e.toString());
-		}
-		return Collections.emptyList();
-	}
 
-	/**
+            if (HttpURLConnection.HTTP_OK == result.code) {
-	 * 从HTTP响应拿到变化的groupKey。保证不返回NULL。
+                setHealthServer(true);
-	 */
+                return parseUpdateDataIdResponse(result.content);
-	private List<String> parseUpdateDataIdResponse(String response) {
+            } else {
-		if (StringUtils.isBlank(response)) {
+                setHealthServer(false);
-			return Collections.emptyList();
+                if (result.code == HttpURLConnection.HTTP_INTERNAL_ERROR) {
-		}
+                    log.error("NACOS-0007", LoggerHelper.getErrorCodeStr("Nacos", "Nacos-0007", "环境问题",
+                        "[check-update] get changed dataId error"));
+                }
+                log.error(agent.getName(), "NACOS-XXXX", "[check-update] get changed dataId error, code={}",
+                    result.code);
+            }
+        } catch (IOException e) {
+            setHealthServer(false);
+            log.error(agent.getName(), "NACOS-XXXX", "[check-update] get changed dataId exception, msg={}",
+                e.toString());
+        }
+        return Collections.emptyList();
+    }
 
-		try {
+    /**
-			response = URLDecoder.decode(response, "UTF-8");
+     * 从HTTP响应拿到变化的groupKey。保证不返回NULL。
-		} catch (Exception e) {
+     */
-			log.error(agent.getName(), "NACOS-XXXX", "[polling-resp] decode modifiedDataIdsString error", e);
+    private List<String> parseUpdateDataIdResponse(String response) {
-		}
+        if (StringUtils.isBlank(response)) {
+            return Collections.emptyList();
+        }
 
-		List<String> updateList = new LinkedList<String>();
+        try {
+            response = URLDecoder.decode(response, "UTF-8");
+        } catch (Exception e) {
+            log.error(agent.getName(), "NACOS-XXXX", "[polling-resp] decode modifiedDataIdsString error", e);
+        }
 
-		for (String dataIdAndGroup : response.split(LINE_SEPARATOR)) {
+        List<String> updateList = new LinkedList<String>();
-			if (!StringUtils.isBlank(dataIdAndGroup)) {
-				String[] keyArr = dataIdAndGroup.split(WORD_SEPARATOR);
-				String dataId = keyArr[0];
-				String group = keyArr[1];
-				if (keyArr.length == 2) {
-					updateList.add(GroupKey.getKey(dataId, group));
-					log.info(agent.getName(), "[polling-resp] config changed. dataId={}, group={}", dataId, group);
-				} else if (keyArr.length == 3) {
-					String tenant = keyArr[2];
-					updateList.add(GroupKey.getKeyTenant(dataId, group, tenant));
-					log.info(agent.getName(), "[polling-resp] config changed. dataId={}, group={}, tenant={}", dataId,
-							group, tenant);
-				} else {
-					log.error(agent.getName(), "NACOS-XXXX", "[polling-resp] invalid dataIdAndGroup error",
-							dataIdAndGroup);
-				}
-			}
-		}
-		return updateList;
-	}
 
-	@SuppressWarnings("PMD.ThreadPoolCreationRule")
+        for (String dataIdAndGroup : response.split(LINE_SEPARATOR)) {
-	public ClientWorker(final ServerHttpAgent agent, final ConfigFilterChainManager configFilterChainManager) {
+            if (!StringUtils.isBlank(dataIdAndGroup)) {
-		this.agent = agent;
+                String[] keyArr = dataIdAndGroup.split(WORD_SEPARATOR);
-		this.configFilterChainManager = configFilterChainManager;
+                String dataId = keyArr[0];
-		executor = Executors.newScheduledThreadPool(1, new ThreadFactory() {
+                String group = keyArr[1];
-			@Override
+                if (keyArr.length == 2) {
-			public Thread newThread(Runnable r) {
+                    updateList.add(GroupKey.getKey(dataId, group));
-				Thread t = new Thread(r);
+                    log.info(agent.getName(), "[polling-resp] config changed. dataId={}, group={}", dataId, group);
-				t.setName("com.alibaba.nacos.client.Worker." + agent.getName());
+                } else if (keyArr.length == 3) {
-				t.setDaemon(true);
+                    String tenant = keyArr[2];
-				return t;
+                    updateList.add(GroupKey.getKeyTenant(dataId, group, tenant));
-			}
+                    log.info(agent.getName(), "[polling-resp] config changed. dataId={}, group={}, tenant={}", dataId,
-		});
+                        group, tenant);
+                } else {
+                    log.error(agent.getName(), "NACOS-XXXX", "[polling-resp] invalid dataIdAndGroup error",
+                        dataIdAndGroup);
+                }
+            }
+        }
+        return updateList;
+    }
 
-		executorService = Executors.newCachedThreadPool(new ThreadFactory() {
+    @SuppressWarnings("PMD.ThreadPoolCreationRule")
-			@Override
+    public ClientWorker(final ServerHttpAgent agent, final ConfigFilterChainManager configFilterChainManager) {
-			public Thread newThread(Runnable r) {
+        this.agent = agent;
-				Thread t = new Thread(r);
+        this.configFilterChainManager = configFilterChainManager;
-				t.setName("com.alibaba.nacos.client.Worker.longPulling" + agent.getName());
+        executor = Executors.newScheduledThreadPool(1, new ThreadFactory() {
-				t.setDaemon(true);
+            @Override
-				return t;
+            public Thread newThread(Runnable r) {
-			}
+                Thread t = new Thread(r);
-		});
+                t.setName("com.alibaba.nacos.client.Worker." + agent.getName());
+                t.setDaemon(true);
+                return t;
+            }
+        });
 
-		executor.scheduleWithFixedDelay(new Runnable() {
+        executorService = Executors.newCachedThreadPool(new ThreadFactory() {
-			public void run() {
+            @Override
-				try {
+            public Thread newThread(Runnable r) {
-					checkConfigInfo();
+                Thread t = new Thread(r);
-				} catch (Throwable e) {
+                t.setName("com.alibaba.nacos.client.Worker.longPulling" + agent.getName());
-					log.error(agent.getName(), "NACOS-XXXX", "[sub-check] rotate check error", e);
+                t.setDaemon(true);
-				}
+                return t;
-			}
+            }
-		}, 1L, 10L, TimeUnit.MILLISECONDS);
+        });
-	}
 
-	class LongPullingRunnable implements Runnable {
+        executor.scheduleWithFixedDelay(new Runnable() {
-		private int taskId;
+            public void run() {
+                try {
+                    checkConfigInfo();
+                } catch (Throwable e) {
+                    log.error(agent.getName(), "NACOS-XXXX", "[sub-check] rotate check error", e);
+                }
+            }
+        }, 1L, 10L, TimeUnit.MILLISECONDS);
+    }
 
-		public LongPullingRunnable(int taskId) {
+    class LongPullingRunnable implements Runnable {
-			this.taskId = taskId;
+        private int taskId;
-		}
 
-		public void run() {
+        public LongPullingRunnable(int taskId) {
-			try {
+            this.taskId = taskId;
-				List<CacheData> cacheDatas = new ArrayList<CacheData>();
+        }
-				// check failover config
-				for (CacheData cacheData : cacheMap.get().values()) {
-					if (cacheData.getTaskId() == taskId) {
-						cacheDatas.add(cacheData);
-						try {
-							checkLocalConfig(cacheData);
-							if (cacheData.isUseLocalConfigInfo()) {
-								cacheData.checkListenerMd5();
-							}
-						} catch (Exception e) {
-							log.error("NACOS-CLIENT", "get local config info error", e);
-						}
-					}
-				}
 
-				List<String> inInitializingCacheList = new ArrayList<String>();
+        public void run() {
-				// check server config
+            try {
-				List<String> changedGroupKeys = checkUpdateDataIds(cacheDatas, inInitializingCacheList);
+                List<CacheData> cacheDatas = new ArrayList<CacheData>();
+                // check failover config
+                for (CacheData cacheData : cacheMap.get().values()) {
+                    if (cacheData.getTaskId() == taskId) {
+                        cacheDatas.add(cacheData);
+                        try {
+                            checkLocalConfig(cacheData);
+                            if (cacheData.isUseLocalConfigInfo()) {
+                                cacheData.checkListenerMd5();
+                            }
+                        } catch (Exception e) {
+                            log.error("NACOS-CLIENT", "get local config info error", e);
+                        }
+                    }
+                }
 
-				for (String groupKey : changedGroupKeys) {
+                List<String> inInitializingCacheList = new ArrayList<String>();
-					String[] key = GroupKey.parseKey(groupKey);
+                // check server config
-					String dataId = key[0];
+                List<String> changedGroupKeys = checkUpdateDataIds(cacheDatas, inInitializingCacheList);
-					String group = key[1];
-					String tenant = null;
-					if (key.length == 3) {
-						tenant = key[2];
-					}
-					try {
-						String content = getServerConfig(dataId, group, tenant, 3000L);
-						CacheData cache = cacheMap.get().get(GroupKey.getKeyTenant(dataId, group, tenant));
-						cache.setContent(content);
-						log.info(agent.getName(), "[data-received] dataId={}, group={}, tenant={}, md5={}, content={}",
-								dataId, group, tenant, cache.getMd5(), ContentUtils.truncateContent(content));
-					} catch (NacosException ioe) {
-						log.error(agent.getName(), "NACOS-XXXX",
-								"[get-update] get changed config exception. dataId={}, group={}, tenant={}, msg={}",
-								dataId, group, tenant, ioe.toString());
-					}
-				}
-				for (CacheData cacheData : cacheDatas) {
-					if (!cacheData.isInitializing() || inInitializingCacheList
-							.contains(GroupKey.getKeyTenant(cacheData.dataId, cacheData.group, cacheData.tenant))) {
-						cacheData.checkListenerMd5();
-						cacheData.setInitializing(false);
-					}
-				}
-				inInitializingCacheList.clear();
-			} catch (Throwable e) {
-				log.error("500", "longPulling error", e);
-			} finally {
-				executorService.execute(this);
-			}
-		}
-	}
 
-	// =================
+                for (String groupKey : changedGroupKeys) {
+                    String[] key = GroupKey.parseKey(groupKey);
+                    String dataId = key[0];
+                    String group = key[1];
+                    String tenant = null;
+                    if (key.length == 3) {
+                        tenant = key[2];
+                    }
+                    try {
+                        String content = getServerConfig(dataId, group, tenant, 3000L);
+                        CacheData cache = cacheMap.get().get(GroupKey.getKeyTenant(dataId, group, tenant));
+                        cache.setContent(content);
+                        log.info(agent.getName(), "[data-received] dataId={}, group={}, tenant={}, md5={}, content={}",
+                            dataId, group, tenant, cache.getMd5(), ContentUtils.truncateContent(content));
+                    } catch (NacosException ioe) {
+                        log.error(agent.getName(), "NACOS-XXXX",
+                            "[get-update] get changed config exception. dataId={}, group={}, tenant={}, msg={}",
+                            dataId, group, tenant, ioe.toString());
+                    }
+                }
+                for (CacheData cacheData : cacheDatas) {
+                    if (!cacheData.isInitializing() || inInitializingCacheList
+                        .contains(GroupKey.getKeyTenant(cacheData.dataId, cacheData.group, cacheData.tenant))) {
+                        cacheData.checkListenerMd5();
+                        cacheData.setInitializing(false);
+                    }
+                }
+                inInitializingCacheList.clear();
+            } catch (Throwable e) {
+                log.error("500", "longPulling error", e);
+            } finally {
+                executorService.execute(this);
+            }
+        }
+    }
 
-	public boolean isHealthServer() {
+    // =================
-		return isHealthServer;
-	}
 
-	private void setHealthServer(boolean isHealthServer) {
+    public boolean isHealthServer() {
-		this.isHealthServer = isHealthServer;
+        return isHealthServer;
-	}
+    }
+
+    private void setHealthServer(boolean isHealthServer) {
+        this.isHealthServer = isHealthServer;
+    }
+
+    final ScheduledExecutorService executor;
+    final ExecutorService executorService;
+    /**
+     * groupKey -> cacheData
+     */
+    AtomicReference<Map<String, CacheData>> cacheMap = new AtomicReference<Map<String, CacheData>>(
+        new HashMap<String, CacheData>());
+    ServerHttpAgent agent;
+    ConfigFilterChainManager configFilterChainManager;
+    private boolean isHealthServer = true;
+    private double currentLongingTaskCount = 0;
 
-	final ScheduledExecutorService executor;
-	final ExecutorService executorService;
-	/**
-	 * groupKey -> cacheData
-	 */
-	AtomicReference<Map<String, CacheData>> cacheMap = new AtomicReference<Map<String, CacheData>>(new HashMap<String, CacheData>());
-	ServerHttpAgent agent;
-	ConfigFilterChainManager configFilterChainManager;
-	private boolean isHealthServer = true;
-	private double currentLongingTaskCount = 0;
-	
 }

client/src/main/java/com/alibaba/nacos/client/config/impl/EventDispatcher.java

@@ -24,16 +24,14 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import com.alibaba.nacos.client.config.utils.LogUtils;
 import com.alibaba.nacos.client.logger.Logger;
 
-
 /**
  * Event subscription and publishing tools.
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class EventDispatcher {
-	
+
-	final static public Logger log = LogUtils.logger(EventDispatcher.class);
+    final static public Logger log = LogUtils.logger(EventDispatcher.class);
 
     /**
      * 添加事件监听器
@@ -55,7 +53,7 @@ public class EventDispatcher {
         // 发布该事件暗示的其他事件
         for (AbstractEvent implyEvent : abstractEvent.implyEvents()) {
             try {
-            	// 避免死循环
+                // 避免死循环
                 if (abstractEvent != implyEvent) {
                     fireEvent(implyEvent);
                 }
@@ -74,7 +72,7 @@ public class EventDispatcher {
     }
 
     static synchronized CopyOnWriteArrayList<AbstractEventListener> getListenerList(
-            Class<? extends AbstractEvent> eventType) {
+        Class<? extends AbstractEvent> eventType) {
         CopyOnWriteArrayList<AbstractEventListener> listeners = LISTENER_MAP.get(eventType);
         if (null == listeners) {
             listeners = new CopyOnWriteArrayList<AbstractEventListener>();
@@ -84,8 +82,9 @@ public class EventDispatcher {
     }
 
     // ========================
-    
+
-	static final Map<Class<? extends AbstractEvent>, CopyOnWriteArrayList<AbstractEventListener>> LISTENER_MAP = new HashMap<Class<? extends AbstractEvent>, CopyOnWriteArrayList<AbstractEventListener>>();
+    static final Map<Class<? extends AbstractEvent>, CopyOnWriteArrayList<AbstractEventListener>> LISTENER_MAP
+        = new HashMap<Class<? extends AbstractEvent>, CopyOnWriteArrayList<AbstractEventListener>>();
 
     // ========================
 
@@ -105,29 +104,30 @@ public class EventDispatcher {
      */
     static public abstract class AbstractEventListener {
         public AbstractEventListener() {
-			/**
+            /**
-			 * 自动注册给EventDispatcher
+             * 自动注册给EventDispatcher
-			 */
+             */
-            EventDispatcher.addEventListener(this); 
+            EventDispatcher.addEventListener(this);
         }
-        
+
-		/**
+        /**
-		 * 感兴趣的事件列表
+         * 感兴趣的事件列表
-		 * 
+         *
-		 * @return event list
+         * @return event list
-		 */
+         */
         abstract public List<Class<? extends AbstractEvent>> interest();
 
         /**
          * 处理事件
+         *
          * @param abstractEvent event to do
          */
         abstract public void onEvent(AbstractEvent abstractEvent);
     }
 
-	/**
+    /**
-	 * serverList has changed
+     * serverList has changed
-	 */
+     */
-	static public class ServerlistChangeEvent extends AbstractEvent {
+    static public class ServerlistChangeEvent extends AbstractEvent {
-	}
+    }
 }

client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java

@@ -20,7 +20,7 @@ import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.client.config.utils.IOUtils;
 import com.alibaba.nacos.client.config.utils.MD5;
 import com.alibaba.nacos.client.utils.ParamUtil;
-import com.alibaba.nacos.common.util.UuidUtil;
+import com.alibaba.nacos.common.util.UuidUtils;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -34,95 +34,88 @@ import java.util.Map;
 
 /**
  * Http tool
- * 
+ *
  * @author Nacos
  *
  */
 public class HttpSimpleClient {
 
-
     static public HttpResult httpGet(String url, List<String> headers, List<String> paramValues,
-            String encoding, long readTimeoutMs, boolean isSSL) throws IOException{
+                                     String encoding, long readTimeoutMs, boolean isSSL) throws IOException {
-    	String encodedContent = encodingParams(paramValues, encoding);
+        String encodedContent = encodingParams(paramValues, encoding);
         url += (null == encodedContent) ? "" : ("?" + encodedContent);
-		if (Limiter.isLimit(MD5.getInstance().getMD5String(
+        if (Limiter.isLimit(MD5.getInstance().getMD5String(
-				new StringBuilder(url).append(encodedContent).toString()))) {
+            new StringBuilder(url).append(encodedContent).toString()))) {
-			return new HttpResult(NacosException.CLIENT_OVER_THRESHOLD,
+            return new HttpResult(NacosException.CLIENT_OVER_THRESHOLD,
-					"More than client-side current limit threshold");
+                "More than client-side current limit threshold");
-		}
+        }
-        
+
         HttpURLConnection conn = null;
-        
-		try {
-			conn = (HttpURLConnection) new URL(url).openConnection();
-			conn.setRequestMethod("GET");
-			conn.setConnectTimeout(ParamUtil.getConnectTimeout() > 100 ? ParamUtil.getConnectTimeout() : 100);
-			conn.setReadTimeout((int) readTimeoutMs);
-			List<String> newHeaders = getHeaders(url, headers, paramValues);
-			setHeaders(conn, newHeaders, encoding);
 
-			conn.connect();
+        try {
-			
+            conn = (HttpURLConnection)new URL(url).openConnection();
-			int respCode = conn.getResponseCode();
+            conn.setRequestMethod("GET");
-			String resp = null;
+            conn.setConnectTimeout(ParamUtil.getConnectTimeout() > 100 ? ParamUtil.getConnectTimeout() : 100);
+            conn.setReadTimeout((int)readTimeoutMs);
+            List<String> newHeaders = getHeaders(url, headers, paramValues);
+            setHeaders(conn, newHeaders, encoding);
 
-			if (HttpURLConnection.HTTP_OK == respCode) {
+            conn.connect();
-				resp = IOUtils.toString(conn.getInputStream(), encoding);
+
-			} else {
+            int respCode = conn.getResponseCode();
-				resp = IOUtils.toString(conn.getErrorStream(), encoding);
+            String resp = null;
-			}
+
-			return new HttpResult(respCode, conn.getHeaderFields(), resp);
+            if (HttpURLConnection.HTTP_OK == respCode) {
-		} finally {
+                resp = IOUtils.toString(conn.getInputStream(), encoding);
+            } else {
+                resp = IOUtils.toString(conn.getErrorStream(), encoding);
+            }
+            return new HttpResult(respCode, conn.getHeaderFields(), resp);
+        } finally {
             if (conn != null) {
                 conn.disconnect();
             }
         }
     }
 
-
+    /**
-	/**
+     * 发送GET请求。
-	 * 发送GET请求。
+     */
-	 */
+    static public HttpResult httpGet(String url, List<String> headers, List<String> paramValues, String encoding,
-	static public HttpResult httpGet(String url, List<String> headers, List<String> paramValues, String encoding,
+                                     long readTimeoutMs) throws IOException {
-			long readTimeoutMs) throws IOException {
+        return httpGet(url, headers, paramValues, encoding, readTimeoutMs, false);
-		return httpGet(url, headers, paramValues, encoding, readTimeoutMs, false);
+    }
-	}
 
     /**
      * 发送POST请求。
-     * 
+     *
      * @param url
-     * @param headers
+     * @param headers       请求Header，可以为null
-     *            请求Header，可以为null
+     * @param paramValues   参数，可以为null
-     * @param paramValues
+     * @param encoding      URL编码使用的字符集
-     *            参数，可以为null
+     * @param readTimeoutMs 响应超时
-     * @param encoding
+     * @param isSSL         是否https
-     *            URL编码使用的字符集
-     * @param readTimeoutMs
-     *            响应超时
-     * @param isSSL
-     *            是否https
      * @return
      * @throws IOException
      */
     static public HttpResult httpPost(String url, List<String> headers, List<String> paramValues,
-            String encoding, long readTimeoutMs, boolean isSSL) throws IOException {
+                                      String encoding, long readTimeoutMs, boolean isSSL) throws IOException {
-		String encodedContent = encodingParams(paramValues, encoding);
+        String encodedContent = encodingParams(paramValues, encoding);
-		if (Limiter.isLimit(MD5.getInstance().getMD5String(
+        if (Limiter.isLimit(MD5.getInstance().getMD5String(
-				new StringBuilder(url).append(encodedContent).toString()))) {
+            new StringBuilder(url).append(encodedContent).toString()))) {
-			return new HttpResult(NacosException.CLIENT_OVER_THRESHOLD,
+            return new HttpResult(NacosException.CLIENT_OVER_THRESHOLD,
-					"More than client-side current limit threshold");
+                "More than client-side current limit threshold");
-		}
+        }
         HttpURLConnection conn = null;
         try {
-			conn = (HttpURLConnection) new URL(url).openConnection();
+            conn = (HttpURLConnection)new URL(url).openConnection();
             conn.setRequestMethod("POST");
             conn.setConnectTimeout(ParamUtil.getConnectTimeout() > 3000 ? ParamUtil.getConnectTimeout() : 3000);
-            conn.setReadTimeout((int) readTimeoutMs);
+            conn.setReadTimeout((int)readTimeoutMs);
             conn.setDoOutput(true);
             conn.setDoInput(true);
-			List<String> newHeaders = getHeaders(url, headers, paramValues);
+            List<String> newHeaders = getHeaders(url, headers, paramValues);
-			setHeaders(conn, newHeaders, encoding);
+            setHeaders(conn, newHeaders, encoding);
 
             conn.getOutputStream().write(encodedContent.getBytes(encoding));
 
@@ -141,81 +134,75 @@ public class HttpSimpleClient {
             }
         }
     }
-    
-	/**
-	 * 发送POST请求。
-	 * 
-	 * @param url
-	 * @param headers
-	 *            请求Header，可以为null
-	 * @param paramValues
-	 *            参数，可以为null
-	 * @param encoding
-	 *            URL编码使用的字符集
-	 * @param readTimeoutMs
-	 *            响应超时
-	 * @return
-	 * @throws IOException
-	 */
-	static public HttpResult httpPost(String url, List<String> headers, List<String> paramValues, String encoding,
-			long readTimeoutMs) throws IOException {
-		return httpPost(url, headers, paramValues, encoding, readTimeoutMs, false);
-	}
 
-	
+    /**
+     * 发送POST请求。
+     *
+     * @param url
+     * @param headers       请求Header，可以为null
+     * @param paramValues   参数，可以为null
+     * @param encoding      URL编码使用的字符集
+     * @param readTimeoutMs 响应超时
+     * @return
+     * @throws IOException
+     */
+    static public HttpResult httpPost(String url, List<String> headers, List<String> paramValues, String encoding,
+                                      long readTimeoutMs) throws IOException {
+        return httpPost(url, headers, paramValues, encoding, readTimeoutMs, false);
+    }
+
     static public HttpResult httpDelete(String url, List<String> headers, List<String> paramValues,
-            String encoding, long readTimeoutMs, boolean isSSL) throws IOException{
+                                        String encoding, long readTimeoutMs, boolean isSSL) throws IOException {
-    	String encodedContent = encodingParams(paramValues, encoding);
+        String encodedContent = encodingParams(paramValues, encoding);
         url += (null == encodedContent) ? "" : ("?" + encodedContent);
-		if (Limiter.isLimit(MD5.getInstance().getMD5String(
+        if (Limiter.isLimit(MD5.getInstance().getMD5String(
-				new StringBuilder(url).append(encodedContent).toString()))) {
+            new StringBuilder(url).append(encodedContent).toString()))) {
-			return new HttpResult(NacosException.CLIENT_OVER_THRESHOLD,
+            return new HttpResult(NacosException.CLIENT_OVER_THRESHOLD,
-					"More than client-side current limit threshold");
+                "More than client-side current limit threshold");
-		}
+        }
-        
+
         HttpURLConnection conn = null;
-        
-		try {
-			conn = (HttpURLConnection) new URL(url).openConnection();
-			conn.setRequestMethod("DELETE");
-			conn.setConnectTimeout(ParamUtil.getConnectTimeout() > 100 ? ParamUtil.getConnectTimeout() : 100);
-			conn.setReadTimeout((int) readTimeoutMs);
-			List<String> newHeaders = getHeaders(url, headers, paramValues);
-			setHeaders(conn, newHeaders, encoding);
 
-			conn.connect();
+        try {
-			
+            conn = (HttpURLConnection)new URL(url).openConnection();
-			int respCode = conn.getResponseCode();
+            conn.setRequestMethod("DELETE");
-			String resp = null;
+            conn.setConnectTimeout(ParamUtil.getConnectTimeout() > 100 ? ParamUtil.getConnectTimeout() : 100);
+            conn.setReadTimeout((int)readTimeoutMs);
+            List<String> newHeaders = getHeaders(url, headers, paramValues);
+            setHeaders(conn, newHeaders, encoding);
 
-			if (HttpURLConnection.HTTP_OK == respCode) {
+            conn.connect();
-				resp = IOUtils.toString(conn.getInputStream(), encoding);
+
-			} else {
+            int respCode = conn.getResponseCode();
-				resp = IOUtils.toString(conn.getErrorStream(), encoding);
+            String resp = null;
-			}
+
-			return new HttpResult(respCode, conn.getHeaderFields(), resp);
+            if (HttpURLConnection.HTTP_OK == respCode) {
-		} finally {
+                resp = IOUtils.toString(conn.getInputStream(), encoding);
+            } else {
+                resp = IOUtils.toString(conn.getErrorStream(), encoding);
+            }
+            return new HttpResult(respCode, conn.getHeaderFields(), resp);
+        } finally {
             if (conn != null) {
                 conn.disconnect();
             }
         }
     }
 
+    static public HttpResult httpDelete(String url, List<String> headers, List<String> paramValues, String encoding,
+                                        long readTimeoutMs) throws IOException {
+        return httpGet(url, headers, paramValues, encoding, readTimeoutMs, false);
+    }
 
-	static public HttpResult httpDelete(String url, List<String> headers, List<String> paramValues, String encoding,
-			long readTimeoutMs) throws IOException {
-		return httpGet(url, headers, paramValues, encoding, readTimeoutMs, false);
-	}
-	
     static private void setHeaders(HttpURLConnection conn, List<String> headers, String encoding) {
         if (null != headers) {
-            for (Iterator<String> iter = headers.iterator(); iter.hasNext();) {
+            for (Iterator<String> iter = headers.iterator(); iter.hasNext(); ) {
                 conn.addRequestProperty(iter.next(), iter.next());
             }
         }
         conn.addRequestProperty("Client-Version", ParamUtil.getClientVersion());
         conn.addRequestProperty("Content-Type", "application/x-www-form-urlencoded;charset=" + encoding);
-        
+
         String ts = String.valueOf(System.currentTimeMillis());
         String token = MD5.getInstance().getMD5String(ts + ParamUtil.getAppKey());
 
@@ -224,27 +211,27 @@ public class HttpSimpleClient {
         conn.addRequestProperty(Constants.CLIENT_REQUEST_TOKEN_HEADER, token);
     }
 
-	private static List<String> getHeaders(String url, List<String> headers, List<String> paramValues)
+    private static List<String> getHeaders(String url, List<String> headers, List<String> paramValues)
-			throws IOException {
+        throws IOException {
-		List<String> newHeaders = new ArrayList<String>();
+        List<String> newHeaders = new ArrayList<String>();
-		newHeaders.add("exConfigInfo");
+        newHeaders.add("exConfigInfo");
-		newHeaders.add("true");
+        newHeaders.add("true");
-		newHeaders.add("RequestId");
+        newHeaders.add("RequestId");
-		newHeaders.add(UuidUtil.generateUuid());
+        newHeaders.add(UuidUtils.generateUuid());
-		if (headers!=null) {
+        if (headers != null) {
-			newHeaders.addAll(headers);
+            newHeaders.addAll(headers);
-		}
+        }
-		return newHeaders;
+        return newHeaders;
-	}
+    }
-	
+
     static private String encodingParams(List<String> paramValues, String encoding)
-            throws UnsupportedEncodingException {
+        throws UnsupportedEncodingException {
         StringBuilder sb = new StringBuilder();
         if (null == paramValues) {
             return null;
         }
-        
+
-        for (Iterator<String> iter = paramValues.iterator(); iter.hasNext();) {
+        for (Iterator<String> iter = paramValues.iterator(); iter.hasNext(); ) {
             sb.append(iter.next()).append("=");
             sb.append(URLEncoder.encode(iter.next(), encoding));
             if (iter.hasNext()) {
@@ -253,23 +240,23 @@ public class HttpSimpleClient {
         }
         return sb.toString();
     }
-    
+
     static public class HttpResult {
         final public int code;
-        final public Map<String,List<String>> headers;
+        final public Map<String, List<String>> headers;
         final public String content;
 
-		public HttpResult(int code, String content) {
+        public HttpResult(int code, String content) {
-			this.code = code;
+            this.code = code;
-			this.headers = null;
+            this.headers = null;
-			this.content = content;
+            this.content = content;
-		}
+        }
-		
+
-		public HttpResult(int code, Map<String, List<String>> headers, String content) {
+        public HttpResult(int code, Map<String, List<String>> headers, String content) {
-			this.code = code;
+            this.code = code;
-			this.headers = headers;
+            this.headers = headers;
-			this.content = content;
+            this.content = content;
-		}
+        }
     }
-    
+
 }

client/src/main/java/com/alibaba/nacos/client/config/impl/Limiter.java

@@ -27,53 +27,52 @@ import com.google.common.util.concurrent.RateLimiter;
 
 /**
  * Limiter
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class Limiter {
 
-	static final public Logger log = LogUtils.logger(Limiter.class);
+    static final public Logger log = LogUtils.logger(Limiter.class);
-	private static int CAPACITY_SIZE = 1000;
+    private static int CAPACITY_SIZE = 1000;
-	private static int LIMIT_TIME = 1000;
+    private static int LIMIT_TIME = 1000;
-	private static Cache<String, RateLimiter> cache = CacheBuilder.newBuilder()
+    private static Cache<String, RateLimiter> cache = CacheBuilder.newBuilder()
-			.initialCapacity(CAPACITY_SIZE).expireAfterAccess(1, TimeUnit.MINUTES)
+        .initialCapacity(CAPACITY_SIZE).expireAfterAccess(1, TimeUnit.MINUTES)
-			.build();
+        .build();
 
-	/**
+    /**
-	 * qps 5
+     * qps 5
-	 */
+     */
-	private static final String DEFAULT_LIMIT = "5";
+    private static final String DEFAULT_LIMIT = "5";
-	private static double limit = 5;
+    private static double limit = 5;
 
-	static {
+    static {
-		try {
+        try {
-			String limitTimeStr = System
+            String limitTimeStr = System
-					.getProperty("limitTime", DEFAULT_LIMIT);
+                .getProperty("limitTime", DEFAULT_LIMIT);
-			limit = Double.parseDouble(limitTimeStr);
+            limit = Double.parseDouble(limitTimeStr);
-			log.info("limitTime:{}", limit);
+            log.info("limitTime:{}", limit);
-		} catch (Exception e) {
+        } catch (Exception e) {
-			log.error("Nacos-xxx", "init limitTime fail", e);
+            log.error("Nacos-xxx", "init limitTime fail", e);
-		}
+        }
-	}
+    }
 
-	public static boolean isLimit(String accessKeyID) {
+    public static boolean isLimit(String accessKeyID) {
-		RateLimiter rateLimiter = null;
+        RateLimiter rateLimiter = null;
-		try {
+        try {
-			rateLimiter = cache.get(accessKeyID, new Callable<RateLimiter>() {
+            rateLimiter = cache.get(accessKeyID, new Callable<RateLimiter>() {
-				@Override
+                @Override
-				public RateLimiter call() throws Exception {
+                public RateLimiter call() throws Exception {
-					return RateLimiter.create(limit);
+                    return RateLimiter.create(limit);
-				}
+                }
-			});
+            });
-		} catch (ExecutionException e) {
+        } catch (ExecutionException e) {
-			log.error("Nacos-XXX", "create limit fail", e);
+            log.error("Nacos-XXX", "create limit fail", e);
-		}
+        }
-		if (rateLimiter != null && !rateLimiter.tryAcquire(LIMIT_TIME, TimeUnit.MILLISECONDS)) {
+        if (rateLimiter != null && !rateLimiter.tryAcquire(LIMIT_TIME, TimeUnit.MILLISECONDS)) {
-			log.error("Nacos-XXX", "access_key_id:{} limited", accessKeyID);
+            log.error("Nacos-XXX", "access_key_id:{} limited", accessKeyID);
-			return true;
+            return true;
-		}
+        }
-		return false;
+        return false;
-	}
+    }
 
 }

client/src/main/java/com/alibaba/nacos/client/config/impl/LocalConfigInfoProcessor.java

@@ -25,169 +25,170 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-
 /**
  * Local Disaster Recovery Directory Tool
- * 
+ *
  * @author Nacos
  */
 public class LocalConfigInfoProcessor {
-	
+
-	final static public Logger log = LogUtils.logger(LocalConfigInfoProcessor.class);
+    final static public Logger log = LogUtils.logger(LocalConfigInfoProcessor.class);
 
     static public String getFailover(String serverName, String dataId, String group, String tenant) {
-    	File localPath = getFailoverFile(serverName, dataId, group, tenant);
+        File localPath = getFailoverFile(serverName, dataId, group, tenant);
-    	if (!localPath.exists() || !localPath.isFile()) {
+        if (!localPath.exists() || !localPath.isFile()) {
-    		return null;
+            return null;
-    	}
+        }
-    	
+
-    	try {
+        try {
-    		return readFile(localPath);
+            return readFile(localPath);
-    	} catch (IOException ioe) {
+        } catch (IOException ioe) {
-    		log.error(serverName, "NACOS-XXXX","get failover error, " + localPath + ioe.toString());
+            log.error(serverName, "NACOS-XXXX", "get failover error, " + localPath + ioe.toString());
-    		return null;
+            return null;
-    	}
+        }
     }
-    
+
     /**
      * 获取本地缓存文件内容。NULL表示没有本地文件或抛出异常。
      */
     static public String getSnapshot(String name, String dataId, String group, String tenant) {
-    	if (!SnapShotSwitch.getIsSnapShot()) {
+        if (!SnapShotSwitch.getIsSnapShot()) {
-    		return null;
+            return null;
-    	}
+        }
-    	File file = getSnapshotFile(name, dataId, group, tenant);
+        File file = getSnapshotFile(name, dataId, group, tenant);
-    	if (!file.exists() || !file.isFile()) {
+        if (!file.exists() || !file.isFile()) {
-    		return null;
+            return null;
-    	}
+        }
-    	
+
-    	try {
+        try {
-    		return readFile(file);
+            return readFile(file);
-    	} catch (IOException ioe) {
+        } catch (IOException ioe) {
-    		log.error(name, "NACOS-XXXX","get snapshot error, " + file + ", " + ioe.toString());
+            log.error(name, "NACOS-XXXX", "get snapshot error, " + file + ", " + ioe.toString());
-    		return null;
+            return null;
-    	}
+        }
     }
-    
-	static private String readFile(File file) throws IOException {
-		if (!file.exists() || !file.isFile()) {
-			return null;
-		}
 
-		if (JVMUtil.isMultiInstance()) {
+    static private String readFile(File file) throws IOException {
-			return ConcurrentDiskUtil.getFileContent(file, Constants.ENCODE);
+        if (!file.exists() || !file.isFile()) {
-		} else {
+            return null;
-			InputStream is = null;
+        }
-			try {
+
-				is = new FileInputStream(file);
+        if (JVMUtil.isMultiInstance()) {
-				return IOUtils.toString(is, Constants.ENCODE);
+            return ConcurrentDiskUtil.getFileContent(file, Constants.ENCODE);
-			} finally {
+        } else {
-				try {
+            InputStream is = null;
-					if (null != is) {
+            try {
-						is.close();
+                is = new FileInputStream(file);
-					}
+                return IOUtils.toString(is, Constants.ENCODE);
-				} catch (IOException ioe) {
+            } finally {
-				}
+                try {
-			}
+                    if (null != is) {
-		}
+                        is.close();
-	}
+                    }
+                } catch (IOException ioe) {
+                }
+            }
+        }
+    }
 
-    
     static public void saveSnapshot(String envName, String dataId, String group, String tenant, String config) {
-		if (!SnapShotSwitch.getIsSnapShot()) {
+        if (!SnapShotSwitch.getIsSnapShot()) {
-			return;
+            return;
-		}
+        }
         File file = getSnapshotFile(envName, dataId, group, tenant);
         if (null == config) {
             try {
                 IOUtils.delete(file);
             } catch (IOException ioe) {
-                log.error(envName, "NACOS-XXXX","delete snapshot error, " + file + ", " + ioe.toString());
+                log.error(envName, "NACOS-XXXX", "delete snapshot error, " + file + ", " + ioe.toString());
             }
         } else {
             try {
-				boolean isMdOk = file.getParentFile().mkdirs();
+                File parentFile = file.getParentFile();
-				if (!isMdOk) {
+                if (!parentFile.exists()) {
-					log.error(envName, "NACOS-XXXX", "save snapshot error");
+                    boolean isMdOk = parentFile.mkdirs();
-				}
+                    if (!isMdOk) {
-				if (JVMUtil.isMultiInstance()) {
+                        log.error(envName, "NACOS-XXXX", "save snapshot error");
-					ConcurrentDiskUtil.writeFileContent(file, config,
+                    }
-							Constants.ENCODE);
+                }
-				} else {
+
-					IOUtils.writeStringToFile(file, config, Constants.ENCODE);
+                if (JVMUtil.isMultiInstance()) {
-				}
+                    ConcurrentDiskUtil.writeFileContent(file, config,
+                        Constants.ENCODE);
+                } else {
+                    IOUtils.writeStringToFile(file, config, Constants.ENCODE);
+                }
             } catch (IOException ioe) {
-                log.error(envName, "NACOS-XXXX","save snapshot error, " + file + ", " + ioe.toString());
+                log.error(envName, "NACOS-XXXX", "save snapshot error, " + file + ", " + ioe.toString());
             }
         }
     }
-    
+
     /**
      * 清除snapshot目录下所有缓存文件。
      */
     static public void cleanAllSnapshot() {
         try {
-        	File rootFile = new File(LOCAL_SNAPSHOT_PATH);
+            File rootFile = new File(LOCAL_SNAPSHOT_PATH);
-        	File[] files = rootFile.listFiles();
+            File[] files = rootFile.listFiles();
-			if (files == null || files.length == 0) {
+            if (files == null || files.length == 0) {
-				return;
+                return;
-			}
+            }
-        	for(File file : files){
+            for (File file : files) {
-        		if(file.getName().endsWith("_nacos")){
+                if (file.getName().endsWith("_nacos")) {
-        			IOUtils.cleanDirectory(file);
+                    IOUtils.cleanDirectory(file);
-        		}
+                }
-        	}
+            }
         } catch (IOException ioe) {
-            log.error("NACOS-XXXX","clean all snapshot error, " + ioe.toString(), ioe);
+            log.error("NACOS-XXXX", "clean all snapshot error, " + ioe.toString(), ioe);
         }
     }
-    
+
-    static public void cleanEnvSnapshot(String envName){
+    static public void cleanEnvSnapshot(String envName) {
-    	File tmp = new File(LOCAL_SNAPSHOT_PATH, envName + "_nacos");
+        File tmp = new File(LOCAL_SNAPSHOT_PATH, envName + "_nacos");
-    	tmp = new File(tmp, "snapshot");
+        tmp = new File(tmp, "snapshot");
-    	try {
+        try {
-			IOUtils.cleanDirectory(tmp);
+            IOUtils.cleanDirectory(tmp);
-			log.info("success dlelet " + envName + "-snapshot");
+            log.info("success delete " + envName + "-snapshot");
-		} catch (IOException e) {
+        } catch (IOException e) {
-			log.info("fail dlelet " + envName + "-snapshot, " + e.toString());
+            log.info("fail delete " + envName + "-snapshot, " + e.toString());
-			e.printStackTrace();
+            e.printStackTrace();
-		}
+        }
     }
-    
 
     static File getFailoverFile(String serverName, String dataId, String group, String tenant) {
-    	File tmp = new File(LOCAL_SNAPSHOT_PATH, serverName + "_nacos");
+        File tmp = new File(LOCAL_SNAPSHOT_PATH, serverName + "_nacos");
-    	tmp = new File(tmp, "data");
+        tmp = new File(tmp, "data");
-    	if (StringUtils.isBlank(tenant)) {
+        if (StringUtils.isBlank(tenant)) {
-    		tmp = new File(tmp, "config-data");
+            tmp = new File(tmp, "config-data");
-    	} else
+        } else {
-    	{
+            tmp = new File(tmp, "config-data-tenant");
-    		tmp = new File(tmp, "config-data-tenant");
+            tmp = new File(tmp, tenant);
-    		tmp = new File(tmp, tenant);
+        }
-    	}
-    	return new File(new File(tmp, group), dataId);
-    }
-    
-    static File getSnapshotFile(String envName, String dataId, String group, String tenant) {
-		File tmp = new File(LOCAL_SNAPSHOT_PATH, envName + "_nacos");
-		if (StringUtils.isBlank(tenant)) {
-			tmp = new File(tmp, "snapshot");
-		} else {
-			tmp = new File(tmp, "snapshot-tenant");
-			tmp = new File(tmp, tenant);
-		}
-    	
         return new File(new File(tmp, group), dataId);
     }
-    
+
+    static File getSnapshotFile(String envName, String dataId, String group, String tenant) {
+        File tmp = new File(LOCAL_SNAPSHOT_PATH, envName + "_nacos");
+        if (StringUtils.isBlank(tenant)) {
+            tmp = new File(tmp, "snapshot");
+        } else {
+            tmp = new File(tmp, "snapshot-tenant");
+            tmp = new File(tmp, tenant);
+        }
+
+        return new File(new File(tmp, group), dataId);
+    }
+
     public static final String LOCAL_FILEROOT_PATH;
     public static final String LOCAL_SNAPSHOT_PATH;
-	static {
+
-		LOCAL_FILEROOT_PATH = System.getProperty("JM.LOG.PATH", System.getProperty("user.home")) + File.separator
+    static {
-				+ "nacos" + File.separator + "config";
+        LOCAL_FILEROOT_PATH = System.getProperty("JM.LOG.PATH", System.getProperty("user.home")) + File.separator
-		LOCAL_SNAPSHOT_PATH = System.getProperty("JM.SNAPSHOT.PATH", System.getProperty("user.home")) + File.separator
+            + "nacos" + File.separator + "config";
-				+ "nacos" + File.separator + "config";
+        LOCAL_SNAPSHOT_PATH = System.getProperty("JM.SNAPSHOT.PATH", System.getProperty("user.home")) + File.separator
-		log.warn("LOCAL_SNAPSHOT_PATH:{}", LOCAL_SNAPSHOT_PATH);
+            + "nacos" + File.separator + "config";
-	}
+        log.warn("LOCAL_SNAPSHOT_PATH:{}", LOCAL_SNAPSHOT_PATH);
+    }
 
 }

client/src/main/java/com/alibaba/nacos/client/config/impl/ServerHttpAgent.java

@@ -41,351 +41,352 @@ import java.util.List;
 import java.util.Properties;
 
 /**
- * Server Agent 
+ * Server Agent
- * 
- * @author water.lyl
  *
+ * @author water.lyl
  */
 public class ServerHttpAgent {
 
-	final static public Logger log = LogUtils.logger(ServerHttpAgent.class);
+    final static public Logger log = LogUtils.logger(ServerHttpAgent.class);
-	/**
-	 * @param path
-	 *            相对于web应用根，以/开头
-	 * @param headers
-	 * @param paramValues
-	 * @param encoding
-	 * @param readTimeoutMs
-	 * @return
-	 * @throws IOException
-	 */
-	public HttpResult httpGet(String path, List<String> headers, List<String> paramValues, String encoding,
-			long readTimeoutMs) throws IOException {
-		final long endTime = System.currentTimeMillis() + readTimeoutMs;
 
-		boolean isSSL = false;
+    /**
-		
+     * @param path          相对于web应用根，以/开头
-		do {
+     * @param headers
-			try {
+     * @param paramValues
-				List<String> newHeaders = getSpasHeaders(paramValues);
+     * @param encoding
-				if (headers != null) {
+     * @param readTimeoutMs
-					newHeaders.addAll(headers);
+     * @return
-				}
+     * @throws IOException
-				HttpResult result = HttpSimpleClient.httpGet(
+     */
-						getUrl(serverListMgr.getCurrentServerAddr(), path, isSSL), newHeaders, paramValues, encoding,
+    public HttpResult httpGet(String path, List<String> headers, List<String> paramValues, String encoding,
-						readTimeoutMs, isSSL);
+                              long readTimeoutMs) throws IOException {
-				if (result.code == HttpURLConnection.HTTP_INTERNAL_ERROR
+        final long endTime = System.currentTimeMillis() + readTimeoutMs;
-						|| result.code == HttpURLConnection.HTTP_BAD_GATEWAY
-						|| result.code == HttpURLConnection.HTTP_UNAVAILABLE) {
-					log.error("NACOS ConnectException", "currentServerAddr:{}. httpCode:",
-							new Object[] { serverListMgr.getCurrentServerAddr(), result.code });
-				} else {
-					return result;
-				}
-			} catch (ConnectException ce) {
-				log.error("NACOS ConnectException", "currentServerAddr:{}",
-						new Object[] { serverListMgr.getCurrentServerAddr() });
-				serverListMgr.refreshCurrentServerAddr();
-			} catch (SocketTimeoutException stoe) {
-				log.error("NACOS  SocketTimeoutException", "currentServerAddr:{}",
-						new Object[] { serverListMgr.getCurrentServerAddr()});
-				serverListMgr.refreshCurrentServerAddr();
-			} catch (IOException ioe) {
-				log.error("NACOS  IOException", "currentServerAddr:{}",
-						new Object[] { serverListMgr.getCurrentServerAddr()});
-				throw ioe;
-			}
-		} while (System.currentTimeMillis() <= endTime);
 
-		log.error("NACOS-0002",
+        boolean isSSL = false;
-				LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0002", "环境问题", "no available server"));
-		throw new ConnectException("no available server");
-	}
 
-	public HttpResult httpPost(String path, List<String> headers, List<String> paramValues, String encoding,
+        do {
-			long readTimeoutMs) throws IOException {
+            try {
-		final long endTime = System.currentTimeMillis() + readTimeoutMs;
+                List<String> newHeaders = getSpasHeaders(paramValues);
-		boolean isSSL = false;
+                if (headers != null) {
-		do {
+                    newHeaders.addAll(headers);
-			try {
+                }
-				List<String> newHeaders = getSpasHeaders(paramValues);
+                HttpResult result = HttpSimpleClient.httpGet(
-				if (headers != null) {
+                    getUrl(serverListMgr.getCurrentServerAddr(), path, isSSL), newHeaders, paramValues, encoding,
-					newHeaders.addAll(headers);
+                    readTimeoutMs, isSSL);
-				}
+                if (result.code == HttpURLConnection.HTTP_INTERNAL_ERROR
-				HttpResult result = HttpSimpleClient.httpPost(
+                    || result.code == HttpURLConnection.HTTP_BAD_GATEWAY
-						getUrl(serverListMgr.getCurrentServerAddr(), path, isSSL), newHeaders, paramValues, encoding,
+                    || result.code == HttpURLConnection.HTTP_UNAVAILABLE) {
-						readTimeoutMs, isSSL);
+                    log.error("NACOS ConnectException", "currentServerAddr:{}. httpCode:",
-				if (result.code == HttpURLConnection.HTTP_INTERNAL_ERROR
+                        new Object[] {serverListMgr.getCurrentServerAddr(), result.code});
-						|| result.code == HttpURLConnection.HTTP_BAD_GATEWAY
+                } else {
-						|| result.code == HttpURLConnection.HTTP_UNAVAILABLE) {
+                    return result;
-					log.error("NACOS ConnectException", "currentServerAddr:{}. httpCode:",
+                }
-							new Object[] { serverListMgr.getCurrentServerAddr(), result.code });
+            } catch (ConnectException ce) {
-				} else {
+                log.error("NACOS ConnectException", "currentServerAddr:{}",
-					return result;
+                    new Object[] {serverListMgr.getCurrentServerAddr()});
-				}
+                serverListMgr.refreshCurrentServerAddr();
-			} catch (ConnectException ce) {
+            } catch (SocketTimeoutException stoe) {
-				log.error("NACOS ConnectException", "currentServerAddr:{}",
+                log.error("NACOS  SocketTimeoutException", "currentServerAddr:{}",
-						new Object[] { serverListMgr.getCurrentServerAddr()});
+                    new Object[] {serverListMgr.getCurrentServerAddr()});
-				serverListMgr.refreshCurrentServerAddr();
+                serverListMgr.refreshCurrentServerAddr();
-			} catch (SocketTimeoutException stoe) {
+            } catch (IOException ioe) {
-				log.error("NACOS  SocketTimeoutException", "currentServerAddr:{}",
+                log.error("NACOS  IOException", "currentServerAddr:{}",
-						new Object[] { serverListMgr.getCurrentServerAddr()});
+                    new Object[] {serverListMgr.getCurrentServerAddr()});
-				serverListMgr.refreshCurrentServerAddr();
+                throw ioe;
-			} catch (IOException ioe) {
+            }
-				log.error("NACOS  IOException", "currentServerAddr:{}",
+        } while (System.currentTimeMillis() <= endTime);
-						new Object[] { serverListMgr.getCurrentServerAddr()});
-				throw ioe;
-			}
 
-		} while (System.currentTimeMillis() <= endTime);
+        log.error("NACOS-0002",
+            LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0002", "环境问题", "no available server"));
+        throw new ConnectException("no available server");
+    }
 
-		log.error("NACOS-0002",
+    public HttpResult httpPost(String path, List<String> headers, List<String> paramValues, String encoding,
-				LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0002", "环境问题", "no available server"));
+                               long readTimeoutMs) throws IOException {
-		throw new ConnectException("no available server");
+        final long endTime = System.currentTimeMillis() + readTimeoutMs;
-	}
+        boolean isSSL = false;
-	
+        do {
-	public HttpResult httpDelete(String path, List<String> headers, List<String> paramValues, String encoding,
+            try {
-			long readTimeoutMs) throws IOException {
+                List<String> newHeaders = getSpasHeaders(paramValues);
-		final long endTime = System.currentTimeMillis() + readTimeoutMs;
+                if (headers != null) {
-		boolean isSSL = false;
+                    newHeaders.addAll(headers);
-		do {
+                }
-			try {
+                HttpResult result = HttpSimpleClient.httpPost(
-				List<String> newHeaders = getSpasHeaders(paramValues);
+                    getUrl(serverListMgr.getCurrentServerAddr(), path, isSSL), newHeaders, paramValues, encoding,
-				if (headers != null) {
+                    readTimeoutMs, isSSL);
-					newHeaders.addAll(headers);
+                if (result.code == HttpURLConnection.HTTP_INTERNAL_ERROR
-				}
+                    || result.code == HttpURLConnection.HTTP_BAD_GATEWAY
-				HttpResult result = HttpSimpleClient.httpDelete(
+                    || result.code == HttpURLConnection.HTTP_UNAVAILABLE) {
-						getUrl(serverListMgr.getCurrentServerAddr(), path, isSSL), newHeaders, paramValues, encoding,
+                    log.error("NACOS ConnectException", "currentServerAddr:{}. httpCode:",
-						readTimeoutMs, isSSL);
+                        new Object[] {serverListMgr.getCurrentServerAddr(), result.code});
-				if (result.code == HttpURLConnection.HTTP_INTERNAL_ERROR
+                } else {
-						|| result.code == HttpURLConnection.HTTP_BAD_GATEWAY
+                    return result;
-						|| result.code == HttpURLConnection.HTTP_UNAVAILABLE) {
+                }
-					log.error("NACOS ConnectException", "currentServerAddr:{}. httpCode:",
+            } catch (ConnectException ce) {
-							new Object[] { serverListMgr.getCurrentServerAddr(), result.code });
+                log.error("NACOS ConnectException", "currentServerAddr:{}",
-				} else {
+                    new Object[] {serverListMgr.getCurrentServerAddr()});
-					return result;
+                serverListMgr.refreshCurrentServerAddr();
-				}
+            } catch (SocketTimeoutException stoe) {
-			} catch (ConnectException ce) {
+                log.error("NACOS  SocketTimeoutException", "currentServerAddr:{}",
-				log.error("NACOS ConnectException", "currentServerAddr:{}",
+                    new Object[] {serverListMgr.getCurrentServerAddr()});
-						new Object[] { serverListMgr.getCurrentServerAddr()});
+                serverListMgr.refreshCurrentServerAddr();
-				serverListMgr.refreshCurrentServerAddr();
+            } catch (IOException ioe) {
-			} catch (SocketTimeoutException stoe) {
+                log.error("NACOS  IOException", "currentServerAddr:{}",
-				log.error("NACOS  SocketTimeoutException", "currentServerAddr:{}",
+                    new Object[] {serverListMgr.getCurrentServerAddr()});
-						new Object[] { serverListMgr.getCurrentServerAddr()});
+                throw ioe;
-				serverListMgr.refreshCurrentServerAddr();
+            }
-			} catch (IOException ioe) {
-				log.error("NACOS  IOException", "currentServerAddr:{}",
-						new Object[] { serverListMgr.getCurrentServerAddr()});
-				throw ioe;
-			}
-			
-		} while (System.currentTimeMillis() <= endTime);
-		
-		log.error("NACOS-0002",
-				LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0002", "环境问题", "no available server"));
-		throw new ConnectException("no available server");
-	}
 
-	private String getUrl(String serverAddr, String relativePath, boolean isSSL) {
+        } while (System.currentTimeMillis() <= endTime);
-		String httpPrefix = "http://";
-		if (isSSL) {
-			httpPrefix = "https://";
-		}
-		return httpPrefix + serverAddr + "/" + serverListMgr.getContentPath() + relativePath;
-	}
 
-	public static String getAppname() {
+        log.error("NACOS-0002",
-		return ParamUtil.getAppName();
+            LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0002", "环境问题", "no available server"));
-	}
+        throw new ConnectException("no available server");
+    }
 
-	public ServerHttpAgent(ServerListManager mgr) {
+    public HttpResult httpDelete(String path, List<String> headers, List<String> paramValues, String encoding,
-		serverListMgr = mgr;
+                                 long readTimeoutMs) throws IOException {
-	}
+        final long endTime = System.currentTimeMillis() + readTimeoutMs;
-	
+        boolean isSSL = false;
-	public ServerHttpAgent(ServerListManager mgr, Properties properties) {
+        do {
-		serverListMgr = mgr;
+            try {
-		String ak = properties.getProperty(PropertyKeyConst.ACCESS_KEY);
+                List<String> newHeaders = getSpasHeaders(paramValues);
-		if (StringUtils.isBlank(ak)) {
+                if (headers != null) {
-			accessKey = SpasAdapter.getAk();
+                    newHeaders.addAll(headers);
-		} else {
+                }
-			accessKey = ak;
+                HttpResult result = HttpSimpleClient.httpDelete(
-		}
+                    getUrl(serverListMgr.getCurrentServerAddr(), path, isSSL), newHeaders, paramValues, encoding,
+                    readTimeoutMs, isSSL);
+                if (result.code == HttpURLConnection.HTTP_INTERNAL_ERROR
+                    || result.code == HttpURLConnection.HTTP_BAD_GATEWAY
+                    || result.code == HttpURLConnection.HTTP_UNAVAILABLE) {
+                    log.error("NACOS ConnectException", "currentServerAddr:{}. httpCode:",
+                        new Object[] {serverListMgr.getCurrentServerAddr(), result.code});
+                } else {
+                    return result;
+                }
+            } catch (ConnectException ce) {
+                log.error("NACOS ConnectException", "currentServerAddr:{}",
+                    new Object[] {serverListMgr.getCurrentServerAddr()});
+                serverListMgr.refreshCurrentServerAddr();
+            } catch (SocketTimeoutException stoe) {
+                log.error("NACOS  SocketTimeoutException", "currentServerAddr:{}",
+                    new Object[] {serverListMgr.getCurrentServerAddr()});
+                serverListMgr.refreshCurrentServerAddr();
+            } catch (IOException ioe) {
+                log.error("NACOS  IOException", "currentServerAddr:{}",
+                    new Object[] {serverListMgr.getCurrentServerAddr()});
+                throw ioe;
+            }
 
-		String sk = properties.getProperty(PropertyKeyConst.SECRET_KEY);
+        } while (System.currentTimeMillis() <= endTime);
-		if (StringUtils.isBlank(sk)) {
-			secretKey = SpasAdapter.getSk();
-		} else {
-			secretKey = sk;
-		}
-	}
-	
-	public ServerHttpAgent(Properties properties) throws NacosException {
-		String encodeTmp = properties.getProperty(PropertyKeyConst.ENCODE);
-		if (StringUtils.isBlank(encodeTmp)) {
-			encode = Constants.ENCODE;
-		} else {
-			encode = encodeTmp.trim();
-		}
-		serverListMgr = new ServerListManager(properties);
-		String ak = properties.getProperty(PropertyKeyConst.ACCESS_KEY);
-		if (StringUtils.isBlank(ak)) {
-			accessKey = SpasAdapter.getAk();
-		} else {
-			accessKey = ak;
-		}
-		
-		String sk = properties.getProperty(PropertyKeyConst.SECRET_KEY);
-		if (StringUtils.isBlank(sk)) {
-			secretKey = SpasAdapter.getSk();
-		} else {
-			secretKey = sk;
-		}
-	}
 
-	public synchronized void start() throws NacosException {
+        log.error("NACOS-0002",
-		serverListMgr.start();
+            LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0002", "环境问题", "no available server"));
-	}
+        throw new ConnectException("no available server");
-	
+    }
-	private List<String> getSpasHeaders(List<String> paramValues) throws IOException {
-		List<String> newHeaders = new ArrayList<String>();
-		// STS 临时凭证鉴权的优先级高于 AK/SK 鉴权
-		if (STSConfig.getInstance().isSTSOn()) {
-			STSCredential sTSCredential = getSTSCredential();
-			accessKey = sTSCredential.accessKeyId;
-			secretKey = sTSCredential.accessKeySecret;
-			newHeaders.add("Spas-SecurityToken");
-			newHeaders.add(sTSCredential.securityToken);
-		}
 
-		if (StringUtils.isNotEmpty(accessKey) && StringUtils.isNotEmpty(secretKey)) {
+    private String getUrl(String serverAddr, String relativePath, boolean isSSL) {
-			newHeaders.add("Spas-AccessKey");
+        String httpPrefix = "http://";
-			newHeaders.add(accessKey);
+        if (isSSL) {
-			List<String> signHeaders = SpasAdapter.getSignHeaders(paramValues, secretKey);
+            httpPrefix = "https://";
-			if (signHeaders != null) {
+        }
-				newHeaders.addAll(signHeaders);
+        return httpPrefix + serverAddr + "/" + serverListMgr.getContentPath() + relativePath;
-			}
+    }
-		}
-		return newHeaders;
-	}
 
-	private STSCredential getSTSCredential() throws IOException {
+    public static String getAppname() {
-		boolean cacheSecurityCredentials = STSConfig.getInstance().isCacheSecurityCredentials();
+        return ParamUtil.getAppName();
-		if (cacheSecurityCredentials && sTSCredential != null) {
+    }
-			long currentTime = System.currentTimeMillis();
-			long expirationTime = sTSCredential.expiration.getTime();
-			int timeToRefreshInMillisecond = STSConfig.getInstance().getTimeToRefreshInMillisecond();
-			if (expirationTime - currentTime > timeToRefreshInMillisecond) {
-				return sTSCredential;
-			}
-		}
-		String stsResponse = getSTSResponse();
-		STSCredential stsCredentialTmp = (STSCredential)JSONUtils.deserializeObject(stsResponse,
-			new TypeReference<STSCredential>() {});
-		sTSCredential = stsCredentialTmp;
-		log.info("getSTSCredential", "code:{}, accessKeyId:{}, lastUpdated:{}, expiration:{}", sTSCredential.getCode(),
-			sTSCredential.getAccessKeyId(), sTSCredential.getLastUpdated(), sTSCredential.getExpiration());
-		return sTSCredential;
-	}
 
-	private static String getSTSResponse() throws IOException {
+    public ServerHttpAgent(ServerListManager mgr) {
-		String securityCredentials = STSConfig.getInstance().getSecurityCredentials();
+        serverListMgr = mgr;
-		if (securityCredentials != null) {
+    }
-			return securityCredentials;
-		}
-		String securityCredentialsUrl = STSConfig.getInstance().getSecurityCredentialsUrl();
-		HttpURLConnection conn = null;
-		int respCode;
-		String response;
-		try {
-			conn = (HttpURLConnection)new URL(securityCredentialsUrl).openConnection();
-			conn.setRequestMethod("GET");
-			conn.setConnectTimeout(ParamUtil.getConnectTimeout() > 100 ? ParamUtil.getConnectTimeout() : 100);
-			conn.setReadTimeout(1000);
-			conn.connect();
-			respCode = conn.getResponseCode();
-			if (HttpURLConnection.HTTP_OK == respCode) {
-				response = IOUtils.toString(conn.getInputStream(), Constants.ENCODE);
-			} else {
-				response = IOUtils.toString(conn.getErrorStream(), Constants.ENCODE);
-			}
-		} catch (IOException e) {
-			log.error("500", "can not get security credentials", e);
-			throw e;
-		} finally {
-			if (null != conn) {
-				conn.disconnect();
-			}
-		}
-		if (HttpURLConnection.HTTP_OK == respCode) {
-			return response;
-		}
-		log.error(respCode + "", "can not get security credentials, securityCredentialsUrl:{}, response:{}",
-			new Object[] {securityCredentialsUrl, response});
-		throw new IOException("can not get security credentials, responseCode: " + respCode + ", response: " + response);
-	}
-	
-	public String getName() {
-		return serverListMgr.getName();
-	}
 
-	public String getNamespace() {
+    public ServerHttpAgent(ServerListManager mgr, Properties properties) {
-		return serverListMgr.getNamespace();
+        serverListMgr = mgr;
-	}
+        String ak = properties.getProperty(PropertyKeyConst.ACCESS_KEY);
-	public String getTenant() {
+        if (StringUtils.isBlank(ak)) {
-		return serverListMgr.getTenant();
+            accessKey = SpasAdapter.getAk();
-	}
+        } else {
+            accessKey = ak;
+        }
 
-	public String getEncode() {
+        String sk = properties.getProperty(PropertyKeyConst.SECRET_KEY);
-		return encode;
+        if (StringUtils.isBlank(sk)) {
-	}
+            secretKey = SpasAdapter.getSk();
+        } else {
+            secretKey = sk;
+        }
+    }
 
-	@SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
+    public ServerHttpAgent(Properties properties) throws NacosException {
-	private static class STSCredential {
+        String encodeTmp = properties.getProperty(PropertyKeyConst.ENCODE);
-		@JsonProperty(value = "AccessKeyId")
+        if (StringUtils.isBlank(encodeTmp)) {
-		private String accessKeyId;
+            encode = Constants.ENCODE;
-		@JsonProperty(value = "AccessKeySecret")
+        } else {
-		private String accessKeySecret;
+            encode = encodeTmp.trim();
-		@JsonProperty(value = "Expiration")
+        }
-		private Date expiration;
+        serverListMgr = new ServerListManager(properties);
-		@JsonProperty(value = "SecurityToken")
+        String ak = properties.getProperty(PropertyKeyConst.ACCESS_KEY);
-		private String securityToken;
+        if (StringUtils.isBlank(ak)) {
-		@JsonProperty(value = "LastUpdated")
+            accessKey = SpasAdapter.getAk();
-		private Date lastUpdated;
+        } else {
-		@JsonProperty(value = "Code")
+            accessKey = ak;
-		private String code;
+        }
 
-		public String getAccessKeyId() {
+        String sk = properties.getProperty(PropertyKeyConst.SECRET_KEY);
-			return accessKeyId;
+        if (StringUtils.isBlank(sk)) {
-		}
+            secretKey = SpasAdapter.getSk();
+        } else {
+            secretKey = sk;
+        }
+    }
 
-		public Date getExpiration() {
+    public synchronized void start() throws NacosException {
-			return expiration;
+        serverListMgr.start();
-		}
+    }
 
-		public Date getLastUpdated() {
+    private List<String> getSpasHeaders(List<String> paramValues) throws IOException {
-			return lastUpdated;
+        List<String> newHeaders = new ArrayList<String>();
-		}
+        // STS 临时凭证鉴权的优先级高于 AK/SK 鉴权
+        if (STSConfig.getInstance().isSTSOn()) {
+            STSCredential sTSCredential = getSTSCredential();
+            accessKey = sTSCredential.accessKeyId;
+            secretKey = sTSCredential.accessKeySecret;
+            newHeaders.add("Spas-SecurityToken");
+            newHeaders.add(sTSCredential.securityToken);
+        }
 
-		public String getCode() {
+        if (StringUtils.isNotEmpty(accessKey) && StringUtils.isNotEmpty(secretKey)) {
-			return code;
+            newHeaders.add("Spas-AccessKey");
-		}
+            newHeaders.add(accessKey);
+            List<String> signHeaders = SpasAdapter.getSignHeaders(paramValues, secretKey);
+            if (signHeaders != null) {
+                newHeaders.addAll(signHeaders);
+            }
+        }
+        return newHeaders;
+    }
 
-		public String toString() {
+    private STSCredential getSTSCredential() throws IOException {
-			return "STSCredential{" +
+        boolean cacheSecurityCredentials = STSConfig.getInstance().isCacheSecurityCredentials();
-				"accessKeyId='" + accessKeyId + '\'' +
+        if (cacheSecurityCredentials && sTSCredential != null) {
-				", accessKeySecret='" + accessKeySecret + '\'' +
+            long currentTime = System.currentTimeMillis();
-				", expiration=" + expiration +
+            long expirationTime = sTSCredential.expiration.getTime();
-				", securityToken='" + securityToken + '\'' +
+            int timeToRefreshInMillisecond = STSConfig.getInstance().getTimeToRefreshInMillisecond();
-				", lastUpdated=" + lastUpdated +
+            if (expirationTime - currentTime > timeToRefreshInMillisecond) {
-				", code='" + code + '\'' +
+                return sTSCredential;
-				'}';
+            }
-		}
+        }
-	}
+        String stsResponse = getSTSResponse();
-	
+        STSCredential stsCredentialTmp = (STSCredential)JSONUtils.deserializeObject(stsResponse,
-	private String accessKey;
+            new TypeReference<STSCredential>() {});
-	private String secretKey;
+        sTSCredential = stsCredentialTmp;
-	private String encode;
+        log.info("getSTSCredential", "code:{}, accessKeyId:{}, lastUpdated:{}, expiration:{}", sTSCredential.getCode(),
-	private volatile STSCredential sTSCredential;
+            sTSCredential.getAccessKeyId(), sTSCredential.getLastUpdated(), sTSCredential.getExpiration());
-	final ServerListManager serverListMgr;
+        return sTSCredential;
+    }
+
+    private static String getSTSResponse() throws IOException {
+        String securityCredentials = STSConfig.getInstance().getSecurityCredentials();
+        if (securityCredentials != null) {
+            return securityCredentials;
+        }
+        String securityCredentialsUrl = STSConfig.getInstance().getSecurityCredentialsUrl();
+        HttpURLConnection conn = null;
+        int respCode;
+        String response;
+        try {
+            conn = (HttpURLConnection)new URL(securityCredentialsUrl).openConnection();
+            conn.setRequestMethod("GET");
+            conn.setConnectTimeout(ParamUtil.getConnectTimeout() > 100 ? ParamUtil.getConnectTimeout() : 100);
+            conn.setReadTimeout(1000);
+            conn.connect();
+            respCode = conn.getResponseCode();
+            if (HttpURLConnection.HTTP_OK == respCode) {
+                response = IOUtils.toString(conn.getInputStream(), Constants.ENCODE);
+            } else {
+                response = IOUtils.toString(conn.getErrorStream(), Constants.ENCODE);
+            }
+        } catch (IOException e) {
+            log.error("500", "can not get security credentials", e);
+            throw e;
+        } finally {
+            if (null != conn) {
+                conn.disconnect();
+            }
+        }
+        if (HttpURLConnection.HTTP_OK == respCode) {
+            return response;
+        }
+        log.error(respCode + "", "can not get security credentials, securityCredentialsUrl:{}, response:{}",
+            new Object[] {securityCredentialsUrl, response});
+        throw new IOException(
+            "can not get security credentials, responseCode: " + respCode + ", response: " + response);
+    }
+
+    public String getName() {
+        return serverListMgr.getName();
+    }
+
+    public String getNamespace() {
+        return serverListMgr.getNamespace();
+    }
+
+    public String getTenant() {
+        return serverListMgr.getTenant();
+    }
+
+    public String getEncode() {
+        return encode;
+    }
+
+    @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
+    private static class STSCredential {
+        @JsonProperty(value = "AccessKeyId")
+        private String accessKeyId;
+        @JsonProperty(value = "AccessKeySecret")
+        private String accessKeySecret;
+        @JsonProperty(value = "Expiration")
+        private Date expiration;
+        @JsonProperty(value = "SecurityToken")
+        private String securityToken;
+        @JsonProperty(value = "LastUpdated")
+        private Date lastUpdated;
+        @JsonProperty(value = "Code")
+        private String code;
+
+        public String getAccessKeyId() {
+            return accessKeyId;
+        }
+
+        public Date getExpiration() {
+            return expiration;
+        }
+
+        public Date getLastUpdated() {
+            return lastUpdated;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String toString() {
+            return "STSCredential{" +
+                "accessKeyId='" + accessKeyId + '\'' +
+                ", accessKeySecret='" + accessKeySecret + '\'' +
+                ", expiration=" + expiration +
+                ", securityToken='" + securityToken + '\'' +
+                ", lastUpdated=" + lastUpdated +
+                ", code='" + code + '\'' +
+                '}';
+        }
+    }
+
+    private String accessKey;
+    private String secretKey;
+    private String encode;
+    private volatile STSCredential sTSCredential;
+    final ServerListManager serverListMgr;
 
 }

client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java

@@ -40,212 +40,213 @@ import com.alibaba.nacos.client.utils.StringUtils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-
 /**
  * Serverlist Manager
- * 
+ *
  * @author Nacos
  */
 public class ServerListManager {
-    
-	final static public Logger log = LogUtils.logger(ServerListManager.class);
-	public ServerListManager() {
-		isFixed = false;
-		isStarted = false;
-		name = DEFAULT_NAME;
-	}
 
-	public ServerListManager(List<String> fixed) {
+    final static public Logger log = LogUtils.logger(ServerListManager.class);
-		this(fixed, null);
-	}
-    
-	public ServerListManager(List<String> fixed, String namespace) {
-		isFixed = true;
-		isStarted = true;
-		List<String> serverAddrs = new ArrayList<String>();
-		for (String serverAddr : fixed) {
-			String[] serverAddrArr = serverAddr.split(":");
-			if (serverAddrArr.length == 1) {
-				serverAddrs.add(serverAddrArr[0] + ":" + ParamUtil.getDefaultServerPort());
-			} else {
-				serverAddrs.add(serverAddr);
-			}
-		}
-		serverUrls = new ArrayList<String>(serverAddrs);
-		if (StringUtils.isBlank(namespace)) {
-			name = FIXED_NAME + "-" + getFixedNameSuffix(serverAddrs.toArray(new String[serverAddrs.size()]));
-		} else {
-			this.namespace = namespace;
-			name = FIXED_NAME + "-" + getFixedNameSuffix(serverAddrs.toArray(new String[serverAddrs.size()])) + "-"
-					+ namespace;
-		}
-	}
 
-	public ServerListManager(String host, int port) {
+    public ServerListManager() {
-		isFixed = false;
+        isFixed = false;
-		isStarted = false;
+        isStarted = false;
-		name = CUSTOM_NAME + "-" + host + "-" + port;
+        name = DEFAULT_NAME;
-		addressServerUrl = String.format("http://%s:%d/%s/%s", host, port, contentPath, serverListName);
+    }
-	}
 
-	public ServerListManager(String endpoint) throws NacosException {
+    public ServerListManager(List<String> fixed) {
-		this(endpoint, null);
+        this(fixed, null);
-	}
+    }
+
+    public ServerListManager(List<String> fixed, String namespace) {
+        isFixed = true;
+        isStarted = true;
+        List<String> serverAddrs = new ArrayList<String>();
+        for (String serverAddr : fixed) {
+            String[] serverAddrArr = serverAddr.split(":");
+            if (serverAddrArr.length == 1) {
+                serverAddrs.add(serverAddrArr[0] + ":" + ParamUtil.getDefaultServerPort());
+            } else {
+                serverAddrs.add(serverAddr);
+            }
+        }
+        serverUrls = new ArrayList<String>(serverAddrs);
+        if (StringUtils.isBlank(namespace)) {
+            name = FIXED_NAME + "-" + getFixedNameSuffix(serverAddrs.toArray(new String[serverAddrs.size()]));
+        } else {
+            this.namespace = namespace;
+            name = FIXED_NAME + "-" + getFixedNameSuffix(serverAddrs.toArray(new String[serverAddrs.size()])) + "-"
+                + namespace;
+        }
+    }
+
+    public ServerListManager(String host, int port) {
+        isFixed = false;
+        isStarted = false;
+        name = CUSTOM_NAME + "-" + host + "-" + port;
+        addressServerUrl = String.format("http://%s:%d/%s/%s", host, port, contentPath, serverListName);
+    }
+
+    public ServerListManager(String endpoint) throws NacosException {
+        this(endpoint, null);
+    }
+
+    public ServerListManager(String endpoint, String namespace) throws NacosException {
+        isFixed = false;
+        isStarted = false;
+        if (StringUtils.isBlank(endpoint)) {
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "endpoint is blank");
+        }
+        if (StringUtils.isBlank(namespace)) {
+            name = endpoint;
+            addressServerUrl = String.format("http://%s:%d/%s/%s", endpoint, endpointPort, contentPath,
+                serverListName);
+        } else {
+            if (StringUtils.isBlank(endpoint)) {
+                throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "endpoint is blank");
+            }
+            name = endpoint + "-" + namespace;
+            this.namespace = namespace;
+            this.tenant = namespace;
+            addressServerUrl = String.format("http://%s:%d/%s/%s?namespace=%s", endpoint, endpointPort, contentPath,
+                serverListName, namespace);
+        }
+    }
+
+    public ServerListManager(Properties properties) throws NacosException {
+        isStarted = false;
+        String serverAddrsStr = properties.getProperty(PropertyKeyConst.SERVER_ADDR);
+        String namespace = properties.getProperty(PropertyKeyConst.NAMESPACE);
+        initParam(properties);
+        if (StringUtils.isNotEmpty(serverAddrsStr)) {
+            isFixed = true;
+            List<String> serverAddrs = new ArrayList<String>();
+            String[] serverAddrsArr = serverAddrsStr.split(",");
+            for (String serverAddr : serverAddrsArr) {
+                String[] serverAddrArr = serverAddr.split(":");
+                if (serverAddrArr.length == 1) {
+                    serverAddrs.add(serverAddrArr[0] + ":" + ParamUtil.getDefaultServerPort());
+                } else {
+                    serverAddrs.add(serverAddr);
+                }
+            }
+            serverUrls = serverAddrs;
+            if (StringUtils.isBlank(namespace)) {
+                name = FIXED_NAME + "-" + getFixedNameSuffix(serverUrls.toArray(new String[serverUrls.size()]));
+            } else {
+                this.namespace = namespace;
+                this.tenant = namespace;
+                name = FIXED_NAME + "-" + getFixedNameSuffix(serverUrls.toArray(new String[serverUrls.size()])) + "-"
+                    + namespace;
+            }
+        } else {
+            if (StringUtils.isBlank(endpoint)) {
+                throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "endpoint is blank");
+            }
+            isFixed = false;
+            if (StringUtils.isBlank(namespace)) {
+                name = endpoint;
+                addressServerUrl = String.format("http://%s:%d/%s/%s", endpoint, endpointPort, contentPath,
+                    serverListName);
+            } else {
+                this.namespace = namespace;
+                this.tenant = namespace;
+                name = endpoint + "-" + namespace;
+                addressServerUrl = String.format("http://%s:%d/%s/%s?namespace=%s", endpoint, endpointPort,
+                    contentPath, serverListName, namespace);
+            }
+        }
+    }
+
+    private void initParam(Properties properties) {
+        String endpointTmp = properties.getProperty(PropertyKeyConst.ENDPOINT);
+        if (!StringUtils.isBlank(endpointTmp)) {
+            endpoint = endpointTmp;
+        }
+        String contentPathTmp = properties.getProperty(PropertyKeyConst.CONTEXT_PATH);
+        if (!StringUtils.isBlank(contentPathTmp)) {
+            contentPath = contentPathTmp;
+        }
+        String serverListNameTmp = properties.getProperty(PropertyKeyConst.CLUSTER_NAME);
+        if (!StringUtils.isBlank(serverListNameTmp)) {
+            serverListName = serverListNameTmp;
+        }
+    }
 
-	public ServerListManager(String endpoint, String namespace) throws NacosException {
-		isFixed = false;
-		isStarted = false;
-		if (StringUtils.isBlank(endpoint)) {
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "endpoint is blank");
-		}
-		if (StringUtils.isBlank(namespace)) {
-			name = endpoint;
-			addressServerUrl = String.format("http://%s:%d/%s/%s", endpoint, endpointPort, contentPath,
-					serverListName);
-		} else {
-			if (StringUtils.isBlank(endpoint)) {
-				throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "endpoint is blank");
-			}
-			name = endpoint + "-" + namespace;
-			this.namespace = namespace;
-			this.tenant = namespace;
-			addressServerUrl = String.format("http://%s:%d/%s/%s?namespace=%s", endpoint, endpointPort, contentPath,
-					serverListName, namespace);
-		}
-	}
-	
-	public ServerListManager(Properties properties) throws NacosException {
-		isStarted = false;
-		String serverAddrsStr = properties.getProperty(PropertyKeyConst.SERVER_ADDR);
-		String namespace = properties.getProperty(PropertyKeyConst.NAMESPACE);
-		initParam(properties);
-		if (StringUtils.isNotEmpty(serverAddrsStr)) {
-			isFixed = true;
-			List<String> serverAddrs = new ArrayList<String>();
-			String[] serverAddrsArr = serverAddrsStr.split(",");
-			for (String serverAddr : serverAddrsArr) {
-				String[] serverAddrArr = serverAddr.split(":");
-				if (serverAddrArr.length == 1) {
-					serverAddrs.add(serverAddrArr[0] + ":" + ParamUtil.getDefaultServerPort());
-				} else {
-					serverAddrs.add(serverAddr);
-				}
-			}
-			serverUrls = serverAddrs;
-			if (StringUtils.isBlank(namespace)) {
-				name = FIXED_NAME + "-" + getFixedNameSuffix(serverUrls.toArray(new String[serverUrls.size()]));
-			} else {
-				this.namespace = namespace;
-				this.tenant = namespace;
-				name = FIXED_NAME + "-" + getFixedNameSuffix(serverUrls.toArray(new String[serverUrls.size()])) + "-"
-						+ namespace;
-			}
-		} else {
-			if (StringUtils.isBlank(endpoint)) {
-				throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "endpoint is blank");
-			}
-			isFixed = false;
-			if (StringUtils.isBlank(namespace)) {
-				name = endpoint;
-				addressServerUrl = String.format("http://%s:%d/%s/%s", endpoint, endpointPort, contentPath,
-						serverListName);
-			} else {
-				this.namespace = namespace;
-				this.tenant = namespace;
-				name = endpoint + "-" + namespace;
-				addressServerUrl = String.format("http://%s:%d/%s/%s?namespace=%s", endpoint, endpointPort,
-						contentPath, serverListName, namespace);
-			}
-		}
-	}
-	
-	private void initParam(Properties properties) {
-		String endpointTmp = properties.getProperty(PropertyKeyConst.ENDPOINT);
-		if (!StringUtils.isBlank(endpointTmp)) {
-			endpoint = endpointTmp;
-		}
-		String contentPathTmp = properties.getProperty(PropertyKeyConst.CONTEXT_PATH);
-		if (!StringUtils.isBlank(contentPathTmp)) {
-			contentPath = contentPathTmp;
-		}
-		String serverListNameTmp = properties.getProperty(PropertyKeyConst.CLUSTER_NAME);
-		if (!StringUtils.isBlank(serverListNameTmp)) {
-			serverListName = serverListNameTmp;
-		}
-	}
-	
     public synchronized void start() throws NacosException {
-    	
+
         if (isStarted || isFixed) {
             return;
         }
 
-		GetServerListTask getServersTask = new GetServerListTask(addressServerUrl);
+        GetServerListTask getServersTask = new GetServerListTask(addressServerUrl);
-		for (int i = 0; i < initServerlistRetryTimes && serverUrls.isEmpty(); ++i) {
+        for (int i = 0; i < initServerlistRetryTimes && serverUrls.isEmpty(); ++i) {
-			getServersTask.run();
+            getServersTask.run();
-			try {
+            try {
-				this.wait((i + 1) * 100L);
+                this.wait((i + 1) * 100L);
-			} catch (Exception e) {
+            } catch (Exception e) {
-				log.warn("get serverlist fail,url: " + addressServerUrl);
+                log.warn("get serverlist fail,url: " + addressServerUrl);
-			}
+            }
-		}
+        }
 
-		if (serverUrls.isEmpty()) {
+        if (serverUrls.isEmpty()) {
-			log.error("NACOS-0008", LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0008", "环境问题",
+            log.error("NACOS-0008", LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0008", "环境问题",
-					"fail to get NACOS-server serverlist! env:" + name + ", not connnect url:" + addressServerUrl));
+                "fail to get NACOS-server serverlist! env:" + name + ", not connnect url:" + addressServerUrl));
-			log.error(name, "NACOS-XXXX", "[init-serverlist] fail to get NACOS-server serverlist!");
+            log.error(name, "NACOS-XXXX", "[init-serverlist] fail to get NACOS-server serverlist!");
-			throw new NacosException(NacosException.SERVER_ERROR,
+            throw new NacosException(NacosException.SERVER_ERROR,
-					"fail to get NACOS-server serverlist! env:" + name + ", not connnect url:" + addressServerUrl);
+                "fail to get NACOS-server serverlist! env:" + name + ", not connnect url:" + addressServerUrl);
-		}
+        }
 
         TimerService.scheduleWithFixedDelay(getServersTask, 0L, 30L, TimeUnit.SECONDS);
         isStarted = true;
     }
-    
+
     Iterator<String> iterator() {
         if (serverUrls.isEmpty()) {
             log.error(name, "NACOS-XXXX", "[iterator-serverlist] No server address defined!");
         }
         return new ServerAddressIterator(serverUrls);
     }
-    
 
     class GetServerListTask implements Runnable {
         final String url;
-        
+
         GetServerListTask(String url) {
             this.url = url;
         }
-        
+
         @Override
-		public void run() {
+        public void run() {
-			/**
+            /**
-			 * get serverlist from nameserver
+             * get serverlist from nameserver
-			 */
+             */
             try {
                 updateIfChanged(getApacheServerList(url, name));
             } catch (Exception e) {
-                log.error(name, "NACOS-XXXX", "[update-serverlist] failed to update serverlist from address server!", e);
+                log.error(name, "NACOS-XXXX", "[update-serverlist] failed to update serverlist from address server!",
+                    e);
             }
         }
     }
-    
+
     private void updateIfChanged(List<String> newList) {
         if (null == newList || newList.isEmpty()) {
-        	
+
-        	log.warn("NACOS-0001", LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0001", "环境问题","[update-serverlist] current serverlist from address server is empty!!!"));
+            log.warn("NACOS-0001", LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0001", "环境问题",
+                "[update-serverlist] current serverlist from address server is empty!!!"));
             log.warn(name, "[update-serverlist] current serverlist from address server is empty!!!");
             return;
         }
-		/**
+        /**
-		 * no change
+         * no change
-		 */
+         */
-        if (newList.equals(serverUrls)) { 
+        if (newList.equals(serverUrls)) {
             return;
         }
         serverUrls = new ArrayList<String>(newList);
         currentServerAddr = iterator().next();
-        
+
         EventDispatcher.fireEvent(new ServerlistChangeEvent());
         log.info(name, "[update-serverlist] serverlist updated to {}", serverUrls);
     }
@@ -253,38 +254,38 @@ public class ServerListManager {
     private List<String> getApacheServerList(String url, String name) {
         try {
             HttpResult httpResult = HttpSimpleClient.httpGet(url, null, null, null, 3000);
-            
+
-			if (HttpURLConnection.HTTP_OK == httpResult.code) {
+            if (HttpURLConnection.HTTP_OK == httpResult.code) {
-				if (DEFAULT_NAME.equals(name) ) {
+                if (DEFAULT_NAME.equals(name)) {
-					EnvUtil.setSelfEnv(httpResult.headers);
+                    EnvUtil.setSelfEnv(httpResult.headers);
-				}
+                }
                 List<String> lines = IOUtils.readLines(new StringReader(httpResult.content));
-				List<String> result = new ArrayList<String>(lines.size());
+                List<String> result = new ArrayList<String>(lines.size());
-				for (String serverAddr : lines) {
+                for (String serverAddr : lines) {
-					if (null == serverAddr || serverAddr.trim().isEmpty()) {
+                    if (null == serverAddr || serverAddr.trim().isEmpty()) {
-						continue;
+                        continue;
-					} else {
+                    } else {
-						String[] ipPort = serverAddr.trim().split(":");
+                        String[] ipPort = serverAddr.trim().split(":");
-						String ip = ipPort[0].trim();
+                        String ip = ipPort[0].trim();
-						if (ipPort.length == 1) {
+                        if (ipPort.length == 1) {
-							result.add(ip + ":" + ParamUtil.getDefaultServerPort());
+                            result.add(ip + ":" + ParamUtil.getDefaultServerPort());
-						} else {
+                        } else {
-							result.add(serverAddr);
+                            result.add(serverAddr);
-						}
+                        }
-					}
+                    }
-				}
+                }
                 return result;
             } else {
                 log.error(addressServerUrl, "NACOS-XXXX", "[check-serverlist] error. code={}", httpResult.code);
                 return null;
             }
         } catch (IOException e) {
-        	log.error("NACOS-0001", LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0001", "环境问题",e.toString()));
+            log.error("NACOS-0001", LoggerHelper.getErrorCodeStr("NACOS", "NACOS-0001", "环境问题", e.toString()));
             log.error(addressServerUrl, "NACOS-XXXX", "[check-serverlist] exception. msg={}", e.toString(), e);
             return null;
         }
     }
-    
+
     String getUrlString() {
         return serverUrls.toString();
     }
@@ -294,105 +295,103 @@ public class ServerListManager {
         String split = "";
         for (String serverIp : serverIps) {
             sb.append(split);
-            sb.append(serverIp);
+            sb.append(serverIp.replaceAll(":", "_"));
             split = "-";
         }
         return sb.toString();
     }
 
-	@Override
+    @Override
     public String toString() {
-        return "ServerManager-" + name + "-" +getUrlString();
+        return "ServerManager-" + name + "-" + getUrlString();
     }
 
-	public boolean contain(String ip){
+    public boolean contain(String ip) {
-		
-		return  serverUrls.contains(ip);
-	}
 
-	public void refreshCurrentServerAddr() {
+        return serverUrls.contains(ip);
-		currentServerAddr = iterator().next();
+    }
-	}
 
-	public String getCurrentServerAddr() {
+    public void refreshCurrentServerAddr() {
-		if (StringUtils.isBlank(currentServerAddr)) {
+        currentServerAddr = iterator().next();
-			currentServerAddr = iterator().next();
+    }
-		}
-		return currentServerAddr;
-	}
 
-	
+    public String getCurrentServerAddr() {
-	public String getContentPath() {
+        if (StringUtils.isBlank(currentServerAddr)) {
-		return contentPath;
+            currentServerAddr = iterator().next();
-	}
+        }
-	
+        return currentServerAddr;
-	public String getName() {
+    }
-		return name;
-	}
-	
-	public String getNamespace() {
-		return namespace;
-	}
 
-	public String getTenant() {
+    public String getContentPath() {
-		return tenant;
+        return contentPath;
-	}
+    }
-	
+
-	/**
+    public String getName() {
-	 * 不同环境的名称
+        return name;
-	 */
+    }
-	private String name;
+
-	private String namespace = "";
+    public String getNamespace() {
-	private String tenant = "";
+        return namespace;
+    }
+
+    public String getTenant() {
+        return tenant;
+    }
+
+    /**
+     * 不同环境的名称
+     */
+    private String name;
+    private String namespace = "";
+    private String tenant = "";
     static public final String DEFAULT_NAME = "default";
     static public final String CUSTOM_NAME = "custom";
     static public final String FIXED_NAME = "fixed";
     private int initServerlistRetryTimes = 5;
-	/**
+    /**
-	 * 和其他server的连接超时和socket超时
+     * 和其他server的连接超时和socket超时
-	 */
+     */
     static final int TIMEOUT = 5000;
-    
+
     final boolean isFixed;
-	boolean isStarted = false;
+    boolean isStarted = false;
-	private String endpoint;
+    private String endpoint;
-	private int endpointPort = 8080;
+    private int endpointPort = 8080;
-	private String contentPath = ParamUtil.getDefaultContextPath();
+    private String contentPath = ParamUtil.getDefaultContextPath();
-	private String serverListName = ParamUtil.getDefaultNodesPath();
+    private String serverListName = ParamUtil.getDefaultNodesPath();
     volatile List<String> serverUrls = new ArrayList<String>();
 
     private volatile String currentServerAddr;
-    
+
-	public String serverPort = ParamUtil.getDefaultServerPort();
+    public String serverPort = ParamUtil.getDefaultServerPort();
-    
+
     public String addressServerUrl;
 
 }
 
-
 /**
- * 对地址列表排序，同机房优先。 
+ * 对地址列表排序，同机房优先。
  */
 class ServerAddressIterator implements Iterator<String> {
 
     static class RandomizedServerAddress implements Comparable<RandomizedServerAddress> {
         static Random random = new Random();
-        
+
         String serverIp;
         int priority = 0;
         int seed;
-        
+
-		public RandomizedServerAddress(String ip) {
+        public RandomizedServerAddress(String ip) {
-			try {
+            try {
-				this.serverIp = ip;
+                this.serverIp = ip;
-				/**
+                /**
-				 * change random scope from 32 to Integer.MAX_VALUE to fix load balance issue
+                 * change random scope from 32 to Integer.MAX_VALUE to fix load balance issue
-				 */
+                 */
-				this.seed = random.nextInt(Integer.MAX_VALUE);
+                this.seed = random.nextInt(Integer.MAX_VALUE);
-			} catch (Exception e) {
+            } catch (Exception e) {
-				throw new RuntimeException(e);
+                throw new RuntimeException(e);
-			}
+            }
-		}
+        }
 
         @Override
         @SuppressFBWarnings("EQ_COMPARETO_USE_OBJECT_EQUALS")
@@ -425,7 +424,7 @@ class ServerAddressIterator implements Iterator<String> {
     public void remove() {
         throw new UnsupportedOperationException();
     }
-    
+
     final List<RandomizedServerAddress> sorted;
     final Iterator<RandomizedServerAddress> iter;
 }

client/src/main/java/com/alibaba/nacos/client/config/impl/SpasAdapter.java

@@ -27,81 +27,79 @@ import java.util.*;
 
 /**
  * 适配spas接口
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class SpasAdapter {
-	
-	public static List<String> getSignHeaders(String resource, String secretKey) {
-		List<String> header = new ArrayList<String>();
-		String timeStamp = String.valueOf(System.currentTimeMillis());
-		header.add("Timestamp");
-		header.add(timeStamp);
-		if (secretKey != null) {
-			header.add("Spas-Signature");
-			String signature = "";
-			if (StringUtils.isBlank(resource)) {
-				signature = signWithhmacSHA1Encrypt(timeStamp, secretKey);
-			} else {
-				signature = signWithhmacSHA1Encrypt(resource + "+" + timeStamp, secretKey);
-			}
-			header.add(signature);
-		}
-		return header;
-	}
-	
-	
-	public static List<String> getSignHeaders(List<String> paramValues, String secretKey) {
-		if (null == paramValues) {
-			return null;
-		}
-		Map<String, String> signMap = new HashMap<String, String>(5);
-		for (Iterator<String> iter = paramValues.iterator(); iter.hasNext();) {
-			String key = iter.next();
-			if (TENANT_KEY.equals(key) || GROUP_KEY.equals(key)) {
-				signMap.put(key, iter.next());
-			} else {
-				iter.next();
-			}
-		}
-		String resource = "";
-		if (signMap.size() > 1) {
-			resource = signMap.get(TENANT_KEY) + "+" + signMap.get(GROUP_KEY);
-		} else {
-			if (!StringUtils.isBlank(signMap.get(GROUP_KEY))) {
-				resource = signMap.get(GROUP_KEY);
-			}
-		}
-		return getSignHeaders(resource, secretKey);
-	}
 
-	public static String getSk() {
+    public static List<String> getSignHeaders(String resource, String secretKey) {
-		return CredentialService.getInstance().getCredential().getSecretKey();
+        List<String> header = new ArrayList<String>();
-	}
+        String timeStamp = String.valueOf(System.currentTimeMillis());
+        header.add("Timestamp");
+        header.add(timeStamp);
+        if (secretKey != null) {
+            header.add("Spas-Signature");
+            String signature = "";
+            if (StringUtils.isBlank(resource)) {
+                signature = signWithhmacSHA1Encrypt(timeStamp, secretKey);
+            } else {
+                signature = signWithhmacSHA1Encrypt(resource + "+" + timeStamp, secretKey);
+            }
+            header.add(signature);
+        }
+        return header;
+    }
 
-	public static String getAk() {
+    public static List<String> getSignHeaders(List<String> paramValues, String secretKey) {
-		return CredentialService.getInstance().getCredential().getAccessKey();
+        if (null == paramValues) {
-	}
+            return null;
-	
+        }
-	public static String signWithhmacSHA1Encrypt(String encryptText, String encryptKey) {
+        Map<String, String> signMap = new HashMap<String, String>(5);
-		try {
+        for (Iterator<String> iter = paramValues.iterator(); iter.hasNext(); ) {
-			byte[] data = encryptKey.getBytes("UTF-8");
+            String key = iter.next();
-			// 根据给定的字节数组构造一个密钥,第二参数指定一个密钥算法的名称
+            if (TENANT_KEY.equals(key) || GROUP_KEY.equals(key)) {
-			SecretKey secretKey = new SecretKeySpec(data, "HmacSHA1");
+                signMap.put(key, iter.next());
-			// 生成一个指定 Mac 算法 的 Mac 对象
+            } else {
-			Mac mac = Mac.getInstance("HmacSHA1");
+                iter.next();
-			// 用给定密钥初始化 Mac 对象
+            }
-			mac.init(secretKey);
+        }
-			byte[] text = encryptText.getBytes("UTF-8");
+        String resource = "";
-			byte[] textFinal = mac.doFinal(text);
+        if (signMap.size() > 1) {
-			// 完成 Mac 操作, base64编码，将byte数组转换为字符串
+            resource = signMap.get(TENANT_KEY) + "+" + signMap.get(GROUP_KEY);
-			return new String(Base64.encodeBase64(textFinal), Constants.ENCODE);
+        } else {
-		} catch (Exception e) {
+            if (!StringUtils.isBlank(signMap.get(GROUP_KEY))) {
-			throw new RuntimeException("signWithhmacSHA1Encrypt fail", e);
+                resource = signMap.get(GROUP_KEY);
-		}
+            }
-	}
+        }
-	
+        return getSignHeaders(resource, secretKey);
-	private static String GROUP_KEY = "group";
+    }
-	private static String TENANT_KEY = "tenant";
+
+    public static String getSk() {
+        return CredentialService.getInstance().getCredential().getSecretKey();
+    }
+
+    public static String getAk() {
+        return CredentialService.getInstance().getCredential().getAccessKey();
+    }
+
+    public static String signWithhmacSHA1Encrypt(String encryptText, String encryptKey) {
+        try {
+            byte[] data = encryptKey.getBytes("UTF-8");
+            // 根据给定的字节数组构造一个密钥,第二参数指定一个密钥算法的名称
+            SecretKey secretKey = new SecretKeySpec(data, "HmacSHA1");
+            // 生成一个指定 Mac 算法 的 Mac 对象
+            Mac mac = Mac.getInstance("HmacSHA1");
+            // 用给定密钥初始化 Mac 对象
+            mac.init(secretKey);
+            byte[] text = encryptText.getBytes("UTF-8");
+            byte[] textFinal = mac.doFinal(text);
+            // 完成 Mac 操作, base64编码，将byte数组转换为字符串
+            return new String(Base64.encodeBase64(textFinal), Constants.ENCODE);
+        } catch (Exception e) {
+            throw new RuntimeException("signWithhmacSHA1Encrypt fail", e);
+        }
+    }
+
+    private static String GROUP_KEY = "group";
+    private static String TENANT_KEY = "tenant";
 }

client/src/main/java/com/alibaba/nacos/client/config/impl/TimerService.java

@@ -21,28 +21,27 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-
 /**
  * Time Service
- * @author Nacos
  *
+ * @author Nacos
  */
 public class TimerService {
 
     static public ScheduledFuture<?> scheduleWithFixedDelay(Runnable command, long initialDelay,
-            long delay, TimeUnit unit) {
+                                                            long delay, TimeUnit unit) {
         return scheduledExecutor.scheduleWithFixedDelay(command, initialDelay, delay, unit);
     }
-    
+
     @SuppressWarnings("PMD.ThreadPoolCreationRule")
     static ScheduledExecutorService scheduledExecutor = Executors
-            .newSingleThreadScheduledExecutor(new ThreadFactory() {
+        .newSingleThreadScheduledExecutor(new ThreadFactory() {
-                public Thread newThread(Runnable r) {
+            public Thread newThread(Runnable r) {
-                    Thread t = new Thread(r);
+                Thread t = new Thread(r);
-                    t.setName("com.alibaba.nacos.client.Timer");
+                t.setName("com.alibaba.nacos.client.Timer");
-                    t.setDaemon(true);
+                t.setDaemon(true);
-                    return t;
+                return t;
-                }
+            }
-            });
+        });
-    
+
 }

client/src/main/java/com/alibaba/nacos/client/config/listener/impl/PropertiesListener.java

@@ -26,14 +26,13 @@ import java.util.Properties;
 
 /**
  * Properties Listener
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 @SuppressWarnings("PMD.AbstractClassShouldStartWithAbstractNamingRule")
 public abstract class PropertiesListener extends AbstractListener {
-	final static public Logger log = LogUtils.logger(PropertiesListener.class);
+    final static public Logger log = LogUtils.logger(PropertiesListener.class);
-	
+
     public void receiveConfigInfo(String configInfo) {
         if (StringUtils.isEmpty(configInfo)) {
             return;
@@ -43,19 +42,17 @@ public abstract class PropertiesListener extends AbstractListener {
         try {
             properties.load(new StringReader(configInfo));
             innerReceive(properties);
-        }
+        } catch (IOException e) {
-        catch (IOException e) {
+            log.error("NACOS-XXXX", "load properties error：" + configInfo, e);
-            log.error("NACOS-XXXX","load properties error：" + configInfo, e);
         }
 
     }
 
-	/**
+    /**
-	 * properties type for receiver
+     * properties type for receiver
-	 * 
+     *
-	 * @param properties
+     * @param properties properties
-	 *            properties
+     */
-	 */
+    public abstract void innerReceive(Properties properties);
-	public abstract void innerReceive(Properties properties);
 
 }

client/src/main/java/com/alibaba/nacos/client/config/utils/ConcurrentDiskUtil.java

@@ -30,217 +30,199 @@ import java.nio.charset.CharsetDecoder;
 
 /**
  * concurrent disk util;op file with file lock
- * 
- * @author configCenter
  *
+ * @author configCenter
  */
 public class ConcurrentDiskUtil {
 
-	/**
+    /**
-	 * get file content
+     * get file content
-	 * 
+     *
-	 * @param path
+     * @param path        file path
-	 *            file path
+     * @param charsetName charsetName
-	 * @param charsetName
+     * @return content
-	 *            charsetName
+     * @throws IOException IOException
-	 * @return content
+     */
-	 * @throws IOException
+    public static String getFileContent(String path, String charsetName)
-	 *             IOException
+        throws IOException {
-	 */
+        File file = new File(path);
-	public static String getFileContent(String path, String charsetName)
+        return getFileContent(file, charsetName);
-			throws IOException {
+    }
-		File file = new File(path);
-		return getFileContent(file, charsetName);
-	}
 
-	/**
+    /**
-	 * get file content
+     * get file content
-	 * 
+     *
-	 * @param file
+     * @param file        file
-	 *            file
+     * @param charsetName charsetName
-	 * @param charsetName
+     * @return content
-	 *            charsetName
+     * @throws IOException IOException
-	 * @return content
+     */
-	 * @throws IOException
+    public static String getFileContent(File file, String charsetName)
-	 *             IOException
+        throws IOException {
-	 */
+        RandomAccessFile fis = null;
-	public static String getFileContent(File file, String charsetName)
+        FileLock rlock = null;
-			throws IOException {
+        try {
-		RandomAccessFile fis = null;
+            fis = new RandomAccessFile(file, "r");
-		FileLock rlock = null;
+            FileChannel fcin = fis.getChannel();
-		try {
+            int i = 0;
-			fis = new RandomAccessFile(file, "r");
+            do {
-			FileChannel fcin = fis.getChannel();
+                try {
-			int i = 0;
+                    rlock = fcin.tryLock(0L, Long.MAX_VALUE, true);
-			do {
+                } catch (Exception e) {
-				try {
+                    ++i;
-					rlock = fcin.tryLock(0L, Long.MAX_VALUE, true);
+                    if (i > RETRY_COUNT) {
-				} catch (Exception e) {
+                        log.error("read {} fail;retryed time:{}",
-					++i;
+                            file.getName(), i);
-					if (i > RETRY_COUNT) {
+                        throw new IOException("read " + file.getAbsolutePath()
-						log.error("read {} fail;retryed time:{}",
+                            + " conflict");
-								file.getName(), i);
+                    }
-						throw new IOException("read " + file.getAbsolutePath()
+                    sleep(SLEEP_BASETIME * i);
-								+ " conflict");
+                    log.warn("read {} conflict;retry time:{}", file.getName(),
-					}
+                        i);
-					sleep(SLEEP_BASETIME * i);
+                }
-					log.warn("read {} conflict;retry time:{}", file.getName(),
+            } while (null == rlock);
-							i);
+            int fileSize = (int)fcin.size();
-				}
+            ByteBuffer byteBuffer = ByteBuffer.allocate(fileSize);
-			} while (null == rlock);
+            fcin.read(byteBuffer);
-			int fileSize = (int) fcin.size();
+            byteBuffer.flip();
-			ByteBuffer byteBuffer = ByteBuffer.allocate(fileSize);
+            return byteBufferToString(byteBuffer, charsetName);
-			fcin.read(byteBuffer);
+        } finally {
-			byteBuffer.flip();
+            if (rlock != null) {
-			return byteBufferToString(byteBuffer, charsetName);
+                rlock.release();
-		} finally {
+                rlock = null;
-			if (rlock != null) {
+            }
-				rlock.release();
+            if (fis != null) {
-				rlock = null;
+                fis.close();
-			}
+                fis = null;
-			if (fis != null) {
+            }
-				fis.close();
+        }
-				fis = null;
+    }
-			}
-		}
-	}
 
-	/**
+    /**
-	 * write file content
+     * write file content
-	 * 
+     *
-	 * @param path
+     * @param path        file path
-	 *            file path
+     * @param content     content
-	 * @param content
+     * @param charsetName charsetName
-	 *            content
+     * @return whether write ok
-	 * @param charsetName
+     * @throws IOException IOException
-	 *            charsetName
+     */
-	 * @return whether write ok
+    public static Boolean writeFileContent(String path, String content,
-	 * @throws IOException
+                                           String charsetName) throws IOException {
-	 *             IOException
+        File file = new File(path);
-	 */
+        return writeFileContent(file, content, charsetName);
-	public static Boolean writeFileContent(String path, String content,
+    }
-			String charsetName) throws IOException {
-		File file = new File(path);
-		return writeFileContent(file, content, charsetName);
-	}
 
-	/**
+    /**
-	 * write file content
+     * write file content
-	 * 
+     *
-	 * @param file
+     * @param file        file
-	 *            file
+     * @param content     content
-	 * @param content
+     * @param charsetName charsetName
-	 *            content
+     * @return whether write ok
-	 * @param charsetName
+     * @throws IOException IOException
-	 *            charsetName
+     */
-	 * @return whether write ok
+    public static Boolean writeFileContent(File file, String content,
-	 * @throws IOException
+                                           String charsetName) throws IOException {
-	 *             IOException
+        if (!file.exists()) {
-	 */
+            boolean isCreateOk = file.createNewFile();
-	public static Boolean writeFileContent(File file, String content,
+            if (!isCreateOk) {
-			String charsetName) throws IOException {
+                return false;
-		if (!file.exists()) {
+            }
-			boolean isCreateOk = file.createNewFile();
+        }
-			if (!isCreateOk) {
+        FileChannel channel = null;
-				return false;
+        FileLock lock = null;
-			}
+        RandomAccessFile raf = null;
-		}
+        try {
-		FileChannel channel = null;
+            raf = new RandomAccessFile(file, "rw");
-		FileLock lock = null;
+            channel = raf.getChannel();
-		RandomAccessFile raf = null;
+            int i = 0;
-		try {
+            do {
-			raf = new RandomAccessFile(file, "rw");
+                try {
-			channel = raf.getChannel();
+                    lock = channel.tryLock();
-			int i = 0;
+                } catch (Exception e) {
-			do {
+                    ++i;
-				try {
+                    if (i > RETRY_COUNT) {
-					lock = channel.tryLock();
+                        log.error("write {} fail;retryed time:{}",
-				} catch (Exception e) {
+                            file.getName(), i);
-					++i;
+                        throw new IOException("write " + file.getAbsolutePath()
-					if (i > RETRY_COUNT) {
+                            + " conflict");
-						log.error("write {} fail;retryed time:{}",
+                    }
-								file.getName(), i);
+                    sleep(SLEEP_BASETIME * i);
-						throw new IOException("write " + file.getAbsolutePath()
+                    log.warn("write {} conflict;retry time:{}", file.getName(),
-								+ " conflict");
+                        i);
-					}
+                }
-					sleep(SLEEP_BASETIME * i);
+            } while (null == lock);
-					log.warn("write {} conflict;retry time:{}", file.getName(),
-							i);
-				}
-			} while (null == lock);
 
-			ByteBuffer sendBuffer = ByteBuffer.wrap(content
+            ByteBuffer sendBuffer = ByteBuffer.wrap(content
-					.getBytes(charsetName));
+                .getBytes(charsetName));
-			while (sendBuffer.hasRemaining()) {
+            while (sendBuffer.hasRemaining()) {
-				channel.write(sendBuffer);
+                channel.write(sendBuffer);
-			}
+            }
-			channel.truncate(content.length());
+            channel.truncate(content.length());
-		} catch (FileNotFoundException e) {
+        } catch (FileNotFoundException e) {
-			throw new IOException("file not exist");
+            throw new IOException("file not exist");
-		} finally {
+        } finally {
-			if (lock != null) {
+            if (lock != null) {
-				try {
+                try {
-					lock.release();
+                    lock.release();
-					lock = null;
+                    lock = null;
-				} catch (IOException e) {
+                } catch (IOException e) {
-					log.warn("close wrong", e);
+                    log.warn("close wrong", e);
-				}
+                }
-			}
+            }
-			if (channel != null) {
+            if (channel != null) {
-				try {
+                try {
-					channel.close();
+                    channel.close();
-					channel = null;
+                    channel = null;
-				} catch (IOException e) {
+                } catch (IOException e) {
-					log.warn("close wrong", e);
+                    log.warn("close wrong", e);
-				}
+                }
-			}
+            }
-			if (raf != null) {
+            if (raf != null) {
-				try {
+                try {
-					raf.close();
+                    raf.close();
-					raf = null;
+                    raf = null;
-				} catch (IOException e) {
+                } catch (IOException e) {
-					log.warn("close wrong", e);
+                    log.warn("close wrong", e);
-				}
+                }
-			}
+            }
 
-		}
+        }
-		return true;
+        return true;
-	}
+    }
 
-	/**
+    /**
-	 * transfer ByteBuffer to String
+     * transfer ByteBuffer to String
-	 * 
+     *
-	 * @param buffer
+     * @param buffer      buffer
-	 *            buffer
+     * @param charsetName charsetName
-	 * @param charsetName
+     * @return String
-	 *            charsetName
+     * @throws IOException IOException
-	 * @return String
+     */
-	 * @throws IOException
+    public static String byteBufferToString(ByteBuffer buffer,
-	 *             IOException
+                                            String charsetName) throws IOException {
-	 */
+        Charset charset = null;
-	public static String byteBufferToString(ByteBuffer buffer,
+        CharsetDecoder decoder = null;
-			String charsetName) throws IOException {
+        CharBuffer charBuffer = null;
-		Charset charset = null;
+        charset = Charset.forName(charsetName);
-		CharsetDecoder decoder = null;
+        decoder = charset.newDecoder();
-		CharBuffer charBuffer = null;
+        charBuffer = decoder.decode(buffer.asReadOnlyBuffer());
-		charset = Charset.forName(charsetName);
+        return charBuffer.toString();
-		decoder = charset.newDecoder();
+    }
-		charBuffer = decoder.decode(buffer.asReadOnlyBuffer());
-		return charBuffer.toString();
-	}
 
-	private static void sleep(int time) {
+    private static void sleep(int time) {
-		try {
+        try {
-			Thread.sleep(time);
+            Thread.sleep(time);
-		} catch (InterruptedException e) {
+        } catch (InterruptedException e) {
-			log.warn("sleep wrong", e);
+            log.warn("sleep wrong", e);
-		}
+        }
-	}
+    }
 
-	static final public Logger log = LogUtils.logger(ConcurrentDiskUtil.class);
+    static final public Logger log = LogUtils.logger(ConcurrentDiskUtil.class);
-	static final int RETRY_COUNT = 10;
+    static final int RETRY_COUNT = 10;
-	/**
+    /**
-	 * ms
+     * ms
-	 */
+     */
-	static final int SLEEP_BASETIME = 10;
+    static final int SLEEP_BASETIME = 10;
 }

client/src/main/java/com/alibaba/nacos/client/config/utils/ContentUtils.java

@@ -21,9 +21,8 @@ import static com.alibaba.nacos.api.common.Constants.WORD_SEPARATOR;
 
 /**
  * Content Util
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class ContentUtils {
 
@@ -43,7 +42,6 @@ public class ContentUtils {
         }
     }
 
-
     public static String getContentIdentity(String content) {
         int index = content.indexOf(WORD_SEPARATOR);
         if (index == -1) {
@@ -52,7 +50,6 @@ public class ContentUtils {
         return content.substring(0, index);
     }
 
-
     public static String getContent(String content) {
         int index = content.indexOf(WORD_SEPARATOR);
         if (index == -1) {
@@ -61,18 +58,15 @@ public class ContentUtils {
         return content.substring(index + 1);
     }
 
-
     public static String truncateContent(String content) {
         if (content == null) {
             return "";
-        }
+        } else if (content.length() <= SHOW_CONTENT_SIZE) {
-        else if (content.length() <= SHOW_CONTENT_SIZE) {
             return content;
-        }
+        } else {
-        else {
+            return content.substring(0, SHOW_CONTENT_SIZE) + "...";
-			return content.substring(0, SHOW_CONTENT_SIZE) + "...";
         }
     }
 
-	private static int SHOW_CONTENT_SIZE = 100;
+    private static int SHOW_CONTENT_SIZE = 100;
 }

client/src/main/java/com/alibaba/nacos/client/config/utils/IOUtils.java

@@ -21,21 +21,19 @@ import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * IO Util
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
 public class IOUtils {
 
     static public String toString(InputStream input, String encoding) throws IOException {
         return (null == encoding) ? toString(new InputStreamReader(input, Constants.ENCODE))
-                : toString(new InputStreamReader(input, encoding));
+            : toString(new InputStreamReader(input, encoding));
     }
-    
+
     static public String toString(Reader reader) throws IOException {
         CharArrayWriter sw = new CharArrayWriter();
         copy(reader, sw);
@@ -45,7 +43,7 @@ public class IOUtils {
     static public long copy(Reader input, Writer output) throws IOException {
         char[] buffer = new char[1 << 12];
         long count = 0;
-        for (int n = 0; (n = input.read(buffer)) >= 0;) {
+        for (int n = 0; (n = input.read(buffer)) >= 0; ) {
             output.write(buffer, 0, n);
             count += n;
         }
@@ -59,7 +57,7 @@ public class IOUtils {
         BufferedReader reader = toBufferedReader(input);
         List<String> list = new ArrayList<String>();
         String line = null;
-        for (;;) {
+        for (; ; ) {
             line = reader.readLine();
             if (null != line) {
                 list.add(line);
@@ -71,8 +69,8 @@ public class IOUtils {
     }
 
     static private BufferedReader toBufferedReader(Reader reader) {
-        return reader instanceof BufferedReader ? (BufferedReader) reader : new BufferedReader(
+        return reader instanceof BufferedReader ? (BufferedReader)reader : new BufferedReader(
-                reader);
+            reader);
     }
 
     public static void delete(File fileOrDir) throws IOException {
@@ -82,16 +80,16 @@ public class IOUtils {
 
         if (fileOrDir.isDirectory()) {
             cleanDirectory(fileOrDir);
-		} else {
+        } else {
-			if (fileOrDir.exists()) {
+            if (fileOrDir.exists()) {
-				boolean isDeleteOk = fileOrDir.delete();
+                boolean isDeleteOk = fileOrDir.delete();
-				if (!isDeleteOk) {
+                if (!isDeleteOk) {
-					throw new IOException("delete fail");
+                    throw new IOException("delete fail");
-				}
+                }
-			}
+            }
-		}
+        }
     }
-    
+
     /**
      * 清理目录下的内容
      */
@@ -107,10 +105,10 @@ public class IOUtils {
         }
 
         File[] files = directory.listFiles();
-		/**
+        /**
-		 * null if security restricted
+         * null if security restricted
-		 */
+         */
-		if (files == null) {
+        if (files == null) {
             throw new IOException("Failed to list contents of " + directory);
         }
 
@@ -129,7 +127,7 @@ public class IOUtils {
     }
 
     public static void writeStringToFile(File file, String data, String encoding)
-            throws IOException {
+        throws IOException {
         OutputStream os = null;
         try {
             os = new FileOutputStream(file);

client/src/main/java/com/alibaba/nacos/client/config/utils/JVMUtil.java

@@ -19,31 +19,30 @@ import com.alibaba.nacos.client.logger.Logger;
 
 /**
  * Get jvm config
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
 public class JVMUtil {
 
-	/**
+    /**
-	 * whether is multi instance
+     * whether is multi instance
-	 * 
+     *
-	 * @return whether multi
+     * @return whether multi
-	 */
+     */
-	public static Boolean isMultiInstance() {
+    public static Boolean isMultiInstance() {
-		return isMultiInstance;
+        return isMultiInstance;
-	}
+    }
 
-	private static Boolean isMultiInstance = false;
+    private static Boolean isMultiInstance = false;
-	private static String TRUE = "true";
+    private static String TRUE = "true";
-	static final public Logger log = LogUtils.logger(JVMUtil.class);
+    static final public Logger log = LogUtils.logger(JVMUtil.class);
 
-	static {
+    static {
-		String multiDeploy = System.getProperty("isMultiInstance", "false");
+        String multiDeploy = System.getProperty("isMultiInstance", "false");
-		if (TRUE.equals(multiDeploy)) {
+        if (TRUE.equals(multiDeploy)) {
-			isMultiInstance = true;
+            isMultiInstance = true;
-		}
+        }
-		log.info("isMultiInstance:{}", isMultiInstance);
+        log.info("isMultiInstance:{}", isMultiInstance);
-	}
+    }
 }

client/src/main/java/com/alibaba/nacos/client/config/utils/LogUtils.java

@@ -22,38 +22,38 @@ import com.alibaba.nacos.client.logger.LoggerFactory;
 
 /**
  * Log Util
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class LogUtils {
 
-	static int JM_LOG_RETAIN_COUNT = 7;
+    static int JM_LOG_RETAIN_COUNT = 7;
-	static String JM_LOG_FILE_SIZE = "10MB";
+    static String JM_LOG_FILE_SIZE = "10MB";
 
     static {
-    	String tmp = "7";
+        String tmp = "7";
         try {
-			/**
+            /**
-			 * change timeout from 100 to 200
+             * change timeout from 100 to 200
-			 */
+             */
-            tmp = System.getProperty("JM.LOG.RETAIN.COUNT","7");
+            tmp = System.getProperty("JM.LOG.RETAIN.COUNT", "7");
             JM_LOG_RETAIN_COUNT = Integer.parseInt(tmp);
         } catch (NumberFormatException e) {
-			e.printStackTrace();
+            e.printStackTrace();
-			throw e;
+            throw e;
         }
-        
+
-        JM_LOG_FILE_SIZE = System.getProperty("JM.LOG.FILE.SIZE","10MB"); 
+        JM_LOG_FILE_SIZE = System.getProperty("JM.LOG.FILE.SIZE", "10MB");
-    	
+
         // logger init
         Logger logger = LoggerFactory.getLogger("com.alibaba.nacos.client.config");
         logger.setLevel(Level.INFO);
         logger.setAdditivity(false);
-        logger.activateAppenderWithSizeRolling("nacos", "config.log", Constants.ENCODE, JM_LOG_FILE_SIZE, JM_LOG_RETAIN_COUNT);
+        logger.activateAppenderWithSizeRolling("nacos", "config.log", Constants.ENCODE, JM_LOG_FILE_SIZE,
+            JM_LOG_RETAIN_COUNT);
     }
 
-   public static Logger logger(Class<?> clazz) {
+    public static Logger logger(Class<?> clazz) {
-       return LoggerFactory.getLogger(clazz);
+        return LoggerFactory.getLogger(clazz);
-   }
+    }
 }

client/src/main/java/com/alibaba/nacos/client/config/utils/MD5.java

@@ -25,16 +25,16 @@ import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * MD5 util
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
 public class MD5 {
-	private static int DIGITS_SIZE = 16;
+    private static int DIGITS_SIZE = 16;
-    private static char[] digits = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+    private static char[] digits = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 
     private static Map<Character, Integer> rDigits = new HashMap<Character, Integer>(16);
+
     static {
         for (int i = 0; i < digits.length; ++i) {
             rDigits.put(digits[i], i);
@@ -45,41 +45,34 @@ public class MD5 {
     private MessageDigest mHasher;
     private ReentrantLock opLock = new ReentrantLock();
 
-
     private MD5() {
         try {
             mHasher = MessageDigest.getInstance("md5");
-        }
+        } catch (Exception e) {
-        catch (Exception e) {
             throw new RuntimeException(e);
         }
 
     }
 
-
     public static MD5 getInstance() {
         return me;
     }
 
-
     public String getMD5String(String content) {
         return bytes2string(hash(content));
     }
 
-
     public String getMD5String(byte[] content) {
         return bytes2string(hash(content));
     }
 
-
     public byte[] getMD5Bytes(byte[] content) {
         return hash(content);
     }
 
-
     /**
      * 对字符串进行md5
-     * 
+     *
      * @param str
      * @return md5 byte[16]
      */
@@ -91,20 +84,17 @@ public class MD5 {
                 throw new IllegalArgumentException("md5 need");
             }
             return bt;
-        }
+        } catch (UnsupportedEncodingException e) {
-        catch (UnsupportedEncodingException e) {
             throw new RuntimeException("unsupported utf-8 encoding", e);
-        }
+        } finally {
-        finally {
             opLock.unlock();
         }
     }
 
-
     /**
      * 对二进制数据进行md5
-     * 
+     *
-     * @param str
+     * @param data
      * @return md5 byte[16]
      */
     public byte[] hash(byte[] data) {
@@ -115,16 +105,14 @@ public class MD5 {
                 throw new IllegalArgumentException("md5 need");
             }
             return bt;
-        }
+        } finally {
-        finally {
             opLock.unlock();
         }
     }
 
-
     /**
      * 将一个字节数组转化为可见的字符串
-     * 
+     *
      * @param bt
      * @return
      */
@@ -141,5 +129,4 @@ public class MD5 {
         return new String(out);
     }
 
-
 }

client/src/main/java/com/alibaba/nacos/client/config/utils/ParamUtils.java

@@ -23,18 +23,16 @@ import com.alibaba.nacos.client.utils.StringUtils;
 
 /**
  * Param check util
- * 
+ *
  * @author Nacos
- * 
  */
 public class ParamUtils {
 
-    private static char[] validChars = new char[] { '_', '-', '.', ':' };
+    private static char[] validChars = new char[] {'_', '-', '.', ':'};
-
 
     /**
      * 白名单的方式检查, 合法的参数只能包含字母、数字、以及validChars中的字符, 并且不能为空
-     * 
+     *
      * @param param
      * @return
      */
@@ -47,18 +45,15 @@ public class ParamUtils {
             char ch = param.charAt(i);
             if (Character.isLetterOrDigit(ch)) {
                 continue;
-            }
+            } else if (isValidChar(ch)) {
-            else if (isValidChar(ch)) {
                 continue;
-            }
+            } else {
-            else {
                 return false;
             }
         }
         return true;
     }
 
-
     private static boolean isValidChar(char ch) {
         for (char c : validChars) {
             if (c == ch) {
@@ -67,88 +62,88 @@ public class ParamUtils {
         }
         return false;
     }
-    
-	public static void checkKeyParam(String dataId, String group) throws NacosException {
-		if (StringUtils.isBlank(dataId) || !ParamUtils.isValid(dataId)) {
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "dataId invalid");
-		}
-		if (StringUtils.isBlank(group) || !ParamUtils.isValid(group)) {
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "group invalid");
-		}
-	}
-	
-	public static void checkTDG(String tenant, String dataId, String group) throws NacosException {
-		checkTenant(tenant);
-		if (StringUtils.isBlank(dataId) || !ParamUtils.isValid(dataId)) {
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "dataId invalid");
-		}
-		if (StringUtils.isBlank(group) || !ParamUtils.isValid(group)) {
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "group invalid");
-		}
-	}
-	
-	public static void checkKeyParam(String dataId, String group, String datumId)
-			throws NacosException {
-		if (StringUtils.isBlank(dataId) || !ParamUtils.isValid(dataId)) {
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "dataId invalid");
-		}
-		if (StringUtils.isBlank(group) || !ParamUtils.isValid(group)) {
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "group invalid");
-		}
-		if (StringUtils.isBlank(datumId) || !ParamUtils.isValid(datumId)) {
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "datumId invalid");
-		}
-	}
-    
-	public static void checkKeyParam(List<String> dataIds, String group) throws NacosException {
-		if (dataIds == null || dataIds.size() == 0) {
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "dataIds invalid");
-		}
-		for (String dataId : dataIds) {
-			if (StringUtils.isBlank(dataId) || !ParamUtils.isValid(dataId)) {
-				throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "dataId invalid");
-			}
-		}
-		if (StringUtils.isBlank(group) || !ParamUtils.isValid(group)) {
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "group invalid");
-		}
-	}
 
-	public static void checkParam(String dataId, String group, String content) throws NacosException {
+    public static void checkKeyParam(String dataId, String group) throws NacosException {
-		checkKeyParam(dataId, group);
+        if (StringUtils.isBlank(dataId) || !ParamUtils.isValid(dataId)) {
-		if (StringUtils.isBlank(content)) {
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "dataId invalid");
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "content invalid");
+        }
-		}
+        if (StringUtils.isBlank(group) || !ParamUtils.isValid(group)) {
-	}
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "group invalid");
-    
+        }
-	public static void checkParam(String dataId, String group, String datumId, String content) throws NacosException {
+    }
-		checkKeyParam(dataId, group, datumId);
-		if (StringUtils.isBlank(content)) {
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "content invalid");
-		}
-	}
 
-	public static void checkTenant(String tenant) throws NacosException {
+    public static void checkTDG(String tenant, String dataId, String group) throws NacosException {
-		if (StringUtils.isBlank(tenant) || !ParamUtils.isValid(tenant)) {
+        checkTenant(tenant);
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "tenant invalid");
+        if (StringUtils.isBlank(dataId) || !ParamUtils.isValid(dataId)) {
-		}
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "dataId invalid");
-	}
+        }
-	
+        if (StringUtils.isBlank(group) || !ParamUtils.isValid(group)) {
-	public static void checkBetaIps(String betaIps) throws NacosException {
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "group invalid");
-		if (StringUtils.isBlank(betaIps)) {
+        }
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "betaIps invalid");
+    }
-		}
-		String[] ipsArr = betaIps.split(",");
-		for (String ip : ipsArr) {
-			if (!IPUtil.isIPV4(ip)) {
-				throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "betaIps invalid");
-			}
-		}
-	}
 
-	public static void checkContent(String content) throws NacosException {
+    public static void checkKeyParam(String dataId, String group, String datumId)
-		if (StringUtils.isBlank(content)) {
+        throws NacosException {
-			throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "content invalid");
+        if (StringUtils.isBlank(dataId) || !ParamUtils.isValid(dataId)) {
-		}
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "dataId invalid");
-	}
+        }
+        if (StringUtils.isBlank(group) || !ParamUtils.isValid(group)) {
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "group invalid");
+        }
+        if (StringUtils.isBlank(datumId) || !ParamUtils.isValid(datumId)) {
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "datumId invalid");
+        }
+    }
+
+    public static void checkKeyParam(List<String> dataIds, String group) throws NacosException {
+        if (dataIds == null || dataIds.size() == 0) {
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "dataIds invalid");
+        }
+        for (String dataId : dataIds) {
+            if (StringUtils.isBlank(dataId) || !ParamUtils.isValid(dataId)) {
+                throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "dataId invalid");
+            }
+        }
+        if (StringUtils.isBlank(group) || !ParamUtils.isValid(group)) {
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "group invalid");
+        }
+    }
+
+    public static void checkParam(String dataId, String group, String content) throws NacosException {
+        checkKeyParam(dataId, group);
+        if (StringUtils.isBlank(content)) {
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "content invalid");
+        }
+    }
+
+    public static void checkParam(String dataId, String group, String datumId, String content) throws NacosException {
+        checkKeyParam(dataId, group, datumId);
+        if (StringUtils.isBlank(content)) {
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "content invalid");
+        }
+    }
+
+    public static void checkTenant(String tenant) throws NacosException {
+        if (StringUtils.isBlank(tenant) || !ParamUtils.isValid(tenant)) {
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "tenant invalid");
+        }
+    }
+
+    public static void checkBetaIps(String betaIps) throws NacosException {
+        if (StringUtils.isBlank(betaIps)) {
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "betaIps invalid");
+        }
+        String[] ipsArr = betaIps.split(",");
+        for (String ip : ipsArr) {
+            if (!IPUtil.isIPV4(ip)) {
+                throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "betaIps invalid");
+            }
+        }
+    }
+
+    public static void checkContent(String content) throws NacosException {
+        if (StringUtils.isBlank(content)) {
+            throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "content invalid");
+        }
+    }
 }

client/src/main/java/com/alibaba/nacos/client/config/utils/SnapShotSwitch.java

@@ -19,24 +19,23 @@ import com.alibaba.nacos.client.config.impl.LocalConfigInfoProcessor;
 
 /**
  * Snapshot switch
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class SnapShotSwitch {
 
-	/**
+    /**
-	 * whether use local cache
+     * whether use local cache
-	 */
+     */
-	private static Boolean isSnapShot = true;
+    private static Boolean isSnapShot = true;
 
-	public static Boolean getIsSnapShot() {
+    public static Boolean getIsSnapShot() {
-		return isSnapShot;
+        return isSnapShot;
-	}
+    }
+
+    public static void setIsSnapShot(Boolean isSnapShot) {
+        SnapShotSwitch.isSnapShot = isSnapShot;
+        LocalConfigInfoProcessor.cleanAllSnapshot();
+    }
 
-	public static void setIsSnapShot(Boolean isSnapShot) {
-		SnapShotSwitch.isSnapShot = isSnapShot;
-		LocalConfigInfoProcessor.cleanAllSnapshot();
-	}
-	
 }

client/src/main/java/com/alibaba/nacos/client/config/utils/TenantUtil.java

@@ -19,26 +19,25 @@ import com.alibaba.nacos.client.utils.StringUtils;
 
 /**
  * Tenant Util
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class TenantUtil {
 
-	static String userTenant = "";
+    static String userTenant = "";
-	
-	static {
-		userTenant = System.getProperty("tenant.id", "");
-		if (StringUtils.isBlank(userTenant)) {
-			userTenant = System.getProperty("acm.namespace", "");
-		}
-	}
 
-	public static String getUserTenant() {
+    static {
-		return userTenant;
+        userTenant = System.getProperty("tenant.id", "");
-	}
+        if (StringUtils.isBlank(userTenant)) {
+            userTenant = System.getProperty("acm.namespace", "");
+        }
+    }
 
-	public static void setUserTenant(String userTenant) {
+    public static String getUserTenant() {
-		TenantUtil.userTenant = userTenant;
+        return userTenant;
-	}
+    }
+
+    public static void setUserTenant(String userTenant) {
+        TenantUtil.userTenant = userTenant;
+    }
 }

client/src/main/java/com/alibaba/nacos/client/identify/Constants.java

@@ -17,16 +17,15 @@ package com.alibaba.nacos.client.identify;
 
 /**
  * Identify Constants
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class Constants {
-	public static final String ACCESS_KEY = "accessKey";
+    public static final String ACCESS_KEY = "accessKey";
-	
+
-	public static final String SECRET_KEY = "secretKey";
+    public static final String SECRET_KEY = "secretKey";
-	
+
-	public static final String PROPERTIES_FILENAME = "spas.properties";
+    public static final String PROPERTIES_FILENAME = "spas.properties";
 
     public static final String CREDENTIAL_PATH = "/home/admin/.spas_key/";
 

client/src/main/java/com/alibaba/nacos/client/identify/CredentialListener.java

@@ -17,13 +17,12 @@ package com.alibaba.nacos.client.identify;
 
 /**
  * Credential Listener
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public interface CredentialListener {
-	/**
+    /**
-	 * update Credential
+     * update Credential
-	 */
+     */
     public void onUpdateCredential();
 }

client/src/main/java/com/alibaba/nacos/client/identify/CredentialService.java

@@ -23,34 +23,33 @@ import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Credential Service
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public final class CredentialService implements SpasCredentialLoader {
-	static final public Logger log = LogUtils.logger(CredentialService.class);
+    static final public Logger log = LogUtils.logger(CredentialService.class);
-    private static ConcurrentHashMap<String, CredentialService> instances = new ConcurrentHashMap<String, CredentialService>();
+    private static ConcurrentHashMap<String, CredentialService> instances
+        = new ConcurrentHashMap<String, CredentialService>();
 
     private String appName;
-	private Credentials credentials = new Credentials();
+    private Credentials credentials = new Credentials();
     private CredentialWatcher watcher;
     private CredentialListener listener;
-	
+
-	private CredentialService(String appName) {
+    private CredentialService(String appName) {
         if (appName == null) {
-        	String value = System.getProperty("project.name");
+            String value = System.getProperty("project.name");
-        	if (StringUtils.isNotEmpty(value)) {
+            if (StringUtils.isNotEmpty(value)) {
-				appName = value;
+                appName = value;
-			}
+            }
         }
         this.appName = appName;
         watcher = new CredentialWatcher(appName, this);
-	}
+    }
-	
+
-	
+    public static CredentialService getInstance() {
-	public static CredentialService getInstance() {
         return getInstance(null);
-	}
+    }
 
     public static CredentialService getInstance(String appName) {
         String key = appName != null ? appName : Constants.NO_APP_NAME;
@@ -85,13 +84,13 @@ public final class CredentialService implements SpasCredentialLoader {
         log.info(appName, this.getClass().getSimpleName() + " is freed");
     }
 
-	public Credentials getCredential() {
+    public Credentials getCredential() {
         Credentials localCredential = credentials;
         if (localCredential.valid()) {
             return localCredential;
         }
-		return credentials;
+        return credentials;
-	}
+    }
 
     public void setCredential(Credentials credential) {
         boolean changed = !(credentials == credential || (credentials != null && credentials.identical(credential)));
@@ -113,23 +112,23 @@ public final class CredentialService implements SpasCredentialLoader {
     }
 
     @Deprecated
-	public void setAccessKey(String accessKey) {
+    public void setAccessKey(String accessKey) {
-		credentials.setAccessKey(accessKey);
+        credentials.setAccessKey(accessKey);
-	}
+    }
 
     @Deprecated
-	public void setSecretKey(String secretKey) {
+    public void setSecretKey(String secretKey) {
-		credentials.setSecretKey(secretKey);
+        credentials.setSecretKey(secretKey);
-	}
+    }
 
     @Deprecated
-	public String getAccessKey() {
+    public String getAccessKey() {
-		return credentials.getAccessKey();
+        return credentials.getAccessKey();
-	}
+    }
 
     @Deprecated
-	public String getSecretKey() {
+    public String getSecretKey() {
-		return credentials.getSecretKey();
+        return credentials.getSecretKey();
-	}
+    }
 
 }

client/src/main/java/com/alibaba/nacos/client/identify/CredentialWatcher.java

@@ -31,12 +31,11 @@ import com.alibaba.nacos.client.utils.StringUtils;
 
 /**
  * Credential Watcher
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class CredentialWatcher {
-	static final public Logger SpasLogger = LogUtils.logger(CredentialWatcher.class);
+    static final public Logger SpasLogger = LogUtils.logger(CredentialWatcher.class);
     private static final long REFRESH_INTERVAL = 10 * 1000;
 
     private CredentialService serviceInstance;
@@ -104,21 +103,20 @@ public class CredentialWatcher {
                 propertyPath = url.getPath();
             }
             if (propertyPath == null || propertyPath.isEmpty()) {
-            	
+
-            	String value = System.getProperty("spas.identity");
+                String value = System.getProperty("spas.identity");
-				if (StringUtils.isNotEmpty(value)) {
+                if (StringUtils.isNotEmpty(value)) {
-					propertyPath = value;
+                    propertyPath = value;
-				}
-                if (propertyPath == null || propertyPath.isEmpty()) {
-                    propertyPath = Constants.CREDENTIAL_PATH + (appName == null ? Constants.CREDENTIAL_DEFAULT : appName);
                 }
-                else {
+                if (propertyPath == null || propertyPath.isEmpty()) {
+                    propertyPath = Constants.CREDENTIAL_PATH + (appName == null ? Constants.CREDENTIAL_DEFAULT
+                        : appName);
+                } else {
                     if (logWarn) {
                         SpasLogger.info(appName, "Defined credential file: -D" + "spas.identity" + "=" + propertyPath);
                     }
                 }
-            }
+            } else {
-            else {
                 if (logWarn) {
                     SpasLogger.info(appName, "Load credential file from classpath: " + Constants.PROPERTIES_FILENAME);
                 }
@@ -130,7 +128,8 @@ public class CredentialWatcher {
             try {
                 propertiesIS = new FileInputStream(propertyPath);
             } catch (FileNotFoundException e) {
-                if (appName != null && !appName.equals(Constants.CREDENTIAL_DEFAULT) && propertyPath.equals(Constants.CREDENTIAL_PATH + appName)) {
+                if (appName != null && !appName.equals(Constants.CREDENTIAL_DEFAULT) && propertyPath.equals(
+                    Constants.CREDENTIAL_PATH + appName)) {
                     propertyPath = Constants.CREDENTIAL_PATH + Constants.CREDENTIAL_DEFAULT;
                     continue;
                 }
@@ -154,22 +153,21 @@ public class CredentialWatcher {
                 }
                 return;
             }
-        }
+        } else {
-        else {
             Properties properties = new Properties();
             try {
                 properties.load(propertiesIS);
             } catch (IOException e) {
-				SpasLogger.error("26", "Unable to load credential file, appName:" + appName
+                SpasLogger.error("26", "Unable to load credential file, appName:" + appName
-						+ "Unable to load credential file " + propertyPath, e);
+                    + "Unable to load credential file " + propertyPath, e);
-				propertyPath = null;
+                propertyPath = null;
                 return;
             } finally {
                 try {
                     propertiesIS.close();
                 } catch (IOException e) {
-                	SpasLogger.error("27", "Unable to close credential file, appName:" + appName
+                    SpasLogger.error("27", "Unable to close credential file, appName:" + appName
-    						+ "Unable to close credential file " + propertyPath, e);
+                        + "Unable to close credential file " + propertyPath, e);
                 }
             }
 
@@ -202,12 +200,12 @@ public class CredentialWatcher {
         }
 
         Credentials credential = new Credentials(accessKey, secretKey);
-		if (!credential.valid()) {
+        if (!credential.valid()) {
-			SpasLogger.warn("1", "Credential file missing required property" + appName + "Credential file missing "
+            SpasLogger.warn("1", "Credential file missing required property" + appName + "Credential file missing "
-					+ Constants.ACCESS_KEY + " or " + Constants.SECRET_KEY);
+                + Constants.ACCESS_KEY + " or " + Constants.SECRET_KEY);
-			propertyPath = null;
+            propertyPath = null;
-			// return;
+            // return;
-		}
+        }
 
         serviceInstance.setCredential(credential);
     }

client/src/main/java/com/alibaba/nacos/client/identify/Credentials.java

@@ -17,40 +17,39 @@ package com.alibaba.nacos.client.identify;
 
 /**
  * Credentials
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public class Credentials implements SpasCredential {
-	
-	private volatile String accessKey;
-	
-	private volatile String secretKey;
-	
-	public Credentials(String accessKey, String secretKey) {
-		this.accessKey = accessKey;
-		this.secretKey = secretKey;
-	}
-	
-	public Credentials() {
-		this(null, null);
-	}
-	
-	public String getAccessKey() {
-		return accessKey;
-	}
 
-	public void setAccessKey(String accessKey) {
+    private volatile String accessKey;
-		this.accessKey = accessKey;
-	}
 
-	public String getSecretKey() {
+    private volatile String secretKey;
-		return secretKey;
-	}
 
-	public void setSecretKey(String secretKey) {
+    public Credentials(String accessKey, String secretKey) {
-		this.secretKey = secretKey;
+        this.accessKey = accessKey;
-	}
+        this.secretKey = secretKey;
+    }
+
+    public Credentials() {
+        this(null, null);
+    }
+
+    public String getAccessKey() {
+        return accessKey;
+    }
+
+    public void setAccessKey(String accessKey) {
+        this.accessKey = accessKey;
+    }
+
+    public String getSecretKey() {
+        return secretKey;
+    }
+
+    public void setSecretKey(String secretKey) {
+        this.secretKey = secretKey;
+    }
 
     public boolean valid() {
         return accessKey != null && !accessKey.isEmpty() && secretKey != null && !secretKey.isEmpty();
@@ -58,8 +57,10 @@ public class Credentials implements SpasCredential {
 
     public boolean identical(Credentials other) {
         return this == other ||
-               (other != null &&
+            (other != null &&
-                (accessKey == null && other.accessKey == null || accessKey != null && accessKey.equals(other.accessKey)) &&
+                (accessKey == null && other.accessKey == null || accessKey != null && accessKey.equals(other.accessKey))
-                (secretKey == null && other.secretKey == null || secretKey != null && secretKey.equals(other.secretKey)));
+                &&
+                (secretKey == null && other.secretKey == null || secretKey != null && secretKey.equals(
+                    other.secretKey)));
     }
 }

client/src/main/java/com/alibaba/nacos/client/identify/STSConfig.java

@@ -19,110 +19,110 @@ import com.alibaba.nacos.client.utils.StringUtils;
 
 /**
  * Sts config
- * 
+ *
  * @author Nacos
  */
 @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
 public class STSConfig {
-	private static final String RAM_SECURITY_CREDENTIALS_URL
+    private static final String RAM_SECURITY_CREDENTIALS_URL
-		= "";
+        = "";
-	private String ramRoleName;
+    private String ramRoleName;
-	/**
+    /**
-	 * STS 临时凭证有效期剩余多少时开始刷新（允许本地时间比 STS 服务时间最多慢多久）
+     * STS 临时凭证有效期剩余多少时开始刷新（允许本地时间比 STS 服务时间最多慢多久）
-	 */
+     */
-	private int timeToRefreshInMillisecond = 3 * 60 * 1000;
+    private int timeToRefreshInMillisecond = 3 * 60 * 1000;
-	/**
+    /**
-	 * 获取 STS 临时凭证的元数据接口（包含角色名称）
+     * 获取 STS 临时凭证的元数据接口（包含角色名称）
-	 */
+     */
-	private String securityCredentialsUrl;
+    private String securityCredentialsUrl;
-	/**
+    /**
-	 * 设定 STS 临时凭证，不再通过元数据接口获取
+     * 设定 STS 临时凭证，不再通过元数据接口获取
-	 */
+     */
-	private String securityCredentials;
+    private String securityCredentials;
-	/**
+    /**
-	 * 是否缓存
+     * 是否缓存
-	 */
+     */
-	private boolean cacheSecurityCredentials = true;
+    private boolean cacheSecurityCredentials = true;
 
-	private static class Singleton {
+    private static class Singleton {
-		private static final STSConfig INSTANCE = new STSConfig();
+        private static final STSConfig INSTANCE = new STSConfig();
-	}
+    }
 
-	private STSConfig() {
+    private STSConfig() {
-		String ramRoleName = System.getProperty("ram.role.name");
+        String ramRoleName = System.getProperty("ram.role.name");
-		if (!StringUtils.isBlank(ramRoleName)) {
+        if (!StringUtils.isBlank(ramRoleName)) {
-			setRamRoleName(ramRoleName);
+            setRamRoleName(ramRoleName);
-		}
+        }
 
-		String timeToRefreshInMillisecond = System.getProperty("time.to.refresh.in.millisecond");
+        String timeToRefreshInMillisecond = System.getProperty("time.to.refresh.in.millisecond");
-		if (!StringUtils.isBlank(timeToRefreshInMillisecond)) {
+        if (!StringUtils.isBlank(timeToRefreshInMillisecond)) {
-			setTimeToRefreshInMillisecond(Integer.parseInt(timeToRefreshInMillisecond));
+            setTimeToRefreshInMillisecond(Integer.parseInt(timeToRefreshInMillisecond));
-		}
+        }
 
-		String securityCredentials = System.getProperty("security.credentials");
+        String securityCredentials = System.getProperty("security.credentials");
-		if (!StringUtils.isBlank(securityCredentials)) {
+        if (!StringUtils.isBlank(securityCredentials)) {
-			setSecurityCredentials(securityCredentials);
+            setSecurityCredentials(securityCredentials);
-		}
+        }
 
-		String securityCredentialsUrl = System.getProperty("security.credentials.url");
+        String securityCredentialsUrl = System.getProperty("security.credentials.url");
-		if (!StringUtils.isBlank(securityCredentialsUrl)) {
+        if (!StringUtils.isBlank(securityCredentialsUrl)) {
-			setSecurityCredentialsUrl(securityCredentialsUrl);
+            setSecurityCredentialsUrl(securityCredentialsUrl);
-		}
+        }
 
-		String cacheSecurityCredentials = System.getProperty("cache.security.credentials");
+        String cacheSecurityCredentials = System.getProperty("cache.security.credentials");
-		if (!StringUtils.isBlank(cacheSecurityCredentials)) {
+        if (!StringUtils.isBlank(cacheSecurityCredentials)) {
-			setCacheSecurityCredentials(Boolean.valueOf(cacheSecurityCredentials));
+            setCacheSecurityCredentials(Boolean.valueOf(cacheSecurityCredentials));
-		}
+        }
-	}
+    }
 
-	public static STSConfig getInstance() {
+    public static STSConfig getInstance() {
-		return Singleton.INSTANCE;
+        return Singleton.INSTANCE;
-	}
+    }
 
-	public String getRamRoleName() {
+    public String getRamRoleName() {
-		return ramRoleName;
+        return ramRoleName;
-	}
+    }
 
-	public void setRamRoleName(String ramRoleName) {
+    public void setRamRoleName(String ramRoleName) {
-		this.ramRoleName = ramRoleName;
+        this.ramRoleName = ramRoleName;
-	}
+    }
 
-	public int getTimeToRefreshInMillisecond() {
+    public int getTimeToRefreshInMillisecond() {
-		return timeToRefreshInMillisecond;
+        return timeToRefreshInMillisecond;
-	}
+    }
 
-	public void setTimeToRefreshInMillisecond(int timeToRefreshInMillisecond) {
+    public void setTimeToRefreshInMillisecond(int timeToRefreshInMillisecond) {
-		this.timeToRefreshInMillisecond = timeToRefreshInMillisecond;
+        this.timeToRefreshInMillisecond = timeToRefreshInMillisecond;
-	}
+    }
 
-	public String getSecurityCredentialsUrl() {
+    public String getSecurityCredentialsUrl() {
-		if (securityCredentialsUrl == null && ramRoleName != null) {
+        if (securityCredentialsUrl == null && ramRoleName != null) {
-			return RAM_SECURITY_CREDENTIALS_URL + ramRoleName;
+            return RAM_SECURITY_CREDENTIALS_URL + ramRoleName;
-		}
+        }
-		return securityCredentialsUrl;
+        return securityCredentialsUrl;
-	}
+    }
 
-	public void setSecurityCredentialsUrl(String securityCredentialsUrl) {
+    public void setSecurityCredentialsUrl(String securityCredentialsUrl) {
-		this.securityCredentialsUrl = securityCredentialsUrl;
+        this.securityCredentialsUrl = securityCredentialsUrl;
-	}
+    }
 
-	public String getSecurityCredentials() {
+    public String getSecurityCredentials() {
-		return securityCredentials;
+        return securityCredentials;
-	}
+    }
 
-	public void setSecurityCredentials(String securityCredentials) {
+    public void setSecurityCredentials(String securityCredentials) {
-		this.securityCredentials = securityCredentials;
+        this.securityCredentials = securityCredentials;
-	}
+    }
 
-	public boolean isSTSOn() {
+    public boolean isSTSOn() {
-		return StringUtils.isNotEmpty(getSecurityCredentials()) || StringUtils.isNotEmpty(getSecurityCredentialsUrl());
+        return StringUtils.isNotEmpty(getSecurityCredentials()) || StringUtils.isNotEmpty(getSecurityCredentialsUrl());
-	}
+    }
 
-	public boolean isCacheSecurityCredentials() {
+    public boolean isCacheSecurityCredentials() {
-		return cacheSecurityCredentials;
+        return cacheSecurityCredentials;
-	}
+    }
 
-	public void setCacheSecurityCredentials(boolean cacheSecurityCredentials) {
+    public void setCacheSecurityCredentials(boolean cacheSecurityCredentials) {
-		this.cacheSecurityCredentials = cacheSecurityCredentials;
+        this.cacheSecurityCredentials = cacheSecurityCredentials;
-	}
+    }
 }

client/src/main/java/com/alibaba/nacos/client/identify/SpasCredential.java

@@ -17,22 +17,21 @@ package com.alibaba.nacos.client.identify;
 
 /**
  * Spas Credential Interface
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public interface SpasCredential {
-	/**
+    /**
-	 * get AccessKey
+     * get AccessKey
-	 * 
+     *
-	 * @return AccessKey
+     * @return AccessKey
-	 */
+     */
-	public String getAccessKey();
+    public String getAccessKey();
 
-	/**
+    /**
-	 * get SecretKey
+     * get SecretKey
-	 * 
+     *
-	 * @return SecretKey
+     * @return SecretKey
-	 */
+     */
-	public String getSecretKey();
+    public String getSecretKey();
 }

client/src/main/java/com/alibaba/nacos/client/identify/SpasCredentialLoader.java

@@ -17,15 +17,14 @@ package com.alibaba.nacos.client.identify;
 
 /**
  * Spas Credential Loader
- * 
- * @author Nacos
  *
+ * @author Nacos
  */
 public interface SpasCredentialLoader {
-	/**
+    /**
-	 * get Credential
+     * get Credential
-	 * 
+     *
-	 * @return Credential
+     * @return Credential
-	 */
+     */
     SpasCredential getCredential();
 }

client/src/main/java/com/alibaba/nacos/client/logger/Level.java

@@ -17,14 +17,18 @@ package com.alibaba.nacos.client.logger;
 
 /**
  * 阿里中间件日志级别
- * 
+ *
  * @author zhuyong 2014年3月20日 上午9:57:27
  */
 public enum Level {
-	/**
+    /**
-	 * log level
+     * log level
-	 */
+     */
-    DEBUG("DEBUG"), INFO("INFO"), WARN("WARN"), ERROR("ERROR"), OFF("OFF");
+    DEBUG("DEBUG"),
+    INFO("INFO"),
+    WARN("WARN"),
+    ERROR("ERROR"),
+    OFF("OFF");
 
     private String name;
 

client/src/main/java/com/alibaba/nacos/client/logger/Logger.java

@@ -20,7 +20,7 @@ import com.alibaba.nacos.client.logger.option.ActivateOption;
 /**
  * <pre>
  * 阿里中间件日志API，用于输出定制化的日志
- * 
+ *
  * 定制格式如下：01 %d{yyyy-MM-dd HH:mm:ss.SSS} %p [%-5t:%c{2}] %m%n
  * 其中：
  * 01                           日志API版本，后续如果格式有变化，会修改此版本号，方便机器解析
@@ -29,17 +29,17 @@ import com.alibaba.nacos.client.logger.option.ActivateOption;
  * [%-5t:%c{2}]                 线程名:日志名
  * %m                           日志信息
  * %n                           换行
- * 
+ *
  * 关于%m，也有其中的格式要求：[Context] [STAT-INFO] [ERROR-CODE]
  * 其中：
  * Context                      打印时间时的上下文信息，如果没有，则内容为空，但'[]'这个占位符仍要输出
  * STAT-INFO                    待定
  * ERROR-CODE                   常见的错误码，帮助用户解决问题
- * 
+ *
  * 在异常中，也需要输出ErrorCode及对应的TraceUrl，可以使用
  * com.alibaba.nacos.client.logger.support.LoggerHelper.getErrorCodeStr(String errorCode)来获取格式化后的串
  * </pre>
- * 
+ *
  * @author zhuyong 2014年3月20日 上午9:58:27
  */
 public interface Logger extends ActivateOption {
@@ -55,7 +55,7 @@ public interface Logger extends ActivateOption {
      * 输出Debug日志
      *
      * @param format 日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
-     * @param args 格式化串参数数组
+     * @param args   格式化串参数数组
      */
     void debug(String format, Object... args);
 
@@ -71,8 +71,8 @@ public interface Logger extends ActivateOption {
      * 输出Debug日志
      *
      * @param context 日志上下文信息
-     * @param format 日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
+     * @param format  日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
-     * @param args 格式化串参数数组
+     * @param args    格式化串参数数组
      */
     void debug(String context, String format, Object... args);
 
@@ -87,7 +87,7 @@ public interface Logger extends ActivateOption {
      * 输出Info日志
      *
      * @param format 日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
-     * @param args 格式化串参数数组
+     * @param args   格式化串参数数组
      */
     void info(String format, Object... args);
 
@@ -103,8 +103,8 @@ public interface Logger extends ActivateOption {
      * 输出Info日志
      *
      * @param context 日志上下文信息
-     * @param format 日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
+     * @param format  日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
-     * @param args 格式化串参数数组
+     * @param args    格式化串参数数组
      */
     void info(String context, String format, Object... args);
 
@@ -119,7 +119,7 @@ public interface Logger extends ActivateOption {
      * 输出Warn日志
      *
      * @param message 日志信息（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
-     * @param t 异常信息
+     * @param t       异常信息
      * @since 0.1.5
      */
     void warn(String message, Throwable t);
@@ -128,7 +128,7 @@ public interface Logger extends ActivateOption {
      * 输出Warn日志
      *
      * @param format 日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
-     * @param args 格式化串参数数组
+     * @param args   格式化串参数数组
      */
     void warn(String format, Object... args);
 
@@ -144,8 +144,8 @@ public interface Logger extends ActivateOption {
      * 输出Warn日志
      *
      * @param context 日志上下文信息
-     * @param format 日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
+     * @param format  日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
-     * @param args 格式化串参数数组
+     * @param args    格式化串参数数组
      */
     void warn(String context, String format, Object... args);
 
@@ -153,7 +153,7 @@ public interface Logger extends ActivateOption {
      * 输出Error日志
      *
      * @param errorCode 错误码，如HSF-0001
-     * @param message 日志信息（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
+     * @param message   日志信息（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
      */
     void error(String errorCode, String message);
 
@@ -161,8 +161,8 @@ public interface Logger extends ActivateOption {
      * 输出Error日志
      *
      * @param errorCode 错误码，如HSF-0001
-     * @param message 日志信息（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
+     * @param message   日志信息（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
-     * @param t 异常信息
+     * @param t         异常信息
      */
     void error(String errorCode, String message, Throwable t);
 
@@ -170,68 +170,71 @@ public interface Logger extends ActivateOption {
      * 输出Error日志
      *
      * @param errorCode 错误码，如HSF-0001
-     * @param format 日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
+     * @param format    日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
-     * @param objs 格式化串参数数组
+     * @param objs      格式化串参数数组
      */
     void error(String errorCode, String format, Object... objs);
 
     /**
      * 输出Error日志
      *
-     * @param context 日志上下文信息
+     * @param context   日志上下文信息
      * @param errorCode 错误码
-     * @param message 日志信息（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
+     * @param message   日志信息（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
      */
     void error(String context, String errorCode, String message);
 
     /**
      * 输出Error日志
      *
-     * @param context 日志上下文信息
+     * @param context   日志上下文信息
      * @param errorCode 错误码
-     * @param message 日志信息（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
+     * @param message   日志信息（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
-     * @param t 异常信息
+     * @param t         异常信息
      */
     void error(String context, String errorCode, String message, Throwable t);
 
     /**
      * 输出Error日志
      *
-     * @param context 日志上下文信息
+     * @param context   日志上下文信息
      * @param errorCode 错误码
-     * @param format 日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
+     * @param format    日志信息格式化字符串，比如 'Hi,{} {} {}'（当使用ResourceBundle用于国际化日志输出时，message为对应的key, since 0.1.5）
-     * @param args 格式化串参数
+     * @param args      格式化串参数
      */
     void error(String context, String errorCode, String format, Object... args);
 
-	/**
+    /**
-	 * 判断Debug级别是否开启
+     * 判断Debug级别是否开启
-	 * 
+     *
-	 * @return Debug级别是否开启
+     * @return Debug级别是否开启
-	 */
+     */
     boolean isDebugEnabled();
 
     /**
      * 判断Info级别是否开启
+     *
      * @return Info级别是否开启
      */
     boolean isInfoEnabled();
 
     /**
      * 判断Warn级别是否开启
+     *
      * @return Warn级别是否开启
      */
     boolean isWarnEnabled();
 
-	/**
+    /**
-	 * 判断Error级别是否开启
+     * 判断Error级别是否开启
-	 * 
+     *
-	 * @return Error级别是否开启
+     * @return Error级别是否开启
-	 */
+     */
     boolean isErrorEnabled();
 
     /**
      * * 获取内部日志实现对象
+     *
      * @return 内部日志实现对象
      */
     Object getDelegate();

client/src/main/java/com/alibaba/nacos/client/logger/LoggerFactory.java

@@ -15,16 +15,15 @@
  */
 package com.alibaba.nacos.client.logger;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.alibaba.nacos.client.logger.log4j.Log4jLoggerFactory;
 import com.alibaba.nacos.client.logger.log4j2.Log4j2LoggerFactory;
 import com.alibaba.nacos.client.logger.nop.NopLoggerFactory;
 import com.alibaba.nacos.client.logger.slf4j.Slf4jLoggerFactory;
 import com.alibaba.nacos.client.logger.support.ILoggerFactory;
 import com.alibaba.nacos.client.logger.support.LogLog;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
  * <pre>
  * 阿里中间件LoggerFactory，获取具体日志实现
@@ -57,17 +56,12 @@ public class LoggerFactory {
             LogLog.info("Init JM logger with Slf4jLoggerFactory success, " + LoggerFactory.class.getClassLoader());
         } catch (Throwable e1) {
             try {
-                setLoggerFactory(new Log4jLoggerFactory());
+                setLoggerFactory(new Log4j2LoggerFactory());
-                LogLog.info("Init JM logger with Log4jLoggerFactory, " + LoggerFactory.class.getClassLoader());
+                LogLog.info("Init JM logger with Log4j2LoggerFactory, " + LoggerFactory.class.getClassLoader());
             } catch (Throwable e2) {
-                try {
+                setLoggerFactory(new NopLoggerFactory());
-                    setLoggerFactory(new Log4j2LoggerFactory());
+                LogLog.warn("Init JM logger with NopLoggerFactory, pay attention. "
-                    LogLog.info("Init JM logger with Log4j2LoggerFactory, " + LoggerFactory.class.getClassLoader());
+                    + LoggerFactory.class.getClassLoader(), e2);
-                } catch (Throwable e3) {
-                    setLoggerFactory(new NopLoggerFactory());
-                    LogLog.warn("Init JM logger with NopLoggerFactory, pay attention. "
-                                + LoggerFactory.class.getClassLoader(), e2);
-                }
             }
         }
 

client/src/main/java/com/alibaba/nacos/client/logger/json/JSONArray.java

@@ -28,371 +28,367 @@ import java.util.Iterator;
 
 /**
  * A JSON array. JSONObject supports java.util.List interface.
- * 
+ *
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong<fangyidong   @   yahoo.com.cn>
  */
 @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
 public class JSONArray extends ArrayList implements JSONAware, JSONStreamAware {
-	private static final long serialVersionUID = 3957988303675231981L;
+    private static final long serialVersionUID = 3957988303675231981L;
-	
+
-	/**
-	 * Constructs an empty JSONArray.
-	 */
-	public JSONArray(){
-		super();
-	}
-	
-	/**
-	 * Constructs a JSONArray containing the elements of the specified
-	 * collection, in the order they are returned by the collection's iterator.
-	 * 
-	 * @param c the collection whose elements are to be placed into this JSONArray
-	 */
-	public JSONArray(Collection c){
-		super(c);
-	}
-	
     /**
-     * Encode a list into JSON text and write it to out. 
+     * Constructs an empty JSONArray.
-     * If this list is also a JSONStreamAware or a JSONAware, JSONStreamAware and JSONAware specific behaviours will be ignored at this top level.
+     */
-     * 
+    public JSONArray() {
-     * @see com.alibaba.nacos.client.logger.json.JSONValue#writeJSONString(Object, Writer)
+        super();
-     * 
+    }
+
+    /**
+     * Constructs a JSONArray containing the elements of the specified collection, in the order they are returned by the
+     * collection's iterator.
+     *
+     * @param c the collection whose elements are to be placed into this JSONArray
+     */
+    public JSONArray(Collection c) {
+        super(c);
+    }
+
+    /**
+     * Encode a list into JSON text and write it to out. If this list is also a JSONStreamAware or a JSONAware,
+     * JSONStreamAware and JSONAware specific behaviours will be ignored at this top level.
+     *
      * @param collection
      * @param out
+     * @see com.alibaba.nacos.client.logger.json.JSONValue#writeJSONString(Object, Writer)
      */
-	public static void writeJSONString(Collection collection, Writer out) throws IOException{
+    public static void writeJSONString(Collection collection, Writer out) throws IOException {
-		if(collection == null){
+        if (collection == null) {
-			out.write("null");
+            out.write("null");
-			return;
+            return;
-		}
+        }
-		
+
-		boolean first = true;
+        boolean first = true;
-		Iterator iter=collection.iterator();
+        Iterator iter = collection.iterator();
-		
+
         out.write('[');
-		while(iter.hasNext()){
+        while (iter.hasNext()) {
-            if(first) {
+            if (first) {
                 first = false;
-            }
+            } else {
-            else {
                 out.write(',');
             }
-			Object value=iter.next();
+            Object value = iter.next();
-			if(value == null){
+            if (value == null) {
-				out.write("null");
+                out.write("null");
-				continue;
+                continue;
-			}
+            }
-			
-			JSONValue.writeJSONString(value, out);
-		}
-		out.write(']');
-	}
-	
-	public void writeJSONString(Writer out) throws IOException{
-		writeJSONString(this, out);
-	}
-	
-	/**
-	 * Convert a list to JSON text. The result is a JSON array. 
-	 * If this list is also a JSONAware, JSONAware specific behaviours will be omitted at this top level.
-	 * 
-	 * @see com.alibaba.nacos.client.logger.json.JSONValue#toJSONString(Object)
-	 * 
-	 * @param collection
-	 * @return JSON text, or "null" if list is null.
-	 */
-	public static String toJSONString(Collection collection){
-		final StringWriter writer = new StringWriter();
-		
-		try {
-			writeJSONString(collection, writer);
-			return writer.toString();
-		} catch(IOException e){
-			// This should never happen for a StringWriter
-			throw new RuntimeException(e);
-		}
-	}
 
-	public static void writeJSONString(byte[] array, Writer out) throws IOException{
+            JSONValue.writeJSONString(value, out);
-		if(array == null){
+        }
-			out.write("null");
+        out.write(']');
-		} else if(array.length == 0) {
+    }
-			out.write("[]");
-		} else {
-			out.write("[");
-			out.write(String.valueOf(array[0]));
-			
-			for(int i = 1; i < array.length; i++){
-				out.write(",");
-				out.write(String.valueOf(array[i]));
-			}
-			
-			out.write("]");
-		}
-	}
-	
-	public static String toJSONString(byte[] array){
-		final StringWriter writer = new StringWriter();
-		
-		try {
-			writeJSONString(array, writer);
-			return writer.toString();
-		} catch(IOException e){
-			// This should never happen for a StringWriter
-			throw new RuntimeException(e);
-		}
-	}
-	
-	public static void writeJSONString(short[] array, Writer out) throws IOException{
-		if(array == null){
-			out.write("null");
-		} else if(array.length == 0) {
-			out.write("[]");
-		} else {
-			out.write("[");
-			out.write(String.valueOf(array[0]));
-			
-			for(int i = 1; i < array.length; i++){
-				out.write(",");
-				out.write(String.valueOf(array[i]));
-			}
-			
-			out.write("]");
-		}
-	}
-	
-	public static String toJSONString(short[] array){
-		final StringWriter writer = new StringWriter();
-		
-		try {
-			writeJSONString(array, writer);
-			return writer.toString();
-		} catch(IOException e){
-			// This should never happen for a StringWriter
-			throw new RuntimeException(e);
-		}
-	}
-	
-	public static void writeJSONString(int[] array, Writer out) throws IOException{
-		if(array == null){
-			out.write("null");
-		} else if(array.length == 0) {
-			out.write("[]");
-		} else {
-			out.write("[");
-			out.write(String.valueOf(array[0]));
-			
-			for(int i = 1; i < array.length; i++){
-				out.write(",");
-				out.write(String.valueOf(array[i]));
-			}
-			
-			out.write("]");
-		}
-	}
-	
-	public static String toJSONString(int[] array){
-		final StringWriter writer = new StringWriter();
-		
-		try {
-			writeJSONString(array, writer);
-			return writer.toString();
-		} catch(IOException e){
-			// This should never happen for a StringWriter
-			throw new RuntimeException(e);
-		}
-	}
-	
-	public static void writeJSONString(long[] array, Writer out) throws IOException{
-		if(array == null){
-			out.write("null");
-		} else if(array.length == 0) {
-			out.write("[]");
-		} else {
-			out.write("[");
-			out.write(String.valueOf(array[0]));
-			
-			for(int i = 1; i < array.length; i++){
-				out.write(",");
-				out.write(String.valueOf(array[i]));
-			}
-			
-			out.write("]");
-		}
-	}
-	
-	public static String toJSONString(long[] array){
-		final StringWriter writer = new StringWriter();
-		
-		try {
-			writeJSONString(array, writer);
-			return writer.toString();
-		} catch(IOException e){
-			// This should never happen for a StringWriter
-			throw new RuntimeException(e);
-		}
-	}
-	
-	public static void writeJSONString(float[] array, Writer out) throws IOException{
-		if(array == null){
-			out.write("null");
-		} else if(array.length == 0) {
-			out.write("[]");
-		} else {
-			out.write("[");
-			out.write(String.valueOf(array[0]));
-			
-			for(int i = 1; i < array.length; i++){
-				out.write(",");
-				out.write(String.valueOf(array[i]));
-			}
-			
-			out.write("]");
-		}
-	}
-	
-	public static String toJSONString(float[] array){
-		final StringWriter writer = new StringWriter();
-		
-		try {
-			writeJSONString(array, writer);
-			return writer.toString();
-		} catch(IOException e){
-			// This should never happen for a StringWriter
-			throw new RuntimeException(e);
-		}
-	}
-	
-	public static void writeJSONString(double[] array, Writer out) throws IOException{
-		if(array == null){
-			out.write("null");
-		} else if(array.length == 0) {
-			out.write("[]");
-		} else {
-			out.write("[");
-			out.write(String.valueOf(array[0]));
-			
-			for(int i = 1; i < array.length; i++){
-				out.write(",");
-				out.write(String.valueOf(array[i]));
-			}
-			
-			out.write("]");
-		}
-	}
-	
-	public static String toJSONString(double[] array){
-		final StringWriter writer = new StringWriter();
-		
-		try {
-			writeJSONString(array, writer);
-			return writer.toString();
-		} catch(IOException e){
-			// This should never happen for a StringWriter
-			throw new RuntimeException(e);
-		}
-	}
-	
-	public static void writeJSONString(boolean[] array, Writer out) throws IOException{
-		if(array == null){
-			out.write("null");
-		} else if(array.length == 0) {
-			out.write("[]");
-		} else {
-			out.write("[");
-			out.write(String.valueOf(array[0]));
-			
-			for(int i = 1; i < array.length; i++){
-				out.write(",");
-				out.write(String.valueOf(array[i]));
-			}
-			
-			out.write("]");
-		}
-	}
-	
-	public static String toJSONString(boolean[] array){
-		final StringWriter writer = new StringWriter();
-		
-		try {
-			writeJSONString(array, writer);
-			return writer.toString();
-		} catch(IOException e){
-			// This should never happen for a StringWriter
-			throw new RuntimeException(e);
-		}
-	}
-	
-	public static void writeJSONString(char[] array, Writer out) throws IOException{
-		if(array == null){
-			out.write("null");
-		} else if(array.length == 0) {
-			out.write("[]");
-		} else {
-			out.write("[\"");
-			out.write(String.valueOf(array[0]));
-			
-			for(int i = 1; i < array.length; i++){
-				out.write("\",\"");
-				out.write(String.valueOf(array[i]));
-			}
-			
-			out.write("\"]");
-		}
-	}
-	
-	public static String toJSONString(char[] array){
-		final StringWriter writer = new StringWriter();
-		
-		try {
-			writeJSONString(array, writer);
-			return writer.toString();
-		} catch(IOException e){
-			// This should never happen for a StringWriter
-			throw new RuntimeException(e);
-		}
-	}
-	
-	public static void writeJSONString(Object[] array, Writer out) throws IOException{
-		if(array == null){
-			out.write("null");
-		} else if(array.length == 0) {
-			out.write("[]");
-		} else {
-			out.write("[");
-			JSONValue.writeJSONString(array[0], out);
-			
-			for(int i = 1; i < array.length; i++){
-				out.write(",");
-				JSONValue.writeJSONString(array[i], out);
-			}
-			
-			out.write("]");
-		}
-	}
-	
-	public static String toJSONString(Object[] array){
-		final StringWriter writer = new StringWriter();
-		
-		try {
-			writeJSONString(array, writer);
-			return writer.toString();
-		} catch(IOException e){
-			// This should never happen for a StringWriter
-			throw new RuntimeException(e);
-		}
-	}
-	
-	public String toJSONString(){
-		return toJSONString(this);
-	}
 
-	/**
+    public void writeJSONString(Writer out) throws IOException {
-	 * Returns a string representation of this array. This is equivalent to
+        writeJSONString(this, out);
-	 * calling {@link JSONArray#toJSONString()}.
+    }
-	 */
+
-	public String toString() {
+    /**
-		return toJSONString();
+     * Convert a list to JSON text. The result is a JSON array. If this list is also a JSONAware, JSONAware specific
-	}
+     * behaviours will be omitted at this top level.
+     *
+     * @param collection
+     * @return JSON text, or "null" if list is null.
+     * @see com.alibaba.nacos.client.logger.json.JSONValue#toJSONString(Object)
+     */
+    public static String toJSONString(Collection collection) {
+        final StringWriter writer = new StringWriter();
+
+        try {
+            writeJSONString(collection, writer);
+            return writer.toString();
+        } catch (IOException e) {
+            // This should never happen for a StringWriter
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void writeJSONString(byte[] array, Writer out) throws IOException {
+        if (array == null) {
+            out.write("null");
+        } else if (array.length == 0) {
+            out.write("[]");
+        } else {
+            out.write("[");
+            out.write(String.valueOf(array[0]));
+
+            for (int i = 1; i < array.length; i++) {
+                out.write(",");
+                out.write(String.valueOf(array[i]));
+            }
+
+            out.write("]");
+        }
+    }
+
+    public static String toJSONString(byte[] array) {
+        final StringWriter writer = new StringWriter();
+
+        try {
+            writeJSONString(array, writer);
+            return writer.toString();
+        } catch (IOException e) {
+            // This should never happen for a StringWriter
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void writeJSONString(short[] array, Writer out) throws IOException {
+        if (array == null) {
+            out.write("null");
+        } else if (array.length == 0) {
+            out.write("[]");
+        } else {
+            out.write("[");
+            out.write(String.valueOf(array[0]));
+
+            for (int i = 1; i < array.length; i++) {
+                out.write(",");
+                out.write(String.valueOf(array[i]));
+            }
+
+            out.write("]");
+        }
+    }
+
+    public static String toJSONString(short[] array) {
+        final StringWriter writer = new StringWriter();
+
+        try {
+            writeJSONString(array, writer);
+            return writer.toString();
+        } catch (IOException e) {
+            // This should never happen for a StringWriter
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void writeJSONString(int[] array, Writer out) throws IOException {
+        if (array == null) {
+            out.write("null");
+        } else if (array.length == 0) {
+            out.write("[]");
+        } else {
+            out.write("[");
+            out.write(String.valueOf(array[0]));
+
+            for (int i = 1; i < array.length; i++) {
+                out.write(",");
+                out.write(String.valueOf(array[i]));
+            }
+
+            out.write("]");
+        }
+    }
+
+    public static String toJSONString(int[] array) {
+        final StringWriter writer = new StringWriter();
+
+        try {
+            writeJSONString(array, writer);
+            return writer.toString();
+        } catch (IOException e) {
+            // This should never happen for a StringWriter
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void writeJSONString(long[] array, Writer out) throws IOException {
+        if (array == null) {
+            out.write("null");
+        } else if (array.length == 0) {
+            out.write("[]");
+        } else {
+            out.write("[");
+            out.write(String.valueOf(array[0]));
+
+            for (int i = 1; i < array.length; i++) {
+                out.write(",");
+                out.write(String.valueOf(array[i]));
+            }
+
+            out.write("]");
+        }
+    }
+
+    public static String toJSONString(long[] array) {
+        final StringWriter writer = new StringWriter();
+
+        try {
+            writeJSONString(array, writer);
+            return writer.toString();
+        } catch (IOException e) {
+            // This should never happen for a StringWriter
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void writeJSONString(float[] array, Writer out) throws IOException {
+        if (array == null) {
+            out.write("null");
+        } else if (array.length == 0) {
+            out.write("[]");
+        } else {
+            out.write("[");
+            out.write(String.valueOf(array[0]));
+
+            for (int i = 1; i < array.length; i++) {
+                out.write(",");
+                out.write(String.valueOf(array[i]));
+            }
+
+            out.write("]");
+        }
+    }
+
+    public static String toJSONString(float[] array) {
+        final StringWriter writer = new StringWriter();
+
+        try {
+            writeJSONString(array, writer);
+            return writer.toString();
+        } catch (IOException e) {
+            // This should never happen for a StringWriter
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void writeJSONString(double[] array, Writer out) throws IOException {
+        if (array == null) {
+            out.write("null");
+        } else if (array.length == 0) {
+            out.write("[]");
+        } else {
+            out.write("[");
+            out.write(String.valueOf(array[0]));
+
+            for (int i = 1; i < array.length; i++) {
+                out.write(",");
+                out.write(String.valueOf(array[i]));
+            }
+
+            out.write("]");
+        }
+    }
+
+    public static String toJSONString(double[] array) {
+        final StringWriter writer = new StringWriter();
+
+        try {
+            writeJSONString(array, writer);
+            return writer.toString();
+        } catch (IOException e) {
+            // This should never happen for a StringWriter
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void writeJSONString(boolean[] array, Writer out) throws IOException {
+        if (array == null) {
+            out.write("null");
+        } else if (array.length == 0) {
+            out.write("[]");
+        } else {
+            out.write("[");
+            out.write(String.valueOf(array[0]));
+
+            for (int i = 1; i < array.length; i++) {
+                out.write(",");
+                out.write(String.valueOf(array[i]));
+            }
+
+            out.write("]");
+        }
+    }
+
+    public static String toJSONString(boolean[] array) {
+        final StringWriter writer = new StringWriter();
+
+        try {
+            writeJSONString(array, writer);
+            return writer.toString();
+        } catch (IOException e) {
+            // This should never happen for a StringWriter
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void writeJSONString(char[] array, Writer out) throws IOException {
+        if (array == null) {
+            out.write("null");
+        } else if (array.length == 0) {
+            out.write("[]");
+        } else {
+            out.write("[\"");
+            out.write(String.valueOf(array[0]));
+
+            for (int i = 1; i < array.length; i++) {
+                out.write("\",\"");
+                out.write(String.valueOf(array[i]));
+            }
+
+            out.write("\"]");
+        }
+    }
+
+    public static String toJSONString(char[] array) {
+        final StringWriter writer = new StringWriter();
+
+        try {
+            writeJSONString(array, writer);
+            return writer.toString();
+        } catch (IOException e) {
+            // This should never happen for a StringWriter
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static void writeJSONString(Object[] array, Writer out) throws IOException {
+        if (array == null) {
+            out.write("null");
+        } else if (array.length == 0) {
+            out.write("[]");
+        } else {
+            out.write("[");
+            JSONValue.writeJSONString(array[0], out);
+
+            for (int i = 1; i < array.length; i++) {
+                out.write(",");
+                JSONValue.writeJSONString(array[i], out);
+            }
+
+            out.write("]");
+        }
+    }
+
+    public static String toJSONString(Object[] array) {
+        final StringWriter writer = new StringWriter();
+
+        try {
+            writeJSONString(array, writer);
+            return writer.toString();
+        } catch (IOException e) {
+            // This should never happen for a StringWriter
+            throw new RuntimeException(e);
+        }
+    }
+
+    public String toJSONString() {
+        return toJSONString(this);
+    }
+
+    /**
+     * Returns a string representation of this array. This is equivalent to calling {@link JSONArray#toJSONString()}.
+     */
+    public String toString() {
+        return toJSONString();
+    }
 }

client/src/main/java/com/alibaba/nacos/client/logger/json/JSONAware.java

@@ -16,15 +16,16 @@
 package com.alibaba.nacos.client.logger.json;
 
 /**
- * Beans that support customized output of JSON text shall implement this interface.  
+ * Beans that support customized output of JSON text shall implement this interface.
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ *
+ * @author FangYidong<fangyidong   @   yahoo.com.cn>
  */
 @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
 public interface JSONAware {
-	/**
+    /**
-	 * format change
+     * format change
-	 * 
+     *
-	 * @return JSON text
+     * @return JSON text
-	 */
+     */
-	String toJSONString();
+    String toJSONString();
 }

client/src/main/java/com/alibaba/nacos/client/logger/json/JSONObject.java

@@ -28,125 +28,118 @@ import java.util.Map;
 
 /**
  * A JSON object. Key value pairs are unordered. JSONObject supports java.util.Map interface.
- * 
+ *
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong<fangyidong   @   yahoo.com.cn>
  */
 @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
-public class JSONObject extends HashMap implements Map, JSONAware, JSONStreamAware{
+public class JSONObject extends HashMap implements Map, JSONAware, JSONStreamAware {
-	
-	private static final long serialVersionUID = -503443796854799292L;
-	
-	
-	public JSONObject() {
-		super();
-	}
 
-	/**
+    private static final long serialVersionUID = -503443796854799292L;
-	 * Allows creation of a JSONObject from a Map. After that, both the
-	 * generated JSONObject and the Map can be modified independently.
-	 * 
-	 * @param map
-	 */
-	public JSONObject(Map map) {
-		super(map);
-	}
 
+    public JSONObject() {
+        super();
+    }
 
     /**
-     * Encode a map into JSON text and write it to out.
+     * Allows creation of a JSONObject from a Map. After that, both the generated JSONObject and the Map can be modified
-     * If this map is also a JSONAware or JSONStreamAware, JSONAware or JSONStreamAware specific behaviours will be ignored at this top level.
+     * independently.
-     * 
+     *
-     * @see com.alibaba.nacos.client.logger.json.JSONValue#writeJSONString(Object, Writer)
+     * @param map
-     * 
+     */
+    public JSONObject(Map map) {
+        super(map);
+    }
+
+    /**
+     * Encode a map into JSON text and write it to out. If this map is also a JSONAware or JSONStreamAware, JSONAware or
+     * JSONStreamAware specific behaviours will be ignored at this top level.
+     *
      * @param map
      * @param out
+     * @see com.alibaba.nacos.client.logger.json.JSONValue#writeJSONString(Object, Writer)
      */
-	public static void writeJSONString(Map map, Writer out) throws IOException {
+    public static void writeJSONString(Map map, Writer out) throws IOException {
-		if(map == null){
+        if (map == null) {
-			out.write("null");
+            out.write("null");
-			return;
+            return;
-		}
+        }
-		
+
-		boolean first = true;
+        boolean first = true;
-		Iterator iter=map.entrySet().iterator();
+        Iterator iter = map.entrySet().iterator();
-		
+
         out.write('{');
-		while(iter.hasNext()){
+        while (iter.hasNext()) {
-			if (first) {
+            if (first) {
-				first = false;
+                first = false;
-			}
+            } else {
-			else {
+                out.write(',');
-				out.write(',');
+            }
-			}
+            Map.Entry entry = (Map.Entry)iter.next();
-			Map.Entry entry = (Map.Entry) iter.next();
             out.write('\"');
             out.write(escape(String.valueOf(entry.getKey())));
             out.write('\"');
             out.write(':');
-			JSONValue.writeJSONString(entry.getValue(), out);
+            JSONValue.writeJSONString(entry.getValue(), out);
-		}
+        }
-		out.write('}');
+        out.write('}');
-	}
+    }
 
-	public void writeJSONString(Writer out) throws IOException{
+    public void writeJSONString(Writer out) throws IOException {
-		writeJSONString(this, out);
+        writeJSONString(this, out);
-	}
+    }
-	
-	/**
-	 * Convert a map to JSON text. The result is a JSON object. 
-	 * If this map is also a JSONAware, JSONAware specific behaviours will be omitted at this top level.
-	 * 
-	 * @see com.alibaba.nacos.client.logger.json.JSONValue#toJSONString(Object)
-	 * 
-	 * @param map
-	 * @return JSON text, or "null" if map is null.
-	 */
-	public static String toJSONString(Map map){
-		final StringWriter writer = new StringWriter();
-		
-		try {
-			writeJSONString(map, writer);
-			return writer.toString();
-		} catch (IOException e) {
-			// This should never happen with a StringWriter
-			throw new RuntimeException(e);
-		}
-	}
-	
-	public String toJSONString(){
-		return toJSONString(this);
-	}
-	
-	public String toString(){
-		return toJSONString();
-	}
 
-	public static String toString(String key,Object value){
+    /**
+     * Convert a map to JSON text. The result is a JSON object. If this map is also a JSONAware, JSONAware specific
+     * behaviours will be omitted at this top level.
+     *
+     * @param map
+     * @return JSON text, or "null" if map is null.
+     * @see com.alibaba.nacos.client.logger.json.JSONValue#toJSONString(Object)
+     */
+    public static String toJSONString(Map map) {
+        final StringWriter writer = new StringWriter();
+
+        try {
+            writeJSONString(map, writer);
+            return writer.toString();
+        } catch (IOException e) {
+            // This should never happen with a StringWriter
+            throw new RuntimeException(e);
+        }
+    }
+
+    public String toJSONString() {
+        return toJSONString(this);
+    }
+
+    public String toString() {
+        return toJSONString();
+    }
+
+    public static String toString(String key, Object value) {
         StringBuffer sb = new StringBuffer();
         sb.append('\"');
-        if(key == null) {
+        if (key == null) {
             sb.append("null");
-        }
+        } else {
-        else {
             JSONValue.escape(key, sb);
         }
-		sb.append('\"').append(':');
+        sb.append('\"').append(':');
-		
+
-		sb.append(JSONValue.toJSONString(value));
+        sb.append(JSONValue.toJSONString(value));
-		
+
-		return sb.toString();
+        return sb.toString();
-	}
+    }
-	
+
-	/**
+    /**
-	 * Escape quotes, \, /, \r, \n, \b, \f, \t and other control characters (U+0000 through U+001F).
+     * Escape quotes, \, /, \r, \n, \b, \f, \t and other control characters (U+0000 through U+001F). It's the same as
-	 * It's the same as JSONValue.escape() only for compatibility here.
+     * JSONValue.escape() only for compatibility here.
-	 * 
+     *
-	 * @see com.alibaba.nacos.client.logger.json.JSONValue#escape(String)
+     * @param s
-	 * 
+     * @return
-	 * @param s
+     * @see com.alibaba.nacos.client.logger.json.JSONValue#escape(String)
-	 * @return
+     */
-	 */
+    public static String escape(String s) {
-	public static String escape(String s){
+        return JSONValue.escape(s);
-		return JSONValue.escape(s);
+    }
-	}
 }

client/src/main/java/com/alibaba/nacos/client/logger/json/JSONStreamAware.java

@@ -19,20 +19,17 @@ import java.io.IOException;
 import java.io.Writer;
 
 /**
- * Beans that support customized output of JSON text to a writer shall implement
+ * Beans that support customized output of JSON text to a writer shall implement this interface.
- * this interface.
+ *
- * 
+ * @author FangYidong<fangyidong   @   yahoo.com.cn>
- * @author FangYidong<fangyidong@yahoo.com.cn>
  */
 @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
 public interface JSONStreamAware {
-	/**
+    /**
-	 * write JSON string to out.
+     * write JSON string to out.
-	 * 
+     *
-	 * @param out
+     * @param out out writer
-	 *            out writer
+     * @throws IOException Exception
-	 * @throws IOException
+     */
-	 *             Exception
+    void writeJSONString(Writer out) throws IOException;
-	 */
-	void writeJSONString(Writer out) throws IOException;
 }

client/src/main/java/com/alibaba/nacos/client/logger/json/JSONValue.java

@@ -30,314 +30,286 @@ import java.util.Map;
 import com.alibaba.nacos.client.logger.json.parser.JSONParser;
 import com.alibaba.nacos.client.logger.json.parser.ParseException;
 
-
-
 /**
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong<fangyidong @ yahoo.com.cn>
  */
 @SuppressWarnings("PMD.ClassNamingShouldBeCamelRule")
 public class JSONValue {
-	/**
+    /**
-	 * Parse JSON text into java object from the input source. 
+     * Parse JSON text into java object from the input source. Please use parseWithException() if you don't want to
-	 * Please use parseWithException() if you don't want to ignore the exception.
+     * ignore the exception.
-	 * 
+     *
-	 * @see com.alibaba.nacos.client.logger.jsonparser.JSONParser#parse(Reader)
+     * @param in
-	 * @see #parseWithException(Reader)
+     * @return Instance of the following: com.alibaba.nacos.client.logger.jsonJSONObject,
-	 * 
+     * com.alibaba.nacos.client.logger.jsonJSONArray, java.lang.String, java.lang.Number, java.lang.Boolean, null
-	 * @param in
+     * @see com.alibaba.nacos.client.logger.jsonparser.JSONParser#parse(Reader)
-	 * @return Instance of the following:
+     * @see #parseWithException(Reader)
-	 *	com.alibaba.nacos.client.logger.jsonJSONObject,
+     * @deprecated this method may throw an {@code Error} instead of returning {@code null}; please use {@link
-	 * 	com.alibaba.nacos.client.logger.jsonJSONArray,
+     * JSONValue#parseWithException(Reader)} instead
-	 * 	java.lang.String,
+     */
-	 * 	java.lang.Number,
+    public static Object parse(Reader in) {
-	 * 	java.lang.Boolean,
+        try {
-	 * 	null
+            JSONParser parser = new JSONParser();
-	 * 
+            return parser.parse(in);
-	 * @deprecated this method may throw an {@code Error} instead of returning
+        } catch (Exception e) {
-	 * {@code null}; please use {@link JSONValue#parseWithException(Reader)}
+            return null;
-	 * instead
+        }
-	 */
+    }
-	public static Object parse(Reader in){
+
-		try{
+    /**
-			JSONParser parser=new JSONParser();
+     * Parse JSON text into java object from the given string. Please use parseWithException() if you don't want to
-			return parser.parse(in);
+     * ignore the exception.
-		}
+     *
-		catch(Exception e){
+     * @param s
-			return null;
+     * @return Instance of the following: com.alibaba.nacos.client.logger.jsonJSONObject,
-		}
+     * com.alibaba.nacos.client.logger.jsonJSONArray, java.lang.String, java.lang.Number, java.lang.Boolean, null
-	}
+     * @see com.alibaba.nacos.client.logger.jsonparser.JSONParser#parse(Reader)
-	
+     * @see #parseWithException(Reader)
-	/**
+     * @deprecated this method may throw an {@code Error} instead of returning {@code null}; please use {@link
-	 * Parse JSON text into java object from the given string. 
+     * JSONValue#parseWithException(String)} instead
-	 * Please use parseWithException() if you don't want to ignore the exception.
+     */
-	 * 
+    public static Object parse(String s) {
-	 * @see com.alibaba.nacos.client.logger.jsonparser.JSONParser#parse(Reader)
+        StringReader in = new StringReader(s);
-	 * @see #parseWithException(Reader)
+        return parse(in);
-	 * 
+    }
-	 * @param s
+
-	 * @return Instance of the following:
+    /**
-	 *	com.alibaba.nacos.client.logger.jsonJSONObject,
+     * Parse JSON text into java object from the input source.
-	 * 	com.alibaba.nacos.client.logger.jsonJSONArray,
+     *
-	 * 	java.lang.String,
+     * @param in
-	 * 	java.lang.Number,
+     * @return Instance of the following: com.alibaba.nacos.client.logger.jsonJSONObject,
-	 * 	java.lang.Boolean,
+     * com.alibaba.nacos.client.logger.jsonJSONArray, java.lang.String, java.lang.Number, java.lang.Boolean, null
-	 * 	null
+     * @throws IOException
-	 * 
+     * @throws ParseException
-	 * @deprecated this method may throw an {@code Error} instead of returning
+     * @see com.alibaba.nacos.client.logger.jsonparser.JSONParser
-	 * {@code null}; please use {@link JSONValue#parseWithException(String)}
+     */
-	 * instead
+    public static Object parseWithException(Reader in) throws IOException, ParseException {
-	 */
+        JSONParser parser = new JSONParser();
-	public static Object parse(String s){
+        return parser.parse(in);
-		StringReader in=new StringReader(s);
+    }
-		return parse(in);
+
-	}
+    public static Object parseWithException(String s) throws ParseException {
-	
+        JSONParser parser = new JSONParser();
-	/**
+        return parser.parse(s);
-	 * Parse JSON text into java object from the input source.
+    }
-	 * 
+
-	 * @see com.alibaba.nacos.client.logger.jsonparser.JSONParser
-	 * 
-	 * @param in
-	 * @return Instance of the following:
-	 * 	com.alibaba.nacos.client.logger.jsonJSONObject,
-	 * 	com.alibaba.nacos.client.logger.jsonJSONArray,
-	 * 	java.lang.String,
-	 * 	java.lang.Number,
-	 * 	java.lang.Boolean,
-	 * 	null
-	 * 
-	 * @throws IOException
-	 * @throws ParseException
-	 */
-	public static Object parseWithException(Reader in) throws IOException, ParseException {
-		JSONParser parser=new JSONParser();
-		return parser.parse(in);
-	}
-	
-	public static Object parseWithException(String s) throws ParseException{
-		JSONParser parser=new JSONParser();
-		return parser.parse(s);
-	}
-	
     /**
      * Encode an object into JSON text and write it to out.
      * <p>
-     * If this object is a Map or a List, and it's also a JSONStreamAware or a JSONAware, JSONStreamAware or JSONAware will be considered firstly.
+     * If this object is a Map or a List, and it's also a JSONStreamAware or a JSONAware, JSONStreamAware or JSONAware
+     * will be considered firstly.
      * <p>
-     * DO NOT call this method from writeJSONString(Writer) of a class that implements both JSONStreamAware and (Map or List) with 
+     * DO NOT call this method from writeJSONString(Writer) of a class that implements both JSONStreamAware and (Map or
-     * "this" as the first parameter, use JSONObject.writeJSONString(Map, Writer) or JSONArray.writeJSONString(List, Writer) instead. 
+     * List) with "this" as the first parameter, use JSONObject.writeJSONString(Map, Writer) or
-     * 
+     * JSONArray.writeJSONString(List, Writer) instead.
-     * @see com.alibaba.nacos.client.logger.jsonJSONObject#writeJSONString(Map, Writer)
+     *
-     * @see com.alibaba.nacos.client.logger.jsonJSONArray#writeJSONString(List, Writer)
-     * 
      * @param value
      * @param writer
+     * @see com.alibaba.nacos.client.logger.jsonJSONObject#writeJSONString(Map, Writer)
+     * @see com.alibaba.nacos.client.logger.jsonJSONArray#writeJSONString(List, Writer)
      */
-	public static void writeJSONString(Object value, Writer out) throws IOException {
+    public static void writeJSONString(Object value, Writer out) throws IOException {
-		if(value == null){
+        if (value == null) {
-			out.write("null");
+            out.write("null");
-			return;
-		}
-		
-		if(value instanceof String){
-            out.write('\"');
-			out.write(escape((String)value));
-            out.write('\"');
-			return;
-		}
-		
-		if(value instanceof Double){
-			if(((Double)value).isInfinite() || ((Double)value).isNaN()) {
-				out.write("null");
-			}
-			else {
-				out.write(value.toString());
-			}
-			return;
-		}
-		
-		if(value instanceof Float){
-			if(((Float)value).isInfinite() || ((Float)value).isNaN()) {
-				out.write("null");
-			}
-			else {
-				out.write(value.toString());
-			}
-			return;
-		}		
-		
-		if(value instanceof Number){
-			out.write(value.toString());
-			return;
-		}
-		
-		if(value instanceof Boolean){
-			out.write(value.toString());
-			return;
-		}
-		
-		if((value instanceof JSONStreamAware)){
-			((JSONStreamAware)value).writeJSONString(out);
-			return;
-		}
-		
-		if((value instanceof JSONAware)){
-			out.write(((JSONAware)value).toJSONString());
-			return;
-		}
-		
-		if(value instanceof Map){
-			JSONObject.writeJSONString((Map)value, out);
-			return;
-		}
-		
-		if(value instanceof Collection){
-			JSONArray.writeJSONString((Collection)value, out);
             return;
-		}
+        }
-		
-		if(value instanceof byte[]){
-			JSONArray.writeJSONString((byte[])value, out);
-			return;
-		}
-		
-		if(value instanceof short[]){
-			JSONArray.writeJSONString((short[])value, out);
-			return;
-		}
-		
-		if(value instanceof int[]){
-			JSONArray.writeJSONString((int[])value, out);
-			return;
-		}
-		
-		if(value instanceof long[]){
-			JSONArray.writeJSONString((long[])value, out);
-			return;
-		}
-		
-		if(value instanceof float[]){
-			JSONArray.writeJSONString((float[])value, out);
-			return;
-		}
-		
-		if(value instanceof double[]){
-			JSONArray.writeJSONString((double[])value, out);
-			return;
-		}
-		
-		if(value instanceof boolean[]){
-			JSONArray.writeJSONString((boolean[])value, out);
-			return;
-		}
-		
-		if(value instanceof char[]){
-			JSONArray.writeJSONString((char[])value, out);
-			return;
-		}
-		
-		if(value instanceof Object[]){
-			JSONArray.writeJSONString((Object[])value, out);
-			return;
-		}
-		
-		out.write(value.toString());
-	}
 
-	/**
+        if (value instanceof String) {
-	 * Convert an object to JSON text.
+            out.write('\"');
-	 * <p>
+            out.write(escape((String)value));
-	 * If this object is a Map or a List, and it's also a JSONAware, JSONAware will be considered firstly.
+            out.write('\"');
-	 * <p>
+            return;
-	 * DO NOT call this method from toJSONString() of a class that implements both JSONAware and Map or List with 
+        }
-	 * "this" as the parameter, use JSONObject.toJSONString(Map) or JSONArray.toJSONString(List) instead. 
-	 * 
-	 * @see com.alibaba.nacos.client.logger.json.JSONObject#toJSONString(Map)
-	 *
-	 * @param value
-	 * @return JSON text, or "null" if value is null or it's an NaN or an INF number.
-	 */
-	public static String toJSONString(Object value){
-		final StringWriter writer = new StringWriter();
-		
-		try{
-			writeJSONString(value, writer);
-			return writer.toString();
-		} catch(IOException e){
-			// This should never happen for a StringWriter
-			throw new RuntimeException(e);
-		}
-	}
 
-	/**
+        if (value instanceof Double) {
-	 * Escape quotes, \, /, \r, \n, \b, \f, \t and other control characters (U+0000 through U+001F).
+            if (((Double)value).isInfinite() || ((Double)value).isNaN()) {
-	 * @param s
+                out.write("null");
-	 * @return
+            } else {
-	 */
+                out.write(value.toString());
-	public static String escape(String s){
+            }
-		if(s==null) {
+            return;
-			return null;
+        }
-		}
+
+        if (value instanceof Float) {
+            if (((Float)value).isInfinite() || ((Float)value).isNaN()) {
+                out.write("null");
+            } else {
+                out.write(value.toString());
+            }
+            return;
+        }
+
+        if (value instanceof Number) {
+            out.write(value.toString());
+            return;
+        }
+
+        if (value instanceof Boolean) {
+            out.write(value.toString());
+            return;
+        }
+
+        if ((value instanceof JSONStreamAware)) {
+            ((JSONStreamAware)value).writeJSONString(out);
+            return;
+        }
+
+        if ((value instanceof JSONAware)) {
+            out.write(((JSONAware)value).toJSONString());
+            return;
+        }
+
+        if (value instanceof Map) {
+            JSONObject.writeJSONString((Map)value, out);
+            return;
+        }
+
+        if (value instanceof Collection) {
+            JSONArray.writeJSONString((Collection)value, out);
+            return;
+        }
+
+        if (value instanceof byte[]) {
+            JSONArray.writeJSONString((byte[])value, out);
+            return;
+        }
+
+        if (value instanceof short[]) {
+            JSONArray.writeJSONString((short[])value, out);
+            return;
+        }
+
+        if (value instanceof int[]) {
+            JSONArray.writeJSONString((int[])value, out);
+            return;
+        }
+
+        if (value instanceof long[]) {
+            JSONArray.writeJSONString((long[])value, out);
+            return;
+        }
+
+        if (value instanceof float[]) {
+            JSONArray.writeJSONString((float[])value, out);
+            return;
+        }
+
+        if (value instanceof double[]) {
+            JSONArray.writeJSONString((double[])value, out);
+            return;
+        }
+
+        if (value instanceof boolean[]) {
+            JSONArray.writeJSONString((boolean[])value, out);
+            return;
+        }
+
+        if (value instanceof char[]) {
+            JSONArray.writeJSONString((char[])value, out);
+            return;
+        }
+
+        if (value instanceof Object[]) {
+            JSONArray.writeJSONString((Object[])value, out);
+            return;
+        }
+
+        out.write(value.toString());
+    }
+
+    /**
+     * Convert an object to JSON text.
+     * <p>
+     * If this object is a Map or a List, and it's also a JSONAware, JSONAware will be considered firstly.
+     * <p>
+     * DO NOT call this method from toJSONString() of a class that implements both JSONAware and Map or List with "this"
+     * as the parameter, use JSONObject.toJSONString(Map) or JSONArray.toJSONString(List) instead.
+     *
+     * @param value
+     * @return JSON text, or "null" if value is null or it's an NaN or an INF number.
+     * @see com.alibaba.nacos.client.logger.json.JSONObject#toJSONString(Map)
+     */
+    public static String toJSONString(Object value) {
+        final StringWriter writer = new StringWriter();
+
+        try {
+            writeJSONString(value, writer);
+            return writer.toString();
+        } catch (IOException e) {
+            // This should never happen for a StringWriter
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Escape quotes, \, /, \r, \n, \b, \f, \t and other control characters (U+0000 through U+001F).
+     *
+     * @param s
+     * @return
+     */
+    public static String escape(String s) {
+        if (s == null) {
+            return null;
+        }
         StringBuffer sb = new StringBuffer();
         escape(s, sb);
         return sb.toString();
     }
 
     /**
-     * @param s - Must not be null.
+     * @param s  - Must not be null.
      * @param sb
      */
     static void escape(String s, StringBuffer sb) {
-    	final int len = s.length();
+        final int len = s.length();
-		for(int i=0;i<len;i++){
+        for (int i = 0; i < len; i++) {
-			char ch=s.charAt(i);
+            char ch = s.charAt(i);
-			switch(ch){
+            switch (ch) {
-			case '"':
+                case '"':
-				sb.append("\\\"");
+                    sb.append("\\\"");
-				break;
+                    break;
-			case '\\':
+                case '\\':
-				sb.append("\\\\");
+                    sb.append("\\\\");
-				break;
+                    break;
-			case '\b':
+                case '\b':
-				sb.append("\\b");
+                    sb.append("\\b");
-				break;
+                    break;
-			case '\f':
+                case '\f':
-				sb.append("\\f");
+                    sb.append("\\f");
-				break;
+                    break;
-			case '\n':
+                case '\n':
-				sb.append("\\n");
+                    sb.append("\\n");
-				break;
+                    break;
-			case '\r':
+                case '\r':
-				sb.append("\\r");
+                    sb.append("\\r");
-				break;
+                    break;
-			case '\t':
+                case '\t':
-				sb.append("\\t");
+                    sb.append("\\t");
-				break;
+                    break;
-			case '/':
+                case '/':
-				sb.append("\\/");
+                    sb.append("\\/");
-				break;
+                    break;
-			default:
+                default:
-                //Reference: http://www.unicode.org/versions/Unicode5.1.0/
+                    //Reference: http://www.unicode.org/versions/Unicode5.1.0/
-				if(isUnicodeChar(ch)){
+                    if (isUnicodeChar(ch)) {
-					String ss=Integer.toHexString(ch);
+                        String ss = Integer.toHexString(ch);
-					sb.append("\\u");
+                        sb.append("\\u");
-					for(int k=0;k<FOUR-ss.length();k++){
+                        for (int k = 0; k < FOUR - ss.length(); k++) {
-						sb.append('0');
+                            sb.append('0');
-					}
+                        }
-					sb.append(ss.toUpperCase());
+                        sb.append(ss.toUpperCase());
-				}
+                    } else {
-				else{
+                        sb.append(ch);
-					sb.append(ch);
+                    }
-				}
+            }
-			}
+        }//for
-		}//for
+    }
-	}
+
-    
+    private static boolean isUnicodeChar(char ch) {
-	private static boolean isUnicodeChar(char ch) {
+        return (ch >= '\u0000' && ch <= '\u001F') || (ch >= '\u007F' && ch <= '\u009F')
-		return (ch >= '\u0000' && ch <= '\u001F') || (ch >= '\u007F' && ch <= '\u009F')
+            || (ch >= '\u2000' && ch <= '\u20FF');
-				|| (ch >= '\u2000' && ch <= '\u20FF');
+    }
-	}
+
-	
+    private static int FOUR = 4;
-	private static int FOUR = 4;
 
 }

client/src/main/java/com/alibaba/nacos/client/logger/json/parser/ContainerFactory.java

@@ -20,21 +20,24 @@ import java.util.Map;
 
 /**
  * Container factory for creating containers for JSON object and JSON array.
- * 
+ *
+ * @author FangYidong<fangyidong   @   yahoo.com.cn>
  * @see com.alibaba.nacos.client.logger.json.parser.JSONParser#parse(java.io.Reader, ContainerFactory)
- * 
- * @author FangYidong<fangyidong@yahoo.com.cn>
  */
 public interface ContainerFactory {
-	/**
+    /**
-	 * create json container
+     * create json container
-	 * @return A Map instance to store JSON object, or null if you want to use com.alibaba.nacos.client.logger.jsonJSONObject.
+     *
-	 */
+     * @return A Map instance to store JSON object, or null if you want to use com.alibaba.nacos.client.logger
-	Map createObjectContainer();
+     * .jsonJSONObject.
-	
+     */
-	/**
+    Map createObjectContainer();
-	 * create array json container
+
-	 * @return A List instance to store JSON array, or null if you want to use com.alibaba.nacos.client.logger.jsonJSONArray.
+    /**
-	 */
+     * create array json container
-	List creatArrayContainer();
+     *
+     * @return A List instance to store JSON array, or null if you want to use com.alibaba.nacos.client.logger
+     * .jsonJSONArray.
+     */
+    List creatArrayContainer();
 }

client/src/main/java/com/alibaba/nacos/client/logger/json/parser/ContentHandler.java

@@ -18,112 +18,100 @@ package com.alibaba.nacos.client.logger.json.parser;
 import java.io.IOException;
 
 /**
- * A simplified and stoppable SAX-like content handler for stream processing of JSON text. 
+ * A simplified and stoppable SAX-like content handler for stream processing of JSON text.
- * 
+ *
+ * @author FangYidong<fangyidong   @   yahoo.com.cn>
  * @see org.xml.sax.ContentHandler
  * @see com.alibaba.nacos.client.logger.json.parser.JSONParser#parse(java.io.Reader, ContentHandler, boolean)
- * 
- * @author FangYidong<fangyidong@yahoo.com.cn>
  */
 public interface ContentHandler {
-	/**
+    /**
-	 * Receive notification of the beginning of JSON processing.
+     * Receive notification of the beginning of JSON processing. The parser will invoke this method only once.
-	 * The parser will invoke this method only once.
+     *
-     * 
+     * @throws ParseException - JSONParser will stop and throw the same exception to the caller when receiving this
-	 * @throws ParseException 
+     *                        exception.
-	 * 			- JSONParser will stop and throw the same exception to the caller when receiving this exception.
      * @throws IOException
-	 */
+     */
-	void startJSON() throws ParseException, IOException;
+    void startJSON() throws ParseException, IOException;
-	
+
-	/**
+    /**
-	 * Receive notification of the end of JSON processing.
+     * Receive notification of the end of JSON processing.
-	 * 
+     *
-	 * @throws ParseException
+     * @throws ParseException
-	 * @throws IOException
+     * @throws IOException
-	 */
+     */
-	void endJSON() throws ParseException, IOException;
+    void endJSON() throws ParseException, IOException;
-	
+
-	/**
+    /**
-	 * Receive notification of the beginning of a JSON object.
+     * Receive notification of the beginning of a JSON object.
-	 * 
+     *
-	 * @return false if the handler wants to stop parsing after return.
+     * @return false if the handler wants to stop parsing after return.
-	 * @throws ParseException
+     * @throws ParseException - JSONParser will stop and throw the same exception to the caller when receiving this
-     *          - JSONParser will stop and throw the same exception to the caller when receiving this exception.
+     *                        exception.
      * @throws IOException
      * @see #endJSON
-	 */
+     */
-	boolean startObject() throws ParseException, IOException;
+    boolean startObject() throws ParseException, IOException;
-	
+
-	/**
+    /**
-	 * Receive notification of the end of a JSON object.
+     * Receive notification of the end of a JSON object.
-	 * 
+     *
-	 * @return false if the handler wants to stop parsing after return.
+     * @return false if the handler wants to stop parsing after return.
-	 * @throws ParseException
+     * @throws ParseException
-	 * @throws IOException
+     * @throws IOException
      * @see #startObject
-	 */
+     */
-	boolean endObject() throws ParseException, IOException;
+    boolean endObject() throws ParseException, IOException;
-	
+
-	/**
+    /**
-	 * Receive notification of the beginning of a JSON object entry.
+     * Receive notification of the beginning of a JSON object entry.
-	 * 
+     *
-	 * @param key - Key of a JSON object entry. 
+     * @param key - Key of a JSON object entry.
-	 * 
+     * @return false if the handler wants to stop parsing after return.
-	 * @return false if the handler wants to stop parsing after return.
+     * @throws ParseException
-	 * @throws ParseException
+     * @throws IOException
-	 * @throws IOException
      * @see #endObjectEntry
-	 */
+     */
-	boolean startObjectEntry(String key) throws ParseException, IOException;
+    boolean startObjectEntry(String key) throws ParseException, IOException;
-	
+
-	/**
+    /**
-	 * Receive notification of the end of the value of previous object entry.
+     * Receive notification of the end of the value of previous object entry.
-	 * 
+     *
-	 * @return false if the handler wants to stop parsing after return.
+     * @return false if the handler wants to stop parsing after return.
-	 * @throws ParseException
+     * @throws ParseException
-	 * @throws IOException
+     * @throws IOException
      * @see #startObjectEntry
-	 */
+     */
-	boolean endObjectEntry() throws ParseException, IOException;
+    boolean endObjectEntry() throws ParseException, IOException;
-	
+
-	/**
+    /**
-	 * Receive notification of the beginning of a JSON array.
+     * Receive notification of the beginning of a JSON array.
-	 * 
+     *
-	 * @return false if the handler wants to stop parsing after return.
+     * @return false if the handler wants to stop parsing after return.
-	 * @throws ParseException
+     * @throws ParseException
-	 * @throws IOException
+     * @throws IOException
      * @see #endArray
-	 */
+     */
-	boolean startArray() throws ParseException, IOException;
+    boolean startArray() throws ParseException, IOException;
-	
+
-	/**
+    /**
-	 * Receive notification of the end of a JSON array.
+     * Receive notification of the end of a JSON array.
-	 * 
+     *
-	 * @return false if the handler wants to stop parsing after return.
+     * @return false if the handler wants to stop parsing after return.
-	 * @throws ParseException
+     * @throws ParseException
-	 * @throws IOException
+     * @throws IOException
      * @see #startArray
-	 */
+     */
-	boolean endArray() throws ParseException, IOException;
+    boolean endArray() throws ParseException, IOException;
-	
+
-	/**
+    /**
-	 * Receive notification of the JSON primitive values:
+     * Receive notification of the JSON primitive values: java.lang.String, java.lang.Number, java.lang.Boolean null
-	 * 	java.lang.String,
+     *
-	 * 	java.lang.Number,
+     * @param value - Instance of the following: java.lang.String, java.lang.Number, java.lang.Boolean null
-	 * 	java.lang.Boolean
+     * @return false if the handler wants to stop parsing after return.
-	 * 	null
+     * @throws ParseException
-	 * 
+     * @throws IOException
-	 * @param value - Instance of the following:
+     */
-	 * 			java.lang.String,
+    boolean primitive(Object value) throws ParseException, IOException;
-	 * 			java.lang.Number,
+
-	 * 			java.lang.Boolean
-	 * 			null
-	 * 
-	 * @return false if the handler wants to stop parsing after return.
-	 * @throws ParseException
-	 * @throws IOException
-	 */
-	boolean primitive(Object value) throws ParseException, IOException;
-		
 }

client/src/main/java/com/alibaba/nacos/client/logger/json/parser/ParseException.java

@@ -17,89 +17,87 @@ package com.alibaba.nacos.client.logger.json.parser;
 
 /**
  * ParseException explains why and where the error occurs in source JSON text.
- * 
- * @author FangYidong<fangyidong@yahoo.com.cn>
  *
+ * @author FangYidong<fangyidong   @   yahoo.com.cn>
  */
 public class ParseException extends Exception {
-	private static final long serialVersionUID = -7880698968187728547L;
+    private static final long serialVersionUID = -7880698968187728547L;
-	
-	public static final int ERROR_UNEXPECTED_CHAR = 0;
-	public static final int ERROR_UNEXPECTED_TOKEN = 1;
-	public static final int ERROR_UNEXPECTED_EXCEPTION = 2;
 
-	private int errorType;
+    public static final int ERROR_UNEXPECTED_CHAR = 0;
-	private Object unexpectedObject;
+    public static final int ERROR_UNEXPECTED_TOKEN = 1;
-	private int position;
+    public static final int ERROR_UNEXPECTED_EXCEPTION = 2;
-	
+
-	public ParseException(int errorType){
+    private int errorType;
-		this(-1, errorType, null);
+    private Object unexpectedObject;
-	}
+    private int position;
-	
+
-	public ParseException(int errorType, Object unexpectedObject){
+    public ParseException(int errorType) {
-		this(-1, errorType, unexpectedObject);
+        this(-1, errorType, null);
-	}
+    }
-	
+
-	public ParseException(int position, int errorType, Object unexpectedObject){
+    public ParseException(int errorType, Object unexpectedObject) {
-		this.position = position;
+        this(-1, errorType, unexpectedObject);
-		this.errorType = errorType;
+    }
-		this.unexpectedObject = unexpectedObject;
+
-	}
+    public ParseException(int position, int errorType, Object unexpectedObject) {
-	
+        this.position = position;
-	public int getErrorType() {
+        this.errorType = errorType;
-		return errorType;
+        this.unexpectedObject = unexpectedObject;
-	}
+    }
-	
+
-	public void setErrorType(int errorType) {
+    public int getErrorType() {
-		this.errorType = errorType;
+        return errorType;
-	}
+    }
-	
+
-	/**
+    public void setErrorType(int errorType) {
-	 * @see com.alibaba.nacos.client.logger.json.parser.JSONParser#getPosition()
+        this.errorType = errorType;
-	 * 
+    }
-	 * @return The character position (starting with 0) of the input where the error occurs.
+
-	 */
+    /**
-	public int getPosition() {
+     * @return The character position (starting with 0) of the input where the error occurs.
-		return position;
+     * @see com.alibaba.nacos.client.logger.json.parser.JSONParser#getPosition()
-	}
+     */
-	
+    public int getPosition() {
-	public void setPosition(int position) {
+        return position;
-		this.position = position;
+    }
-	}
+
-	
+    public void setPosition(int position) {
-	/**
+        this.position = position;
-	 * @see com.alibaba.nacos.client.logger.json.parser.Yytoken
+    }
-	 * 
+
-	 * @return One of the following base on the value of errorType:
+    /**
-	 * 		   	ERROR_UNEXPECTED_CHAR		java.lang.Character
+     * @return One of the following base on the value of errorType: ERROR_UNEXPECTED_CHAR java.lang.Character
-	 * 			ERROR_UNEXPECTED_TOKEN		com.alibaba.nacos.client.logger.jsonparser.Yytoken
+     * ERROR_UNEXPECTED_TOKEN com.alibaba.nacos.client.logger.jsonparser.Yytoken ERROR_UNEXPECTED_EXCEPTION
-	 * 			ERROR_UNEXPECTED_EXCEPTION	java.lang.Exception
+     * java.lang.Exception
-	 */
+     * @see com.alibaba.nacos.client.logger.json.parser.Yytoken
-	public Object getUnexpectedObject() {
+     */
-		return unexpectedObject;
+    public Object getUnexpectedObject() {
-	}
+        return unexpectedObject;
-	
+    }
-	public void setUnexpectedObject(Object unexpectedObject) {
+
-		this.unexpectedObject = unexpectedObject;
+    public void setUnexpectedObject(Object unexpectedObject) {
-	}
+        this.unexpectedObject = unexpectedObject;
-	
+    }
-	public String getMessage() {
+
-		StringBuffer sb = new StringBuffer();
+    public String getMessage() {
-		
+        StringBuffer sb = new StringBuffer();
-		switch(errorType){
+
-		case ERROR_UNEXPECTED_CHAR:
+        switch (errorType) {
-			sb.append("Unexpected character (").append(unexpectedObject).append(") at position ").append(position).append(".");
+            case ERROR_UNEXPECTED_CHAR:
-			break;
+                sb.append("Unexpected character (").append(unexpectedObject).append(") at position ").append(position)
-		case ERROR_UNEXPECTED_TOKEN:
+                    .append(".");
-			sb.append("Unexpected token ").append(unexpectedObject).append(" at position ").append(position).append(".");
+                break;
-			break;
+            case ERROR_UNEXPECTED_TOKEN:
-		case ERROR_UNEXPECTED_EXCEPTION:
+                sb.append("Unexpected token ").append(unexpectedObject).append(" at position ").append(position).append(
-			sb.append("Unexpected exception at position ").append(position).append(": ").append(unexpectedObject);
+                    ".");
-			break;
+                break;
-		default:
+            case ERROR_UNEXPECTED_EXCEPTION:
-			sb.append("Unkown error at position ").append(position).append(".");
+                sb.append("Unexpected exception at position ").append(position).append(": ").append(unexpectedObject);
-			break;
+                break;
-		}
+            default:
-		return sb.toString();
+                sb.append("Unkown error at position ").append(position).append(".");
-	}
+                break;
+        }
+        return sb.toString();
+    }
 }

client/src/main/java/com/alibaba/nacos/client/logger/json/parser/Yylex.java

@@ -23,34 +23,38 @@ import java.io.UnsupportedEncodingException;
 
 /**
  * Yylex
- * @author Nacos
  *
+ * @author Nacos
  */
 class Yylex {
 
-    /** This character denotes the end of file */
+    /**
+     * This character denotes the end of file
+     */
     public static final int YYEOF = -1;
 
-    /** initial size of the lookahead buffer */
+    /**
+     * initial size of the lookahead buffer
+     */
     private static final int ZZ_BUFFERSIZE = 16384;
 
-    /** lexical states */
+    /**
+     * lexical states
+     */
     public static final int YYINITIAL = 0;
     public static final int STRING_BEGIN = 2;
 
     /**
-     * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l
+     * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l ZZ_LEXSTATE[l+1] is the state in the DFA for the
-     * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l
+     * lexical state l at the beginning of a line l is of the form l = 2*k, k a non negative integer
-     * at the beginning of a line
-     * l is of the form l = 2*k, k a non negative integer
      */
-    private static final int ZZ_LEXSTATE[] = { 0, 0, 1, 1 };
+    private static final int ZZ_LEXSTATE[] = {0, 0, 1, 1};
 
     /**
      * Translates characters to character classes
      */
     private static final String ZZ_CMAP_PACKED =
-            "\11\0\1\7\1\7\2\0\1\7\22\0\1\7\1\0\1\11\10\0" + "\1\6\1\31\1\2\1\4\1\12\12\3\1\32\6\0\4\1\1\5"
+        "\11\0\1\7\1\7\2\0\1\7\22\0\1\7\1\0\1\11\10\0" + "\1\6\1\31\1\2\1\4\1\12\12\3\1\32\6\0\4\1\1\5"
             + "\1\1\24\0\1\27\1\10\1\30\3\0\1\22\1\13\2\1\1\21" + "\1\14\5\0\1\23\1\0\1\15\3\0\1\16\1\24\1\17\1\20"
             + "\5\0\1\25\1\0\1\26\uff82\0";
 
@@ -65,7 +69,7 @@ class Yylex {
     private static final int[] ZZ_ACTION = zzUnpackAction();
 
     private static final String ZZ_ACTION_PACKED_0 =
-            "\2\0\2\1\1\2\1\3\1\4\3\1\1\5\1\6" + "\1\7\1\10\1\11\1\12\1\13\1\14\1\15\5\0"
+        "\2\0\2\1\1\2\1\3\1\4\3\1\1\5\1\6" + "\1\7\1\10\1\11\1\12\1\13\1\14\1\15\5\0"
             + "\1\14\1\16\1\17\1\20\1\21\1\22\1\23\1\24" + "\1\0\1\25\1\0\1\25\4\0\1\26\1\27\2\0" + "\1\30";
 
     private static int[] zzUnpackAction() {
@@ -82,7 +86,7 @@ class Yylex {
         while (i < l) {
             int count = packed.charAt(i++);
             int value = packed.charAt(i++);
-            do result[j++] = value; while (--count > 0);
+            do { result[j++] = value; } while (--count > 0);
         }
         return j;
     }
@@ -93,7 +97,7 @@ class Yylex {
     private static final int[] ZZ_ROWMAP = zzUnpackRowMap();
 
     private static final String ZZ_ROWMAP_PACKED_0 =
-            "\0\0\0\33\0\66\0\121\0\154\0\207\0\66\0\242" + "\0\275\0\330\0\66\0\66\0\66\0\66\0\66\0\66"
+        "\0\0\0\33\0\66\0\121\0\154\0\207\0\66\0\242" + "\0\275\0\330\0\66\0\66\0\66\0\66\0\66\0\66"
             + "\0\363\0\u010e\0\66\0\u0129\0\u0144\0\u015f\0\u017a\0\u0195" + "\0\66\0\66\0\66\0\66\0\66\0\66\0\66\0\66"
             + "\0\u01b0\0\u01cb\0\u01e6\0\u01e6\0\u0201\0\u021c\0\u0237\0\u0252" + "\0\66\0\66\0\u026d\0\u0288\0\66";
 
@@ -118,42 +122,42 @@ class Yylex {
     /**
      * The transition table of the DFA
      */
-    private static final int ZZ_TRANS[] = { 2, 2, 3, 4, 2, 2, 2, 5, 2, 6, 2, 2, 7, 8, 2, 9, 2, 2, 2, 2, 2, 10, 11, 12,
+    private static final int ZZ_TRANS[] = {2, 2, 3, 4, 2, 2, 2, 5, 2, 6, 2, 2, 7, 8, 2, 9, 2, 2, 2, 2, 2, 10, 11, 12,
-                                            13, 14, 15, 16, 16, 16, 16, 16, 16, 16, 16, 17, 18, 16, 16, 16, 16, 16, 16,
+        13, 14, 15, 16, 16, 16, 16, 16, 16, 16, 16, 17, 18, 16, 16, 16, 16, 16, 16,
-                                            16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, -1, -1, -1, -1, -1, -1, -1, -1,
+        16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, 19, 20, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, 19, 20, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, 21, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, 21, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 22, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 23, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 23, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 16, 16, 16, 16, 16, 16, 16, 16, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 16, 16, 16, 16, 16, 16, 16, 16, -1,
-                                            -1, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, -1,
+        -1, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, 24, 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, 24, 25, 26, 27, 28, 29, 30, 31, 32, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 33, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 33, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 34, 35,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 34, 35,
-                                            -1, -1, 34, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, 34, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, 36, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 37, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 37, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 38, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 38, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 39, -1, 39, -1, 39, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 39, -1, 39, -1, 39, -1, -1, -1, -1,
-                                            -1, 39, 39, -1, -1, -1, -1, 39, 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, 39, 39, -1, -1, -1, -1, 39, 39, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, 33, -1, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 20, -1, -1, -1,
+        -1, 33, -1, 20, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 20, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, 35, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, 35, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 38, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 38, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, 40, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, 41, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-                                            -1, 42, -1, 42, -1, 42, -1, -1, -1, -1, -1, 42, 42, -1, -1, -1, -1, 42, 42,
+        -1, 42, -1, 42, -1, 42, -1, -1, -1, -1, -1, 42, 42, -1, -1, -1, -1, 42, 42,
-                                            -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, 43, -1, 43, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, 43, -1, 43, -1, -1, -1, -1, -1,
-                                            43, 43, -1, -1, -1, -1, 43, 43, -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, -1,
+        43, 43, -1, -1, -1, -1, 43, 43, -1, -1, -1, -1, -1, -1, -1, -1, -1, 44, -1,
-                                            44, -1, 44, -1, -1, -1, -1, -1, 44, 44, -1, -1, -1, -1, 44, 44, -1, -1, -1,
+        44, -1, 44, -1, -1, -1, -1, -1, 44, 44, -1, -1, -1, -1, 44, 44, -1, -1, -1,
-                                            -1, -1, -1, -1, -1, };
+        -1, -1, -1, -1, -1,};
 
     /**
      * error codes
@@ -163,10 +167,10 @@ class Yylex {
     private static final int ZZ_PUSHBACK_2BIG = 2;
     private static final int NIGTY = 90;
     /**
-     * error messages for the codes above 
+     * error messages for the codes above
      */
-	private static final String[] ZZ_ERROR_MSG = { "Unkown internal scanner error", "Error: could not match input",
+    private static final String[] ZZ_ERROR_MSG = {"Unkown internal scanner error", "Error: could not match input",
-                                                   "Error: pushback value was too large" };
+        "Error: pushback value was too large"};
 
     /**
      * ZZ_ATTRIBUTE[aState] contains the attributes of state <code>aState</code>
@@ -174,7 +178,7 @@ class Yylex {
     private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute();
 
     private static final String ZZ_ATTRIBUTE_PACKED_0 =
-            "\2\0\1\11\3\1\1\11\3\1\6\11\2\1\1\11" + "\5\0\10\11\1\0\1\1\1\0\1\1\4\0\2\11" + "\2\0\1\11";
+        "\2\0\1\11\3\1\1\11\3\1\6\11\2\1\1\11" + "\5\0\10\11\1\0\1\1\1\0\1\1\4\0\2\11" + "\2\0\1\11";
 
     private static int[] zzUnpackAttribute() {
         int[] result = new int[45];
@@ -185,50 +189,64 @@ class Yylex {
 
     private static int zzUnpackAttribute(String packed, int offset, int[] result) {
         int i = 0;
-        int j = offset; 
+        int j = offset;
         int l = packed.length();
         while (i < l) {
             int count = packed.charAt(i++);
             int value = packed.charAt(i++);
-            do result[j++] = value; while (--count > 0);
+            do { result[j++] = value; } while (--count > 0);
         }
         return j;
     }
 
-    /** the input device */
+    /**
+     * the input device
+     */
     private java.io.Reader zzReader;
 
-    /** the current state of the DFA */
+    /**
+     * the current state of the DFA
+     */
     private int zzState;
 
-    /** the current lexical state */
+    /**
+     * the current lexical state
+     */
     private int zzLexicalState = YYINITIAL;
 
     /**
-     * this buffer contains the current text to be matched and is
+     * this buffer contains the current text to be matched and is the source of the yytext() string
-     * the source of the yytext() string
      */
     private char zzBuffer[] = new char[ZZ_BUFFERSIZE];
 
-    /** the textposition at the last accepting state */
+    /**
+     * the textposition at the last accepting state
+     */
     private int zzMarkedPos;
 
-    /** the current text position in the buffer */
+    /**
+     * the current text position in the buffer
+     */
     private int zzCurrentPos;
 
-    /** startRead marks the beginning of the yytext() string in the buffer */
+    /**
+     * startRead marks the beginning of the yytext() string in the buffer
+     */
     private int zzStartRead;
 
     /**
-     * endRead marks the last character in the buffer, that has been read
+     * endRead marks the last character in the buffer, that has been read from input
-     * from input
      */
     private int zzEndRead;
 
-    /** the number of characters up to the start of the matched text */
+    /**
+     * the number of characters up to the start of the matched text
+     */
     private int yychar;
 
-    /** zzAtEOF == true <=> the scanner is at the EOF */
+    /**
+     * zzAtEOF == true <=> the scanner is at the EOF
+     */
     private boolean zzAtEOF;
 
     /**
@@ -241,8 +259,7 @@ class Yylex {
     }
 
     /**
-     * Creates a new scanner
+     * Creates a new scanner There is also a java.io.InputStream version of this constructor.
-     * There is also a java.io.InputStream version of this constructor.
      *
      * @param in the java.io.Reader to read input from.
      */
@@ -251,11 +268,10 @@ class Yylex {
     }
 
     /**
-     * Creates a new scanner.
+     * Creates a new scanner. There is also java.io.Reader version of this constructor.
-     * There is also java.io.Reader version of this constructor.
      *
      * @param in the java.io.Inputstream to read input from.
-     * @throws UnsupportedEncodingException 
+     * @throws UnsupportedEncodingException
      */
     Yylex(java.io.InputStream in) throws UnsupportedEncodingException {
         this(new java.io.InputStreamReader(in, Constants.ENCODE));
@@ -269,12 +285,12 @@ class Yylex {
      */
     private static char[] zzUnpackCMap(String packed) {
         char[] map = new char[0x10000];
-        int i = 0;  
+        int i = 0;
-        int j = 0;  
+        int j = 0;
         while (i < NIGTY) {
             int count = packed.charAt(i++);
             char value = packed.charAt(i++);
-            do map[j++] = value; while (--count > 0);
+            do { map[j++] = value; } while (--count > 0);
         }
         return map;
     }
@@ -287,26 +303,26 @@ class Yylex {
      */
     private boolean zzRefill() throws java.io.IOException {
 
-    /* first: make room (if you can) */
+        /* first: make room (if you can) */
         if (zzStartRead > 0) {
             System.arraycopy(zzBuffer, zzStartRead, zzBuffer, 0, zzEndRead - zzStartRead);
 
-      /* translate stored positions */
+            /* translate stored positions */
             zzEndRead -= zzStartRead;
             zzCurrentPos -= zzStartRead;
             zzMarkedPos -= zzStartRead;
             zzStartRead = 0;
         }
 
-    /* is the buffer big enough? */
+        /* is the buffer big enough? */
         if (zzCurrentPos >= zzBuffer.length) {
-      /* if not: blow it up */
+            /* if not: blow it up */
             char newBuffer[] = new char[zzCurrentPos * 2];
             System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length);
             zzBuffer = newBuffer;
         }
 
-    /* finally: fill the buffer with new input */
+        /* finally: fill the buffer with new input */
         int numRead = zzReader.read(zzBuffer, zzEndRead, zzBuffer.length - zzEndRead);
 
         if (numRead > 0) {
@@ -319,7 +335,7 @@ class Yylex {
             if (c == -1) {
                 return true;
             } else {
-                zzBuffer[zzEndRead++] = (char) c;
+                zzBuffer[zzEndRead++] = (char)c;
                 return false;
             }
         }
@@ -333,19 +349,17 @@ class Yylex {
      */
     public final void yyclose() throws java.io.IOException {
         zzAtEOF = true;
-        zzEndRead = zzStartRead; 
+        zzEndRead = zzStartRead;
 
         if (zzReader != null) {
-        	zzReader.close();
+            zzReader.close();
         }
     }
 
     /**
-     * Resets the scanner to read from a new input stream.
+     * Resets the scanner to read from a new input stream. Does not close the old reader. All internal variables are
-     * Does not close the old reader.
+     * reset, the old input stream <b>cannot</b> be reused (internal buffer is discarded and lost). Lexical state is set
-     * All internal variables are reset, the old input stream
+     * to <tt>ZZ_INITIAL</tt>.
-     * <b>cannot</b> be reused (internal buffer is discarded and lost).
-     * Lexical state is set to <tt>ZZ_INITIAL</tt>.
      *
      * @param reader the new input stream
      */
@@ -381,12 +395,10 @@ class Yylex {
     }
 
     /**
-     * Returns the character at position <tt>pos</tt> from the
+     * Returns the character at position <tt>pos</tt> from the matched text. It is equivalent to yytext().charAt(pos),
-     * matched text.
+     * but faster
-     * It is equivalent to yytext().charAt(pos), but faster
      *
-     * @param pos the position of the character to fetch.
+     * @param pos the position of the character to fetch. A value from 0 to yylength()-1.
-     *            A value from 0 to yylength()-1.
      * @return the character at position pos
      */
     public final char yycharat(int pos) {
@@ -401,14 +413,10 @@ class Yylex {
     }
 
     /**
-     * Reports an error that occured while scanning.
+     * Reports an error that occured while scanning. In a wellformed scanner (no or only correct usage of
-     * In a wellformed scanner (no or only correct usage of
+     * yypushback(int) and a match-all fallback rule) this method will only be called with things that "Can't Possibly
-     * yypushback(int) and a match-all fallback rule) this method
+     * Happen". If this method is called, something is seriously wrong (e.g. a JFlex bug producing a faulty scanner
-     * will only be called with things that "Can't Possibly Happen".
+     * etc.). Usual syntax/scanner level error handling should be done in error fallback rules.
-     * If this method is called, something is seriously wrong
-     * (e.g. a JFlex bug producing a faulty scanner etc.).
-     * Usual syntax/scanner level error handling should be done
-     * in error fallback rules.
      *
      * @param errorCode the code of the errormessage to display
      */
@@ -424,23 +432,22 @@ class Yylex {
     }
 
     /**
-     * Pushes the specified amount of characters back into the input stream.
+     * Pushes the specified amount of characters back into the input stream. They will be read again by then next call
-     * They will be read again by then next call of the scanning method
+     * of the scanning method
      *
-     * @param number the number of characters to be read again.
+     * @param number the number of characters to be read again. This number must not be greater than yylength()!
-     *               This number must not be greater than yylength()!
      */
     public void yypushback(int number) {
         if (number > yylength()) {
-        	zzScanError(ZZ_PUSHBACK_2BIG);
+            zzScanError(ZZ_PUSHBACK_2BIG);
         }
 
         zzMarkedPos -= number;
     }
 
     /**
-     * Resumes scanning until the next regular expression is matched,
+     * Resumes scanning until the next regular expression is matched, the end of input is encountered or an I/O-Error
-     * the end of input is encountered or an I/O-Error occurs.
+     * occurs.
      *
      * @return the next token
      * @throws java.io.IOException if any I/O-Error occurs
@@ -476,10 +483,9 @@ class Yylex {
             {
                 while (true) {
 
-					if (zzCurrentPosL < zzEndReadL) {
+                    if (zzCurrentPosL < zzEndReadL) {
-						zzInput = zzBufferL[zzCurrentPosL++];
+                        zzInput = zzBufferL[zzCurrentPosL++];
-					}
+                    } else if (zzAtEOF) {
-                    else if (zzAtEOF) {
                         zzInput = YYEOF;
                         break zzForAction;
                     } else {
@@ -500,18 +506,18 @@ class Yylex {
                         }
                     }
                     int zzNext = zzTransL[zzRowMapL[zzState] + zzCMapL[zzInput]];
-					if (zzNext == -1) {
+                    if (zzNext == -1) {
-						break zzForAction;
+                        break zzForAction;
-					}
+                    }
                     zzState = zzNext;
 
                     int zzAttributes = zzAttrL[zzState];
                     if ((zzAttributes & 1) == 1) {
                         zzAction = zzState;
                         zzMarkedPosL = zzCurrentPosL;
-						if ((zzAttributes & 8) == 8) {
+                        if ((zzAttributes & 8) == 8) {
-							break zzForAction;
+                            break zzForAction;
-						}
+                        }
                     }
 
                 }
@@ -519,7 +525,7 @@ class Yylex {
 
             // store back cached position
             zzMarkedPos = zzMarkedPosL;
-            
+
             switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
                 case 11: {
                     sb.append(yytext());
@@ -572,7 +578,8 @@ class Yylex {
                 case 33:
                     break;
                 case 1: {
-                    throw new ParseException(yychar, ParseException.ERROR_UNEXPECTED_CHAR, Character.valueOf(yycharat(0)));
+                    throw new ParseException(yychar, ParseException.ERROR_UNEXPECTED_CHAR,
+                        Character.valueOf(yycharat(0)));
                 }
                 case 34:
                     break;
@@ -614,7 +621,7 @@ class Yylex {
                 case 24: {
                     try {
                         int ch = Integer.parseInt(yytext().substring(2), 16);
-                        sb.append((char) ch);
+                        sb.append((char)ch);
                     } catch (Exception e) {
                         throw new ParseException(yychar, ParseException.ERROR_UNEXPECTED_EXCEPTION, e);
                     }

client/src/main/java/com/alibaba/nacos/client/logger/json/parser/Yytoken.java

@@ -20,62 +20,62 @@
 package com.alibaba.nacos.client.logger.json.parser;
 
 /**
- * @author FangYidong<fangyidong@yahoo.com.cn>
+ * @author FangYidong<fangyidong @ yahoo.com.cn>
  */
 public class Yytoken {
-	/**
+    /**
-	 * JSON primitive value: string,number,boolean,null
+     * JSON primitive value: string,number,boolean,null
-	 */
+     */
-	public static final int TYPE_VALUE=0;
+    public static final int TYPE_VALUE = 0;
-	public static final int TYPE_LEFT_BRACE=1;
+    public static final int TYPE_LEFT_BRACE = 1;
-	public static final int TYPE_RIGHT_BRACE=2;
+    public static final int TYPE_RIGHT_BRACE = 2;
-	public static final int TYPE_LEFT_SQUARE=3;
+    public static final int TYPE_LEFT_SQUARE = 3;
-	public static final int TYPE_RIGHT_SQUARE=4;
+    public static final int TYPE_RIGHT_SQUARE = 4;
-	public static final int TYPE_COMMA=5;
+    public static final int TYPE_COMMA = 5;
-	public static final int TYPE_COLON=6;
+    public static final int TYPE_COLON = 6;
-	/**
+    /**
-	 * end of file
+     * end of file
-	 */
+     */
-	public static final int TYPE_EOF=-1;
+    public static final int TYPE_EOF = -1;
-	
+
-	public int type=0;
+    public int type = 0;
-	public Object value=null;
+    public Object value = null;
-	
+
-	public Yytoken(int type,Object value){
+    public Yytoken(int type, Object value) {
-		this.type=type;
+        this.type = type;
-		this.value=value;
+        this.value = value;
-	}
+    }
-	
+
-	public String toString(){
+    public String toString() {
-		StringBuffer sb = new StringBuffer();
+        StringBuffer sb = new StringBuffer();
-		switch(type){
+        switch (type) {
-		case TYPE_VALUE:
+            case TYPE_VALUE:
-			sb.append("VALUE(").append(value).append(")");
+                sb.append("VALUE(").append(value).append(")");
-			break;
+                break;
-		case TYPE_LEFT_BRACE:
+            case TYPE_LEFT_BRACE:
-			sb.append("LEFT BRACE({)");
+                sb.append("LEFT BRACE({)");
-			break;
+                break;
-		case TYPE_RIGHT_BRACE:
+            case TYPE_RIGHT_BRACE:
-			sb.append("RIGHT BRACE(})");
+                sb.append("RIGHT BRACE(})");
-			break;
+                break;
-		case TYPE_LEFT_SQUARE:
+            case TYPE_LEFT_SQUARE:
-			sb.append("LEFT SQUARE([)");
+                sb.append("LEFT SQUARE([)");
-			break;
+                break;
-		case TYPE_RIGHT_SQUARE:
+            case TYPE_RIGHT_SQUARE:
-			sb.append("RIGHT SQUARE(])");
+                sb.append("RIGHT SQUARE(])");
-			break;
+                break;
-		case TYPE_COMMA:
+            case TYPE_COMMA:
-			sb.append("COMMA(,)");
+                sb.append("COMMA(,)");
-			break;
+                break;
-		case TYPE_COLON:
+            case TYPE_COLON:
-			sb.append("COLON(:)");
+                sb.append("COLON(:)");
-			break;
+                break;
-		case TYPE_EOF:
+            case TYPE_EOF:
-			sb.append("END OF FILE");
+                sb.append("END OF FILE");
-			break;
+                break;
-		default:
+            default:
-			break;
+                break;
-		}
+        }
-		return sb.toString();
+        return sb.toString();
-	}
+    }
 }

client/src/main/java/com/alibaba/nacos/client/logger/log4j/Log4jLogger.java

@@ -1,146 +0,0 @@
-/*
- * Copyright 1999-2018 Alibaba Group Holding Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.alibaba.nacos.client.logger.log4j;
-
-import org.apache.log4j.Level;
-
-import com.alibaba.nacos.client.logger.Logger;
-import com.alibaba.nacos.client.logger.option.Log4jActivateOption;
-import com.alibaba.nacos.client.logger.support.LoggerHelper;
-import com.alibaba.nacos.client.logger.support.LoggerSupport;
-import com.alibaba.nacos.client.logger.util.MessageUtil;
-
-
-/**
- * Log4jLogger
- * @author Nacos
- *
- */
-public class Log4jLogger extends LoggerSupport implements Logger {
-
-    private org.apache.log4j.Logger delegate;
-
-    public Log4jLogger(org.apache.log4j.Logger delegate) {
-        super(delegate);
-
-        if (delegate == null) {
-            throw new IllegalArgumentException("delegate Logger is null");
-        }
-        this.delegate = delegate;
-
-        this.activateOption = new Log4jActivateOption(delegate);
-    }
-
-    @Override
-    public void debug(String context, String message) {
-        if (isDebugEnabled()) {
-            message = LoggerHelper.getResourceBundleString(getProductName(), message);
-            delegate.debug(MessageUtil.getMessage(context, message));
-        }
-    }
-
-    @Override
-    public void debug(String context, String format, Object... args) {
-        if (isDebugEnabled()) {
-            format = LoggerHelper.getResourceBundleString(getProductName(), format);
-            delegate.debug(MessageUtil.getMessage(context, MessageUtil.formatMessage(format, args)));
-        }
-    }
-
-    @Override
-    public void info(String context, String message) {
-        if (isInfoEnabled()) {
-            message = LoggerHelper.getResourceBundleString(getProductName(), message);
-            delegate.info(MessageUtil.getMessage(context, message));
-        }
-    }
-
-    @Override
-    public void info(String context, String format, Object... args) {
-        if (isInfoEnabled()) {
-            format = LoggerHelper.getResourceBundleString(getProductName(), format);
-            delegate.info(MessageUtil.getMessage(context, MessageUtil.formatMessage(format, args)));
-        }
-    }
-
-    @Override
-    public void warn(String message, Throwable t) {
-        if (isWarnEnabled()) {
-            message = LoggerHelper.getResourceBundleString(getProductName(), message);
-            delegate.warn(MessageUtil.getMessage(null, message), t);
-        }
-    }
-
-    @Override
-    public void warn(String context, String message) {
-        if (isWarnEnabled()) {
-            message = LoggerHelper.getResourceBundleString(getProductName(), message);
-            delegate.warn(MessageUtil.getMessage(context, message));
-        }
-    }
-
-    @Override
-    public void warn(String context, String format, Object... args) {
-        if (isWarnEnabled()) {
-            format = LoggerHelper.getResourceBundleString(getProductName(), format);
-            delegate.warn(MessageUtil.getMessage(context, MessageUtil.formatMessage(format, args)));
-        }
-    }
-
-    @Override
-    public void error(String context, String errorCode, String message) {
-        if (isErrorEnabled()) {
-            message = LoggerHelper.getResourceBundleString(getProductName(), message);
-            delegate.error(MessageUtil.getMessage(context, errorCode, message));
-        }
-    }
-
-    @Override
-    public void error(String context, String errorCode, String message, Throwable t) {
-        if (isErrorEnabled()) {
-            message = LoggerHelper.getResourceBundleString(getProductName(), message);
-            delegate.error(MessageUtil.getMessage(context, errorCode, message), t);
-        }
-    }
-
-    @Override
-    public void error(String context, String errorCode, String format, Object... args) {
-        if (isErrorEnabled()) {
-            format = LoggerHelper.getResourceBundleString(getProductName(), format);
-            delegate.error(MessageUtil.getMessage(context, errorCode, MessageUtil.formatMessage(format, args)));
-        }
-    }
-
-    @Override
-    public boolean isDebugEnabled() {
-        return delegate.isDebugEnabled();
-    }
-
-    @Override
-    public boolean isInfoEnabled() {
-        return delegate.isInfoEnabled();
-    }
-
-    @Override
-    public boolean isWarnEnabled() {
-        return delegate.isEnabledFor(Level.WARN);
-    }
-
-    @Override
-    public boolean isErrorEnabled() {
-        return delegate.isEnabledFor(Level.ERROR);
-    }
-}

client/src/main/java/com/alibaba/nacos/client/logger/log4j/Log4jLoggerFactory.java

@@ -1,53 +0,0 @@
-/*
- * Copyright 1999-2018 Alibaba Group Holding Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.alibaba.nacos.client.logger.log4j;
-
-import org.apache.log4j.LogManager;
-
-import com.alibaba.nacos.client.logger.Logger;
-import com.alibaba.nacos.client.logger.nop.NopLogger;
-import com.alibaba.nacos.client.logger.support.ILoggerFactory;
-import com.alibaba.nacos.client.logger.support.LogLog;
-
-/**
- * Log4jLogger Factory
- * @author Nacos
- *
- */
-public class Log4jLoggerFactory implements ILoggerFactory {
-
-    public Log4jLoggerFactory() throws ClassNotFoundException {
-        Class.forName("org.apache.log4j.Level");
-    }
-
-    public Logger getLogger(Class<?> clazz) {
-        try {
-            return new Log4jLogger(LogManager.getLogger(clazz));
-        } catch (Throwable t) {
-            LogLog.error("Failed to get Log4jLogger", t);
-            return new NopLogger();
-        }
-    }
-
-    public Logger getLogger(String name) {
-        try {
-            return new Log4jLogger(LogManager.getLogger(name));
-        } catch (Throwable t) {
-            LogLog.error("Failed to get Log4jLogger", t);
-            return new NopLogger();
-        }
-    }
-}