Skip to content

Commit

Permalink
Merge pull request alibaba#5 from nacos-group/master
Browse files Browse the repository at this point in the history
Merge request
  • Loading branch information
caojiele authored May 28, 2019
2 parents d4049f8 + f0c6a69 commit da1756a
Show file tree
Hide file tree
Showing 13 changed files with 1,838 additions and 1,814 deletions.
7 changes: 7 additions & 0 deletions docs/en-us/FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
- [Nacos报401错误](#3.10)
- [Nacos权重不生效](#3.11)
- [Nacos如何扩缩容](#3.12)
- [Nacos客户端修改日志级别](#3.13)

- Nacos原理问题

Expand Down Expand Up @@ -131,4 +132,10 @@ Nacos控制台上编辑权重, 目前从SpringCloud客户端和Dubbo客户端都

目前支持修改cluster.conf文件的方式进行扩缩容, 改完后无需重启, Server会自动刷新到文件新内容.

<h4 id="3.13">Nacos客户端修改日志级别</h4>

配置-D参数com.alibaba.nacos.naming.log.level设置naming客户端的日志级别,例如设置为error:
`-Dcom.alibaba.nacos.naming.log.level=error`
同样的,-D参数com.alibaba.nacos.config.log.level用来设置config客户端的日志级别。

## Nacos原理问题
2 changes: 1 addition & 1 deletion docs/en-us/quick-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Or double-click the startup.cmd run file.

### Service discovery

`curl -X GET 'http://127.0.0.1:8848/nacos/v1/ns/instances?serviceName=nacos.naming.serviceName'`
`curl -X GET 'http://127.0.0.1:8848/nacos/v1/ns/instance/list?serviceName=nacos.naming.serviceName'`

### Publish config

Expand Down
7 changes: 7 additions & 0 deletions docs/zh-cn/FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
- [Nacos报401错误](#3.10)
- [Nacos权重不生效](#3.11)
- [Nacos如何扩缩容](#3.12)
- [Nacos客户端修改日志级别](#3.13)

- Nacos原理问题

Expand Down Expand Up @@ -131,4 +132,10 @@ Nacos控制台上编辑权重, 目前从SpringCloud客户端和Dubbo客户端都

目前支持修改cluster.conf文件的方式进行扩缩容, 改完后无需重启, Server会自动刷新到文件新内容.

<h4 id="3.13">Nacos客户端修改日志级别</h4>

配置-D参数com.alibaba.nacos.naming.log.level设置naming客户端的日志级别,例如设置为error:
`-Dcom.alibaba.nacos.naming.log.level=error`
同样的,-D参数com.alibaba.nacos.config.log.level用来设置config客户端的日志级别。

## Nacos原理问题
2 changes: 1 addition & 1 deletion docs/zh-cn/quick-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ cd distribution/target/nacos-server-$version/nacos/bin

### 服务发现

`curl -X GET 'http://127.0.0.1:8848/nacos/v1/ns/instances?serviceName=nacos.naming.serviceName'`
`curl -X GET 'http://127.0.0.1:8848/nacos/v1/ns/instance/list?serviceName=nacos.naming.serviceName'`

### 发布配置

Expand Down
5 changes: 5 additions & 0 deletions en-us/docs/FAQ.html
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
<li><a href="#3.10">Nacos报401错误</a></li>
<li><a href="#3.11">Nacos权重不生效</a></li>
<li><a href="#3.12">Nacos如何扩缩容</a></li>
<li><a href="#3.13">Nacos客户端修改日志级别</a></li>
</ul>
</li>
<li>
Expand Down Expand Up @@ -109,6 +110,10 @@ <h4 id="3.11">Nacos权重不生效</h4>
<p>Nacos控制台上编辑权重, 目前从SpringCloud客户端和Dubbo客户端都没有打通, 所以不能生效. 对于SpringCloud客户端, 应用可以实现Ribbon的负载均衡器来进行权重过滤.</p>
<h4 id="3.12">Nacos如何扩缩容</h4>
<p>目前支持修改cluster.conf文件的方式进行扩缩容, 改完后无需重启, Server会自动刷新到文件新内容.</p>
<h4 id="3.13">Nacos客户端修改日志级别</h4>
<p>配置-D参数com.alibaba.nacos.naming.log.level设置naming客户端的日志级别,例如设置为error:
<code>-Dcom.alibaba.nacos.naming.log.level=error</code>
同样的,-D参数com.alibaba.nacos.config.log.level用来设置config客户端的日志级别。</p>
<h2>Nacos原理问题</h2>
</div></div></section><footer class="footer-container"><div class="footer-body"><img src="/img/nacos_gray.png"/><div class="cols-container"><div class="col col-12"><h3>Vision</h3><p>By providing an easy-to-use service infrastructure such as dynamic service discovery, service configuration, service sharing and management and etc., Nacos help users better construct, deliver and manage their own service platform, reuse and composite business service faster and deliver value of business innovation more quickly so as to win market for users in the era of cloud native and in all cloud environments, such as private, mixed, or public clouds.</p></div><div class="col col-6"><dl><dt>Documentation</dt><dd><a href="/en-us/docs/what-is-nacos.html" target="_self">Overview</a></dd><dd><a href="/en-us/docs/quick-start.html" target="_self">Quick start</a></dd><dd><a href="/en-us/docs/contributing.html" target="_self">Developer guide</a></dd></dl></div><div class="col col-6"><dl><dt>Resources</dt><dd><a href="/en-us/community/index.html" target="_self">Community</a></dd><dd><a href="https://www.aliyun.com/product/acm?source_type=nacos_pc_20181219" target="_self">Cloud Service ACM</a></dd><dd><a href="https://www.aliyun.com/product/edas?source_type=nacos_pc_20181219" target="_self">Cloud Service EDAS</a></dd><dd><a href="https://www.aliyun.com/product/ahas?source_type=nacos_pc_20190225" target="_self">Cloud Service AHAS</a></dd></dl></div></div><div class="copyright"><span>@ 2018 The Nacos Authors | An Alibaba Middleware (Aliware) Project</span></div></div></footer></div></div>
<script src="https://f.alicdn.com/react/15.4.1/react-with-addons.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion en-us/docs/FAQ.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion en-us/docs/quick-start.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h2>4.Service &amp; Configuration Management</h2>
<h3>Service registration</h3>
<p><code>curl -X POST 'http://127.0.0.1:8848/nacos/v1/ns/instance?serviceName=nacos.naming.serviceName&amp;ip=20.18.7.10&amp;port=8080'</code></p>
<h3>Service discovery</h3>
<p><code>curl -X GET 'http://127.0.0.1:8848/nacos/v1/ns/instances?serviceName=nacos.naming.serviceName'</code></p>
<p><code>curl -X GET 'http://127.0.0.1:8848/nacos/v1/ns/instance/list?serviceName=nacos.naming.serviceName'</code></p>
<h3>Publish config</h3>
<p><code>curl -X POST &quot;http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=nacos.cfg.dataId&amp;group=test&amp;content=helloWorld&quot;</code></p>
<h3>Get config</h3>
Expand Down
2 changes: 1 addition & 1 deletion en-us/docs/quick-start.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"filename": "quick-start.md",
"__html": "<p>This topic is about how to set up and use Nacos.</p>\n<h2>1.Prerequisites</h2>\n<p>Before you begin, install the following:</p>\n<ol>\n<li>64bit OS: Linux/Unix/Mac/Windows supported, Linux/Unix/Mac recommended.</li>\n<li>64bit JDK 1.8+: <a href=\"http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html\">downloads</a>, <a href=\"https://docs.oracle.com/cd/E19182-01/820-7851/inst_cli_jdk_javahome_t/\">JAVA_HOME settings</a>.</li>\n<li>Maven 3.2.x+: <a href=\"https://maven.apache.org/download.cgi\">downloads</a>, <a href=\"https://maven.apache.org/settings.html\">settings</a>.</li>\n</ol>\n<h2>2.Download &amp; Build from Release</h2>\n<p>There are two ways to get Nacos.</p>\n<h3>1)Download source code from Github</h3>\n<pre><code class=\"language-bash\">unzip nacos-source.zip\n<span class=\"hljs-built_in\">cd</span> nacos/\nmvn -Prelease-nacos clean install -U \n<span class=\"hljs-built_in\">cd</span> nacos/distribution/target/nacos-server-0.8.0/nacos/bin\n</code></pre>\n<h3>2)Download run package</h3>\n<p><a href=\"https://github.com/alibaba/nacos/releases/download/0.9.0/nacos-server-0.9.0.zip\">zip package Download</a></p>\n<p><a href=\"https://github.com/alibaba/nacos/releases/download/0.9.0/nacos-server-0.9.0.tar.gz\">tar.gz package Download</a></p>\n<pre><code class=\"language-bash\"> unzip nacos-server-0.9.0.zip OR tar -xvf nacos-server-0.9.0.tar.gz\n <span class=\"hljs-built_in\">cd</span> nacos/bin\n</code></pre>\n<h2>3.Start Server</h2>\n<h3>Linux/Unix/Mac</h3>\n<p>Run the following command to sart(standalone means non-cluster mode):</p>\n<p><code>sh startup.sh -m standalone</code></p>\n<h3>Windows</h3>\n<p>Run the following command to start:</p>\n<p><code>cmd startup.cmd</code></p>\n<p>Or double-click the startup.cmd run file.</p>\n<h2>4.Service &amp; Configuration Management</h2>\n<h3>Service registration</h3>\n<p><code>curl -X POST 'http://127.0.0.1:8848/nacos/v1/ns/instance?serviceName=nacos.naming.serviceName&amp;ip=20.18.7.10&amp;port=8080'</code></p>\n<h3>Service discovery</h3>\n<p><code>curl -X GET 'http://127.0.0.1:8848/nacos/v1/ns/instances?serviceName=nacos.naming.serviceName'</code></p>\n<h3>Publish config</h3>\n<p><code>curl -X POST &quot;http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=nacos.cfg.dataId&amp;group=test&amp;content=helloWorld&quot;</code></p>\n<h3>Get config</h3>\n<p><code>curl -X GET &quot;http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=nacos.cfg.dataId&amp;group=test&quot;</code></p>\n<h2>5.Shutdown Servers</h2>\n<h3>Linux/Unix/Mac</h3>\n<p><code>sh shutdown.sh</code></p>\n<h3>Windows</h3>\n<p><code>cmd shutdown.cmd</code></p>\n",
"__html": "<p>This topic is about how to set up and use Nacos.</p>\n<h2>1.Prerequisites</h2>\n<p>Before you begin, install the following:</p>\n<ol>\n<li>64bit OS: Linux/Unix/Mac/Windows supported, Linux/Unix/Mac recommended.</li>\n<li>64bit JDK 1.8+: <a href=\"http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html\">downloads</a>, <a href=\"https://docs.oracle.com/cd/E19182-01/820-7851/inst_cli_jdk_javahome_t/\">JAVA_HOME settings</a>.</li>\n<li>Maven 3.2.x+: <a href=\"https://maven.apache.org/download.cgi\">downloads</a>, <a href=\"https://maven.apache.org/settings.html\">settings</a>.</li>\n</ol>\n<h2>2.Download &amp; Build from Release</h2>\n<p>There are two ways to get Nacos.</p>\n<h3>1)Download source code from Github</h3>\n<pre><code class=\"language-bash\">unzip nacos-source.zip\n<span class=\"hljs-built_in\">cd</span> nacos/\nmvn -Prelease-nacos clean install -U \n<span class=\"hljs-built_in\">cd</span> nacos/distribution/target/nacos-server-0.8.0/nacos/bin\n</code></pre>\n<h3>2)Download run package</h3>\n<p><a href=\"https://github.com/alibaba/nacos/releases/download/0.9.0/nacos-server-0.9.0.zip\">zip package Download</a></p>\n<p><a href=\"https://github.com/alibaba/nacos/releases/download/0.9.0/nacos-server-0.9.0.tar.gz\">tar.gz package Download</a></p>\n<pre><code class=\"language-bash\"> unzip nacos-server-0.9.0.zip OR tar -xvf nacos-server-0.9.0.tar.gz\n <span class=\"hljs-built_in\">cd</span> nacos/bin\n</code></pre>\n<h2>3.Start Server</h2>\n<h3>Linux/Unix/Mac</h3>\n<p>Run the following command to sart(standalone means non-cluster mode):</p>\n<p><code>sh startup.sh -m standalone</code></p>\n<h3>Windows</h3>\n<p>Run the following command to start:</p>\n<p><code>cmd startup.cmd</code></p>\n<p>Or double-click the startup.cmd run file.</p>\n<h2>4.Service &amp; Configuration Management</h2>\n<h3>Service registration</h3>\n<p><code>curl -X POST 'http://127.0.0.1:8848/nacos/v1/ns/instance?serviceName=nacos.naming.serviceName&amp;ip=20.18.7.10&amp;port=8080'</code></p>\n<h3>Service discovery</h3>\n<p><code>curl -X GET 'http://127.0.0.1:8848/nacos/v1/ns/instance/list?serviceName=nacos.naming.serviceName'</code></p>\n<h3>Publish config</h3>\n<p><code>curl -X POST &quot;http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=nacos.cfg.dataId&amp;group=test&amp;content=helloWorld&quot;</code></p>\n<h3>Get config</h3>\n<p><code>curl -X GET &quot;http://127.0.0.1:8848/nacos/v1/cs/configs?dataId=nacos.cfg.dataId&amp;group=test&quot;</code></p>\n<h2>5.Shutdown Servers</h2>\n<h3>Linux/Unix/Mac</h3>\n<p><code>sh shutdown.sh</code></p>\n<h3>Windows</h3>\n<p><code>cmd shutdown.cmd</code></p>\n",
"link": "/en-us/docs/quick-start.html",
"meta": {}
}
Loading

0 comments on commit da1756a

Please sign in to comment.