发布 1.4.5

pagehelper · Sep 18, 2022 · ad12893 · ad12893
1 parent 418b8eb
commit ad12893
Show file tree

Hide file tree

Showing 9 changed files with 94 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -16,10 +16,14 @@ Add the following dependency to your pom.xml:
 <dependency>
   <groupId>com.github.pagehelper</groupId>
   <artifactId>pagehelper-spring-boot-starter</artifactId>
-  <version>1.4.4</version>
+  <version>1.4.5</version>
 </dependency>
 ```
 
+## v1.4.5 - 2022-09-18
+
+- 升级 PageHelper 到 5.3.2
+
 ## v1.4.4 - 2022-09-16
 
 - 修复配置文件中kebab-case风格的配置项失效的问题 pr#138, by ShoWen

diff --git a/pagehelper-spring-boot-autoconfigure/pom.xml b/pagehelper-spring-boot-autoconfigure/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
     </parent>
     <artifactId>pagehelper-spring-boot-autoconfigure</artifactId>
     <name>pagehelper-spring-boot-autoconfigure</name>

diff --git a/...igure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperStandardProperties.java b/...igure/src/main/java/com/github/pagehelper/autoconfigure/PageHelperStandardProperties.java
@@ -36,6 +36,14 @@ public class PageHelperStandardProperties {
     private Boolean defaultCount;
     private String dialectAlias;
     private String autoDialectClass;
+    private Boolean useSqlserver2012;
+    private String countColumn;
+    private String replaceSql;
+    private String sqlCacheClass;
+    private String boundSqlInterceptors;
+    private Boolean keepOrderBy;
+    private Boolean keepSubSelectOrderBy;
+    private String sqlParser;
 
     @Autowired
     public PageHelperStandardProperties(PageHelperProperties properties) {
@@ -171,4 +179,76 @@ public void setAutoDialectClass(String autoDialectClass) {
         this.autoDialectClass = autoDialectClass;
         Optional.ofNullable(autoDialectClass).ifPresent(properties::setAutoDialectClass);
     }
+
+    public Boolean getUseSqlserver2012() {
+        return useSqlserver2012;
+    }
+
+    public void setUseSqlserver2012(Boolean useSqlserver2012) {
+        this.useSqlserver2012 = useSqlserver2012;
+        Optional.ofNullable(useSqlserver2012).ifPresent(v -> properties.setProperty("useSqlserver2012", v.toString()));
+    }
+
+    public String getCountColumn() {
+        return countColumn;
+    }
+
+    public void setCountColumn(String countColumn) {
+        this.countColumn = countColumn;
+        Optional.ofNullable(countColumn).ifPresent(v -> properties.setProperty("countColumn", v));
+    }
+
+    public String getReplaceSql() {
+        return replaceSql;
+    }
+
+    public void setReplaceSql(String replaceSql) {
+        this.replaceSql = replaceSql;
+        Optional.ofNullable(replaceSql).ifPresent(v -> properties.setProperty("replaceSql", v));
+    }
+
+    public String getSqlCacheClass() {
+        return sqlCacheClass;
+    }
+
+    public void setSqlCacheClass(String sqlCacheClass) {
+        this.sqlCacheClass = sqlCacheClass;
+        Optional.ofNullable(sqlCacheClass).ifPresent(v -> properties.setProperty("sqlCacheClass", v));
+    }
+
+    public String getBoundSqlInterceptors() {
+        return boundSqlInterceptors;
+    }
+
+    public void setBoundSqlInterceptors(String boundSqlInterceptors) {
+        this.boundSqlInterceptors = boundSqlInterceptors;
+        Optional.ofNullable(boundSqlInterceptors).ifPresent(v -> properties.setProperty("boundSqlInterceptors", v));
+    }
+
+    public Boolean getKeepOrderBy() {
+        return keepOrderBy;
+    }
+
+    public void setKeepOrderBy(Boolean keepOrderBy) {
+        this.keepOrderBy = keepOrderBy;
+        Optional.ofNullable(keepOrderBy).ifPresent(v -> properties.setProperty("keepOrderBy", v.toString()));
+    }
+
+    public Boolean getKeepSubSelectOrderBy() {
+        return keepSubSelectOrderBy;
+    }
+
+    public void setKeepSubSelectOrderBy(Boolean keepSubSelectOrderBy) {
+        this.keepSubSelectOrderBy = keepSubSelectOrderBy;
+        Optional.ofNullable(keepSubSelectOrderBy).ifPresent(v -> properties.setProperty("keepSubSelectOrderBy", v.toString()));
+    }
+
+    public String getSqlParser() {
+        return sqlParser;
+    }
+
+    public void setSqlParser(String sqlParser) {
+        this.sqlParser = sqlParser;
+        Optional.ofNullable(sqlParser).ifPresent(v -> properties.setProperty("sqlParser", v));
+    }
 }
diff --git a/pagehelper-spring-boot-samples/pagehelper-spring-boot-sample-annotation/pom.xml b/pagehelper-spring-boot-samples/pagehelper-spring-boot-sample-annotation/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot-samples</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
     </parent>
     <artifactId>pagehelper-spring-boot-sample-annotation</artifactId>
     <packaging>jar</packaging>

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
@@ -31,4 +31,5 @@ pagehelper.closeConn=true
 #\u6D4B\u8BD5\u5C5E\u6027\u6CE8\u5165
 pagehelper.hello=\u4F60\u597D
 pagehelper.nihao=Hello
-pagehelper.offset-as-page-num=true
+pagehelper.offset-as-page-num=true
+pagehelper.count-column=*
diff --git a/pagehelper-spring-boot-samples/pagehelper-spring-boot-sample-xml/pom.xml b/pagehelper-spring-boot-samples/pagehelper-spring-boot-sample-xml/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot-samples</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
     </parent>
     <artifactId>pagehelper-spring-boot-sample-xml</artifactId>
     <packaging>jar</packaging>

diff --git a/pagehelper-spring-boot-samples/pom.xml b/pagehelper-spring-boot-samples/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
     </parent>
     <artifactId>pagehelper-spring-boot-samples</artifactId>
     <packaging>pom</packaging>

diff --git a/pagehelper-spring-boot-starter/pom.xml b/pagehelper-spring-boot-starter/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.5</version>
     </parent>
     <artifactId>pagehelper-spring-boot-starter</artifactId>
     <name>pagehelper-spring-boot-starter</name>

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
 
     <groupId>com.github.pagehelper</groupId>
     <artifactId>pagehelper-spring-boot</artifactId>
-    <version>1.4.4</version>
+    <version>1.4.5</version>
     <packaging>pom</packaging>
 
     <name>pagehelper-spring-boot</name>
@@ -69,7 +69,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <mybatis.version>3.5.10</mybatis.version>
-        <pagehelper.version>5.3.1</pagehelper.version>
+        <pagehelper.version>5.3.2</pagehelper.version>
         <mybatis-spring-boot.version>2.2.2</mybatis-spring-boot.version>
         <spring-boot.version>2.7.3</spring-boot.version>
     </properties>