Skip to content

Commit 4fe5f4c

Browse files
YurunsoftYurunsoft
committed
3.0，启动！
1 parent 5d2eeb9 commit 4fe5f4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+238
-237
lines changed

‎.github/workflows/mirror.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

1010
jobs:
1111
gitee:
12-
if: github.repository == 'imiphp/imi' && (github.ref == 'refs/heads/2.1')
12+
if: github.repository == 'imiphp/imi' && (github.ref == 'refs/heads/3.0')
1313
runs-on: ubuntu-20.04
1414
steps:
1515
- uses: ahmadnassri/action-workflow-queue@v1

‎.github/workflows/split-repository.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: split repository
33
on:
44
push:
55
branches:
6-
- "2.1"
6+
- "3.0"
77
release:
88
types: [published]
99

‎README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33
<p align="center">
44
<a href="https://www.imiphp.com" target="_blank">
5-
<img src="https://cdn.jsdelivr.net/gh/imiphp/imi@2.1/res/logo.png" alt="imi" />
5+
<img src="https://cdn.jsdelivr.net/gh/imiphp/imi@3.0/res/logo.png" alt="imi" />
66
</a>
77
</p>
88

99
[![Latest Version](https://img.shields.io/packagist/v/imiphp/imi.svg)](https://packagist.org/packages/imiphp/imi)
10-
![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/imiphp/imi/ci.yml?branch=2.1)
10+
![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/imiphp/imi/ci.yml?branch=3.0)
1111
[![Php Version](https://img.shields.io/badge/php-%3E=7.4-brightgreen.svg)](https://secure.php.net/)
1212
[![Swoole Version](https://img.shields.io/badge/swoole-%3E=4.8.0-brightgreen.svg)](https://github.com/swoole/swoole-src)
13-
[![imi Doc](https://img.shields.io/badge/docs-passing-green.svg)](https://doc.imiphp.com/v2.1/)
13+
[![imi Doc](https://img.shields.io/badge/docs-passing-green.svg)](https://doc.imiphp.com/v3.0/)
1414
[![imi License](https://img.shields.io/badge/license-MulanPSL%202.0-brightgreen.svg)](https://github.com/imiphp/imi/blob/master/LICENSE)
1515
[![star](https://gitee.com/yurunsoft/IMI/badge/star.svg?theme=gvp)](https://gitee.com/yurunsoft/IMI/stargazers)
16-
[![codecov](https://codecov.io/github/imiphp/imi/branch/2.1/graph/badge.svg?token=YrNRQgbRe2)](https://codecov.io/github/imiphp/imi)
16+
[![codecov](https://codecov.io/github/imiphp/imi/branch/3.0/graph/badge.svg?token=YrNRQgbRe2)](https://codecov.io/github/imiphp/imi)
1717

1818
## 介绍
1919

@@ -75,19 +75,19 @@ imi 框架进阶教程——五子棋游戏开发(免费7集全)<https://space.b
7575

7676
## 开始使用
7777

78-
创建 Http Server 项目：`composer create-project imiphp/project-http:~2.1.0`
78+
创建 Http Server 项目：`composer create-project imiphp/project-http:~3.0.0`
7979

80-
创建 WebSocket Server 项目：`composer create-project imiphp/project-websocket:~2.1.0`
80+
创建 WebSocket Server 项目：`composer create-project imiphp/project-websocket:~3.0.0`
8181

82-
创建 TCP Server 项目：`composer create-project imiphp/project-tcp:~2.1.0`
82+
创建 TCP Server 项目：`composer create-project imiphp/project-tcp:~3.0.0`
8383

84-
创建 UDP Server 项目：`composer create-project imiphp/project-udp:~2.1.0`
84+
创建 UDP Server 项目：`composer create-project imiphp/project-udp:~3.0.0`
8585

86-
创建 gRPC 项目：`composer create-project imiphp/project-grpc:~2.1.0`
86+
创建 gRPC 项目：`composer create-project imiphp/project-grpc:~3.0.0`
8787

88-
创建 MQTT Server 项目：`composer create-project imiphp/project-mqtt:~2.1.0`
88+
创建 MQTT Server 项目：`composer create-project imiphp/project-mqtt:~3.0.0`
8989

90-
[完全开发手册](https://doc.imiphp.com/v2.1/)
90+
[完全开发手册](https://doc.imiphp.com/v3.0/)
9191

9292
## 运行环境
9393

@@ -153,4 +153,4 @@ imi 遵循木兰宽松许可证(Mulan PSL v2) 开源协议发布，并提供免
153153

154154
提交 `Pull Request` 到本仓库，你可以成为 imi 的贡献者！
155155

156-
参与框架开发教程详见：<https://doc.imiphp.com/v2.1/adv/devp.html>
156+
参与框架开发教程详见：<https://doc.imiphp.com/v3.0/adv/devp.html>

‎doc/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# 项目介绍
22

3-
![imi logo](https://cdn.jsdelivr.net/gh/imiphp/imi@2.1/res/logo.png)
3+
![imi logo](https://cdn.jsdelivr.net/gh/imiphp/imi@3.0/res/logo.png)
44

5-
[![Latest Version](https://img.shields.io/packagist/v/imiphp/imi.svg)](https://packagist.org/packages/imiphp/imi) ![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/imiphp/imi/ci.yml?branch=2.1) [![Php Version](https://img.shields.io/badge/php-%3E=7.4-brightgreen.svg)](https://secure.php.net/) [![Swoole Version](https://img.shields.io/badge/swoole-%3E=4.8.0-brightgreen.svg)](https://github.com/swoole/swoole-src) [![imi Doc](https://img.shields.io/badge/docs-passing-green.svg)](/v2.1/) [![imi License](https://img.shields.io/badge/license-MulanPSL%202.0-brightgreen.svg)](https://github.com/imiphp/imi/blob/master/LICENSE) [![star](https://gitee.com/yurunsoft/IMI/badge/star.svg?theme=gvp)](https://gitee.com/yurunsoft/IMI/stargazers)
5+
[![Latest Version](https://img.shields.io/packagist/v/imiphp/imi.svg)](https://packagist.org/packages/imiphp/imi) ![GitHub Workflow Status (branch)](https://img.shields.io/github/actions/workflow/status/imiphp/imi/ci.yml?branch=3.0) [![Php Version](https://img.shields.io/badge/php-%3E=7.4-brightgreen.svg)](https://secure.php.net/) [![Swoole Version](https://img.shields.io/badge/swoole-%3E=4.8.0-brightgreen.svg)](https://github.com/swoole/swoole-src) [![imi Doc](https://img.shields.io/badge/docs-passing-green.svg)](/v3.0/) [![imi License](https://img.shields.io/badge/license-MulanPSL%202.0-brightgreen.svg)](https://github.com/imiphp/imi/blob/master/LICENSE) [![star](https://gitee.com/yurunsoft/IMI/badge/star.svg?theme=gvp)](https://gitee.com/yurunsoft/IMI/stargazers)
66

77
## 介绍
88

@@ -64,19 +64,19 @@ imi 框架进阶教程——五子棋游戏开发(免费7集全)<https://space.b
6464

6565
## 开始使用
6666

67-
创建 Http Server 项目：`composer create-project imiphp/project-http:~2.1.0`
67+
创建 Http Server 项目：`composer create-project imiphp/project-http:~3.0.0`
6868

69-
创建 WebSocket Server 项目：`composer create-project imiphp/project-websocket:~2.1.0`
69+
创建 WebSocket Server 项目：`composer create-project imiphp/project-websocket:~3.0.0`
7070

71-
创建 TCP Server 项目：`composer create-project imiphp/project-tcp:~2.1.0`
71+
创建 TCP Server 项目：`composer create-project imiphp/project-tcp:~3.0.0`
7272

73-
创建 UDP Server 项目：`composer create-project imiphp/project-udp:~2.1.0`
73+
创建 UDP Server 项目：`composer create-project imiphp/project-udp:~3.0.0`
7474

75-
创建 gRPC 项目：`composer create-project imiphp/project-grpc:~2.1.0`
75+
创建 gRPC 项目：`composer create-project imiphp/project-grpc:~3.0.0`
7676

77-
创建 MQTT Server 项目：`composer create-project imiphp/project-mqtt:~2.1.0`
77+
创建 MQTT Server 项目：`composer create-project imiphp/project-mqtt:~3.0.0`
7878

79-
[完全开发手册](/v2.1/)
79+
[完全开发手册](/v3.0/)
8080

8181
## 运行环境
8282

@@ -142,4 +142,4 @@ imi 遵循木兰宽松许可证（Mulan PSL v2）开源协议发布，并提供
142142

143143
提交 `Pull Request` 到本仓库，你可以成为 imi 的贡献者！
144144

145-
参与框架开发教程详见：[链接](/v2.1/adv/devp.html)
145+
参与框架开发教程详见：[链接](/v3.0/adv/devp.html)

‎doc/annotations/annotation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ class TransactionAop
145145
}
146146
```
147147

148-
具体用法请参考：[链接](/v2.1/components/aop/index.html)
148+
具体用法请参考：[链接](/v3.0/components/aop/index.html)
149149

150150
## 获取注解
151151

152-
具体用法请参考：[链接](/v2.1/annotations/annotationManager.html)
152+
具体用法请参考：[链接](/v3.0/annotations/annotationManager.html)
153153

154154
## 编写处理器
155155

‎doc/base/new.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66

77
imi 提供了多个项目模板可供选择：
88

9-
创建 Http Server 项目：`composer create-project imiphp/project-http:~2.1.0`
9+
创建 Http Server 项目：`composer create-project imiphp/project-http:~3.0.0`
1010

11-
创建 WebSocket Server 项目：`composer create-project imiphp/project-websocket:~2.1.0`
11+
创建 WebSocket Server 项目：`composer create-project imiphp/project-websocket:~3.0.0`
1212

13-
创建 TCP Server 项目：`composer create-project imiphp/project-tcp:~2.1.0`
13+
创建 TCP Server 项目：`composer create-project imiphp/project-tcp:~3.0.0`
1414

15-
创建 UDP Server 项目：`composer create-project imiphp/project-udp:~2.1.0`
15+
创建 UDP Server 项目：`composer create-project imiphp/project-udp:~3.0.0`
1616

17-
创建 gRPC 项目：`composer create-project imiphp/project-grpc:~2.1.0`
17+
创建 gRPC 项目：`composer create-project imiphp/project-grpc:~3.0.0`
1818

19-
创建 MQTT Server 项目：`composer create-project imiphp/project-mqtt:~2.1.0`
19+
创建 MQTT Server 项目：`composer create-project imiphp/project-mqtt:~3.0.0`
2020

2121
运行命令后，会在当前目录创建一个新的 imi 项目，并下载所需的依赖。
2222

‎doc/base/qa.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ PDOException: SQLSTATE[42000]: Syntax error or access violation: 1461 Can't crea
4646

4747
imi 默认会缓存 Statement，建议调大 mysql 的 `max_prepared_stmt_count` 配置值。
4848

49-
从 imi v2.1.34 开始你也可以配置 [Statement 最大缓存数量](/v2.1/components/db/config.html) 来自动清理缓存的 Statement。
49+
从 imi v2.1.34 开始你也可以配置 [Statement 最大缓存数量](/v3.0/components/db/config.html) 来自动清理缓存的 Statement。
5050

5151
## Workerman 报错：send buffer full and drop package
5252

‎doc/components/access-control.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ imi 框架的权限控制组件，不提供具体 API、管理界面，仅提供
1717
```json
1818
{
1919
"require": {
20-
"imiphp/imi-access-control": "~2.1.0"
20+
"imiphp/imi-access-control": "~3.0.0"
2121
}
2222
}
2323
```
@@ -38,7 +38,7 @@ imi 框架的权限控制组件，不提供具体 API、管理界面，仅提供
3838
```
3939

4040
本组件中包含几个数据表，打开本组件目录，找到`Model`目录，在数据库中建立对应的表，即可使用。
41-
建表这里优先推荐用`generate/table`：[链接](/v2.1/dev/generate/table.html)
41+
建表这里优先推荐用`generate/table`：[链接](/v3.0/dev/generate/table.html)
4242

4343
### 操作权限
4444

‎doc/components/cache/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Imi\Cache\CacheManager::clear('缓存名称');
120120
*/
121121
```
122122

123-
`lockable` 用法请参考 [Lock](/v2.1/components/lock/index.html)
123+
`lockable` 用法请参考 [Lock](/v3.0/components/lock/index.html)
124124

125125
`preventBreakdown` 如果设为 `true`，会在获得锁后，尝试获取缓存，如果缓存存在则不再执行方法体
126126

‎doc/components/config/center.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060

6161
### Nacos
6262

63-
**安装：**`composer require imiphp/imi-nacos:~2.1.0`
63+
**安装：**`composer require imiphp/imi-nacos:~3.0.0`
6464

6565
**配置：**
6666

@@ -130,7 +130,7 @@ $configCenter->getDriver('nacos')->push($name, $value, [
130130

131131
### Etcd
132132

133-
**安装：**`composer require imiphp/imi-etcd:~2.1.0`
133+
**安装：**`composer require imiphp/imi-etcd:~3.0.0`
134134

135135
**配置：**
136136

@@ -211,7 +211,7 @@ $configCenter->getDriver('etcd')->push($name, $value, $options);
211211

212212
* 非 Swoole 用户请安装 [php-zookeeper](<https://github.com/php-zookeeper/php-zookeeper>) 扩展。
213213

214-
**安装：**`composer require imiphp/imi-zookeeper:~2.1.0`
214+
**安装：**`composer require imiphp/imi-zookeeper:~3.0.0`
215215

216216
**配置：**
217217

‎doc/components/httpserver/aop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
AOP（Aspect-Oriented Programming 面向切面编程）是一种在运行时， 动态地将一段代码片段（切面）切入到指定类、类的指定方法（切入点）等位置， 从而改变其原有的行为的编程思想。可以在不改变原有逻辑的基础上， 增加一些额外的功能，例如日志记录，性能统计，安全控制，事务处理，异常处理等。
1010

11-
详细介绍请见：[链接](/v2.1/components/aop/index.html)
11+
详细介绍请见：[链接](/v3.0/components/aop/index.html)
1212

1313
## Demo
1414

‎doc/components/httpserver/controller.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ class Index extends HttpController
7474

7575
## 绑定请求参数到控制器方法参数
7676

77-
详见：[链接](/v2.1/components/httpserver/request.html#%E7%BB%91%E5%AE%9A%E8%AF%B7%E6%B1%82%E5%8F%82%E6%95%B0%E5%88%B0%E6%8E%A7%E5%88%B6%E5%99%A8%E6%96%B9%E6%B3%95%E5%8F%82%E6%95%B0)
77+
详见：[链接](/v3.0/components/httpserver/request.html#%E7%BB%91%E5%AE%9A%E8%AF%B7%E6%B1%82%E5%8F%82%E6%95%B0%E5%88%B0%E6%8E%A7%E5%88%B6%E5%99%A8%E6%96%B9%E6%B3%95%E5%8F%82%E6%95%B0)
7878

7979
## 属性
8080

8181
### $server
8282

83-
详见：[链接](/v2.1/core/server.html)
83+
详见：[链接](/v3.0/core/server.html)
8484

8585
### $request
8686

‎doc/components/httpserver/cros.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ imi 框架内置了一个 `OptionsMiddleware` 中间件，用于解决使用 `ap
88

99
别名：`OptionsMiddleware`
1010

11-
中间件使用方法：[链接](/v2.1/components/httpserver/middleware.html)
11+
中间件使用方法：[链接](/v3.0/components/httpserver/middleware.html)
1212

1313
## 参数设置
1414

‎doc/components/httpserver/jwt.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ imi v2 使用 2.0 版本
2121
```json
2222
{
2323
"require": {
24-
"imiphp/imi-jwt": "~2.1.0"
24+
"imiphp/imi-jwt": "~3.0.0"
2525
}
2626
}
2727
```

‎doc/components/httpserver/validation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[toc]
44

5-
请先阅读 [验证器](/v2.1/components/validation/index.html) 章节，HTTP 验证器基于验证器扩展，基本使用方式相似。
5+
请先阅读 [验证器](/v3.0/components/validation/index.html) 章节，HTTP 验证器基于验证器扩展，基本使用方式相似。
66

77
## @HttpValidation
88

‎doc/components/influxdb.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ imi-influxdb：<https://github.com/imiphp/imi-influxdb>
1212
1313
## 安装
1414

15-
`composer require imiphp/imi-influxdb:~2.1.0`
15+
`composer require imiphp/imi-influxdb:~3.0.0`
1616

1717
## 使用说明
1818

‎doc/components/macro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
```json
2222
{
2323
"require": {
24-
"imiphp/imi-macro": "~2.1.0"
24+
"imiphp/imi-macro": "~3.0.0"
2525
}
2626
}
2727
```

‎doc/components/meter/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ imi 接入了服务指标监控能力，提供了 [imi-meter](https://github.com
1010

1111
**支持的中间件：**
1212

13-
* [x] [Prometheus](/v2.1/components/meter/prometheus.html)
13+
* [x] [Prometheus](/v3.0/components/meter/prometheus.html)
1414

15-
* [x] [InfluxDB](/v2.1/components/meter/influxdb.html)
15+
* [x] [InfluxDB](/v3.0/components/meter/influxdb.html)
1616

17-
* [x] [TDengine](/v2.1/components/meter/tdengine.html)
17+
* [x] [TDengine](/v3.0/components/meter/tdengine.html)
1818

1919
……

‎doc/components/meter/influxdb.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ imi 支持将服务指标监控的数据写入 InfluxDB。
1616

1717
## 安装
1818

19-
`composer require imiphp/imi-influxdb:~2.1.0`
19+
`composer require imiphp/imi-influxdb:~3.0.0`
2020

2121
## 使用说明
2222

23-
imi-influxdb 基础配置和使用说明详见：[链接](/v2.1/components/influxdb.html)
23+
imi-influxdb 基础配置和使用说明详见：[链接](/v3.0/components/influxdb.html)
2424

2525
### 服务指标监控
2626

@@ -30,7 +30,7 @@ imi-influxdb 基础配置和使用说明详见：[链接](/v2.1/components/influ
3030

3131
#### 安装所需组件
3232

33-
`composer require imiphp/imi-meter:~2.1.0`
33+
`composer require imiphp/imi-meter:~3.0.0`
3434

3535
#### 配置
3636

‎doc/components/meter/prometheus.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ imi-prometheus：<https://github.com/imiphp/imi-prometheus>
2121

2222
## 安装
2323

24-
`composer require imiphp/imi-prometheus:~2.1.0`
24+
`composer require imiphp/imi-prometheus:~3.0.0`
2525

2626
## 使用说明
2727

‎doc/components/meter/tdengine.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ imi 支持将服务指标监控的数据写入 TDengine。
2121

2222
### InfluxDB 兼容接口
2323

24-
这个写入方式主要依赖 imi-influxdb，文档请移步：[链接](/v2.1/components/meter/influxdb.html)
24+
这个写入方式主要依赖 imi-influxdb，文档请移步：[链接](/v3.0/components/meter/influxdb.html)
2525

2626
在 InfluxDB 配置基础上，只需要做如下修改，即可兼容 TDengine：
2727

‎doc/components/mq/amqp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Github: <https://github.com/imiphp/imi-amqp>
1717
```json
1818
{
1919
"require": {
20-
"imiphp/imi-amqp": "~2.1.0"
20+
"imiphp/imi-amqp": "~3.0.0"
2121
}
2222
}
2323
```
@@ -477,7 +477,7 @@ class TestProcess extends BaseProcess
477477

478478
适合计算密集型场景、消费量非常多的场景。
479479

480-
进程池写法参考：[链接](/v2.1/components/process-pool/swoole.html)
480+
进程池写法参考：[链接](/v3.0/components/process-pool/swoole.html)
481481

482482
启动消费者写法参考上面的即可。
483483

‎doc/components/mq/kafka.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
```json
1818
{
1919
"require": {
20-
"imiphp/imi-kafka": "~2.1.0"
20+
"imiphp/imi-kafka": "~3.0.0"
2121
}
2222
}
2323
```

‎doc/components/mq/redis.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
```json
2525
{
2626
"require": {
27-
"imiphp/imi-queue": "~2.1.0"
27+
"imiphp/imi-queue": "~3.0.0"
2828
}
2929
}
3030
```

‎doc/components/mq/redisStream.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
```json
2525
{
2626
"require": {
27-
"imiphp/imi-queue": "~2.1.0"
27+
"imiphp/imi-queue": "~3.0.0"
2828
}
2929
}
3030
```

‎doc/components/mqtt/server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ MQTT是一个基于客户端-服务器的消息发布/订阅传输协议。MQTT
88
99
安装：`composer require imiphp/imi-mqtt`
1010

11-
示例项目：`composer create-project imiphp/project-mqtt:~2.1.0`
11+
示例项目：`composer create-project imiphp/project-mqtt:~3.0.0`
1212

1313
## 配置
1414

0 commit comments

Comments
 (0)