Merge remote-tracking branch 'github/3.0' into 3.0

build.gradle

@@ -59,7 +59,7 @@ ext {
         "junit-jupiter-api"          : "org.junit.jupiter:junit-jupiter-api:${junitVersion}",
         "junit-jupiter-engine"       : "org.junit.jupiter:junit-jupiter-engine:${junitVersion}",
         "fastjson"                   : "com.alibaba:fastjson:1.2.68",
-        "jackson"                    : "com.fasterxml.jackson.core:jackson-databind:2.10.3",
+        "jackson"                    : "com.fasterxml.jackson.core:jackson-databind:2.11.0",
         "gson"                       : "com.google.code.gson:gson:2.8.6",
         "lagarto"                    : "org.jodd:jodd-lagarto:5.1.4",
         //datasource
@@ -70,7 +70,7 @@ ext {
         "dm"                         : fileTree(dir: 'libs', includes: ["jdbcDriver-18.jar"]),
         "kingbase"                   : fileTree(dir: 'libs', includes: ["kingbase8-8.2.0.jar"]),
         "h2"                         : "com.h2database:h2:1.4.200",
-        "mysql"                      : "mysql:mysql-connector-java:8.0.19",
+        "mysql"                      : "mysql:mysql-connector-java:8.0.20",
         "sqlite"                     : "org.xerial:sqlite-jdbc:3.30.1",
         //code generator
         "velocity"                   : "org.apache.velocity:velocity-engine-core:2.2",

mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/metadata/IPage.java

@@ -199,7 +199,7 @@ public interface IPage<T> extends Serializable {
         List<R> collect = this.getRecords().stream().map(mapper).collect(toList());
         return ((IPage<R>) this).setRecords(collect);
     }
-    
+
     /**
      * 生成缓存key值
      *
@@ -208,7 +208,7 @@ public interface IPage<T> extends Serializable {
      */
     default String cacheKey() {
         StringBuilder key = new StringBuilder();
-        key.append(getCurrent()).append(StringPool.COLON).append(getSize());
+        key.append(offset()).append(StringPool.COLON).append(getSize());
         List<OrderItem> orders = orders();
         if (CollectionUtils.isNotEmpty(orders)) {
             for (OrderItem item : orders) {
@@ -217,5 +217,5 @@ public interface IPage<T> extends Serializable {
         }
         return key.toString();
     }
-    
+
 }