liubao68 closed pull request #2: 修改启用HTTP2的错误， h2应该为http2
URL: https://github.com/apache/incubator-servicecomb-docs/pull/2
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/java-chassis-reference/zh_CN/SUMMARY.md
b/java-chassis-reference/zh_CN/SUMMARY.md
index af622f5..c4e9607 100644
--- a/java-chassis-reference/zh_CN/SUMMARY.md
+++ b/java-chassis-reference/zh_CN/SUMMARY.md
@@ -26,6 +26,7 @@
* [REST over Servlet](build-provider/protocol/rest-over-servlet.md)
* [REST over Vertx](build-provider/protocol/rest-over-vertx.md)
* [Highway RPC协议](build-provider/protocol/highway-rpc.md)
+ * [使用HTTP2通信](build-provider/protocol/http2.md)
* [程序启动逻辑](build-provider/bootup.md)
* [微服务实例之间的逻辑隔离关系](build-provider/definition/isolate-relationship.md)
* [Access Log配置](build-provider/access-log-configuration.md)
@@ -63,7 +64,6 @@
* [微服务安全](catalog/security.md)
* [使用TLS通信](security/tls.md)
* [使用RSA认证](security/shi-yong-rsa-ren-zheng.md)
- * [使用HTTP2通信](security/http2.md)
* [在Spring Boot中使用java chassis](using-java-chassis-in-spring-boot.md)
* [提供的组件说明](using-java-chassis-in-spring-boot/components-for-spring-boot.md)
* [JAVA应用方式开发步骤](using-java-chassis-in-spring-boot/java-application.md)
diff --git a/java-chassis-reference/zh_CN/security/http2.md
b/java-chassis-reference/zh_CN/build-provider/protocol/http2.md
similarity index 60%
rename from java-chassis-reference/zh_CN/security/http2.md
rename to java-chassis-reference/zh_CN/build-provider/protocol/http2.md
index f2babf3..1998f13 100644
--- a/java-chassis-reference/zh_CN/security/http2.md
+++ b/java-chassis-reference/zh_CN/build-provider/protocol/http2.md
@@ -7,25 +7,25 @@
与外部服务通信相关的配置写在microservice.yaml文件中。
* 启用h2\(Http2 + TLS\)进行通信
-
服务端在配置服务监听地址时，可以通过在地址后面追加`?sslEnabled=true`开启TLS通信，具体介绍见[使用TLS通信](https://huawei-servicecomb.gitbooks.io/developerguide/content/security/tls.html
"使用TLS通信")章节。然后再追加`&protocol=h2`启用h2通信。示例如下：
+
服务端在配置服务监听地址时，可以通过在地址后面追加`?sslEnabled=true`开启TLS通信，具体介绍见[使用TLS通信](../../security/tls.md)章节。然后再追加`&protocol=http2`启用h2通信。示例如下：
```yaml
servicecomb:
rest:
- address: 0.0.0.0:8080?sslEnabled=true&protocol=h2
+ address: 0.0.0.0:8080?sslEnabled=true&protocol=http2
highway:
- address: 0.0.0.0:7070?sslEnabled=true&protocol=h2
+ address: 0.0.0.0:7070?sslEnabled=true&protocol=http2
```
* 启用h2c\(Http2 without TLS\)进行通信
- 服务端在配置服务监听地址时，可以通过在地址后面追加`?protocol=h2`启用h2c通信。示例如下：
+ 服务端在配置服务监听地址时，可以通过在地址后面追加`?protocol=http2`启用h2c通信。示例如下：
```yaml
servicecomb:
rest:
- address: 0.0.0.0:8080?protocol=h2
+ address: 0.0.0.0:8080?protocol=http2
highway:
- address: 0.0.0.0:7070?protocol=h2
+ address: 0.0.0.0:7070?protocol=http2
```
* 客户端会通过从服务中心读取服务端地址中的配置来使用http2进行通信。
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
