lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-30 04:45:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2022-04-28 03:35:07 +08:00
parent 351c841de0
commit c65d51b87e
34 changed files with 57 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-core/src/main/java/cn/hutool/core/date/DateUtil.java
View File

@ -7,10 +7,10 @@ import cn.hutool.core.date.format.DatePrinter;
import cn.hutool.core.date.format.FastDateFormat;
import cn.hutool.core.date.format.GlobalCustomFormat;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.regex.PatternPool;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
import java.text.DateFormat;

2
hutool-core/src/main/java/cn/hutool/core/date/LocalDateTimeUtil.java
View File

@ -2,7 +2,7 @@ package cn.hutool.core.date;
import cn.hutool.core.date.format.GlobalCustomFormat;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
import java.time.DayOfWeek;

2
hutool-core/src/main/java/cn/hutool/core/io/FileUtil.java
View File

@ -18,7 +18,7 @@ import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ClassUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil;
import cn.hutool.core.util.ZipUtil;

2
hutool-core/src/main/java/cn/hutool/core/io/file/FileNameUtil.java
View File

@ -1,7 +1,7 @@
package cn.hutool.core.io.file;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
import java.io.File;

3
hutool-core/src/main/java/cn/hutool/core/lang/Validator.java
View File

@ -2,10 +2,11 @@ package cn.hutool.core.lang;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.exceptions.ValidateException;
import cn.hutool.core.regex.PatternPool;
import cn.hutool.core.util.CreditCodeUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.IdcardUtil;

2
hutool-core/src/main/java/cn/hutool/core/lang/ParameterizedTypeImpl.java → hutool-core/src/main/java/cn/hutool/core/lang/reflect/ParameterizedTypeImpl.java
View File

@ -1,4 +1,4 @@
package cn.hutool.core.lang;
package cn.hutool.core.lang.reflect;
import java.io.Serializable;
import java.lang.reflect.ParameterizedType;

2
hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java
View File

@ -3,7 +3,7 @@ package cn.hutool.core.net;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.regex.PatternPool;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.StrUtil;

2
hutool-core/src/main/java/cn/hutool/core/lang/PatternPool.java → hutool-core/src/main/java/cn/hutool/core/regex/PatternPool.java
View File

@ -1,4 +1,4 @@
package cn.hutool.core.lang;
package cn.hutool.core.regex;
import cn.hutool.core.map.WeakConcurrentMap;

9
hutool-core/src/main/java/cn/hutool/core/util/ReUtil.java → hutool-core/src/main/java/cn/hutool/core/regex/ReUtil.java
View File

@ -1,16 +1,19 @@
package cn.hutool.core.util;
package cn.hutool.core.regex;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.RegexPool;
import cn.hutool.core.regex.PatternPool;
import cn.hutool.core.regex.RegexPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.lang.func.Func1;
import cn.hutool.core.lang.mutable.Mutable;
import cn.hutool.core.lang.mutable.MutableObj;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReflectUtil;
import cn.hutool.core.util.StrUtil;
import java.util.ArrayList;
import java.util.Collection;

12
hutool-core/src/main/java/cn/hutool/core/lang/RegexPool.java → hutool-core/src/main/java/cn/hutool/core/regex/RegexPool.java
View File

