diff --git a/rxlib/pom.xml b/rxlib/pom.xml index c49d19da..28f6264a 100644 --- a/rxlib/pom.xml +++ b/rxlib/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.github.rockylomo @@ -15,7 +16,7 @@ 2.0.4 1.3.12 - 2.0.46 + 2.0.48 2.9.3 3.14.0 4.4 @@ -23,14 +24,14 @@ 1.14.12 2.11.3 2.2.224 - 4.1.92.Final + 4.1.107.Final 1.77 4.11.0 2.12.1 0.1.55 - 2.5.14 - 5.3.20 + 2.5.15 + 5.3.33 1.9.7 @@ -44,6 +45,14 @@ org.springframework.boot spring-boot-starter-logging + + spring-beans + org.springframework + + + spring-core + org.springframework + @@ -76,6 +85,12 @@ ch.qos.logback logback-classic ${logback.version} + + + slf4j-api + org.slf4j + + com.alibaba.fastjson2 @@ -173,11 +188,11 @@ - - - - - + + + + + com.h2database h2 diff --git a/rxlib/src/main/java/org/rx/bean/DataTable.java b/rxlib/src/main/java/org/rx/bean/DataTable.java index ccd207dc..98af4d81 100644 --- a/rxlib/src/main/java/org/rx/bean/DataTable.java +++ b/rxlib/src/main/java/org/rx/bean/DataTable.java @@ -15,6 +15,7 @@ import org.rx.core.StringBuilder; import org.rx.core.*; import org.rx.exception.InvalidException; +import org.rx.third.guava.CaseFormat; import java.lang.reflect.Type; import java.sql.ResultSet; @@ -167,7 +168,16 @@ public DataTable(String tableName) { this.tableName = tableName; } - public List toList(@NonNull Type type) { + public List toList(Type type) { + return toList(type, false); + } + + public List toList(@NonNull Type type, boolean toLowerCamelColumn) { + if (toLowerCamelColumn) { + for (DataColumn column : columns) { + column.setColumnName(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, column.getColumnName())); + } + } List list = new ArrayList<>(); int colSize = columns.size(); Iterator rows = getRows();