Commit Graph

1252 Commits

Author SHA1 Message Date
Looly
15f0b6be54
!778 新增AnsiColors(改自Spring Boot)、AnsiColorWrapper,优化QrCodeUtil
Merge pull request !778 from Tom Xin/v5-dev-qrcode-svg
2022-09-14 14:57:18 +00:00
Looly
c7bb17138e IdcardUtil增加convert18To15方法 2022-09-14 21:49:22 +08:00
Looly
5bd118c636 修复ObjectUtil.defaultIfXXX中NPE问题 2022-09-13 23:04:32 +08:00
Golden Looly
a4a0633ed9
Merge pull request #2603 from youtiaoguagua/v5-dev
fix(bug): change ObjectUtil.defaultIfXXX param type Supplier to Function
2022-09-13 23:01:22 +08:00
Looly
344c27ae17 add test 2022-09-13 19:23:13 +08:00
Looly
b2c90d7d88 BooleanUtil的andOfWrap和orOfWrap()忽略null 2022-09-13 11:17:13 +08:00
youtiaoguagua
df98df70bb fix(bug): change ObjectUtil.defaultIfXXX param type Supplier to Function 2022-09-11 00:16:46 +08:00
Looly
366a0e5c93
!793 修复图片分割方法ImgUtil.sliceByRowsAndCols()导致分割后图片失真问题
Merge pull request !793 from 小白仙人/v5-master
2022-09-05 09:14:53 +00:00
cnwenjun
5de2894520 优化图片分割失真问题 2022-09-05 14:12:37 +08:00
Looly
84b4609d43
!792 【轻量级pr】优化 getProcessorCount 潜在的获取不到的问题 - V5
Merge pull request !792 from dazer007/v5-dev-cpunum-fix
2022-09-04 16:39:25 +00:00
Looly
fd7be4e6d2 扩展LocalDateTimeUtil.isIn方法使用场景 2022-09-04 22:06:11 +08:00
fengbaoheng
7ec9106c7a 补充比较当前时间的单元测试 2022-09-04 01:16:01 +08:00
fengbaoheng
be9711d5dd 合并isBetween、isIn方法 2022-09-04 01:07:15 +08:00
fengbaoheng
b906cad408 校验时间比较方法的入参合法性 2022-09-04 00:20:25 +08:00
fengbaoheng
5d148eb2e3 增加比较时间范围的工具方法 2022-09-04 00:03:17 +08:00
duandazhi
c5c60984cb 修复availableProcessors,潜在的native方法获取CPU个数失败的问题 2022-09-02 22:54:22 +08:00
Looly
87a1cec9ed add test 2022-08-30 22:27:30 +08:00
Looly
5febb65d7c
!779 解决FilterIter 类中构造器filter 传入null 无法进行迭代器迭代
Merge pull request !779 from Joker7001/v5-dev
2022-08-30 14:25:03 +00:00
Looly
c5911c0501 修复提示信息错误 2022-08-30 21:53:45 +08:00
chao.wang
030a27a0df 解决FilterIter 类中构造器filter 传入null 无法进行迭代器迭代 2022-08-29 10:24:18 +08:00
TomXin
146abd3e26 优化AnsiColorWrapper 2022-08-28 20:30:57 +08:00
TomXin
a90664b3d7 错误修正,更新AnsiEncoderTest 2022-08-27 17:27:09 +08:00
TomXin
4e53873d81 新增AnsiColors、AnsiColorWrapper 2022-08-27 15:59:03 +08:00
Looly
ef0fc738f1 UrlBuilder.addPath 方法传入非有效路径字符串时,会出现空指针异常 2022-08-27 01:10:13 +08:00
韩帅
92e1434187 NumberUtil.roundStr() 修改为使用toPlainString 2022-08-26 13:46:56 +08:00
Golden Looly
d01d1e4704
Merge pull request #2533 from Herm2s/v5-dev
feature: StrUtil增加替换字符串中第一个指定字符串和最后一个指定字符串方法
2022-08-20 01:13:14 +08:00
Golden Looly
2dd90253e2
Merge pull request #2543 from zhaoxinhu/v5-dev
V5 dev
2022-08-20 01:06:59 +08:00
Looly
b69ae38829 Tree add 类型校验 2022-08-20 01:06:37 +08:00
zhaoxinhu
331fd1f2bc 调整方法修饰符为public并添加junit测试例子 2022-08-18 09:02:43 +08:00
duhanmin
6196f83caa Tree add 类型校验 2022-08-16 14:45:32 +08:00
Looly
a60aa0ec47 IterUtil.getFirst优化 2022-08-16 09:58:15 +08:00
青韵
1c457414b9 IterUtil当为List时直接获取值 2022-08-15 22:39:16 +08:00
herm2s
d6aa8fdb96 feature: StrUtil增加替换字符串中第一个指定字符串和最后一个指定字符串方法 2022-08-15 17:50:11 +08:00
Looly
2f66008d02 NumberUtil.parseInt忽略科学计数法 2022-08-15 10:10:17 +08:00
Looly
92ca87a8fc DateUtil.parseUTC支持只有时分的格式 2022-08-15 09:11:53 +08:00
青韵
f77fd600a3 CollUtil参照Map.putIfAbsent,新增集合的addIfAbsent方法 2022-08-10 22:34:04 +08:00
Looly
0fdec254ed UrlBuilder的toURI方法将url重复编码 2022-08-09 21:14:49 +08:00
hiqiuyi
6c32295a37 指定压缩后图片的背景色 2022-08-04 14:49:03 +08:00
Looly
2e349104a3 fix code 2022-07-29 23:48:40 +08:00
Looly
d4d8522cd4
!729 修复Convert#toMap默认转成HashMap的问题,关联issue#I5IG1F
Merge pull request !729 from 问北/v5-dev
2022-07-29 14:09:08 +00:00
Looly
a8c6cf94cd
!726 新增zip文件解压大小限制,防止zip炸弹
Merge pull request !726 from mingwang/v5-master
2022-07-29 13:59:10 +00:00
Looly
22259e568f add test 2022-07-29 21:39:01 +08:00
Golden Looly
4344834ac2
Merge pull request #2475 from hiqiuyi/v5-dev
根据文字创建透明背景的PNG图片
2022-07-29 21:33:30 +08:00
Golden Looly
4123efcad9
Merge pull request #2492 from duhanmin/2484-v
测试在非覆盖模式下,来源对象值为null则不覆盖
2022-07-29 21:16:04 +08:00
duhanmin
348b0652b6 测试在非覆盖模式下,来源对象值为null则不覆盖 2022-07-28 21:22:00 +08:00
wenbei
bb85c40924 1.更新 Convert.toMap方法注释,格式化代码
2.删除mapToMapWithSelfTypeTest方法多余空行
2022-07-26 12:33:09 +08:00
wenbei
de52d71031 1.update Convert.toMap, If value is a map type, use its own type; otherwise, use HashMap
2.add Convert.toMap, Overload a method to specify the map type of conversion
2022-07-26 11:55:00 +08:00
hiqiuyi
0f2fc9f3ae 根据文字创建透明背景的PNG图片 2022-07-25 12:01:26 +08:00
zhouxm
160fec0f69 说明
在对在对Zip文件解压时,判断该Zip文件是否是Zip炸弹,如果是Zip炸弹那么抛出异常

