SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sync docs from master to gh-pages

Browse Source
This commit is contained in:
buildmaster
2019-09-09 16:11:26 +00:00
parent 164090cabf
commit 65e034d90b
4 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
reference/html/README.html
View File

@@ -186,6 +186,9 @@ Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon), Circuit Brea
<li>
<p>supports Ribbon and Zuul</p>
</li>
<li>
<p>supports Spring Cloud LoadBalancer</p>
</li>
</ul>
</div>
</li>

19
reference/html/index.html
View File

@@ -446,7 +446,7 @@ spring.cloud.consul.discovery.management-tags</pre>
<div class="sect2">
<h3 id="_looking_up_services"><a class="link" href="#_looking_up_services">Looking up services</a></h3>
<div class="sect3">
<h4 id="_using_ribbon"><a class="link" href="#_using_ribbon">Using Ribbon</a></h4>
<h4 id="_using_load_balancer"><a class="link" href="#_using_load_balancer">Using Load-balancer</a></h4>
<div class="paragraph">
<p>Spring Cloud has support for <a href="https://github.com/spring-cloud/spring-cloud-netflix/blob/master/docs/src/main/asciidoc/spring-cloud-netflix.adoc#spring-cloud-feign">Feign</a> (a REST client builder) and also <a href="https://github.com/spring-cloud/spring-cloud-netflix/blob/master/docs/src/main/asciidoc/spring-cloud-netflix.adoc#spring-cloud-ribbon">Spring <code>RestTemplate</code></a>
for looking up services using the logical service names/ids instead of physical URLs. Both Feign and the discovery-aware RestTemplate utilize <a href="https://cloud.spring.io/spring-cloud-netflix/single/spring-cloud-netflix.html#spring-cloud-ribbon">Ribbon</a> for client-side load balancing.</p>
@@ -481,6 +481,23 @@ public String getFirstProduct() {
you use property <code>spring.cloud.consul.discovery.datacenters.STORES=dc-west</code> where <code>STORES</code> is the service name/id and <code>dc-west</code> is the datacenter
where the STORES service lives.</p>
</div>
<div class="admonitionblock tip">
<table>
<tr>
<td class="icon">
<i class="fa icon-tip" title="Tip"></i>
</td>
<td class="content">
Spring Cloud now also offers support for
<a href="https://cloud.spring.io/spring-cloud-commons/reference/html/#_spring_resttemplate_as_a_load_balancer_client">Spring Cloud LoadBalancer</a>.
</td>
</tr>
</table>
</div>
<div class="paragraph">
<p>As Spring Cloud Ribbon is now under maintenance, we suggest you set <code>spring.cloud.loadbalancer.ribbon.enabled</code>
to <code>false</code>, so that <code>BlockingLoadBalancerClient</code> is used instead of <code>RibbonLoadBalancerClient</code>.</p>
</div>
</div>
<div class="sect3">
<h4 id="_using_the_discoveryclient"><a class="link" href="#_using_the_discoveryclient">Using the DiscoveryClient</a></h4>

3
reference/html/sagan-index.html
View File

@@ -123,6 +123,9 @@ $(addBlockSwitches);
<p>Supports Ribbon, the client side load-balancer via Spring Cloud Netflix</p>
</li>
<li>
<p>Supports Spring Cloud LoadBalancer - a client side load-balancer provided by the Spring Cloud project</p>
</li>
<li>
<p>Supports Zuul, a dynamic router and filter via Spring Cloud Netflix</p>
</li>
<li>

19
reference/html/spring-cloud-consul.html
View File

@@ -446,7 +446,7 @@ spring.cloud.consul.discovery.management-tags</pre>
<div class="sect2">
<h3 id="_looking_up_services"><a class="link" href="#_looking_up_services">Looking up services</a></h3>
<div class="sect3">
<h4 id="_using_ribbon"><a class="link" href="#_using_ribbon">Using Ribbon</a></h4>
<h4 id="_using_load_balancer"><a class="link" href="#_using_load_balancer">Using Load-balancer</a></h4>
<div class="paragraph">
<p>Spring Cloud has support for <a href="https://github.com/spring-cloud/spring-cloud-netflix/blob/master/docs/src/main/asciidoc/spring-cloud-netflix.adoc#spring-cloud-feign">Feign</a> (a REST client builder) and also <a href="https://github.com/spring-cloud/spring-cloud-netflix/blob/master/docs/src/main/asciidoc/spring-cloud-netflix.adoc#spring-cloud-ribbon">Spring <code>RestTemplate</code></a>
for looking up services using the logical service names/ids instead of physical URLs. Both Feign and the discovery-aware RestTemplate utilize <a href="https://cloud.spring.io/spring-cloud-netflix/single/spring-cloud-netflix.html#spring-cloud-ribbon">Ribbon</a> for client-side load balancing.</p>
@@ -481,6 +481,23 @@ public String getFirstProduct() {
you use property <code>spring.cloud.consul.discovery.datacenters.STORES=dc-west</code> where <code>STORES</code> is the service name/id and <code>dc-west</code> is the datacenter
where the STORES service lives.</p>
</div>
<div class="admonitionblock tip">
<table>
<tr>
<td class="icon">
<i class="fa icon-tip" title="Tip"></i>
</td>
<td class="content">
Spring Cloud now also offers support for
<a href="https://cloud.spring.io/spring-cloud-commons/reference/html/#_spring_resttemplate_as_a_load_balancer_client">Spring Cloud LoadBalancer</a>.
</td>
</tr>
</table>
</div>
<div class="paragraph">
<p>As Spring Cloud Ribbon is now under maintenance, we suggest you set <code>spring.cloud.loadbalancer.ribbon.enabled</code>
to <code>false</code>, so that <code>BlockingLoadBalancerClient</code> is used instead of <code>RibbonLoadBalancerClient</code>.</p>
</div>
</div>
<div class="sect3">
<h4 id="_using_the_discoveryclient"><a class="link" href="#_using_the_discoveryclient">Using the DiscoveryClient</a></h4>