Skip to content

Commit 8961063

Browse files
committed
PageHelper 6 发布,支持jdk8+
1 parent 19043df commit 8961063

File tree

7 files changed

+130
-184
lines changed

7 files changed

+130
-184
lines changed

README.md

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@
1212

1313
想要使用分页插件?请看[如何使用分页插件](https://github.com/pagehelper/Mybatis-PageHelper/blob/master/wikis/zh/HowToUse.md)
1414

15-
## 新增 JavaDoc 文档
16-
17-
文档地址:https://apidoc.gitee.com/free/Mybatis_PageHelper
18-
19-
Method API: https://apidoc.gitee.com/free/Mybatis_PageHelper/com/github/pagehelper/page/PageMethod.html
20-
2115
## 《MyBatis 从入门到精通》
2216

2317
![MyBatis 从入门到精通](https://github.com/mybatis-book/book/raw/master/book.png)
@@ -31,6 +25,10 @@ GitHub项目:https://github.com/mybatis-book/book
3125

3226
## 支持 [MyBatis 3.1.0+](https://github.com/mybatis/mybatis-3)
3327

28+
## PageHelper 6 支持 jdk8+
29+
30+
## PageHelper 5 支持 jdk6+
31+
3432
## 物理分页
3533

3634
该插件目前支持以下数据库的<b>物理分页</b> [PageAutoDialect](src/main/java/com/github/pagehelper/page/PageAutoDialect.java):
@@ -41,19 +39,26 @@ static {
4139
registerDialectAlias("hsqldb",HsqldbDialect.class);
4240
registerDialectAlias("h2",HsqldbDialect.class);
4341
registerDialectAlias("phoenix",HsqldbDialect.class);
42+
4443
registerDialectAlias("postgresql",PostgreSqlDialect.class);
44+
4545
registerDialectAlias("mysql",MySqlDialect.class);
4646
registerDialectAlias("mariadb",MySqlDialect.class);
4747
registerDialectAlias("sqlite",MySqlDialect.class);
48+
4849
registerDialectAlias("herddb",HerdDBDialect.class);
50+
4951
registerDialectAlias("oracle",OracleDialect.class);
5052
registerDialectAlias("oracle9i",Oracle9iDialect.class);
5153
registerDialectAlias("db2",Db2Dialect.class);
54+
registerDialectAlias("as400",AS400Dialect.class);
5255
registerDialectAlias("informix",InformixDialect.class);
5356
//解决 informix-sqli #129,仍然保留上面的
5457
registerDialectAlias("informix-sqli",InformixDialect.class);
58+
5559
registerDialectAlias("sqlserver",SqlServerDialect.class);
5660
registerDialectAlias("sqlserver2012",SqlServer2012Dialect.class);
61+
5762
registerDialectAlias("derby",SqlServer2012Dialect.class);
5863
//达梦数据库,https://github.com/mybatis-book/book/issues/43
5964
registerDialectAlias("dm",OracleDialect.class);
@@ -66,8 +71,28 @@ static {
6671
registerDialectAlias("highgo",HsqldbDialect.class);
6772
//虚谷数据库
6873
registerDialectAlias("xugu",HsqldbDialect.class);
74+
registerDialectAlias("impala",HsqldbDialect.class);
75+
registerDialectAlias("firebirdsql",FirebirdDialect.class);
6976
//人大金仓数据库
7077
registerDialectAlias("kingbase",PostgreSqlDialect.class);
78+
// 人大金仓新版本kingbase8
79+
registerDialectAlias("kingbase8",PostgreSqlDialect.class);
80+
//行云数据库
81+
registerDialectAlias("xcloud",CirroDataDialect.class);
82+
83+
//openGauss数据库
84+
registerDialectAlias("opengauss",PostgreSqlDialect.class);
85+
86+
//注册 AutoDialect
87+
//想要实现和以前版本相同的效果时,可以配置 autoDialectClass=old
88+
registerAutoDialectAlias("old",DefaultAutoDialect.class);
89+
registerAutoDialectAlias("hikari",HikariAutoDialect.class);
90+
registerAutoDialectAlias("druid",DruidAutoDialect.class);
91+
registerAutoDialectAlias("tomcat-jdbc",TomcatAutoDialect.class);
92+
registerAutoDialectAlias("dbcp",DbcpAutoDialect.class);
93+
registerAutoDialectAlias("c3p0",C3P0AutoDialect.class);
94+
//不配置时,默认使用 DataSourceNegotiationAutoDialect
95+
registerAutoDialectAlias("default",DataSourceNegotiationAutoDialect.class);
7196
}
7297
```
7398

@@ -77,20 +102,16 @@ static {
77102
>
78103
>```xml
79104
><property name="dialectAlias" value="oracle=com.github.pagehelper.dialect.helper.OracleDialect"/>
80-
><!-- 支持下面的引用方式,引用 Oracle9iDialect.class 的实现 -->
105+
><!-- 6.0支持下面的引用方式,引用 Oracle9iDialect.class 的实现 -->
81106
><property name="dialectAlias" value="oracle=oracle9i"/>
82-
><!-- 支持下面的引用方式,达梦使用oracle语法分页,简化类全名写法 -->
107+
><!-- 6.0支持下面的引用方式,达梦使用oracle语法分页,简化类全名写法 -->
83108
><property name="dialectAlias" value="dm=oracle"/>
84109
>```
85110
86111
## 使用 [QueryInterceptor 规范](https://github.com/pagehelper/Mybatis-PageHelper/blob/master/src/main/java/com/github/pagehelper/QueryInterceptor.java)
87112
88113
[Executor 拦截器高级教程 - QueryInterceptor 规范](https://github.com/pagehelper/Mybatis-PageHelper/blob/master/wikis/zh/Interceptor.md)
89114
90-
## 分页插件 5.0
91-
92-
由于分页插件 5.0 版本和 4.2.x 实现完全不同,所以 master 分支为 5.x 版本,4.2 作为一个分支存在,如果有针对 4.2 的 PR,请注意提交到分支版本。
93-
94115
## 集成
95116
96117
使用 PageHelper 你只需要在 classpath
@@ -128,8 +149,7 @@ static {
128149

129150
## 提交 BUG
130151

131-
- [提交到 github](https://github.com/pagehelper/Mybatis-PageHelper/issues/new)
132-
- [提交到 gitosc](http://git.oschina.net/free/Mybatis_PageHelper/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D=)
152+
https://github.com/pagehelper/Mybatis-PageHelper/issues/new
133153

134154
## 项目的发展离不开你的支持
135155

README_en.md

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,41 @@ GitHub:https://github.com/mybatis-book/book
3737

3838
## Support [MyBatis 3.1.0+](https://github.com/mybatis/mybatis-3)
3939

40+
## PageHelper 6 Support jdk8+
41+
42+
## PageHelper 5 Support jdk6+
43+
4044
## Physical Paging
4145

4246
PageHelper supports the following
4347
databases [PageAutoDialect](src/main/java/com/github/pagehelper/page/PageAutoDialect.java):
4448

4549
```java
4650
static {
47-
//register aliass
51+
//register alias
4852
registerDialectAlias("hsqldb",HsqldbDialect.class);
4953
registerDialectAlias("h2",HsqldbDialect.class);
5054
registerDialectAlias("phoenix",HsqldbDialect.class);
55+
5156
registerDialectAlias("postgresql",PostgreSqlDialect.class);
57+
5258
registerDialectAlias("mysql",MySqlDialect.class);
5359
registerDialectAlias("mariadb",MySqlDialect.class);
5460
registerDialectAlias("sqlite",MySqlDialect.class);
61+
5562
registerDialectAlias("herddb",HerdDBDialect.class);
63+
5664
registerDialectAlias("oracle",OracleDialect.class);
5765
registerDialectAlias("oracle9i",Oracle9iDialect.class);
5866
registerDialectAlias("db2",Db2Dialect.class);
67+
registerDialectAlias("as400",AS400Dialect.class);
5968
registerDialectAlias("informix",InformixDialect.class);
60-
//解决 informix-sqli #129,仍然保留上面的
69+
//Solve informix-sqli #129, still keep the above
6170
registerDialectAlias("informix-sqli",InformixDialect.class);
71+
6272
registerDialectAlias("sqlserver",SqlServerDialect.class);
6373
registerDialectAlias("sqlserver2012",SqlServer2012Dialect.class);
74+
6475
registerDialectAlias("derby",SqlServer2012Dialect.class);
6576
//达梦数据库,https://github.com/mybatis-book/book/issues/43
6677
registerDialectAlias("dm",OracleDialect.class);
@@ -73,10 +84,28 @@ static {
7384
registerDialectAlias("highgo",HsqldbDialect.class);
7485
//虚谷数据库
7586
registerDialectAlias("xugu",HsqldbDialect.class);
87+
registerDialectAlias("impala",HsqldbDialect.class);
88+
registerDialectAlias("firebirdsql",FirebirdDialect.class);
7689
//人大金仓数据库
7790
registerDialectAlias("kingbase",PostgreSqlDialect.class);
78-
//华为openGauss数据库
91+
// 人大金仓新版本kingbase8
92+
registerDialectAlias("kingbase8",PostgreSqlDialect.class);
93+
//行云数据库
94+
registerDialectAlias("xcloud",CirroDataDialect.class);
95+
96+
//openGauss数据库
7997
registerDialectAlias("opengauss",PostgreSqlDialect.class);
98+
99+
//注册 AutoDialect
100+
//If you want to achieve the same effect as the previous version, you can configure it autoDialectClass=old
101+
registerAutoDialectAlias("old",DefaultAutoDialect.class);
102+
registerAutoDialectAlias("hikari",HikariAutoDialect.class);
103+
registerAutoDialectAlias("druid",DruidAutoDialect.class);
104+
registerAutoDialectAlias("tomcat-jdbc",TomcatAutoDialect.class);
105+
registerAutoDialectAlias("dbcp",DbcpAutoDialect.class);
106+
registerAutoDialectAlias("c3p0",C3P0AutoDialect.class);
107+
//If not configured, it is used by default DataSourceNegotiationAutoDialect
108+
registerAutoDialectAlias("default",DataSourceNegotiationAutoDialect.class);
80109
}
81110
```
82111

@@ -89,9 +118,9 @@ static {
89118
>
90119
>```xml
91120
><property name="dialectAlias" value="oracle=com.github.pagehelper.dialect.helper.OracleDialect"/>
92-
><!-- The following reference is supported, referencing the implementation of Oracle9iDialect.class -->
121+
><!-- 6.0 The following reference is supported, referencing the implementation of Oracle9iDialect.class -->
93122
><property name="dialectAlias" value="oracle=oracle9i"/>
94-
><!-- To support the following citation methods, DM uses oracle syntax for pagination to simplify the writing of the full name of the class -->
123+
><!-- 6.0 To support the following citation methods, DM uses oracle syntax for pagination to simplify the writing of the full name of the class -->
95124
><property name="dialectAlias" value="dm=oracle"/>
96125
>```
97126
@@ -135,8 +164,7 @@ the [pagehelper-spring-boot-starter](https://github.com/pagehelper/pagehelper-sp
135164

136165
## Submit BUG
137166

138-
- [Submit to github](https://github.com/pagehelper/Mybatis-PageHelper/issues/new)
139-
- [Submit to gitosc](http://git.oschina.net/free/Mybatis_PageHelper/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D=)
167+
https://github.com/pagehelper/Mybatis-PageHelper/issues/new
140168

141169
## Thank you for your support
142170

@@ -157,3 +185,13 @@ Email: abel533@gmail.com
157185
PageHelper on github:https://github.com/pagehelper/Mybatis-PageHelper
158186

159187
PageHelper on gitosc:http://git.oschina.net/free/Mybatis_PageHelper
188+
189+
## MyBatis-3
190+
191+
- Project:https://github.com/mybatis/mybatis-3
192+
- Document:https://mybatis.org/mybatis-3/index.html
193+
194+
MyBatis 专栏:
195+
196+
- [MyBatis Sample](http://blog.csdn.net/column/details/mybatis-sample.html)
197+
- [MyBatis QA](http://blog.csdn.net/column/details/mybatisqa.html)

README_zh.md

Lines changed: 0 additions & 160 deletions
This file was deleted.

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828

2929
<groupId>com.github.pagehelper</groupId>
3030
<artifactId>pagehelper</artifactId>
31-
<version>6.0.0-SNAPSHOT</version>
31+
<version>6.0.0</version>
3232
<packaging>jar</packaging>
3333

34-
<name>pagehelper 5</name>
34+
<name>pagehelper 6</name>
3535
<description>Mybatis Pagination Plugin</description>
3636
<url>https://github.com/pagehelper/Mybatis-PageHelper</url>
3737

0 commit comments

Comments
 (0)