Merge pull request #828 from bfenetworks/release/v1.3.0

Release/v1.3.0

ADOPTERS.md

@@ -1,3 +1,39 @@
-See https://www.bfe-networks.net/en_us/#users . 
+Please [reply the issue](https://github.com/bfenetworks/bfe/issues/748) if you want to be listed here.
 
-Please [create an issue](https://github.com/bfenetworks/bfe/issues/new?&title=New%20BFE%20User) if you want to be listed there.
+Some of our users include:
+
+* [Baidu](https://www.baidu.com)
+
+* [CCTV](https://www.cctv.com)
+
+* [China Life](https://www.chinalife.com.cn)
+
+* [China Merchants Bank](https://www.cmbchina.com)
+
+* [Duxiaoman Financial](https://www.duxiaoman.com)
+
+* [Haier](https://www.haier.com)
+
+* [Postal Savings Bank of China](https://www.psbc.com)
+
+* [Resolink](https://www.crresolink.com.cn)
+
+* [Safesoft](http://www.safesoftcorp.com)
+
+* [Shenzhen Stock Exchange](http://www.szse.cn)
+
+* [Sichuan Airlines](https://www.sichuanair.com)
+
+* [SPD Bank](https://www.spdb.com.cn)
+
+* [State Grid](http://www.sgcc.com.cn)
+
+* [Sunbox](http://www.sunboxsoft.com)
+
+* [USTC](https://www.ustc.edu.cn)
+
+* [Xixuetong](http://www.xixuetong.com)
+
+* [Yillion Bank](https://www.yillionbank.com)
+
+* [360](https://www.so.com)

CHANGELOG.md

@@ -10,6 +10,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.3.0] - 2021-09-16
+
+### Added
+- Support basic route rules that are similar to k8s ingress rules
+- Documents optimization
+
+### Changed
+- Ignore GREASE values for JA3 fingerprint
+
+
 ## [v1.2.0] - 2021-06-21
 
 ### Added
@@ -252,6 +262,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Flexible plugin framework to extend functionality. Based on the framework, developer can add new features rapidly
 - Detailed built-in metrics available for service status monitor
 
+[v1.3.0]: https://github.com/bfenetworks/bfe/compare/v1.2.0...v1.3.0
 [v1.2.0]: https://github.com/bfenetworks/bfe/compare/v1.1.0...v1.2.0
 [v1.1.0]: https://github.com/bfenetworks/bfe/compare/v1.0.0...v1.1.0
 [v1.0.0]: https://github.com/bfenetworks/bfe/compare/v0.12.0...v1.0.0

CONTRIBUTORS.md

@@ -70,9 +70,12 @@
 |          | 0xflotus |
 |          | calify |
 |          | Gii16 |
+|          | lancoLiu |
+|          | mingjliu9 |
 |          | MoonShining |
 |          | odidev |
 |          | pirDOL |
+|          | qloog |
 |          | tianlan2011 |
 |          | u5surf |
 |          | xiaocongwjb |

README-CN.md

@@ -0,0 +1,72 @@
+# BFE
+
+[English](README.md) | 中文
+
+[![GitHub](https://img.shields.io/github/license/bfenetworks/bfe)](https://github.com/bfenetworks/bfe/blob/develop/LICENSE)
+[![Travis](https://img.shields.io/travis/com/bfenetworks/bfe)](https://travis-ci.com/bfenetworks/bfe)
+[![Go Report Card](https://goreportcard.com/badge/github.com/bfenetworks/bfe)](https://goreportcard.com/report/github.com/bfenetworks/bfe)
+[![GoDoc](https://godoc.org/github.com/bfenetworks/bfe?status.svg)](https://godoc.org/github.com/bfenetworks/bfe/bfe_module)
+[![Snap Status](https://build.snapcraft.io/badge/bfenetworks/bfe.svg)](https://build.snapcraft.io/user/bfenetworks/bfe)
+[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3209/badge)](https://bestpractices.coreinfrastructure.org/projects/3209)
+[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fbfenetworks%2Fbfe.svg?type=shield)](https://app.fossa.com/reports/1f05f9f0-ac3d-486e-8ba9-ad95dabd4768)
+[![CLA assistant](https://cla-assistant.io/readme/badge/bfenetworks/bfe)](https://cla-assistant.io/bfenetworks/bfe)
+[![Slack Widget](https://img.shields.io/badge/join-us%20on%20slack-gray.svg?longCache=true&logo=slack&colorB=green)](https://slack.cncf.io)
+
+BFE是百度开源的现代化七层负载均衡系统
+
+## 特性及优点
+- 丰富协议支持：支持HTTP、HTTPS、SPDY、HTTP/2、WebSocket、TLS、gRPC、FastCGI等
+- 基于请求内容的路由：支持高级条件表达式定制转发规则，转发规则易于理解及维护
+- 高级负载均衡：支持全局/分布式负载均衡，实现就近访问、跨可用区容灾及过载保护等
+- 灵活的模块框架：支持高效率定制开发第三方扩展模块
+- 一流的可见性：提供丰富详尽的监控指标，提供各类日志供问题诊断、数据分析及可视化
+[了解更多详情](https://www.bfe-networks.net/zh_cn/introduction/overview/)
+
+## 开始使用
+- [编译及运行](docs/zh_cn/installation/install_from_source.md)
+
+## 运行测试
+- 请参考[编译及运行](docs/zh_cn/installation/install_from_source.md)
+
+## 文档
+- [英文版](https://www.bfe-networks.net/en_us/ABOUT/)
+- [中文版](https://www.bfe-networks.net/zh_cn/ABOUT/)
+
+## 书籍
+
+- [《深入理解BFE》](https://github.com/baidu/bfe-book) ：介绍网络接入的相关技术原理，说明BFE的设计思想，以及如何基于BFE搭建现代化的网络接入平台。现已开放全文阅读。
+
+## 参与贡献
+
+- 请首先在[issue列表](http://github.com/bfenetworks/bfe/issues)中创建一个issue
+- 如有必要，请联系项目维护者/负责人进行进一步讨论
+- 请遵循golang编程规范
+- 详情请参阅[参与贡献指南](CONTRIBUTING.md)
+
+## 作者
+- 项目维护者: [MAINTAINERS](MAINTAINERS.md)
+- 项目贡献者: [CONTRIBUTORS](CONTRIBUTORS.md)
+
+## 社区交流
+- [开源BFE用户论坛](https://github.com/bfenetworks/bfe/discussions)
+
+- **开源BFE微信公众号**：扫码关注公众号“BFE开源项目”，及时获取项目最新信息和技术分享
+
+  <table>
+  <tr>
+  <td><img src="./docs/images/qrcode_for_gh.jpg" width="100"></td>
+  </tr>
+  </table>
+
+- **开源BFE用户微信群**：扫码加入，探讨和分享对BFE的建议、使用心得、疑问等
+
+  <table>
+  <tr>
+  <td><img src="https://bfeopensource.bj.bcebos.com/wechatQRCode.png" width="100"></td>
+  </tr>
+  </table>
+
+- **开源BFE开发者微信群**: [发送邮件](mailto:[email protected])说明您的微信号及贡献(例如PR/Issue)，我们将及时邀请您加入
+
+## 许可
+BFE基于Apache 2.0许可证，详见[LICENSE](LICENSE)文件说明

README.md

@@ -1,5 +1,8 @@
 # BFE
 
+English | [中文](README-CN.md)
+
+
 [![GitHub](https://img.shields.io/github/license/bfenetworks/bfe)](https://github.com/bfenetworks/bfe/blob/develop/LICENSE)
 [![Travis](https://img.shields.io/travis/com/bfenetworks/bfe)](https://travis-ci.com/bfenetworks/bfe)
 [![Go Report Card](https://goreportcard.com/badge/github.com/bfenetworks/bfe)](https://goreportcard.com/report/github.com/bfenetworks/bfe)
@@ -40,7 +43,7 @@ BFE is a modern layer 7 load balancer from baidu.
 - Contributors: [CONTRIBUTORS](CONTRIBUTORS.md)
 
 ## Communication
-- BFE community on Slack: [Sign up](https://join.slack.com/t/bfe-networks/shared_invite/zt-cn04xsqr-j7LDFmPkCuCZ39OLcHlMBA) and join channels on topics that interest you.
+- BFE community on Slack: [Sign up](https://slack.cncf.io/) CNCF Slack and join bfe channel.
 - BFE developer group on WeChat: [Send a request mail](mailto:[email protected]) with your WeChat ID and a contribution you've made to BFE(such as a PR/Issue). We will invite you right away.
 
 ## License

VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

bfe_config/bfe_conf/conf_basic.go

@@ -42,7 +42,7 @@ type ConfigBasic struct {
 	HttpsPort   int // listen port for https
 	MonitorPort int // web server port for monitor
 	MaxCpus     int // number of max cpus to use
-	AcceptNum   int // number of accept groutine for each listenr, default 1
+	AcceptNum   int // number of accept goroutine for each listener, default 1
 
 	// settings of layer-4 load balancer
 	Layer4LoadBalancer string