3133 Commits

Author SHA1 Message Date
Looly
f7ab6b0ccf add methods 2022-01-27 09:04:23 +08:00
Golden Looly
3ac71b0a6f
Merge pull request #2118 from youzipi/v5-dev
feat(core:DateUtil): add `rangeFunc` and `rangeConsume`
2022-01-27 08:38:37 +08:00
youzipi
344212f5b6 feat(core:DateUtil): add rangeFunc and rangeConsume 2022-01-26 18:37:39 +08:00
Looly
54a6ba09c6 fix cv 2022-01-26 18:35:16 +08:00
Looly
f729ba7b9c add method 2022-01-26 17:11:42 +08:00
Looly
201290d7c4 update dependency 2022-01-26 10:34:27 +08:00
Looly
bd89ec9335 fix getUsed bug 2022-01-26 10:31:07 +08:00
Looly
48e0e99bb6 add ConditionGroup 2022-01-25 11:12:41 +08:00
Looly
24f79fba4a
!514 新:新增条件组,用于处理复杂的where条件
Merge pull request !514 from 小怪兽说疼疼哒/v5-dev
2022-01-25 03:08:19 +00:00
Looly
763027a786 add method 2022-01-25 11:05:23 +08:00
Looly
fb216a0bff
!516 DateUtil 添加两个日期是否同一周方法,补充 test
Merge pull request !516 from naohu/v5-dev
2022-01-25 02:57:23 +00:00
Looly
0e78438658 add method 2022-01-25 10:56:51 +08:00
Looly
06db212f24 add test 2022-01-25 10:46:53 +08:00
Looly
efeddc1469 fix bug 2022-01-21 11:47:11 +08:00
Looly
f2462892d8 add test 2022-01-21 11:35:13 +08:00
naooohu
3b6cca7435 fix 把日期为设置为当前周的第一天代码块移动到 CalendarUtil 中 2022-01-21 00:55:34 +08:00
naooohu
7d4d87be82 add 添加跨月比较是否在同一周 2022-01-20 21:12:29 +08:00
Looly
673df9e76a add templates 2022-01-20 18:23:43 +08:00
tjh
4447bb18d4 新:新增条件组,用于处理复杂的where条件 2022-01-20 16:28:08 +08:00
Looly
6014a47f7c fix path 2022-01-20 12:30:53 +08:00
Looly
e596a9c8e4 prepare 5.7.21 2022-01-20 12:27:37 +08:00
Looly
41bae74843 🧣release 5.7.20 2022-01-20 12:16:48 +08:00
Looly
4a351ec741 fix tes 2022-01-20 12:10:46 +08:00
Looly
a6e1231085 fix code 2022-01-20 11:41:56 +08:00
Looly
7c18710712 add method 2022-01-20 10:39:29 +08:00
Looly
cbc6682a5c
!508 change ipv4util getBeginIpLong to public
Merge pull request !508 from 不忘初心/v5-dev
2022-01-20 02:38:19 +00:00
Looly
b9df76f92c add method 2022-01-20 10:21:20 +08:00
Looly
c143a61395
!512 增加了判断时间段重合的方法
Merge pull request !512 from 爱花花/cherry-pick-1642598162
2022-01-20 02:06:20 +00:00
Looly
5c6e275750 fix bug 2022-01-20 09:57:24 +08:00
naooohu
538874562d add 添加判断两个日期是否为一周(国内一周的开始为周一,国外一周的开始为周日) 2022-01-20 01:28:58 +08:00
GL
03657b2eaf fixed c592aa6 from https://gitee.com/huahua522/hutool/pulls/511
fixed d6b78ed from https://gitee.com/huahua522/hutool/pulls/509
增加对时间段重合的判断方法 测试用例
2022-01-19 13:16:02 +00:00
GL
41651781b1 fixed 178b994 from https://gitee.com/huahua522/hutool/pulls/511
fixed 4248036 from https://gitee.com/huahua522/hutool/pulls/509
增加对时间段重合的判断方法
2022-01-19 13:16:02 +00:00
Looly
9a88945386 fix bug 2022-01-19 09:25:05 +08:00
Looly
ee80e8c195
!507 修复:格式化为中文日期时,0被处理为空串
Merge pull request !507 from 小怪兽说疼疼哒/v5-dev
2022-01-19 01:10:54 +00:00
不忘初心
7ef7ac52f0
change ipv4util getBeginIpLong to public 2022-01-18 11:09:51 +00:00
tjh
8c20364c2c 修复:格式化为中文日期时,0被处理为空串 2022-01-18 16:12:03 +08:00
tjh
4b02bc7287 修复:格式化为中文日期时,0被处理为空串 2022-01-18 15:39:44 +08:00
Looly
db5bd528ce fix bug 2022-01-17 19:16:07 +08:00
Looly
727e561c1a fix bug 2022-01-17 18:09:56 +08:00
Looly
92afc0b757
!504 修复Opt.ofTry中并发环境下线程安全问题
Merge pull request !504 from 阿超/v5-dev
2022-01-17 10:07:15 +00:00
Looly
91e2eabd04 fix bug 2022-01-17 18:05:32 +08:00
VampireAchao
cba1659833 修复ofTry中并发环境下线程安全问题 2022-01-17 14:40:16 +08:00
Looly
dd560ce5e3 change code 2022-01-16 00:39:44 +08:00
Looly
3720ca5ce7
!503 fix: 对RandomUtil.randomStringWithoutStr排除字符串兼容大写字母
Merge pull request !503 from dream/v5-dev
2022-01-15 16:35:58 +00:00
dream
cacf025b2f fix: 对RandomUtil.randomStringWithoutStr排除字符串兼容大写字母 2022-01-16 00:09:44 +08:00
Looly
15a34bcc24 add method 2022-01-15 22:09:52 +08:00
Looly
749c0f8727 fix bug 2022-01-15 19:22:40 +08:00
Looly
4b44716b5f add null ignore for CollectorUtil 2022-01-15 13:30:44 +08:00
Looly
05ebfb44a9
!502 在CollectorUtil提交Collectors.toMap的对null友好实现,避免NPE
Merge pull request !502 from 阿超/v5-dev
2022-01-15 05:28:11 +00:00
Looly
da4d64fcbc add xugu 2022-01-15 13:26:56 +08:00