Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
wenxuwan committed Jun 15, 2023
2 parents c734e88 + 87af334 commit 5935433
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 deletions.
12 changes: 7 additions & 5 deletions .github/dead_link_check_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
{
"pattern": "^https://docs.buf.build/"
},
{
"pattern":"^https://techhenzy.com/proxy-webassembly-architecture/"
},
{
"pattern": "^#"
}
Expand All @@ -33,13 +36,12 @@
"replacement": "http://localhost:3000/#/en/"
}
],
"timeout": "3s",
"timeout": "10s",
"retryOn429": true,
"retryCount": 2,
"fallbackRetryDelay": "1s",
"fallbackRetryDelay": "10s",
"aliveStatusCodes": [
200,
401,
403
200,
401
]
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Layotto enriches the <a href="https://landscape.cncf.io/serverless">CNCF CLOUD N

| Platform | Link |
| :----------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| 💬 [DingTalk](https://www.dingtalk.com/en) (preferred) | Search the group number: 31912621 or scan the QR code below <br> <img src="https://gw.alipayobjects.com/mdn/rms_5891a1/afts/img/A*HUKsSrFthtUAAAAAAAAAAAAAARQnAQ" height="200px"> |
| 💬 [DingTalk](https://www.dingtalk.com/en) (preferred) | Search the group number: 31912621 or scan the QR code below <br> <img src="https://img.alicdn.com/imgextra/i2/O1CN01SjbQiK21NgcAxArxq_!!6000000006973-0-tps-900-912.jpg" height="200px"> |

[comment]: <> (| 💬 [Wechat]&#40;https://www.wechat.com/en/&#41; | Scan the QR code below and she will invite you into the wechat group <br> <img src="/img/wechat-group.jpg" height="200px">)

Expand Down
2 changes: 1 addition & 1 deletion docs/en/component_specs/configuration/apollo.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Example: configs/config_apollo.json
| metadata.open_api_user | Y | User accessing apollo open-api |

## How to start Apollo
There is no need to deploy the apollo server yourself to use the demo in the project. The demo will use the demo environment provided by apollo http://106.54.227.205/
There is no need to deploy the apollo server yourself to use the demo in the project. The demo will use the demo environment provided by apollo http://81.68.181.139

If you want to deploy apollo yourself, you can refer to [apollo official document](https://www.apolloconfig.com/#/zh/deployment/quick-start)

Expand Down
2 changes: 1 addition & 1 deletion docs/en/start/configuration/start-apollo.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The architecture of this example is shown in the figure below. The processes sta

## Step 1.Deploy Apollo (optional)

You can skip this step, you don't need to deploy the apollo server yourself to use this demo. This demo will use the demo environment provided by [apollo official](https://github.com/apolloconfig/apollo): http://106.54.227.205/
You can skip this step, you don't need to deploy the apollo server yourself to use this demo. This demo will use the demo environment provided by [apollo official](https://github.com/apolloconfig/apollo): http://81.68.181.139

If you have deployed apollo yourself, you can modify Layotto's config file (e.g. configs/config_apollo.json in the project) to change the apollo server address to your own.

Expand Down
2 changes: 1 addition & 1 deletion docs/zh/component_specs/configuration/apollo.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
| metadata.open_api_user | Y | 访问apollo open-api的用户 |

## 怎么启动Apollo
使用项目中的demo无需自己部署apollo服务器。demo会使用apollo官方 提供的演示环境http://106.54.227.205/
使用项目中的demo无需自己部署apollo服务器。demo会使用apollo官方 提供的演示环境http://81.68.181.139

如果您想自己部署apollo,可以参考[apollo 官方文档](https://www.apolloconfig.com/#/zh/deployment/quick-start)

Expand Down
2 changes: 1 addition & 1 deletion docs/zh/start/configuration/start-apollo.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

## 第一步:部署apollo配置中心(可选)

您可以跳过这一步,使用本demo无需自己部署apollo服务器。本demo会使用[apollo官方](https://github.com/apolloconfig/apollo) 提供的演示环境http://106.54.227.205/
您可以跳过这一步,使用本demo无需自己部署apollo服务器。本demo会使用[apollo官方](https://github.com/apolloconfig/apollo) 提供的演示环境http://81.68.181.139

如果您自己部署了apollo,可以修改Layotto的[config文件](https://github.com/mosn/layotto/blob/main/configs/config_apollo.json) ,将apollo服务器地址改成您自己的。

Expand Down
3 changes: 1 addition & 2 deletions docs/zh/start/file/minio.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ docker-compose up -d
> [!TIP|label: 不适合 Windows 用户]
> Layotto 在 Windows 下会编译失败。建议 Windows 用户使用 docker-compose 部署
#### step 1.1. 启动 MinIO 服务

您可以使用 Docker 启动本地MinIO服务, 参考[官方文档](http://docs.minio.org.cn/docs/master/minio-docker-quickstart-guide)
您可以使用 Docker 启动本地MinIO服务, 参考[官方文档](https://min.io/docs/minio/container/index.html)

```shell
docker run -d -p 9000:9000 -p 9090:9090 --name minio \
Expand Down

0 comments on commit 5935433

Please sign in to comment.