@ -1,4 +1,4 @@
package cn.hutool.core.lang;
package cn.hutool.core.regex;
/**
* 常用正则表达式字符串池
@ -21,7 +21,7 @@ public interface RegexPool {
String WORD = "[a-zA-Z]+";
/**
* 单个中文汉字<br>
* 参照维基百科汉字Unicode范围(https://zh.wikipedia.org/wiki/%E6%B1%89%E5%AD%97 页面右侧)
* 参照维基百科汉字Unicode范围(<a href="https://zh.wikipedia.org/wiki/%E6%B1%89%E5%AD%97">https://zh.wikipedia.org/wiki/%E6%B1%89%E5%AD%97</a> 页面右侧)
*/
String CHINESE = "[\u2E80-\u2EFF\u2F00-\u2FDF\u31C0-\u31EF\u3400-\u4DBF\u4E00-\u9FFF\uF900-\uFAFF\uD840\uDC00-\uD869\uDEDF\uD869\uDF00-\uD86D\uDF3F\uD86D\uDF40-\uD86E\uDC1F\uD86E\uDC20-\uD873\uDEAF\uD87E\uDC00-\uD87E\uDE1F]";
/**
@ -47,8 +47,8 @@ public interface RegexPool {
*/
String MONEY = "^(\\d+(?:\\.\\d+)?)$";
/**
* 邮件，符合RFC 5322规范，正则来自：http://emailregex.com/
* What is the maximum length of a valid email address? https://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address/44317754
* 邮件，符合RFC 5322规范，正则来自：<a href="http://emailregex.com/">http://emailregex.com/</a>
* What is the maximum length of a valid email address? <a href="https://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address/44317754">https://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address/44317754</a>
* 注意email 要宽松一点。比如 jetz.chong@hutool.cn、jetz-chong@ hutool.cn、jetz_chong@hutool.cn、dazhi.duan@hutool.cn 宽松一点把，都算是正常的邮箱
*/
String EMAIL = "(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)])";
@ -103,7 +103,7 @@ public interface RegexPool {
String BIRTHDAY = "^(\\d{2,4})([/\\-.年]?)(\\d{1,2})([/\\-.月]?)(\\d{1,2})日?$";
/**
* URI<br>
* 定义见：https://www.ietf.org/rfc/rfc3986.html#appendix-B
* 定义见：<a href="https://www.ietf.org/rfc/rfc3986.html#appendix-B">https://www.ietf.org/rfc/rfc3986.html#appendix-B</a>
*/
String URI = "^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?";
/**
@ -111,7 +111,7 @@ public interface RegexPool {
*/
String URL = "[a-zA-Z]+://[\\w-+&@#/%?=~_|!:,.;]*[\\w-+&@#/%=~_|]";
/**
* Http URL（来自：http://urlregex.com/）<br>
* Http URL（来自：<a href="http://urlregex.com/">http://urlregex.com/</a>）<br>
* 此正则同时支持FTP、File等协议的URL
*/
String URL_HTTP = "(https?|ftp|file)://[\\w-+&@#/%?=~_|!:,.;]*[\\w-+&@#/%=~_|]";

7
hutool-core/src/main/java/cn/hutool/core/regex/package-info.java Normal file
View File

@ -0,0 +1,7 @@
/**
* 正则表达式相关封装
*
* @author looly
*
*/
package cn.hutool.core.regex;

2
hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
View File

@ -15,7 +15,7 @@ import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.DesensitizedUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
import java.nio.ByteBuffer;

2
hutool-core/src/main/java/cn/hutool/core/text/StrSplitter.java
View File

@ -1,6 +1,6 @@
package cn.hutool.core.text;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.regex.PatternPool;
import cn.hutool.core.text.finder.CharFinder;
import cn.hutool.core.text.finder.CharMatcherFinder;
import cn.hutool.core.text.finder.LengthFinder;

3
hutool-core/src/main/java/cn/hutool/core/util/CreditCodeUtil.java
View File

@ -1,6 +1,7 @@
package cn.hutool.core.util;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.regex.PatternPool;
import cn.hutool.core.regex.ReUtil;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

3
hutool-core/src/main/java/cn/hutool/core/util/IdcardUtil.java
View File

@ -4,8 +4,9 @@ import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.regex.PatternPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.regex.ReUtil;
import java.io.Serializable;
import java.util.Date;

3
hutool-core/src/main/java/cn/hutool/core/util/PhoneUtil.java
View File

@ -1,7 +1,8 @@
package cn.hutool.core.util;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.regex.PatternPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.regex.ReUtil;
/**

2
hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java
View File

@ -1,6 +1,6 @@
package cn.hutool.core.util;
import cn.hutool.core.lang.ParameterizedTypeImpl;
import cn.hutool.core.lang.reflect.ParameterizedTypeImpl;
import cn.hutool.core.lang.reflect.ActualTypeMapperPool;
import java.lang.reflect.Field;

1
hutool-core/src/test/java/cn/hutool/core/lang/ValidatorTest.java
View File

@ -2,6 +2,7 @@ package cn.hutool.core.lang;
import cn.hutool.core.exceptions.ValidateException;
import cn.hutool.core.lang.id.IdUtil;
import cn.hutool.core.regex.PatternPool;
import org.junit.Assert;
import org.junit.Test;

4
hutool-core/src/test/java/cn/hutool/core/net/NetUtilTest.java
View File

@ -1,8 +1,8 @@
package cn.hutool.core.net;
import cn.hutool.core.lang.Console;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.PatternPool;
import cn.hutool.core.regex.ReUtil;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;

3
hutool-core/src/test/java/cn/hutool/core/util/ReUtilTest.java
View File

@ -2,7 +2,8 @@ package cn.hutool.core.util;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.regex.PatternPool;
import cn.hutool.core.regex.ReUtil;
import org.junit.Assert;
import org.junit.Test;

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

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

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

@ -1,7 +1,7 @@
package cn.hutool.db.meta;
import cn.hutool.core.util.BooleanUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.db.DbRuntimeException;
import java.io.Serializable;

2
hutool-extra/src/main/java/cn/hutool/extra/system/JavaInfo.java
View File

@ -1,7 +1,7 @@
package cn.hutool.extra.system;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import java.io.Serializable;

2
hutool-http/src/main/java/cn/hutool/http/HtmlUtil.java
View File

@ -1,7 +1,7 @@
package cn.hutool.http;
import cn.hutool.core.text.escape.EscapeUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
/**

2
hutool-http/src/main/java/cn/hutool/http/HttpResponse.java
View File

@ -7,7 +7,7 @@ import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.io.StreamProgress;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil;
import cn.hutool.http.cookie.GlobalCookieManager;

2
hutool-http/src/main/java/cn/hutool/http/HttpUtil.java
View File

@ -11,7 +11,7 @@ import cn.hutool.core.net.url.UrlQuery;
import cn.hutool.core.text.StrBuilder;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.URLUtil;
import cn.hutool.http.cookie.GlobalCookieManager;

2
hutool-http/src/main/java/cn/hutool/http/useragent/Browser.java
View File

@ -1,7 +1,7 @@
package cn.hutool.http.useragent;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import java.util.List;
import java.util.regex.Pattern;

2
hutool-http/src/main/java/cn/hutool/http/useragent/Engine.java
View File

@ -1,7 +1,7 @@
package cn.hutool.http.useragent;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import java.util.List;
import java.util.regex.Pattern;

2
hutool-http/src/main/java/cn/hutool/http/useragent/OS.java
View File

@ -1,7 +1,7 @@
package cn.hutool.http.useragent;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import java.util.List;
import java.util.regex.Pattern;

2
hutool-http/src/main/java/cn/hutool/http/useragent/UserAgentInfo.java
View File

@ -1,6 +1,6 @@
package cn.hutool.http.useragent;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import java.io.Serializable;
import java.util.regex.Pattern;

2
hutool-http/src/test/java/cn/hutool/http/HttpUtilTest.java
View File

@ -4,7 +4,7 @@ import cn.hutool.core.codec.Base64;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;

2
hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelUtil.java
View File

@ -4,7 +4,7 @@ import cn.hutool.core.exceptions.DependencyException;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.poi.PoiChecker;
import cn.hutool.poi.excel.cell.CellLocation;

2
hutool-poi/src/main/java/cn/hutool/poi/excel/cell/setters/EscapeStrCellSetter.java
View File

@ -1,6 +1,6 @@
package cn.hutool.poi.excel.cell.setters;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
import java.util.regex.Pattern;

2
hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java
View File

@ -6,7 +6,7 @@ import cn.hutool.core.io.resource.Resource;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.regex.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.SystemPropsUtil;
import cn.hutool.log.Log;