Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/yangyshdan/Sermant into …
Browse files Browse the repository at this point in the history
…develop
  • Loading branch information
yangyshdan committed Dec 27, 2022
2 parents aa5843c + 7584140 commit c02038e
Show file tree
Hide file tree
Showing 92 changed files with 248 additions and 10,484 deletions.
124 changes: 0 additions & 124 deletions CONTRIBUTING.md

This file was deleted.

32 changes: 3 additions & 29 deletions README-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,7 @@ mvn clean package -Dmaven.test.skip -Pexample

### 启动Sermant

启动 **Sermant** backend, **准备zookeeper**

```shell
# Run under Linux
java -jar sermant-agent-x.x.x/server/sermant/sermant-backend-x.x.x.jar
```

```shell
# Run under Windows
java -jar sermant-agent-x.x.x\server\sermant\sermant-backend-x.x.x.jar
```

启动 **Sermant** demo 应用:
准备和启动zookeeper,启动 **Sermant** demo 应用:

```shell
# Run under Linux
Expand All @@ -83,31 +71,17 @@ java -cp sermant-example\demo-application\target\demo-application.jar ^

![pic](docs/binary-docs/backend_sermant_info.png)

#### 有关详细信息,请参阅 [服务注册和发现快速开始说明](docs/QuickStart.md)

## 插件功能列表
| 功能名称 | 阶段 | 微服务框架组件支持列表 |
|:-----|:-----|:-----|
| [限流降级](docs/user-guide/flowcontrol/flowcontrol-zh.md) | Beta | SpringBoot 1.2.x - 2.6.x <br> SpringWebMvc 4.1.3.RELEASE - 5.3.x<br>Dubbo 2.6.x-2.7.x |
| [服务注册](docs/user-guide/registry/document-zh.md) | GC | SpringBoot 1.5.x - 2.6.2 <br> SpringCloud Edgware.SR2 - 2021.0.0<br>Dubbo 2.6.x-2.7.x |
| [服务双注册迁移](docs/user-guide/registry/spring-cloud-registry-migiration-zh.md) | GC | SpringBoot 1.5.x - 2.6.2 <br/> SpringCloud Edgware.SR2 - 2021.0.0<br>Dubbo 2.6.x-2.7.x |
| [负载均衡](docs/user-guide/loadbalancer/document-zh.md) | Beta | SpringBoot 1.5.x - 2.6.2 <br/> SpringCloud Edgware.SR2 - 2021.0.0 |
| [标签路由](docs/user-guide/router/document-zh.md) | Beta | SpringBoot 1.5.x - 2.6.2 <br/>SpringCloud Edgware.SR2 - 2021.0.0<br/>Dubbo 2.6.x-2.7.x |
| [优雅上下线](docs/user-guide/graceful/document-zh.md) | Beta | SpringBoot 1.5.x - 2.6.2 <br/> SpringCloud Edgware.SR2 - 2021.0.0 |
| [动态配置](docs/user-guide/dynamic-config/document-zh.md) | Beta | SpringBoot 1.5.x - 2.6.2<br>spring-cloud-starter-alibaba-nacos-config 1.5.0.RELEASE+<br>spring-cloud-starter-zookeeper-config 1.2.0.RELEASE+ |
| [服务监控](docs/user-guide/server-monitor/document-zh.md) | Alpha | All |

## 更多文档

请参阅 [Sermant 开发和使用介绍](docs/README.md)
请参阅 [Sermant文档](https://sermant.io/zh/document/)

## License

Sermant 采用 [Apache 2.0 License.](/LICENSE)

## 贡献指南

请阅读[贡献指南](CONTRIBUTING.md)以了解如何贡献项目。
请阅读[贡献指南](https://sermant.io/zh/document/CONTRIBUTING.html)以了解如何贡献项目。

## 声明

Expand Down
33 changes: 3 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,7 @@ mvn clean package -Dmaven.test.skip -Pexample

### Start Sermant

Start **Sermant** backend, **Prepare zookeeper**.

```shell
# Run under Linux
java -jar sermant-agent-x.x.x/server/sermant/sermant-backend-x.x.x.jar
```

```shell
# Run under Windows
java -jar sermant-agent-x.x.x\server\sermant\sermant-backend-x.x.x.jar
```

Start **Sermant** demo project:
Prepare and start zookeeper, start **Sermant** demo project:

```shell
# Run under Linux
Expand All @@ -82,32 +70,17 @@ Check running status of Sermant. In this example, open the browser and navigate

![pic](docs/binary-docs/backend_sermant_info.png)

#### Please refer to the [Service Register & Discovery Plugin QuickStart](docs/QuickStart.md) for details.

## Plugin Features

| Feature | Phase | Microservice Framework Supported |
|:---- | :---- |:----|
| [FlowControl](docs/user-guide/flowcontrol/flowcontrol.md) | Beta | SpringBoot 1.2.x - 2.6.x <br> SpringWebMvc 4.1.3.RELEASE - 5.3.x<br>Dubbo 2.6.x-2.7.x |
| [Service Registration](docs/user-guide/registry/document.md) | GC | SpringBoot 1.5.x - 2.6.2 <br> SpringCloud Edgware.SR2 - 2021.0.0<br>Dubbo 2.6.x-2.7.x |
| [Service Dual Registration and Migration](docs/user-guide/registry/spring-cloud-registry-migiration.md) | GC | SpringBoot 1.5.x - 2.6.2 <br/> SpringCloud Edgware.SR2 - 2021.0.0<br>Dubbo 2.6.x-2.7.x |
| [Loadbalancer](docs/user-guide/loadbalancer/document.md) | Beta | SpringBoot 1.5.x - 2.6.2 <br/> SpringCloud Edgware.SR2 - 2021.0.0 |
| [Tag Router](docs/user-guide/router/document.md) | Beta | SpringBoot 1.5.x - 2.6.2 <br/>SpringCloud Edgware.SR2 - 2021.0.0<br/>Dubbo 2.6.x-2.7.x |
| [Graceful Online/Offline](docs/user-guide/graceful/document.md) | Beta | SpringBoot 1.5.x - 2.6.2 <br/> SpringCloud Edgware.SR2 - 2021.0.0 |
| [Dynamic Configuration](docs/user-guide/dynamic-config/document.md) | Beta | SpringBoot 1.5.x - 2.6.2<br>spring-cloud-starter-alibaba-nacos-config 1.5.0.RELEASE+<br>spring-cloud-starter-zookeeper-config 1.2.0.RELEASE+ |
| [Server Monitor](docs/user-guide/server-monitor/document.md) | Alpha | All |

## More Documents to Follow

Please refer to the [Development Guide](docs/README.md)
Please refer to the [Sermant Document](https://sermant.io/en/document/)

## License

Sermant adopts [Apache 2.0 License.](/LICENSE)

## How to Contribute

Please read [Contribute Guide](CONTRIBUTING.md) to refer how to join the contribution.
Please read [Contribute Guide](https://sermant.io/en/document/CONTRIBUTING.html) to refer how to join the contribution.

## Declaration

Expand Down
33 changes: 0 additions & 33 deletions docs/FAQ-zh.md

This file was deleted.

33 changes: 0 additions & 33 deletions docs/FAQ.md

This file was deleted.

76 changes: 0 additions & 76 deletions docs/QuickStart-zh.md

This file was deleted.

Loading

0 comments on commit c02038e

Please sign in to comment.