up

RockyLOMO · Apr 2, 2024 · befb580 · befb580
1 parent ef3bc7e
commit befb580
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 11 deletions.
diff --git a/rxlib/pom.xml b/rxlib/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <parent>
  <groupId>com.github.rockylomo</groupId>
@@ -15,22 +16,22 @@
  <properties>
  <slf4j-api.version>2.0.4</slf4j-api.version>
  <logback.version>1.3.12</logback.version>
- <fastjson2.version>2.0.46</fastjson2.version>
+ <fastjson2.version>2.0.48</fastjson2.version>
  <caffeine.version>2.9.3</caffeine.version>
  <commons-lang3.version>3.14.0</commons-lang3.version>
  <commons-collections4.version>4.4</commons-collections4.version>
  <commons-io.version>2.13.0</commons-io.version>
  <byte-buddy.version>1.14.12</byte-buddy.version>
  <zip4j.version>2.11.3</zip4j.version>
  <h2.version>2.2.224</h2.version>
- <netty.version>4.1.92.Final</netty.version>
+ <netty.version>4.1.107.Final</netty.version>
  <bcprov.version>1.77</bcprov.version>
  <okhttp.version>4.11.0</okhttp.version>
  <sshd.version>2.12.1</sshd.version>
  <jsch.version>0.1.55</jsch.version>
 
- <spring.boot.version>2.5.14</spring.boot.version>
- <spring.version>5.3.20</spring.version>
+ <spring.boot.version>2.5.15</spring.boot.version>
+ <spring.version>5.3.33</spring.version>
  <aspectj.version>1.9.7</aspectj.version>
  </properties>
 
@@ -44,6 +45,14 @@
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-logging</artifactId>
  </exclusion>
+ <exclusion>
+ <artifactId>spring-beans</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>spring-core</artifactId>
+ <groupId>org.springframework</groupId>
+ </exclusion>
  </exclusions>
  </dependency>
  <dependency>
@@ -76,6 +85,12 @@
  <groupId>ch.qos.logback</groupId>
  <artifactId>logback-classic</artifactId>
  <version>${logback.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>com.alibaba.fastjson2</groupId>
@@ -173,11 +188,11 @@
  </exclusion>
  </exclusions>
  </dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.jcraft</groupId>-->
-<!-- <artifactId>jsch</artifactId>-->
-<!-- <version>${jsch.version}</version>-->
-<!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.jcraft</groupId>-->
+ <!-- <artifactId>jsch</artifactId>-->
+ <!-- <version>${jsch.version}</version>-->
+ <!-- </dependency>-->
  <dependency>
  <groupId>com.h2database</groupId>
  <artifactId>h2</artifactId>

diff --git 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 <T> List<T> toList(@NonNull Type type) {
+ public <T> List<T> toList(Type type) {
+ return toList(type, false);
+ }
+
+ public <T> List<T> toList(@NonNull Type type, boolean toLowerCamelColumn) {
+ if (toLowerCamelColumn) {
+ for (DataColumn column : columns) {
+ column.setColumnName(CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, column.getColumnName()));
+ }
+ }
  List<T> list = new ArrayList<>();
  int colSize = columns.size();
  Iterator<DataRow> rows = getRows();