发布 2.1.0 版本

pagehelper · Dec 17, 2023 · b3b4ee0 · b3b4ee0
1 parent 8b816cd
commit b3b4ee0
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -16,10 +16,20 @@ Add the following dependency to your pom.xml:
 <dependency>
   <groupId>com.github.pagehelper</groupId>
   <artifactId>pagehelper-spring-boot-starter</artifactId>
-  <version>2.0.0</version>
+  <version>2.1.0</version>
 </dependency>
 ```
 
+## v2.1.0 - 2023-12-17
+
+- 升级 PageHelper 到 6.1.0，支持异步 count
+  等功能，详细查看 [6.1.0](https://github.com/pagehelper/Mybatis-PageHelper/releases/tag/6.1.0)
+- 升级 MyBatis 到 3.5.15
+- 升级 springboot 到 2.7.18
+- 新增参数 `orderBySqlParser`，`OrderBySqlParser`改为接口，允许通过`orderBySqlParser`参数替换为自己的实现
+- 新增参数 `sqlServerSqlParser`，`SqlServerSqlParser`改为接口，允许通过`sqlServerSqlParser`参数替换为自己的实现
+- 接口 `CountSqlParser`,`OrderBySqlParser`,`SqlServerSqlParser` 还支持SPI方式覆盖默认实现，优先级低于参数指定
+
 ## v2.0.0 - 2023-11-05
 
 - 升级 PageHelper 到 6.0.0，支持异步 count 等功能，详细查看 [6.0](https://github.com/pagehelper/Mybatis-PageHelper/releases/tag/v6.0.0)

diff --git a/...autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperProperties.java b/...autoconfigure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperProperties.java
@@ -157,11 +157,27 @@ public void setAsyncCount(Boolean asyncCount) {
         setProperty("asyncCount", asyncCount.toString());
     }
 
-    public String getCountSqlParser(String countSqlParser) {
+    public String getCountSqlParser() {
         return getProperty("countSqlParser");
     }
 
     public void setCountSqlParser(String countSqlParser) {
         setProperty("countSqlParser", countSqlParser);
     }
+
+    public String getOrderBySqlParser() {
+        return getProperty("orderBySqlParser");
+    }
+
+    public void setOrderBySqlParser(String orderBySqlParser) {
+        setProperty("orderBySqlParser", orderBySqlParser);
+    }
+
+    public String getSqlServerSqlParser() {
+        return getProperty("sqlServerSqlParser");
+    }
+
+    public void setSqlServerSqlParser(String sqlServerSqlParser) {
+        setProperty("sqlServerSqlParser", sqlServerSqlParser);
+    }
 }
diff --git a/...igure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperStandardProperties.java b/...igure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperStandardProperties.java
@@ -46,6 +46,8 @@ public class PageHelperStandardProperties {
     private String sqlParser;
     private Boolean asyncCount;
     private String countSqlParser;
+    private String orderBySqlParser;
+    private String sqlServerSqlParser;
 
     @Autowired
     public PageHelperStandardProperties(PageHelperProperties properties) {
@@ -271,4 +273,22 @@ public void setCountSqlParser(String countSqlParser) {
         this.countSqlParser = countSqlParser;
         Optional.ofNullable(countSqlParser).ifPresent(v -> properties.setProperty("countSqlParser", v));
     }
+
+    public String getOrderBySqlParser() {
+        return orderBySqlParser;
+    }
+
+    public void setOrderBySqlParser(String orderBySqlParser) {
+        this.orderBySqlParser = orderBySqlParser;
+        Optional.ofNullable(orderBySqlParser).ifPresent(v -> properties.setProperty("orderBySqlParser", v));
+    }
+
+    public String getSqlServerSqlParser() {
+        return sqlServerSqlParser;
+    }
+
+    public void setSqlServerSqlParser(String sqlServerSqlParser) {
+        this.sqlServerSqlParser = sqlServerSqlParser;
+        Optional.ofNullable(sqlServerSqlParser).ifPresent(v -> properties.setProperty("sqlServerSqlParser", v));
+    }
 }
diff --git a/...r-spring-boot-sample-annotation/src/main/java/tk/mybatis/pagehelper/MyCountSqlParser.java b/...r-spring-boot-sample-annotation/src/main/java/tk/mybatis/pagehelper/MyCountSqlParser.java
@@ -0,0 +1,15 @@
+package tk.mybatis.pagehelper;
+
+import com.github.pagehelper.parser.defaults.DefaultCountSqlParser;
+
+public class MyCountSqlParser extends DefaultCountSqlParser {
+    @Override
+    public String getSmartCountSql(String sql, String countColumn) {
+        return "/* count */" + super.getSmartCountSql(sql, countColumn);
+    }
+
+    @Override
+    public String getSimpleCountSql(String sql) {
+        return "/* count */" + super.getSimpleCountSql(sql);
+    }
+}
diff --git a/...spring-boot-sample-annotation/src/main/java/tk/mybatis/pagehelper/MyOrderBySqlParser.java b/...spring-boot-sample-annotation/src/main/java/tk/mybatis/pagehelper/MyOrderBySqlParser.java
@@ -0,0 +1,12 @@
+package tk.mybatis.pagehelper;
+
+import com.github.pagehelper.parser.defaults.DefaultOrderBySqlParser;
+
+public class MyOrderBySqlParser extends DefaultOrderBySqlParser {
+
+    @Override
+    public String converToOrderBySql(String sql, String orderBy) {
+        return "/* order-by */" + super.converToOrderBySql(sql, orderBy);
+    }
+
+}
diff --git a/...g-boot-sample-annotation/src/main/java/tk/mybatis/pagehelper/SampleMapperApplication.java b/...g-boot-sample-annotation/src/main/java/tk/mybatis/pagehelper/SampleMapperApplication.java
@@ -57,6 +57,13 @@ public void run(String... args) throws Exception {
             System.out.println("Name: " + user.getName());
         }
 
+        PageHelper.orderBy("id desc");
+        users = userMapper.findAll();
+        System.out.println("Total: " + ((Page) users).getTotal());
+        for (User user : users) {
+            System.out.println("Name: " + user.getName());
+        }
+
         PageRowBounds rowBounds = new PageRowBounds(3, 5);
         users = userMapper.findAll(rowBounds);
         System.out.println("Total: " + rowBounds.getTotal());

diff --git a/...notation/src/main/resources/META-INF/services/com.github.pagehelper.parser.CountSqlParser b/...notation/src/main/resources/META-INF/services/com.github.pagehelper.parser.CountSqlParser
@@ -0,0 +1 @@
+tk.mybatis.pagehelper.MyCountSqlParser
diff --git a/...amples/pagehelper-spring-boot-sample-annotation/src/main/resources/application.properties b/...amples/pagehelper-spring-boot-sample-annotation/src/main/resources/application.properties
@@ -33,4 +33,5 @@ pagehelper.hello=\u4F60\u597D
 pagehelper.nihao=Hello
 pagehelper.offset-as-page-num=true
 pagehelper.count-column=*
-pagehelper.async-count=true
+pagehelper.async-count=true
+pagehelper.orderBySqlParser=tk.mybatis.pagehelper.MyOrderBySqlParser
diff --git a/pom.xml b/pom.xml
@@ -63,17 +63,17 @@
     </modules>
 
     <properties>
-        <revision>2.0.0</revision>
+        <revision>2.1.0</revision>
 
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <mybatis.version>3.5.14</mybatis.version>
-        <pagehelper.version>6.0.0</pagehelper.version>
-        <mybatis-spring-boot.version>2.3.1</mybatis-spring-boot.version>
-        <spring-boot.version>2.7.17</spring-boot.version>
+        <mybatis.version>3.5.15</mybatis.version>
+        <pagehelper.version>6.1.0</pagehelper.version>
+        <mybatis-spring-boot.version>2.3.2</mybatis-spring-boot.version>
+        <spring-boot.version>2.7.18</spring-boot.version>
     </properties>
 
     <dependencyManagement>