Skip to content

Commit db7aaf0

Browse files
authored
Merge branch 'master' into kl-doc
2 parents b1a6d24 + 1815912 commit db7aaf0

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

docs/en/deployment/distributed-deployment-guide.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,8 @@ export JAVA_OPTS="-server -Xms4096m -Xmx4096m -Xss256k -XX:MetaspaceSize=128m -X
557557

558558
#### 2.2.3.1 nacos-discovery
559559

560+
> For version 1.8.0 and above
561+
560562
Enable external nacos service registry to replace built-in eureka
561563

562564
> Note: need repackage
@@ -582,6 +584,8 @@ nacos.discovery.context-path=
582584

583585
#### 2.2.3.2 consul-discovery
584586

587+
> For version 1.9.0 and above
588+
585589
Enable external Consul service registry to replace built-in eureka
586590

587591
##### 2.2.3.2.1 For version 2.1.0 and above
@@ -621,6 +625,8 @@ spring.cloud.consul.port=8500
621625

622626
#### 2.2.3.3 zookeeper-discovery
623627

628+
> For version 2.0.0 and above
629+
624630
Enable external Zookeeper service registry to replace built-in eureka
625631

626632
##### 2.2.3.3.1 For version 2.1.0 and above
@@ -682,6 +688,8 @@ admin.serverPort
682688

683689
#### 2.2.3.4 custom-defined-discovery
684690

691+
> For version 2.0.0 and above
692+
685693
Enable custom-defined-discovery to replace built-in eureka
686694

687695
##### 2.2.3.4.1 For version 2.1.0 and above

docs/zh/deployment/distributed-deployment-guide.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,8 @@ export JAVA_OPTS="-server -Xms4096m -Xmx4096m -Xss256k -XX:MetaspaceSize=128m -X
532532

533533
#### 2.2.3.1 nacos-discovery
534534

535+
> 适用于1.8.0及以上版本
536+
535537
启用外部nacos服务注册中心替换内置eureka
536538

537539
> 注意:需要重新打包
@@ -555,6 +557,8 @@ nacos.discovery.context-path=
555557

556558
#### 2.2.3.2 consul-discovery
557559

560+
> 适用于1.9.0及以上版本
561+
558562
启用外部Consul服务注册中心替换内置eureka
559563

560564
##### 2.2.3.2.1 2.1.0 及以上版本
@@ -593,12 +597,12 @@ spring.cloud.consul.port=8500
593597

594598
#### 2.2.3.3 zookeeper-discovery
595599

600+
> 适用于2.0.0及以上版本
601+
596602
启用外部Zookeeper服务注册中心替换内置eureka
597603

598604
##### 2.2.3.3.1 2.1.0 及以上版本
599605

600-
601-
602606
1. 修改`apollo-configservice-x.x.x-github.zip``apollo-adminservice-x.x.x-github.zip`解压后的`config/application.properties`,取消注释,把
603607
```properties
604608
#spring.profiles.active=github,zookeeper-discovery
@@ -644,6 +648,8 @@ admin.serverPort
644648

645649
#### 2.2.3.4 custom-defined-discovery
646650

651+
> 适用于2.0.0及以上版本
652+
647653
启用custom-defined-discovery替换内置eureka
648654

649655
##### 2.2.3.4.1 2.1.0 及以上版本

0 commit comments

Comments
 (0)