From 1d53d760d8fe87cf928247688621074bb0a86b8c Mon Sep 17 00:00:00 2001 From: John Date: Thu, 19 Dec 2019 15:38:34 +0800 Subject: [PATCH] README/DONATOR update; improve ghttp --- DONATOR.MD | 63 ++++++++++++++++++-------------- README.MD | 9 ++++- README_ZH.MD | 8 ++-- net/ghttp/ghttp_server_router.go | 11 +++++- version.go | 2 +- 5 files changed, 57 insertions(+), 36 deletions(-) diff --git a/DONATOR.MD b/DONATOR.MD index b591ec219..49b4ce464 100644 --- a/DONATOR.MD +++ b/DONATOR.MD @@ -1,34 +1,41 @@ # Donators -| Name | Channel | Amount -|---|---|--- -|[hailaz](https://gitee.com/hailaz)|gitee|￥20.00 -|[ireadx](https://github.com/ireadx)|alipay|￥301.00 -|[mg91](https://gitee.com/mg91)|gitee|￥10.00 -|[pibigstar](https://github.com/pibigstar)|alipay|￥10.00 -|[tiangenglan](https://gitee.com/tiangenglan)|gitee|￥30.00 -|[wxkj](https://gitee.com/wxkj)|wechat|￥10.00 -|[zhuhuan12](https://gitee.com/zhuhuan12)|gitee|￥50.00 -|[zfan_codes](https://gitee.com/zfan_codes)|gitee|￥10.00 -|[arden](https://github.com/arden)|alipay|￥10.00 -|[macnie](https://www.macnie.com)|wechat|￥100.00 -|lah|wechat|￥100.00 -|x*z|wechat|￥20.00 -|潘兄|wechat|￥100.00 -|Fly的狐狸|wechat|￥100.00 -|全|alipay|￥100.00 -|东东|wechat|￥100.00 -|严宇轩|alipay|￥99.99 -|土豆相公|alipay|￥66.60 -|Hades|alipay|￥66.66 -|蔡蔡|wechat|￥666.00 -|上海金保证网络科技|bank|￥2000.00 -|[foxhack](https://github.com/foxhack)|wechat|￥20.00 -|*栈|wechat|￥5.00 -|*络|wechat|￥10.00 -|R*s|wechat|￥18.88 -|粟*e|wechat|￥50.00 +| Name | Channel | Amount | Comment +|---|---|--- | --- +|[hailaz](https://gitee.com/hailaz)|gitee|￥20.00 | +|[ireadx](https://github.com/ireadx)|alipay|￥301.00 | +|[mg91](https://gitee.com/mg91)|gitee|￥10.00 | +|[pibigstar](https://github.com/pibigstar)|alipay|￥10.00 | +|[tiangenglan](https://gitee.com/tiangenglan)|gitee|￥30.00 | +|[wxkj](https://gitee.com/wxkj)|wechat|￥10.00 | +|[zhuhuan12](https://gitee.com/zhuhuan12)|gitee|￥50.00 | +|[zfan_codes](https://gitee.com/zfan_codes)|gitee|￥10.00 | +|[arden](https://github.com/arden)|alipay|￥10.00 | +|[macnie](https://www.macnie.com)|wechat|￥100.00 | +|lah|wechat|￥100.00 | +|x*z|wechat|￥20.00 | +|潘兄|wechat|￥100.00 | +|Fly的狐狸|wechat|￥100.00 | +|全|alipay|￥100.00 | +|东东|wechat|￥100.00 | +|严宇轩|alipay|￥99.99 | +|土豆相公|alipay|￥66.60 | +|Hades|alipay|￥66.66 | +|蔡蔡|wechat|￥666.00 | gf越来越强 +|上海金保证网络科技|bank|￥2000.00 | +|[foxhack](https://github.com/foxhack)|wechat|￥20.00 | +|*栈|wechat|￥5.00 | +|*络|wechat|￥10.00| +|M*e|wechat|￥20.00| +|*G|wechat|￥10.00| +|E*_|wechat|￥10.00| +|A*y|wechat|￥1.00| 感谢大佬goframe +|K*e|wechat|￥168.00| 感谢老大 +|*雨|wechat|￥100.00| +|*洁|wechat|￥10.00|赞助你肥宅快乐水 +|R*s|wechat|￥18.88| 谢谢GF！辛苦了！ +|粟*e|wechat|￥50.00| diff --git a/README.MD b/README.MD index 461d972c2..eb620b985 100644 --- a/README.MD +++ b/README.MD @@ -9,7 +9,12 @@ English | [简体中文](README_ZH.MD) -`GF(GoFrame)` is a modular, full-featured and production-ready application development framework of golang. Providing a series of core components and dozens of practical modules, such as: memcache, configure, validator, logging, array/queue/set/map containers, timer/timing tasks, file/memory lock, object pool, database ORM, etc. Supporting web server integrated with router, cookie, session, middleware, logger, template, https, hooks, rewrites and many more features. +`GF(GoFrame)` is a modular, full-featured and production-ready application development framework of golang. +Providing a series of core components and dozens of practical modules, +such as: memcache, configure, validator, logging, array/queue/set/map containers, +timer/timing tasks, file/memory lock, object pool, database ORM, etc. +Supporting web server integrated with router, cookie, session, middleware, logger, +template, https, hooks, rewrites and many more features. # Installation @@ -23,7 +28,7 @@ require github.com/gogf/gf latest # Limitation ``` -golang version >= 1.11 +golang version >= 1.10 ``` # Documentation diff --git a/README_ZH.MD b/README_ZH.MD index ec8bafa9d..e4144d118 100644 --- a/README_ZH.MD +++ b/README_ZH.MD @@ -8,8 +8,11 @@ [English](README.MD) | 简体中文 -`GF(Go Frame)`是一款模块化、高性能、生产级Go应用开发框架。提供了常用的核心开发组件，如：缓存、日志、文件、时间、队列、数组、集合、字符串、定时器、命令行、文件锁、内存锁、对象池、连接池、资源管理、数据校验、数据编码、文件监控、定时任务、数据库ORM、TCP/UDP组件、进程管理/通信、 -并发安全容器等等。并提供了Web服务开发的系列核心组件，如：Router、Cookie、Session、Middleware、服务注册、配置管理、模板引擎等等，支持热重启、热更新、多域名、多端口、多服务、HTTPS、Rewrite等特性。 +`GF(Go Frame)`是一款模块化、高性能、生产级的Go基础开发框架。实现了比较完善的基础设施建设，包括常用的核心开发组件， +如：缓存、日志、文件、时间、队列、数组、集合、字符串、定时器、命令行、文件锁、内存锁、对象池、连接池、资源管理、数据校验、数据编码、文件监控、 +定时任务、数据库ORM、TCP/UDP组件、进程管理/通信、并发安全容器等等。 +并提供了Web服务开发的系列核心组件，如：Router、Cookie、Session、Middleware、服务注册、配置管理、模板引擎等等， +支持热重启、热更新、多域名、多端口、多服务、HTTPS、Rewrite等特性。 # 特点 @@ -18,7 +21,6 @@ * 简便及可维护性为宗旨； * 详尽的开发文档及示例； * 完善的本地中文化支持； -* 致力于项目的通用方案； * 更适合企业及团队使用； * 更多请查阅文档及源码； diff --git a/net/ghttp/ghttp_server_router.go b/net/ghttp/ghttp_server_router.go index cccb86bef..9f7d7ddf1 100644 --- a/net/ghttp/ghttp_server_router.go +++ b/net/ghttp/ghttp_server_router.go @@ -265,8 +265,15 @@ func (s *Server) compareRouterPriority(newItem *handlerItem, oldItem *handlerIte return true } - // 最后新的规则比旧的规则优先级高(路由覆盖) - return true + // 如果是服务路由，那么新的规则比旧的规则优先级高(路由覆盖) + if newItem.itemType == gHANDLER_TYPE_HANDLER || + newItem.itemType == gHANDLER_TYPE_OBJECT || + newItem.itemType == gHANDLER_TYPE_CONTROLLER { + return true + } + + // 如果是其他路由(HOOK/中间件)，那么新的规则比旧的规则优先级低，使得注册相同路由则顺序执行 + return false } // 将pattern（不带method和domain）解析成正则表达式匹配以及对应的query字符串 diff --git a/version.go b/version.go index b575e8289..3c3687e34 100644 --- a/version.go +++ b/version.go @@ -1,4 +1,4 @@ package gf -const VERSION = "v1.10.0" +const VERSION = "v1.10.1" const AUTHORS = "john"