修改描述
[新特性] 新增限制zip文件解压后大小
2022-07-24 03:41:17 +08:00
Looly
b74b7c682c fix code 2022-07-22 16:58:52 +08:00
zhangrenhua
cf84d06cce 增加两个日期间隔时间处理接口 2022-07-22 15:01:40 +08:00
zhangrenhua
fe332dc2dc json序列化时,增加允许多个相同的key配置 2022-07-22 09:09:21 +08:00
zhangrenhua
0ca9627663 参考java.util.concurrent.TimeUnit实现了一个FileSizeUnit工具包,与hutool中DataSize相比更加侧重于单位之间转换 2022-07-21 15:43:15 +08:00
zhangrenhua
2a3686631d Revert "参考java.util.concurrent.TimeUnit实现了一个FileSizeUnit工具包,与hutool中DataSize相比更加侧重于单位之间转换"
This reverts commit 064b163754.
2022-07-21 15:39:54 +08:00
zhangrenhua
8d2e4c3b4c Revert "扩展IoUtil、BooleanUtil两个工具类"
This reverts commit eefdd7fc
2022-07-21 15:36:05 +08:00
zhangrenhua
064b163754 参考java.util.concurrent.TimeUnit实现了一个FileSizeUnit工具包,与hutool中DataSize相比更加侧重于单位之间转换 2022-07-21 15:33:33 +08:00
zhangrenhua
0da4339f51 Merge branch 'v5-dev' of https://gitee.com/hellozrh/hutool into v5-dev 2022-07-21 15:22:35 +08:00
Looly
88c36b8bfa 修复UrlBuilder无法配置末尾追加“/”问题 2022-07-20 13:13:14 +08:00
zhangrenhua
3d27c01819 Merge branch 'v5-dev' of https://gitee.com/hellozrh/hutool into v5-dev 2022-07-19 10:20:47 +08:00
huangchengxing
13b5b32384 添加元素扫描器与通用注解扫描器,在AnnotationScanner中统一提供已经配置好扫描模式的静态扫描器实例 2022-07-19 09:56:37 +08:00
Looly
97fdc33d47
!702 合成注解相关功能重构,添加支持通过@Link及其子注解,实现注解中属性的互为镜像、可选覆盖以及强制覆盖三种模式的别名机制的新特性
Merge pull request !702 from Createsequence/feat-link-annotation-clean
2022-07-17 13:59:18 +00:00
Looly
5c6e7cf507 修复CombinationAnnotationElement造成递归循环 2022-07-17 18:17:32 +08:00
Looly
5d500f8f14 ReUtil增加getAllGroups重载 2022-07-17 00:30:39 +08:00
Looly
eb9df251d5 增加TemporalAccessorUtil.isIn、LocalDateTimeUtil.isIn 2022-07-17 00:15:14 +08:00
huangchengxing
c27c74f192 合成聚合注解支持处理多个根注解,并且可选择是否扫描根注解的元注解 2022-07-16 18:02:02 +08:00
huangchengxing
d873b6e9da 提取获取注解属性值相关逻辑至注解属性值提取器 2022-07-16 16:19:54 +08:00
huangchengxing
931965301b 提取注解合成相关逻辑至注解合成器 2022-07-16 13:18:55 +08:00
Looly
ab79193c7e fix code 2022-07-16 12:18:21 +08:00
Looly
c2ebdb4476
!699 ForestMap添加getNodeValue方法
Merge pull request !699 from Createsequence/feat-node-value
2022-07-16 00:39:30 +00:00
huangchengxing
cf08a92f34 添加层级对象接口 2022-07-14 16:16:14 +08:00
huangchengxing
18f67274b8 优化代码,调整类名 2022-07-13 22:42:16 +08:00
huangchengxing
a352783b5c 优化代码,调整变量、方法与类名,完善测试用例 2022-07-13 22:39:41 +08:00
huangchengxing
18c7a78062 调整方法、变量与类名,完善测试用例 2022-07-13 22:36:08 +08:00
huangchengxing
eae76eb275 优化代码,修复不准确的注释,完善测试用例 2022-07-13 22:34:13 +08:00
huangchengxing
17b48024ad 添加@ForceAliasFor注解 2022-07-13 22:32:04 +08:00
huangchengxing
491c53e7dd 添加@MirrorFor和@AliasFor注解 2022-07-13 22:31:48 +08:00
huangchengxing
e4a7576d7f 1.添加@Link注解以及对应的关系枚举
2.添加注解属性对象与合成注解后置处理器,用于支持基于@Alias与@Link的枚举字段映射功能
2022-07-13 20:38:18 +08:00
huangchengxing
6ca36ec059 add methods 2022-07-13 09:08:03 +08:00
zhangrenhua
eefdd7fc4f 扩展IoUtil、BooleanUtil两个工具类 2022-07-11 16:15:46 +08:00
duhanmin
607ddb725e containsAll 2022-07-09 11:32:55 +08:00
Looly
6ac537d6c3 fix bug 2022-07-05 22:26:27 +08:00
Golden Looly
99d83e142f
Merge pull request #2428 from SupermanChao/v5-dev
fix:修复CollUtil里面关于可变参数传null造成的crash问题
2022-07-05 22:23:57 +08:00
Looly
7f481b3556 add ForestMap 2022-07-05 22:01:38 +08:00
Looly
2c44d04dfd
!677 添加支持对森林结构进行处理的集合
Merge pull request !677 from Createsequence/feat-forest-map
2022-07-05 13:56:58 +00:00
Looly
34835939d2 add method 2022-07-05 21:54:41 +08:00
Looly
fc6a0567b4 add method 2022-07-05 21:47:47 +08:00
Looly
ea6637a770
!674 Convert工具类中,新增中文大写数字金额转换为数字工具方法,解决issues I5EYB3
Merge pull request !674 from hellozrh/v5-dev
2022-07-05 13:30:45 +00:00
huangchengxing
c343b51e38 移除不必要的泛型约束 2022-07-05 16:20:49 +08:00
huangchengxing
254e6f5315 将合成注解代理类提取为外部类 2022-07-05 16:03:11 +08:00
huangchengxing
d20980096e 将SyntheticAnnotation提取为接口,原实现更名为SyntheticMetaAnnotation 2022-07-05 13:47:11 +08:00
刘超
39869d3c67 fix:修复CollUtil里面关于可变参数传null造成的crash问题 2022-07-04 22:23:03 +08:00
huangchengxing
56abab1127 完善测试用例 2022-07-04 18:34:01 +08:00
huangchengxing
81cbb0d8a0 fix code 2022-07-04 15:55:07 +08:00
huangchengxing
59b5a17ee6 添加支持对森林结构进行处理的集合 2022-07-04 15:35:20 +08:00
zhangrenhua
7f13b38a7f 中文大写数字金额转换为数字,返回结果以元为单位的BigDecimal类型数字
解决问题 https://gitee.com/dromara/hutool/issues/I5EYB3
2022-07-01 17:22:04 +08:00
Looly
adf23e1cf7 fix code 2022-06-30 18:40:08 +08:00
Looly
9b19403960
!671 修复注解工具类getAnnotations的NPE问题,注解扫描器添新功能
Merge pull request !671 from Createsequence/refactor-annotation
2022-06-30 10:09:12 +00:00
huangchengxing
7cc0994942 AnnotationUtil添加scanMetaAnnotation、scanClass与scanMethod方法 2022-06-30 15:31:38 +08:00
huangchengxing
0b60b24950 test: 注解扫描器的完善测试用例; 2022-06-30 15:30:41 +08:00
bob.guo
975a6dbe69 检查值是否在指定范围内 修改方法命名 2022-06-30 10:03:12 +08:00
bob.guo
9eb9b07b11 检查值是否在指定范围内 2022-06-28 19:50:41 +08:00
Looly
fc091b01a2 fix test 2022-06-27 21:47:38 +08:00
Looly
ac11df0889 fix bug 2022-06-27 21:29:25 +08:00
Looly
a6d4e96a41 新增注解扫描器和合成注解 2022-06-27 20:25:14 +08:00
Looly
44503270bf
!654 新增注解扫描器和合成注解
Merge pull request !654 from Createsequence/feat-synthetic-annotation
2022-06-27 12:08:55 +00:00
Looly
33e95b23c1 BeanPath在空元素时默认加入map,修改根据下标类型赋值List or map 2022-06-20 19:49:07 +08:00
Looly
e27b24005d LocalDateTimeUtil.parse改为blank检查 2022-06-20 12:25:23 +08:00
Looly
b830e07c52
!661 添加一个带默认值的 Ipv4Util.ipv4ToLong 方法
Merge pull request !661 from churen/v5-dev
2022-06-20 04:13:47 +00:00
Looly
6f6f094d30 add test 2022-06-20 12:08:22 +08:00
lihai03
916a56dac3 添加一个带默认值的 Ipv4Util.ipv4ToLong 方法 2022-06-20 11:12:21 +08:00
Looly
d9601cbbf5 change code for ObjectUtil.isNotNull 2022-06-18 11:06:56 +08:00
Looly
231e0cf1d7 add test 2022-06-16 13:05:53 +08:00
Looly
ea4bc023af fix convert to int bug 2022-06-16 12:49:55 +08:00
Looly
60dd7ce563 fix buf 2022-06-16 12:10:56 +08:00
huangchengxing
5e402a1dd9 合成注解属性调整为同时根据名称和类型进行覆盖; 2022-06-14 17:30:38 +08:00
huangchengxing
686de3ac0c 添加合成注解; 2022-06-14 17:30:37 +08:00
Looly
e9b6f7b2af add method 2022-06-14 16:43:05 +08:00
huangchengxing
0cb498bf6e 添加注解扫描器; 2022-06-14 15:26:51 +08:00
Takaki
b1a93a3345 enhancement in BeanUtil 2022-06-14 11:21:08 +08:00
Looly
54420d8429 fix bug 2022-06-10 22:06:39 +08:00
Looly
dd0fac8889 add webp support 2022-06-09 12:09:12 +08:00
Looly
1c6bdf67e0 fix bug 2022-06-06 01:27:16 +08:00
Looly
78b6c9909e fix null bug 2022-06-05 23:40:34 +08:00
Looly
60a068db3f fix bug and add timeout 2022-05-30 07:44:45 +08:00
Looly
c72ff2c292 fix bug 2022-05-27 18:06:54 +08:00
yubo
64fe41a171 car vin not include I O Q 2022-05-24 15:45:33 +08:00
Looly
3ebd7d9ce0 fix bugs 2022-05-20 12:07:27 +08:00
Looly
3f8699f7e9 fix bug 2022-05-18 10:33:21 +08:00
Looly
0eb5c84ba8 add hex support 2022-05-16 19:00:13 +08:00
Looly
541ab9ed55 add CastUtil 2022-05-12 01:21:44 +08:00
章福来
fb79f437ab 增加泛型集合向上、向下转型 2022-05-10 09:47:08 +08:00
Looly
3df525409b fix bug 2022-05-09 11:41:36 +08:00
Looly
62f851142b fix bug 2022-05-09 10:10:43 +08:00
VampireAchao
b86147c4ae MapUtil.map对null友好,且修复了测试用例中分组问题 2022-05-07 13:01:30 +08:00
Looly
56b0c907e9 add methods 2022-05-05 09:20:02 +08:00
mo_chou_555
2a9eaa6a7f 增加Assert的equals及notEquals 2022-05-03 12:31:55 +08:00
Looly
8b98cb3e90 add test 2022-04-30 11:40:20 +08:00
Looly
c9064c2334 ad test 2022-04-30 10:46:17 +08:00
Looly
bea723c11b add methods 2022-04-28 17:00:49 +08:00
Looly
2917cb7934 fix code 2022-04-28 11:42:25 +08:00
Looly
d874b4282d fix #I54TZ9 2022-04-27 23:26:11 +08:00
Looly
3329d60fff add test 2022-04-27 18:34:57 +08:00
Looly
3896b9d675 fix code 2022-04-27 16:02:57 +08:00
Looly
8e797bd9c1 add ansi 2022-04-27 13:49:31 +08:00
Looly
f118bf8e7e add predicate for CombinationAnnotationElement 2022-04-27 11:22:31 +08:00
李鸿达
562e77e438 fixed 7dbc9e9 from https://gitee.com/yixi-dlmu/hutool/pulls/603
新增可获取重复性注解方法
2022-04-26 13:46:39 +00:00
Looly
d3f7fdcdd5 add test 2022-04-26 11:16:23 +08:00
Looly
82f5b2b154 gts 2022-04-25 17:23:31 +08:00
Looly
940d1cbe31 fix code 2022-04-25 16:04:49 +08:00
Looly
1bed879499 add Hashids 2022-04-25 13:13:11 +08:00
Looly
913e97c272 add tesrt 2022-04-24 11:37:37 +08:00
Looly
7380d5ce91 add test 2022-04-19 19:10:38 +08:00
Looly
befd56bbdb add test 2022-04-19 19:04:38 +08:00
Looly
992477f521 add map 2022-04-17 16:19:16 +08:00
Looly
7e36d0f076 add method 2022-04-17 08:53:43 +08:00
Looly
f23ec7eb16 fix code 2022-04-16 08:13:37 +08:00
Looly
a938455c2e add test 2022-04-13 17:23:24 +08:00
Looly
d890d60b14 add methods 2022-04-13 00:30:01 +08:00
Looly
c1fc2cfc85
!595 添加给图片添加全屏文字水印的方法
Merge pull request !595 from lxychlu/v5-dev
2022-04-12 14:58:42 +00:00
Looly
ca1563ee34 add pid 2022-04-12 14:06:24 +08:00
liuxy
9edf1d2acc 添加给图片添加全屏文字水印的方法 2022-04-11 16:13:15 +08:00
liuxy
ffac908649 添加给图片添加全屏文字水印的方法 2022-04-11 16:10:34 +08:00
Looly
eff60f0c86 fix code 2022-04-10 21:07:56 +08:00
Looly
af977ac3d4 fix weak bug 2022-04-10 18:30:07 +08:00
Looly
477657ffb8 fix code 2022-04-10 15:45:02 +08:00
Looly
f9a3cf7b23 fix bg 2022-04-10 15:24:14 +08:00
Looly
569877e0ef fix null bug 2022-04-10 11:18:54 +08:00
Looly
2b79119c00 fix bug 2022-04-08 21:36:45 +08:00
Looly
b419d8e5f5 fix comment 2022-04-07 15:55:11 +08:00
Looly
d415696e01 add randomSequence support 2022-04-06 23:50:56 +08:00
duandazhi
6b61efd869 Validator 增加:中国人姓名正则校验 2022-04-06 19:13:37 +08:00
Looly
58c7c688ae add methods 2022-04-06 09:46:44 +08:00
lqc
40bfd39407 [新特性] CopyOptions支持以Lambda方式设置忽略属性列表 2022-04-04 22:13:17 +08:00
Looly
9a953b2a03 fix comment 2022-04-02 00:34:49 +08:00
Looly
0986e60a7c fix bug 2022-04-01 12:10:09 +08:00
Looly
2fce7eab06 fix bug 2022-04-01 11:34:30 +08:00
Looly
6a79844dec add test 2022-03-31 19:36:58 +08:00
Looly
64dbc41884 add test 2022-03-31 16:00:11 +08:00
Looly
ae628d5a2c add methods 2022-03-31 02:09:12 +08:00
Looly
0a9a178fbc add method 2022-03-31 00:29:38 +08:00
Looly
d27d2d54aa add test 2022-03-30 20:58:13 +08:00
Looly
d86b643412 fix code 2022-03-30 16:55:03 +08:00
Looly
6427120482 add method 2022-03-30 01:23:48 +08:00
Looly
0d9185a98d add test 2022-03-29 23:57:03 +08:00
Looly
8683caaad0 fix bug and add method 2022-03-28 15:57:36 +08:00
Looly
63ad6de20d fix bug 2022-03-28 00:44:21 +08:00
Looly
8177848a47 fix bug 2022-03-27 23:08:45 +08:00
Looly
c2e1bbafc8 fix code 2022-03-27 18:47:41 +08:00
Looly
bbcf5f1b54 change parser 2022-03-27 12:14:55 +08:00
Looly
eb5fbbb11e add method 2022-03-26 00:15:12 +08:00
VampireAchao
40bc89511e 统一LambdaUtil#getRealClass方法,并提供测试用例,还对传入lambda进行了校验,且完善了注释... 2022-03-25 19:34:24 +08:00
Looly
e622296e64 add test 2022-03-25 11:36:50 +08:00
Looly
222f18e847 add method 2022-03-25 02:31:47 +08:00
Looly
59f7708924 fix code 2022-03-25 02:05:58 +08:00
Looly
e76d2e13cb fix code 2022-03-25 00:53:51 +08:00
Looly
e5bc9d5484
!583 MapUtil提供change函数,EnumUtil提供getBy函数,通过lambda进行枚举字段映射
Merge pull request !583 from 阿超/v5-dev
2022-03-24 15:55:54 +00:00
VampireAchao
38df5a48b6 新增MapUtil#change函数 2022-03-24 23:33:34 +08:00
Looly
0b49530c1d add mime support 2022-03-24 21:58:02 +08:00
Looly
eb0cc1a503 add methon 2022-03-24 10:47:03 +08:00
VampireAchao
c669426a1e 修改Func1参数的方法为LambdaUtil#getInstantiatedClass
提供EnumUtil中对lambda进行映射处理
2022-03-23 22:27:38 +08:00