diff --git a/README.md b/README.md
index c08d5e0a..68ffaf25 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ Jboot 是一个基于 JFinal、Dubbo、Seata、Sentinel、ShardingSphere、Nacos
io.jboot
jboot
- 4.1.7
+ 4.1.8
```
diff --git a/changes.txt b/changes.txt
index 194b680f..5d69c39a 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,3 +1,8 @@
+jboot v4.1.8 2024-08-20:
+修复:紧急修复上个版本合并的 JbootModel 造成的问题
+
+
+
jboot v4.1.7 2024-08-18:
优化:JbootAopFactory.java 构造方法访问权限修改为 protected 方便继承扩展,感谢 @macaque
优化:cache 带有dataLoader的方法中日志会打印多次问题,感谢 @macaque
diff --git a/pom.xml b/pom.xml
index e34d4313..0fb4d2df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
io.jboot
jboot
- 4.1.7
+ 4.1.8
jar
jboot
diff --git a/src/main/java/io/jboot/JbootConsts.java b/src/main/java/io/jboot/JbootConsts.java
index 72a77a82..d351bee5 100644
--- a/src/main/java/io/jboot/JbootConsts.java
+++ b/src/main/java/io/jboot/JbootConsts.java
@@ -22,7 +22,7 @@
*/
public class JbootConsts {
- public static String VERSION = "4.1.7";
+ public static String VERSION = "4.1.8";
public static final String ATTR_CONTEXT_PATH = "CPATH";
diff --git a/src/main/java/io/jboot/db/model/JbootModel.java b/src/main/java/io/jboot/db/model/JbootModel.java
index 47e3ba34..25d1440e 100644
--- a/src/main/java/io/jboot/db/model/JbootModel.java
+++ b/src/main/java/io/jboot/db/model/JbootModel.java
@@ -765,24 +765,12 @@ public List findListByColumns(Columns columns, String orderBy, Integer count)
}
public List findListByColumns(Columns columns, String orderBy, Integer count, String loadColumns) {
- return findListByColumns(columns, orderBy,0, count, loadColumns);
- }
-
- public List findListByColumns(Columns columns, String orderBy,Integer start, Integer count, String loadColumns) {
processColumns(columns, "findList");
loadColumns = getLoadColumns(loadColumns);
- String limitStr = buildLimitStr(start, count);
- String sql = _getDialect().forFindByColumns(alias, joins, _getTableName(), loadColumns, columns.getList(), orderBy, limitStr);
+ String sql = _getDialect().forFindByColumns(alias, joins, _getTableName(), loadColumns, columns.getList(), orderBy, count);
return columns.isEmpty() ? find(sql) : find(sql, columns.getValueArray());
}
- protected String buildLimitStr(Integer start, Integer count) {
- StringBuilder sb = new StringBuilder();
- sb.append(start).append(",").append(count);
- return sb.toString();
- }
-
-
//方便在某些场景下,对 columns 进行二次加工
protected void processColumns(Columns columns, String action) {
}