zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2022-04-29 01:46:01 +08:00
parent b2f0dc7b0f
commit c753a53173
561 changed files with 1532 additions and 4201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-db/src/main/java/cn/hutool/db/DaoTemplate.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.db;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.ds.DSFactory;
import javax.sql.DataSource;

2
hutool-db/src/main/java/cn/hutool/db/DbRuntimeException.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.db;
import cn.hutool.core.exceptions.ExceptionUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
/**
* 数据库异常

2
hutool-db/src/main/java/cn/hutool/db/DialectRunner.java
View File

@@ -3,7 +3,7 @@ package cn.hutool.db;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.dialect.Dialect;
import cn.hutool.db.dialect.DialectFactory;
import cn.hutool.db.handler.NumberHandler;

6
hutool-db/src/main/java/cn/hutool/db/Entity.java
View File

@@ -5,8 +5,8 @@ import cn.hutool.core.map.Dict;
import cn.hutool.core.lang.func.Func0;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.reflect.ReflectUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.sql.SqlUtil;
import java.nio.charset.Charset;
@@ -339,7 +339,7 @@ public class Entity extends Dict {
@Override
public String getStr(String field) {
return getStr(field, CharsetUtil.CHARSET_UTF_8);
return getStr(field, CharsetUtil.UTF_8);
}
/**

2
hutool-db/src/main/java/cn/hutool/db/Session.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.db;
import cn.hutool.core.lang.func.VoidFunc1;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.dialect.Dialect;
import cn.hutool.db.dialect.DialectFactory;
import cn.hutool.db.ds.DSFactory;

2
hutool-db/src/main/java/cn/hutool/db/StatementUtil.java
View File

@@ -5,7 +5,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.handler.HandleHelper;
import cn.hutool.db.handler.RsHandler;
import cn.hutool.db.sql.NamedSql;

2
hutool-db/src/main/java/cn/hutool/db/dialect/DialectFactory.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.db.dialect;
import cn.hutool.core.util.ClassLoaderUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.dialect.impl.AnsiSqlDialect;
import cn.hutool.db.dialect.impl.H2Dialect;
import cn.hutool.db.dialect.impl.MysqlDialect;

2
hutool-db/src/main/java/cn/hutool/db/dialect/DialectName.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.dialect;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
/**
* 方言名<br>

12
hutool-db/src/main/java/cn/hutool/db/dialect/DriverUtil.java
View File

@@ -6,21 +6,21 @@ import java.sql.SQLException;
import javax.sql.DataSource;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.DbUtil;
import cn.hutool.db.ds.DataSourceWrapper;
/**
* 驱动相关工具类，包括自动获取驱动类名
*
*
* @author looly
* @since 4.0.10
*/
public class DriverUtil {
/**
* 通过JDBC URL等信息识别JDBC驱动名
*
*
* @param nameContainsProductInfo 包含数据库标识的字符串
* @return 驱动
* @see DialectFactory#identifyDriver(String)
@@ -31,7 +31,7 @@ public class DriverUtil {
/**
* 识别JDBC驱动名
*
*
* @param ds 数据源
* @return 驱动
*/
@@ -42,7 +42,7 @@ public class DriverUtil {
return driver;
}
}
Connection conn = null;
String driver;
try {
@@ -63,7 +63,7 @@ public class DriverUtil {
/**
* 识别JDBC驱动名
*
*
* @param conn 数据库连接对象
* @return 驱动
* @throws DbRuntimeException SQL异常包装，获取元数据信息失败

2
hutool-db/src/main/java/cn/hutool/db/dialect/impl/AnsiSqlDialect.java
View File

@@ -3,7 +3,7 @@ package cn.hutool.db.dialect.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.Entity;
import cn.hutool.db.Page;

2
hutool-db/src/main/java/cn/hutool/db/dialect/impl/H2Dialect.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.db.dialect.impl;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.Entity;
import cn.hutool.db.Page;
import cn.hutool.db.StatementUtil;

2
hutool-db/src/main/java/cn/hutool/db/dialect/impl/MysqlDialect.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.dialect.impl;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.Entity;
import cn.hutool.db.Page;
import cn.hutool.db.StatementUtil;

2
hutool-db/src/main/java/cn/hutool/db/dialect/impl/OracleDialect.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.dialect.impl;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.Page;
import cn.hutool.db.dialect.DialectName;
import cn.hutool.db.sql.SqlBuilder;

2
hutool-db/src/main/java/cn/hutool/db/dialect/impl/PostgresqlDialect.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.db.dialect.impl;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.Entity;
import cn.hutool.db.StatementUtil;
import cn.hutool.db.dialect.DialectName;

4
hutool-db/src/main/java/cn/hutool/db/dialect/impl/SqlServer2012Dialect.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.dialect.impl;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.Page;
import cn.hutool.db.dialect.DialectName;
import cn.hutool.db.sql.SqlBuilder;
@@ -8,7 +8,7 @@ import cn.hutool.db.sql.Wrapper;
/**
* SQLServer2012 方言
*
*
* @author loolly
*
*/

2
hutool-db/src/main/java/cn/hutool/db/ds/AbstractDSFactory.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.db.ds;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.DbUtil;
import cn.hutool.db.GlobalDbConfig;

2
hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.ds;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.ds.bee.BeeDSFactory;
import cn.hutool.db.ds.c3p0.C3p0DSFactory;
import cn.hutool.db.ds.dbcp.DbcpDSFactory;

2
hutool-db/src/main/java/cn/hutool/db/ds/bee/BeeDSFactory.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.db.ds.bee;
import cn.beecp.BeeDataSource;
import cn.beecp.BeeDataSourceConfig;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.ds.AbstractDSFactory;
import cn.hutool.setting.Setting;

2
hutool-db/src/main/java/cn/hutool/db/ds/c3p0/C3p0DSFactory.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.db.ds.c3p0;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.ds.AbstractDSFactory;
import cn.hutool.setting.Setting;

10
hutool-db/src/main/java/cn/hutool/db/ds/dbcp/DbcpDSFactory.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.ds.dbcp;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.ds.AbstractDSFactory;
import cn.hutool.setting.Setting;
import org.apache.commons.dbcp2.BasicDataSource;
@@ -9,13 +9,13 @@ import javax.sql.DataSource;
/**
* DBCP2数据源工厂类
*
*
* @author Looly
*
*/
public class DbcpDSFactory extends AbstractDSFactory {
private static final long serialVersionUID = -9133501414334104548L;
public static final String DS_NAME = "commons-dbcp2";
public DbcpDSFactory() {
@@ -25,11 +25,11 @@ public class DbcpDSFactory extends AbstractDSFactory {
public DbcpDSFactory(Setting setting) {
super(DS_NAME, BasicDataSource.class, setting);
}
@Override
protected DataSource createDataSource(String jdbcUrl, String driver, String user, String pass, Setting poolSetting) {
final BasicDataSource ds = new BasicDataSource();
ds.setUrl(jdbcUrl);
ds.setDriverClassName(driver);
ds.setUsername(user);

2
hutool-db/src/main/java/cn/hutool/db/ds/druid/DruidDSFactory.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.ds.druid;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.ds.AbstractDSFactory;
import cn.hutool.setting.Setting;
import cn.hutool.setting.dialect.Props;

6
hutool-db/src/main/java/cn/hutool/db/ds/hikari/HikariDSFactory.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.ds.hikari;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.ds.AbstractDSFactory;
import cn.hutool.setting.Setting;
import cn.hutool.setting.dialect.Props;
@@ -11,13 +11,13 @@ import javax.sql.DataSource;
/**
* HikariCP数据源工厂类
*
*
* @author Looly
*
*/
public class HikariDSFactory extends AbstractDSFactory {
private static final long serialVersionUID = -8834744983614749401L;
public static final String DS_NAME = "HikariCP";
public HikariDSFactory() {

6
hutool-db/src/main/java/cn/hutool/db/ds/jndi/JndiDSFactory.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.db.ds.jndi;
import javax.sql.DataSource;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.DbUtil;
import cn.hutool.db.ds.AbstractDSFactory;
@@ -15,13 +15,13 @@ import cn.hutool.setting.Setting;
* [group]<br>
* jndi = jdbc/TestDB<br>
* ---------------------<br>
*
*
* @author Looly
*
*/
public class JndiDSFactory extends AbstractDSFactory {
private static final long serialVersionUID = 1573625812927370432L;
public static final String DS_NAME = "JNDI DataSource";
public JndiDSFactory() {

2
hutool-db/src/main/java/cn/hutool/db/ds/pooled/DbSetting.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.db.ds.pooled;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.dialect.DriverUtil;
import cn.hutool.db.ds.DSFactory;

6
hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDSFactory.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.ds.pooled;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.ds.AbstractDSFactory;
import cn.hutool.setting.Setting;
@@ -8,13 +8,13 @@ import javax.sql.DataSource;
/**
* Hutool自身实现的池化数据源工厂类
*
*
* @author Looly
*
*/
public class PooledDSFactory extends AbstractDSFactory {
private static final long serialVersionUID = 8093886210895248277L;
public static final String DS_NAME = "Hutool-Pooled-DataSource";
public PooledDSFactory() {

2
hutool-db/src/main/java/cn/hutool/db/ds/pooled/PooledDataSource.java
View File

@@ -3,7 +3,7 @@ package cn.hutool.db.ds.pooled;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.thread.ThreadUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.ds.simple.AbstractDataSource;

2
hutool-db/src/main/java/cn/hutool/db/ds/simple/SimpleDataSource.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.db.ds.simple;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.dialect.DriverUtil;
import cn.hutool.db.ds.DSFactory;

12
hutool-db/src/main/java/cn/hutool/db/ds/tomcat/TomcatDSFactory.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.ds.tomcat;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.ds.AbstractDSFactory;
import cn.hutool.setting.Setting;
import cn.hutool.setting.dialect.Props;
@@ -9,13 +9,13 @@ import org.apache.tomcat.jdbc.pool.PoolProperties;
/**
* Tomcat-Jdbc-Pool数据源工厂类
*
*
* @author Looly
*
*/
public class TomcatDSFactory extends AbstractDSFactory {
private static final long serialVersionUID = 4925514193275150156L;
public static final String DS_NAME = "Tomcat-Jdbc-Pool";
/**
@@ -27,13 +27,13 @@ public class TomcatDSFactory extends AbstractDSFactory {
/**
* 构造
*
*
* @param setting Setting数据库配置
*/
public TomcatDSFactory(Setting setting) {
super(DS_NAME, DataSource.class, setting);
}
@Override
protected javax.sql.DataSource createDataSource(String jdbcUrl, String driver, String user, String pass, Setting poolSetting) {
final PoolProperties poolProps = new PoolProperties();
@@ -55,7 +55,7 @@ public class TomcatDSFactory extends AbstractDSFactory {
// 连接池相关参数
poolSetting.toBean(poolProps);
return new DataSource(poolProps);
}
}

4
hutool-db/src/main/java/cn/hutool/db/handler/HandleHelper.java
View File

@@ -5,8 +5,8 @@ import cn.hutool.core.bean.PropDesc;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.reflect.ReflectUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.core.util.TypeUtil;
import cn.hutool.db.Entity;

6
hutool-db/src/main/java/cn/hutool/db/meta/IndexInfo.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.db.meta;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ObjUtil;
import java.io.Serializable;
import java.util.ArrayList;
@@ -121,8 +121,8 @@ public class IndexInfo implements Serializable, Cloneable {
return false;
}
IndexInfo indexInfo = (IndexInfo) o;
return ObjectUtil.equals(indexName, indexInfo.indexName)
&& ObjectUtil.equals(tableName, indexInfo.tableName);
return ObjUtil.equals(indexName, indexInfo.indexName)
&& ObjUtil.equals(tableName, indexInfo.tableName);
}
@Override

2
hutool-db/src/main/java/cn/hutool/db/meta/MetaUtil.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.db.meta;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.DbUtil;
import cn.hutool.db.Entity;

2
hutool-db/src/main/java/cn/hutool/db/nosql/mongo/MongoDS.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.db.nosql.mongo;
import cn.hutool.core.exceptions.NotInitedException;
import cn.hutool.core.net.NetUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.log.Log;
import cn.hutool.setting.Setting;

2
hutool-db/src/main/java/cn/hutool/db/nosql/redis/RedisDS.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.db.nosql.redis;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.setting.Setting;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;

2
hutool-db/src/main/java/cn/hutool/db/sql/Condition.java
View File

@@ -6,7 +6,7 @@ import cn.hutool.core.text.StrSplitter;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import java.util.Arrays;
import java.util.Collection;

2
hutool-db/src/main/java/cn/hutool/db/sql/ConditionBuilder.java
View File

@@ -4,7 +4,7 @@ import cn.hutool.core.builder.Builder;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import java.util.ArrayList;
import java.util.List;

2
hutool-db/src/main/java/cn/hutool/db/sql/ConditionGroup.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.db.sql;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import java.util.List;

2
hutool-db/src/main/java/cn/hutool/db/sql/Direction.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.sql;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
/**
* 排序方式（升序或者降序）

8
hutool-db/src/main/java/cn/hutool/db/sql/LogicalOperator.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.sql;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
/**
* 逻辑运算符
@@ -12,10 +12,10 @@ public enum LogicalOperator{
AND,
/** 或，满足多个条件的一个即可 */
OR;
/**
* 给定字符串逻辑运算符是否与当前逻辑运算符一致，不区分大小写，自动去除两边空白符
*
*
* @param logicalOperatorStr 逻辑运算符字符串
* @return 是否与当前逻辑运算符一致
* @since 3.2.1
@@ -26,4 +26,4 @@ public enum LogicalOperator{
}
return this.name().equalsIgnoreCase(logicalOperatorStr.trim());
}
}
}

2
hutool-db/src/main/java/cn/hutool/db/sql/NamedSql.java
View File

@@ -3,7 +3,7 @@ package cn.hutool.db.sql;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.text.StrBuilder;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import java.util.LinkedList;
import java.util.List;

14
hutool-db/src/main/java/cn/hutool/db/sql/Order.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.db.sql;
import java.io.Serializable;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
/**
* SQL排序对象
@@ -11,16 +11,16 @@ import cn.hutool.core.util.StrUtil;
*/
public class Order implements Serializable{
private static final long serialVersionUID = 1L;
/** 排序的字段 */
private String field;
/** 排序方式（正序还是反序） */
private Direction direction;
//---------------------------------------------------------- Constructor start
public Order() {
}
/**
* 构造
* @param field 排序字段
@@ -28,7 +28,7 @@ public class Order implements Serializable{
public Order(String field) {
this.field = field;
}
/**
* 构造
* @param field 排序字段
@@ -38,7 +38,7 @@ public class Order implements Serializable{
this(field);
this.direction = direction;
}
//---------------------------------------------------------- Constructor end
//---------------------------------------------------------- Getters and Setters start
@@ -70,7 +70,7 @@ public class Order implements Serializable{
this.direction = direction;
}
//---------------------------------------------------------- Getters and Setters end
@Override
public String toString() {
return StrUtil.builder().append(this.field).append(StrUtil.SPACE).append(null == direction ? StrUtil.EMPTY : direction).toString();

2
hutool-db/src/main/java/cn/hutool/db/sql/SqlBuilder.java
View File

@@ -3,7 +3,7 @@ package cn.hutool.db.sql;
import cn.hutool.core.builder.Builder;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.Entity;
import cn.hutool.db.dialect.DialectName;

2
hutool-db/src/main/java/cn/hutool/db/sql/SqlFormatter.java
View File

@@ -1,6 +1,6 @@
package cn.hutool.db.sql;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import java.util.HashSet;
import java.util.LinkedList;

4
hutool-db/src/main/java/cn/hutool/db/sql/SqlUtil.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.db.sql;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.DbRuntimeException;
import cn.hutool.db.Entity;
import cn.hutool.db.sql.Condition.LikeType;
@@ -143,7 +143,7 @@ public class SqlUtil {
* @return RowId字符串
*/
public static String rowIdToString(RowId rowId) {
return StrUtil.str(rowId.getBytes(), CharsetUtil.CHARSET_ISO_8859_1);
return StrUtil.str(rowId.getBytes(), CharsetUtil.ISO_8859_1);
}
/**

2
hutool-db/src/main/java/cn/hutool/db/sql/Wrapper.java
View File

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.Entity;
import java.io.Serializable;

2
hutool-db/src/test/java/cn/hutool/db/PicTransferTest.java
View File

@@ -2,7 +2,7 @@ package cn.hutool.db;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import org.junit.Ignore;
import org.junit.Test;

2
hutool-db/src/test/java/cn/hutool/db/meta/MetaUtilTest.java
View File

@@ -1,7 +1,7 @@
package cn.hutool.db.meta;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.text.StrUtil;
import cn.hutool.db.ds.DSFactory;
import org.junit.Assert;
import org.junit.Test;