Commit Graph

1338 Commits

Author SHA1 Message Date
Looly
a616903de1 fix bug 2021-04-02 18:54:05 +08:00
Zhu Kaixiao
d244650ebc 修正调用 2021-04-02 15:27:13 +08:00
Zhu Kaixiao
6e6aa91a90 新增根据日期获取节气 2021-04-02 15:15:46 +08:00
duandazhi
6d9766effd 修改char utils 带圈字符串的注释 2021-04-02 13:24:16 +08:00
yl-yue
42ca239a58 1. mapToBean()添加对布尔值is前缀的识别
2. 添加相应的测试用例
2021-04-01 16:30:47 +08:00
Looly
9027d146a8 add test 2021-04-01 10:18:20 +08:00
Looly
1542b02771 add test 2021-04-01 09:51:10 +08:00
Looly
c978dcc73b change split 2021-03-31 08:26:22 +08:00
FULaBUla
70503136f1 Fix (hutool-core): 修复拆分byte数组为几个等份时最后一组长度不足 len 时依旧按照 len 分配导致读取过多额外数据的问题
# 修改
1. 在原有实现中,不论最后一组数据有多少都会按照 len 来分配空间,如果最后一组数据长度小于 len 但是又按照 len 的长度分配空间的话就会出现很多无意义的数据,为了保持数据的干净,改为在最后一组时按照剩余数据长度分配空间,确保不会填充无意义的数据。
2. 修改了变量的名称,使得更容易理解变量的意义。
3. 修改了计算等份数量的实现,因为余数必然比 len 小,所以如果出现余数必然是只加 1 的,因此去除原有的专门记录额外长度的 z 变量,当有余数的时候直接在等份数量上加 1 即可。
4. 增加了测试方法用于验证修改是否正确
2021-03-30 19:43:15 +08:00
Looly
6fc58999b8 fix commemt 2021-03-30 17:56:21 +08:00
Looly
026da32fb3 add ByteUtil 2021-03-30 17:22:33 +08:00
FULaBUla
7c01feece9 Refactor (hutool-core): 修改数字转换的实现,增加按照指定端序转换
# 修改
1. 因为跨平台通信时由于平台原因存在字节序不一致的情况,所以在对数据进行转换的时候需要指定端序,按照两边的约定选择是使用大端序还是小端序,因此重构原有 int、short 和 long 与 byte[] 之间互相转换的实现,增加可以指定转换方式,补充大端序转换实现,同时保留原有方法,默认设置为小端序转换。
2. 将部分魔法值使用常量进行替代
3. 对于实现的修改,补充了测试方法的实现,完成不同端序的转换测试
2021-03-28 23:05:45 +08:00
Looly
65adb148c1 !292 toCloseByNumber 增加注释
Merge pull request !292 from dazer007/v5-dev
2021-03-28 20:12:56 +08:00
Looly
0b2c873185 fix code 2021-03-28 20:12:37 +08:00
duandazhi
a6c7e467be toCloseByNumber 增加英文名称注释 和 别名名称 2021-03-28 20:09:35 +08:00
duandazhi
b6c1f87f46 CharUtil 增加特殊字符注释,方便获取 其他开发,需要其他特殊符号,方便查找 2021-03-28 20:02:15 +08:00
duandazhi
015d6ae9f3 Merge remote-tracking branch 'origin/v5-dev' into v5-dev 2021-03-28 19:51:36 +08:00
Looly
4c74a7defc fix path encode 2021-03-28 14:30:12 +08:00
Looly
8d28db0e94 fix comment 2021-03-28 14:24:41 +08:00
Looly
e8d15ec29c fix url path bug 2021-03-28 14:21:36 +08:00
duandazhi
adcd85e977 UnicodeSymbolUtil符号工具类 添加功能:
1、获取大写的罗马数字、获取小写的罗马数字、
2、黑桃♠扑克牌、 红桃♥扑克牌、方块♦扑克牌、梅花♣扑克牌
3、unicode支持一位(Ⓐ \u24b6)和两位形式(🂮 = "\uD83C\uDCAE")
2021-03-26 23:58:46 +08:00
Looly
2484c82584 add methods 2021-03-26 21:50:21 +08:00
Looly
6a8e5d8b6c !288 特殊符号工具类
Merge pull request !288 from dazer007/v5-dev
2021-03-26 20:52:37 +08:00
duandazhi
80e54e512f 获取带圈字母 /封闭式字母 ,从a-z or A-Z 2021-03-26 19:19:42 +08:00
duandazhi
739af1befe fix author 2021-03-26 15:14:53 +08:00
duandazhi
e5c993324d SpecialSymbolUtil 特殊字符工具类 2021-03-26 15:13:27 +08:00
Looly
70ac62660d change style for ArrayUtil 2021-03-25 15:53:10 +08:00
Golden Looly
5bc416677e
Merge pull request #1490 from Honner/v5-dev
fix: LinKedMap特性丢失
2021-03-25 10:06:55 +08:00
Looly
fd4b185929 add constructor 2021-03-25 09:56:49 +08:00
guiye
7c70aba4f2 fix: LinKedMap特性丢失 2021-03-24 16:19:05 +08:00
weisz
25a41fd760 ofd 格式使用扩展名辅助判断 2021-03-22 11:41:00 +08:00
Looly
6fa82a3378 add carLicence 2021-03-22 09:41:31 +08:00
duandazhi
65a43f5318 add:脱敏增加车牌号 2021-03-21 23:08:12 +08:00
Looly
11f54f266b add DesensitizedUtil 2021-03-21 15:13:57 +08:00
duandazhi
422c3de12d Validator 驾驶证档案编号 和 发动机车架号 增加@author 方便后期进行维护 2021-03-20 23:46:56 +08:00
duandazhi
f303afd37e 添加@since和@author 2021-03-20 23:34:34 +08:00
duandazhi
86710d6c20 1、增加脱敏专业工具类 DesensitizedUtils ,增加对 用户id、中文名、身份证号、座机号、手机号、地址、电子邮件、密码;
(生产项目中使用的很多,希望采纳,该脱敏工具类,可以极大简化 项目中脱敏需求的需求)
2、CharSequenceUtil工具类,增加:Left/Right/Mid 用来兼容 org.apache.commons.lang3.StringUtils 使用习惯;
   目前CharSequenceUtil工具类中有 类似的功能,但是和 Left/Right/Mid 功能还是有很大差距。
3、新增的DesensitizedUtils 和  CharSequenceUtil新增left、right、mid方法都经过了测试;
2021-03-20 23:29:27 +08:00
Looly
6d5ca7051b add propertiesFilter 2021-03-19 16:46:36 +08:00
kfyty725
d8de98cbfc feat:属性拷贝选项添加属性过滤器 2021-03-19 14:19:26 +08:00
Looly
3f4e0540db add re 2021-03-19 11:50:06 +08:00
duandazhi
cbb85fd0b3 删除pr被退回的日期工具类 2021-03-19 10:01:11 +08:00
duandazhi
e9cdc55cb9 Validator新增: 车架号(车辆识别码)验证、驾驶证(驾驶证档案编号)的正则校验。
项目中使用车架号和档案编号 场景比较多,因此添加;
经过真实项目实战使用过
2021-03-19 09:55:11 +08:00
duandazhi
aa263733e0 Merge remote-tracking branch 'origin/v5-dev' into v5-dev 2021-03-19 09:23:20 +08:00
Looly
81694dadfe add methods 2021-03-18 22:22:19 +08:00
Looly
8e8518c8d1 fix modifier bug 2021-03-18 21:48:14 +08:00
Looly
abdedf6822 fix bugs 2021-03-18 21:16:14 +08:00
duandazhi
5b7f34b635 DateUtils8Transform互转工具类 增加测试用例 2021-03-16 23:21:19 +08:00
duandazhi
426396633f 增加 LocalDateTime、LocalDate 2 Date 互转工具类 2021-03-16 22:12:44 +08:00
Looly
825b5ea1b4 fix vode 2021-03-16 14:22:01 +08:00
Golden Looly
bc20dfd293
Merge pull request #1476 from cal101/jdt-RemoveAllTrailingWhitespaceCleanUp-1
[cleanup] erefactor/EclipseJdt - Remove trailing whitespace - All lines
2021-03-16 13:18:29 +08:00
Golden Looly
7e7e4b8b0f
Merge pull request #1477 from cal101/jdt-RemoveAllTrailingWhitespaceCleanUp-3
[cleanup] erefactor/EclipseJdt - Remove trailing whitespace - All lines
2021-03-16 13:17:51 +08:00
Golden Looly
a00066b1fa
Merge pull request #1478 from cal101/jdt-RemoveAllTrailingWhitespaceCleanUp-2
[cleanup] erefactor/EclipseJdt - Remove trailing whitespace - All lines
2021-03-16 13:13:19 +08:00
Golden Looly
1ff0ed73a7
Merge pull request #1479 from cal101/jdt-RemoveUnusedImportCleanUp
[cleanup] erefactor/EclipseJdt - Remove unused imports
2021-03-16 13:12:36 +08:00
Golden Looly
bfcd96307f
Merge pull request #1480 from cal101/jdt-ConvertForLoopToEnhancedCleanUp
[cleanup] erefactor/EclipseJdt - Convert 'for' loops to enhanced
2021-03-16 13:11:47 +08:00
Looly
3bd816471c add LazyFuncLoader 2021-03-16 13:10:14 +08:00
Mr.Po
b5e4ec9576 完善测试用例 2021-03-16 11:06:57 +08:00
Mr.Po
35dd387cb9 增加判定非空 2021-03-16 11:01:17 +08:00
Mr.Po
cbf16443dd 增加测试用例 2021-03-16 10:56:56 +08:00
Mr.Po
d848e8cbbd 增加ifInitialized()方法 2021-03-16 10:53:19 +08:00
Mr.Po
41719e394c 完善注释 2021-03-16 10:28:22 +08:00
Mr.Po
496857e67a 新增LazyFunLoader 2021-03-16 10:25:50 +08:00
cal101
b1ca1aed08 [cleanup] erefactor/EclipseJdt - Remove trailing whitespace - All lines
EclipseJdt cleanup 'RemoveAllTrailingWhitespace' applied by erefactor.

For EclipseJdt see https://www.eclipse.org/eclipse/news/4.18/jdt.php
For erefactor see https://github.com/cal101/erefactor
2021-03-15 00:03:34 +00:00
cal101
5eedb7544b [cleanup] erefactor/EclipseJdt - Remove trailing whitespace - All lines
EclipseJdt cleanup 'RemoveAllTrailingWhitespace' applied by erefactor.

For EclipseJdt see https://www.eclipse.org/eclipse/news/4.18/jdt.php
For erefactor see https://github.com/cal101/erefactor
2021-03-15 00:03:34 +00:00
cal101
6d3c0e7a19 [cleanup] erefactor/EclipseJdt - Remove trailing whitespace - All lines
EclipseJdt cleanup 'RemoveAllTrailingWhitespace' applied by erefactor.

For EclipseJdt see https://www.eclipse.org/eclipse/news/4.18/jdt.php
For erefactor see https://github.com/cal101/erefactor
2021-03-15 00:03:33 +00:00
cal101
f02c79bbbc [cleanup] erefactor/EclipseJdt - Remove unused imports
EclipseJdt cleanup 'RemoveUnusedImport' applied by erefactor.

For EclipseJdt see https://www.eclipse.org/eclipse/news/4.18/jdt.php
For erefactor see https://github.com/cal101/erefactor
2021-03-14 23:51:07 +00:00
cal101
1c7284661c [cleanup] erefactor/EclipseJdt - Convert 'for' loops to enhanced
EclipseJdt cleanup 'ConvertForLoopToEnhanced' applied by erefactor.

For EclipseJdt see https://www.eclipse.org/eclipse/news/4.18/jdt.php
For erefactor see https://github.com/cal101/erefactor
2021-03-14 23:25:27 +00:00
Looly
65d60a79fe add methods 2021-03-14 10:09:29 +08:00
Looly
2337e3a367 add method 2021-03-14 09:42:49 +08:00
Looly
ff23934b24 fix io bug 2021-03-14 09:14:05 +08:00
Looly
76d95d44a8 fix code 2021-03-13 00:05:25 +08:00
Looly
183a820206 add method 2021-03-12 23:08:27 +08:00
Golden Looly
cc7183e1be
Merge pull request #1471 from obiecane/v5-dev
新增读取流无法识别类型按照扩展名识别
2021-03-12 23:06:27 +08:00
Looly
0a8558867c fix code 2021-03-12 22:56:05 +08:00
Looly
d9ce2aff95 fix bugs 2021-03-12 22:30:52 +08:00
Looly
50d0569e8c fix code 2021-03-12 20:37:55 +08:00
Looly
b184ad79da add start chart 2021-03-12 09:28:37 +08:00
Looly
511f688d1e fix bug#I3AXIJ 2021-03-11 17:10:02 +08:00
Zhu Kaixiao
47134c0536 新增读取流无法识别类型按照扩展名识别 2021-03-11 12:10:10 +08:00
Looly
5cdbd16c0b add chineseToNumber 2021-03-10 17:44:52 +08:00
totalo
bb5b524418 Merge remote-tracking branch 'upstream/v5-dev' into v5-dev 2021-03-10 14:53:49 +08:00
totalo
b792ad4e08 feat:支持汉字转阿拉伯数字 2021-03-10 14:48:37 +08:00
Looly
f7cf53455f add equals 2021-03-10 11:35:48 +08:00
Looly
ac5cdae892 fix comment 2021-03-08 10:14:49 +08:00
Looly
50df7381b5 fix code 2021-03-07 11:51:33 +08:00
Looly
87813ae898 add method 2021-03-07 11:39:03 +08:00
Looly
f5172ef42b fix code 2021-03-07 10:41:21 +08:00
Looly
5646a1c3c0 add StrMatcher 2021-03-05 22:37:41 +08:00
Looly
047be5a1f8 add FuncKeyMap 2021-03-05 21:22:31 +08:00
Looly
d0f37fe460 fix dta size bug 2021-03-05 20:25:21 +08:00
Looly
626691adec add isEqualList方法 2021-03-05 19:13:20 +08:00
weisz
3a22d7e0da fix FileTypeUtil 2021-03-04 11:35:58 +08:00
weisz
530151fbfd fix FileTypeUtil 2021-03-04 11:13:34 +08:00
Golden Looly
64a3da1e83
Merge pull request #1448 from cal101/jdt-RemoveAllTrailingWhitespaceCleanUp-3
[cleanup] erefactor/EclipseJdt - Remove trailing whitespace - All lines
2021-02-28 12:18:26 +08:00
Golden Looly
50bf7be929
Merge pull request #1447 from cal101/jdt-RemoveAllTrailingWhitespaceCleanUp-2
[cleanup] erefactor/EclipseJdt - Remove trailing whitespace - All lines
2021-02-28 12:16:47 +08:00
cal101
ece50fcaca [cleanup] erefactor/EclipseJdt - Remove trailing whitespace - All lines
EclipseJdt cleanup 'RemoveAllTrailingWhitespace' applied by erefactor.

For EclipseJdt see https://www.eclipse.org/eclipse/news/4.18/jdt.php
For erefactor see https://github.com/cal101/erefactor
2021-02-27 09:54:19 +00:00
cal101
e41c676ed5 [cleanup] erefactor/EclipseJdt - Remove trailing whitespace - All lines
EclipseJdt cleanup 'RemoveAllTrailingWhitespace' applied by erefactor.

For EclipseJdt see https://www.eclipse.org/eclipse/news/4.18/jdt.php
For erefactor see https://github.com/cal101/erefactor
2021-02-27 09:54:18 +00:00
cal101
569e65f9dc [cleanup] erefactor/EclipseJdt - Remove redundant super() call in constructor
EclipseJdt cleanup 'RemoveUnnecessarySuperCall' applied by erefactor.

For EclipseJdt see https://www.eclipse.org/eclipse/news/4.18/jdt.php
For erefactor see https://github.com/cal101/erefactor
2021-02-27 09:43:12 +00:00
Looly
32c4952d31 add method 2021-02-26 22:50:35 +08:00
Looly
fdd4e51fd1 fix test 2021-02-25 22:16:46 +08:00
Looly
bb645308ba fix doc 2021-02-22 16:54:28 +08:00
Looly
76eb65249a add method 2021-02-22 16:21:43 +08:00
Looly
ef3e3f55b5 add formatSimple 2021-02-20 10:35:01 +08:00
Golden Looly
c5530facdf
Merge pull request #1436 from totalo/v5-dev
feat:增加数字转换简写,如2100 =>2.1k
2021-02-20 10:23:37 +08:00
Golden Looly
7506828dd5
Merge pull request #1422 from cal101/jdt-RemoveUnusedImportCleanUp
[cleanup] erefactor/EclipseJdt - Remove unused imports
2021-02-20 10:09:57 +08:00
Golden Looly
a6a420c848
Merge pull request #1420 from cal101/jdt-UseDiamondOperatorCleanUp
[cleanup] erefactor/EclipseJdt - Use diamond operator
2021-02-20 10:03:51 +08:00
Looly
7cee14373a fix doc 2021-02-19 17:51:46 +08:00
Looly
3bc5054a9a fix sm2 bugs 2021-02-19 17:41:49 +08:00
totalo
4f329cfa8a Merge branch 'v5-dev' of https://github.com/totalo/hutool into v5-dev
 Conflicts:
	hutool-core/src/main/java/cn/hutool/core/convert/NumberWordFormatter.java
	hutool-core/src/test/java/cn/hutool/core/convert/NumberWordFormatTest.java
	hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelWriter.java
	hutool-poi/src/test/java/cn/hutool/poi/excel/BigExcelWriteTest.java
2021-02-19 17:40:13 +08:00
totalo
ed520134ee feat:增加数字缩写转换 2021-02-19 17:35:36 +08:00
Looly
f6d265a16d !271 DateUtil添加beginOfMinute和endOfMinute方法
Merge pull request !271 from HsinDumas/v5-dev
2021-02-18 16:04:38 +08:00
Looly
f104eb8ecc add method 2021-02-18 16:04:07 +08:00
cal101
fff07de3d2 [cleanup] erefactor/EclipseJdt - Use diamond operator
EclipseJdt cleanup 'UseDiamondOperator' applied by erefactor.

For EclipseJdt see https://www.eclipse.org/eclipse/news/4.18/jdt.php
For erefactor see https://github.com/cal101/erefactor
2021-02-13 16:02:32 +00:00
cal101
43ddad8941 [cleanup] erefactor/EclipseJdt - Remove unused imports
EclipseJdt cleanup 'RemoveUnusedImport' applied by erefactor.

For EclipseJdt see https://www.eclipse.org/eclipse/news/4.18/jdt.php
For erefactor see https://github.com/cal101/erefactor
2021-02-13 15:56:06 +00:00
CN-dumaszhong
650dfda3a9 feat(date): DateUtil support beginOfMinute and endOfMinute 2021-02-09 15:08:14 +08:00
Looly
3157afd445 fix comment 2021-01-31 22:18:10 +08:00
Looly
e0ac328b19 change SecureRandom 2021-01-31 22:16:18 +08:00
Looly
5465293603 change name 2021-01-31 21:38:54 +08:00
Looly
d69b95f066 fix csv bug 2021-01-31 21:34:17 +08:00
Looly
2d3d41c9f2 add method 2021-01-31 19:19:28 +08:00
Looly
5ca45ded2b add method 2021-01-29 17:27:37 +08:00
Looly
99b2c474a5 !269 DateUtil和CalendarUtil添加获取某小时的开始时间和结束时间的方法
Merge pull request !269 from jiangli31346337/v5-dev
2021-01-29 10:14:29 +08:00
Looly
bf0466ef76 add method 2021-01-29 10:14:07 +08:00
jiangli
8ba4cf7d44 DateUtil和CalendarUtil添加获取某小时的开始时间和结束时间的方法 2021-01-27 19:13:44 +08:00
Looly
e71cc5bc32 fix comment 2021-01-26 19:41:04 +08:00
Looly
d57de90f66 Date convert throw expt 2021-01-25 18:42:24 +08:00
Looly
b65be102ea BeanUtil.getFieldValue suuport coll return 2021-01-25 00:00:46 +08:00
Looly
97ed8ca46a add RadixUtil pr#260 2021-01-24 23:34:08 +08:00
Looly
0471e640c5 !260 增加十进制转自定义进制
Merge pull request !260 from 晓雷/v5-dev
2021-01-24 23:27:44 +08:00
Looly
bdb078b1ee change lock 2021-01-24 22:37:12 +08:00
Looly
b6003aea30 fix comment 2021-01-24 20:55:20 +08:00
Looly
103f352cf4 add uoload check 2021-01-22 22:41:49 +08:00
Looly
93df8333df fix bom 2021-01-22 21:48:28 +08:00
Looly
b7ca34d0e8 fix UrlBuilder bug 2021-01-21 12:36:05 +08:00
Looly
4e38adb32d change line sep 2021-01-20 17:10:45 +08:00
Looly
b228fe0153 fix comment 2021-01-20 16:06:57 +08:00
Looly
c4ce66a991 fix bug #263 2021-01-19 10:06:56 +08:00
Looly
8e2c153512 !263 修复console.input() 输入字符串不全
Merge pull request !263 from gejinxin/v5-dev
2021-01-19 10:03:50 +08:00
gejinxin
bf802a8033 fix #I2DAEN 2021-01-18 16:48:59 +08:00
Looly
5a91698a78 add map method 2021-01-18 16:26:13 +08:00
zhangxiaolei
b78c690d8a 自定义进制转换工具 2021-01-18 00:14:34 +08:00
Looly
d1af3c44f0 add SpringUtil in spring.factories 2021-01-09 22:02:11 +08:00
lzpeng723
2ea7480527 Merge remote-tracking branch 'upstream/v5-dev' into v5-dev 2021-01-09 19:01:38 +08:00
Looly
49fab3986f fix copy #I2CKTI 2021-01-09 18:51:40 +08:00
Looly
bab6ab5a27 add test 2021-01-08 09:40:33 +08:00
Looly
f187dbd307 fix comment 2021-01-07 23:30:51 +08:00
Looly
7fd389c0b3 fix trust bug 2021-01-07 22:47:42 +08:00
bwcx_jzy
0e31ba2fc5 CollUtil.forEach 增加null 判断 2021-01-07 11:24:05 +08:00
Looly
1deed5d9cf fix test 2021-01-07 09:16:47 +08:00
hjc
eb59d21431 尝试添加ipv6相关方法 2021-01-04 22:44:58 +08:00
Looly
f3238ae1e7 fix CsvParser 2021-01-04 05:36:20 +08:00
Looly
3c2f0e46b0 fix #I2BMP1 2021-01-03 12:12:02 +08:00
Looly
bcaf05c589 add section for #IZN95 2021-01-02 13:40:43 +08:00
Looly
99f6fe8110 add section for #IZN95 2021-01-02 12:46:13 +08:00
Looly
6110a20f0a add method for #1348 2021-01-02 11:20:19 +08:00
Looly
387845b869 pr#245 2021-01-02 10:27:52 +08:00
JJZhang
b612eecb33 可选参数,方法重载优先级问题 2020-12-31 21:15:26 +08:00
Looly
b8e5cc006e fix bug #1341 2020-12-29 19:21:08 +08:00
Looly
7d25da459f fix #I2B0S1 2020-12-29 16:54:53 +08:00
郭铮巩
b9cd8a34d4 手机号工具类 座机 正则表达式统一管理 2020-12-28 10:27:32 +08:00
Looly
a50aba4a7b fix #I2AO8B 2020-12-27 02:53:54 +08:00
Looly
e02abaf128 fix #I2AQ2M 2020-12-27 02:50:02 +08:00
lzpeng723
f971cfc3a3 添加ping和isOpen的测试用例 2020-12-24 22:42:16 +08:00
Looly
b8e4a131d8 add methods 2020-12-24 00:35:30 +08:00
Looly
9a181facc2 fix null 2020-12-22 17:04:56 +08:00
Looly
620f660bdf add method 2020-12-17 20:22:21 +08:00
Looly
59cad19989 fix bug and add methods 2020-12-17 00:28:18 +08:00
Looly
89300c5f4d Merge branch 'v5-dev' of github.com:looly/hutool into v5-dev 2020-12-17 00:21:47 +08:00
bwcx_jzy
431c1183c4 URLUtil.normalize(java.lang.String, boolean, boolean) 新增重载方法 2020-12-16 19:24:10 +08:00
justmehyp
3fb46830bf 解决相对路径问题 2020-12-16 16:58:25 +08:00
Looly
217457ac10 fix comment 2020-12-16 14:50:47 +08:00
Looly
f47de0590d fix bug 2020-12-16 14:42:20 +08:00
Looly
990f1b5cc5 fix code 2020-12-16 08:58:00 +08:00
Looly
7c3716bf66 add method 2020-12-16 00:00:29 +08:00
Looly
03e647e700 Merge branch 'v5-dev' of github.com:looly/hutool into v5-dev 2020-12-15 09:50:13 +08:00
Looly
a45c92bbe4 add PassAuth 2020-12-15 09:49:25 +08:00
unufolio
efa87039ef fix typo in NumberUtil 2020-12-14 22:46:07 +08:00
Looly
54fdf60bc3 add method 2020-12-14 00:46:48 +08:00
Looly
3033114e06 fix excel sax bug 2020-12-12 02:09:16 +08:00
Looly
4f6155c45a add NioUtil 2020-12-11 01:47:51 +08:00
Looly
b44dc1bb98 fix bug 2020-12-10 23:53:21 +08:00
不忘初心
0ee10efa04 cn.hutool.core.collection.CollUtil#addAll(java.util.Collection<T>, java.lang.Iterable<T>) 判断空指针 2020-12-09 18:27:01 +08:00
不忘初心
5bb4ff9c40 cn.hutool.core.collection.CollUtil#addAll(java.util.Collection<T>, java.lang.Iterable<T>) 判断空指针 2020-12-09 18:26:45 +08:00
Looly
68da52bf82 fix code 2020-12-08 06:23:48 +08:00
Looly
7a03bbe93a add CharSequenceUtil 2020-12-08 06:15:13 +08:00
Looly
7633733cfe add Segment 2020-12-08 05:03:48 +08:00
Looly
850c766213 add FoundWord 2020-12-08 04:54:44 +08:00
Looly
04a3250708 fix code 2020-12-07 19:13:46 +08:00
Looly
97f1e8b3dd fix localdate for json bug 2020-12-07 18:10:16 +08:00
Looly
36588f7e07 add page of sql support 2020-12-06 07:41:54 +08:00
Looly
9ad2848bbd fix code 2020-12-05 16:05:36 +08:00
Looly
6e5da8664c Merge branch 'v5-dev' of github.com:looly/hutool into v5-dev 2020-12-05 15:52:27 +08:00
LazzMan
626f4e51d0 NumberUtil add unit-test 2020-12-04 16:56:25 +08:00
LazzMan
afe5844b25 NumberUtil add new method 2020-12-04 16:41:48 +08:00
Looly
52d341e650 add check 2020-12-04 11:09:45 +08:00
Looly
f444295bd7 !224 修复subList越界异常
Merge pull request !224 from movescar/v5-master
2020-12-04 11:08:04 +08:00
huanhu01
1c9d06979b fix out of index 2020-12-03 20:24:26 +08:00
Looly
6c76e9258b change test 2020-12-02 22:21:21 +08:00
Looly
cc43e39515 int to long 2020-12-02 21:16:37 +08:00
Looly
f6289f118c add test 2020-12-02 16:15:23 +08:00
Looly
61f58a9b62 fix code 2020-12-02 04:37:06 +08:00
Looly
77e6759d9a add SSLUtil 2020-12-02 04:01:59 +08:00
Looly
66271e4727 fix comment 2020-12-02 02:54:27 +08:00
Looly
c0f1afd709 fix zipcode 2020-12-02 02:33:45 +08:00
Looly
12711ba6fa add isSort 2020-12-01 15:50:07 +08:00
Golden Looly
b374a943ff
Merge pull request #1271 from fengbaoheng/v5-dev
add isSorted() in ArrayUtil
2020-12-01 15:47:20 +08:00
Looly
23ee2d623a fix code 2020-12-01 15:06:03 +08:00
fengbaoheng
188a48f15e add isSorted() in ArrayUtil 2020-12-01 14:33:41 +08:00
Golden Looly
57d68a4db1
Merge pull request #1270 from ShawnLi-25/v5-dev
Fix flaky test in EnumUtilTest
2020-12-01 11:56:41 +08:00
Looly
8761c24e02 add PunyCode 2020-12-01 11:55:39 +08:00
Looly
c99b48a4c4 fix excel sax null bug and add PonyCode 2020-12-01 11:12:31 +08:00
ShawnLi25
7eaa48dd02 Fix flaky test in EnumUtilTest 2020-11-30 20:55:04 -06:00
Looly
cdfae52eb9 fix code 2020-11-30 02:08:14 +08:00
Looly
2f7cd18895 fix code 2020-11-29 15:56:07 +08:00
Looly
b2ee5fbfec add compiler 2020-11-29 15:18:00 +08:00
Looly
db8ff64bf9 add compile 2020-11-29 00:32:04 +08:00
Golden Looly
f126c6ec34
Merge pull request #1243 from lzpeng723/v5-dev
V5 dev
2020-11-28 23:38:12 +08:00
Looly
a302a11483 add groupTimeInterval 2020-11-28 23:29:10 +08:00
Looly
633ed24564 add util 2020-11-27 11:32:17 +08:00
fengbaoheng
48005d8aba 添加Shuffle方法 2020-11-27 10:00:05 +08:00
Looly
20ac0ce6a8 add static 2020-11-27 04:01:09 +08:00
Looly
a30356a215 fix code 2020-11-27 03:54:32 +08:00
Looly
118dee8302 add const 2020-11-27 03:47:39 +08:00
Looly
fb19bbcb27 !220 add 增加年月格式化常量
Merge pull request !220 from jiangzeyin/v5-dev
2020-11-27 03:44:53 +08:00
Looly
a329a1c44c add method 2020-11-27 02:56:08 +08:00
fengbaoheng
bc998700bb 添加运行时异常包装方法 2020-11-26 20:04:27 +08:00
Looly
162c080e5a add method 2020-11-26 14:42:13 +08:00
Looly
4cc276e665 add volitile 2020-11-26 13:58:26 +08:00
Looly
994a7a49bf fix ZipUtil bug 2020-11-26 13:17:24 +08:00
郭铮巩
b9a6940719 代码排版多了空格 2020-11-26 10:33:52 +08:00
Looly
c11e2a935f add mathod 2020-11-25 23:29:26 +08:00
kfyty
de0ef4e5ff 添加刷新注解的属性值的方法 2020-11-25 18:39:19 +08:00
不忘初心
4512ec414b add 增加年月格式化常量 2020-11-25 13:33:28 +08:00
Looly
05586769c9 add test 2020-11-23 11:19:36 +08:00
lzpeng723
cde428b370 增加Java源码编译器 2020-11-23 00:24:10 +08:00
lzpeng723
c92bdde0b3 增加Java源码编译器 2020-11-23 00:21:21 +08:00
Looly
3bd15f999f fix hex bug 2020-11-20 17:33:36 +08:00
Looly
b07571d398 fix xml format 2020-11-20 16:45:49 +08:00
Golden Looly
281341ebd7
Merge pull request #1234 from CherryRum/v5-dev
修改使用xml.setXmlStandalone(true)设定属性后,父节点格式化位置不对。
2020-11-20 16:36:46 +08:00
Looly
84ac3e5d7f fix test 2020-11-19 17:55:46 +08:00
lin
ddd6003e42 修改使用xml.setXmlStandalone(true)设定属性后,父节点格式化位置不对。 2020-11-19 16:41:06 +08:00
Looly
055c9b6bd6 add null check 2020-11-19 13:41:00 +08:00
Looly
556c728389 !216 NumberUtil.equals(float num1, float num2) 注释不正确
Merge pull request !216 from GuoZG0328/v5-dev
2020-11-19 12:02:28 +08:00
Looly
f66a741673 add test 2020-11-19 12:02:09 +08:00
17773237321
d6fb6cc9af Float equals 注释 2020-11-18 15:14:30 +08:00
Looly
dfa0e68e12 fix comment 2020-11-18 01:07:33 +08:00
Looly
bff95b84a9 fix comment 2020-11-18 01:00:04 +08:00
Looly
9867333f68 add engine and fix bug 2020-11-18 00:34:51 +08:00
Looly
01a7b8ddc6 add CollStreamUtil 2020-11-18 00:15:18 +08:00
Golden Looly
6c84e8426a
Merge pull request #1227 from zhangtao-code/v5-dev
V5 dev
2020-11-17 23:51:10 +08:00
Looly
11e6a28113 add method 2020-11-17 23:41:14 +08:00
zhangtao
3c5b9a269b 代码规范缩进 2020-11-17 17:21:57 +08:00
zhangtao
def9c9670e 封装集合的stream操作 2020-11-17 17:19:36 +08:00
Looly
6c31a11ee2 fix test 2020-11-16 20:25:40 +08:00
Looly
aff16c283c fix test 2020-11-16 20:18:53 +08:00
Looly
b268ddb540 fix comment 2020-11-16 18:05:30 +08:00
Looly
26c42cc1c3 !212 多余注释
Merge pull request !212 from GuoZG0328/v5-dev
2020-11-16 18:02:39 +08:00
Looly
583b7cbe47 add visitor 2020-11-16 18:02:27 +08:00
17773237321
1eda43e2dd 多余注释 2020-11-16 11:13:57 +08:00
Looly
ea3060cddf fix move bug 2020-11-15 11:15:03 +08:00
Looly
4fa9794d06 fix bug 2020-11-15 00:50:25 +08:00
Golden Looly
8855746b53
Merge pull request #1217 from gotanksgn/v5-dev
StrUtil工具类增加subBetweenAll(str, beforeAndAfter)方法
2020-11-15 00:40:07 +08:00
Looly
d8fd1e16aa add null edit 2020-11-15 00:36:07 +08:00
gotanks
03fd34b039 StrUtil工具类增加subBetweenAl(str, beforeAndAfter)方法 2020-11-14 09:48:40 +08:00
Looly
71ab8335ce change name 2020-11-14 00:54:37 +08:00
Looly
99eeb30ffe add code 2020-11-13 17:54:42 +08:00
Looly
af118cd953 add size method 2020-11-12 16:03:31 +08:00
Looly
c40622d1cd !208 集合以及迭代器获取size的方法
Merge pull request !208 from HsinDumas/v5-dev
2020-11-12 15:52:43 +08:00
Looly
072a116b0b fix code 2020-11-12 11:50:20 +08:00
ZhongXin
36d6e75017 添加对Collection和iterator获取size方法 2020-11-12 11:33:54 +08:00
Looly
36e599f70b fix big excel writer bug 2020-11-12 01:09:43 +08:00
Looly
c646ba04ef fix convert 2020-11-12 00:35:49 +08:00
Looly
6216eb9994 fix Snoefake bug 2020-11-10 11:28:09 +08:00
Looly
3081e25a4d fix sax 2020-11-10 10:33:29 +08:00
Looly
37dda15906 fix code 2020-11-09 10:24:09 +08:00
Looly
ab410d2e93 add method 2020-11-09 04:10:32 +08:00
Looly
552750da15 fix Ipv4Util bug 2020-11-09 03:45:21 +08:00
Looly
b8adadda38 invoke support null type 2020-11-08 18:01:24 +08:00
lixiaoyu08
8181519c0d [新特性]反射调用支持传递参数的值为null
增加对null参数传递的支持,在传递null参数保持类型信息不丢失
2020-11-05 21:23:39 +08:00
Looly
f4d357971b fix code 2020-11-05 11:53:42 +08:00
Looly
637e1942f9 fix code 2020-11-05 01:42:35 +08:00
Looly
394d05f9d2 fix bug 2020-11-04 01:24:17 +08:00
Looly
a54ce406b7 add sh 2020-11-04 00:15:41 +08:00
Looly
48f43dc34a add method 2020-11-03 18:58:06 +08:00
Looly
6674dcbde7 fix test 2020-10-31 10:30:46 +08:00
Looly
46635600b5 fix image type bug 2020-10-31 10:05:33 +08:00
Looly
80dd13773a !204 修复 RandomUti 中数组越界异常
Merge pull request !204 from yichengxian/hutool-ycx
2020-10-29 18:29:08 +08:00
Looly
af60364302 change code 2020-10-29 18:25:27 +08:00
Looly
1f9d1c2888 fix bug 2020-10-29 16:54:51 +08:00
Looly
282e1e9090 fix code 2020-10-29 16:19:54 +08:00
yichengxian
8c793de4b2 修复 RandomUtil中randomEle方法数组越界异常 2020-10-29 14:46:33 +08:00
Looly
139fd3162e add qrcode 2020-10-28 17:55:08 +08:00
Looly
035ab33fb3 add method 2020-10-28 10:55:46 +08:00
Looly
cdedcf5b2a add me 2020-10-27 18:14:35 +08:00
Looly
e7613143d8 add me 2020-10-27 18:14:18 +08:00
Looly
b3d2f7a94f add test 2020-10-27 11:11:16 +08:00
Looly
c138eb5028 add test 2020-10-27 10:50:03 +08:00
Looly
0c6bd4e7dc add method 2020-10-27 10:41:24 +08:00
Looly
2b89f3fca8 add OptionalBean 2020-10-24 15:46:49 +08:00
totalo
84b973a20a feat:优雅判空 2020-10-24 14:49:41 +08:00
Looly
e79369951d update version 2020-10-23 22:56:38 +08:00
Looly
1b90832f91 add method 2020-10-23 21:49:29 +08:00
Looly
30695b906b !199 ObjectUtil返回对象增加自定义处理后返回,如果不存在则返回用户定义类型的默认对象.
Merge pull request !199 from Min/v5-dev
2020-10-23 21:44:35 +08:00
不忘初心
fe9bf4a183 linux 中的快捷方式照成死循环(node_modules) 2020-10-23 14:52:39 +08:00
liliexuan
34f20cb4d5 返回对象增加自定义处理后返回,如果不存在则返回用户定义类型的默认对象. 2020-10-23 12:43:45 +08:00
Looly
d3bbc99076 add ua 2020-10-23 11:30:29 +08:00
Looly
bee588de3c fix test 2020-10-22 11:35:29 +08:00
Looly
f881d083a9 fix ListUtil.page 2020-10-22 10:56:22 +08:00
Looly
5db99b05cb !198 ListUtil.page方法
Merge pull request !198 from lucky44/v5-dev
2020-10-22 10:39:45 +08:00
Looly
3738bcab73 fix comment 2020-10-22 10:34:37 +08:00
haochen.li
5208e5b02d ListUtil的page方法
调用PageUtil.setFirstPageNo(),如果firstPageNo不是从0开始计算会发生错误
2020-10-21 22:42:43 +08:00
haochen.li
c4a91615b4 ListUtil的page方法
调用PageUtil.setFirstPageNo(),如果firstPageNo不是从0开始计算会发生错误
2020-10-21 21:38:43 +08:00
Looly
f0399a72ad change NumberUtil.toStr 2020-10-21 13:38:20 +08:00
Looly
59202e8061 add test 2020-10-21 13:21:05 +08:00
Looly
4e46606e60 fix bean bug 2020-10-21 13:12:02 +08:00
Golden Looly
e2f3a3b622
Merge pull request #1175 from xyz327/v5-dev
FIX:#1173 修复子类使用同名属性覆盖了父类的transient属性导致属性transient检测而被忽略
2020-10-21 12:59:48 +08:00
Looly
a114113be0 fix check bug 2020-10-21 12:58:03 +08:00
xyz327
995bacc253 fix(hutool-core): 修复子类使用同名属性覆盖了父类的transient属性导致属性transient检测而被忽略 2020-10-20 15:27:03 +08:00
Looly
d5192d8f61 add method 2020-10-18 13:23:37 +08:00
Looly
0085954326 fix comment 2020-10-18 00:21:04 +08:00
Looly
65552f4f54 add class 2020-10-18 00:12:50 +08:00
Looly
fb46196782 add methods 2020-10-15 18:16:56 +08:00
Golden Looly
72ea16b980
Merge pull request #1166 from freshgeek/v5-dev
[新特性]  完成Assert 断言工具类,函数接口延迟获取错误信息接口
2020-10-15 15:50:08 +08:00
chenc
152ce8b24e 修正提交代码缩进 2020-10-15 14:58:02 +08:00
chenc
a7cd0f8583 isTrue,isFalse,isNull,notNull,notEmpty,notBlank,notContain,notEmpty,noNullElements,notEmpty,notEmpty,state等方法的函数式获取错误信息方法 2020-10-15 14:53:57 +08:00
Looly
97d48dde0b add console.table 2020-10-14 18:09:12 +08:00
Looly
5d60656566 update junit 2020-10-14 17:14:17 +08:00
Looly
8ae81241be aad ListUtil.split 2020-10-14 15:33:02 +08:00
Looly
cc59412909 !194 优化针对list的split方法
Merge pull request !194 from easepan/hotfix/optimize-collutil-split
2020-10-14 15:19:57 +08:00
easepan
8913aeaf33 fix: optimize split for list 2020-10-14 13:16:15 +08:00
Looly
f11a151471 fix doc 2020-10-14 11:43:24 +08:00
Looly
d24ff836b8 enhance countAll 2020-10-14 11:01:29 +08:00
Golden Looly
8c17979082
Merge pull request #1159 from akiyamaneko/combination_enhanced
基于#1153 重新做了优化,剔除了缓存,直接计算即可
2020-10-14 11:00:16 +08:00
Golden Looly
81ac3924d6
Merge pull request #1163 from xiejiamingly/v5-dev
修改了CaseInsensitiveMap的remove等方法并没有忽略大小写的问题
2020-10-14 10:51:31 +08:00
Looly
1873b76017 fix doc 2020-10-14 10:48:42 +08:00
xjm
5478b1d67b 修改了CaseInsensitiveMap的remove等方法并没有忽略大小写的问题 2020-10-13 18:43:36 +08:00
Singu
04485c7d4b add comments to StrUtil
补全部分 Empty 相关方法的注释
2020-10-13 17:10:56 +08:00
Singu
ea4271b3db add comments to StrUtil
补全 Blank 相关方法的注释
2020-10-13 17:06:16 +08:00
Singu
9679d1ffaf add comments to CharUtil
补全常量注释
2020-10-13 17:05:12 +08:00
Singu
a9e1b77b2c add comments to StrUtil
补全常量注释
2020-10-13 17:04:02 +08:00
Singu
43152af8be add comments to StrUtil
补全部分方法的版本号
2020-10-13 17:01:15 +08:00
neko
edf01b772d
Update Combination.java 2020-10-11 16:20:22 +08:00
Looly
3617d0a569 DataSizeUtil support decimal 2020-10-11 14:04:45 +08:00
Golden Looly
8cc5b7ffa4
Merge pull request #1158 from totalo/v5-dev
fixed #1155 修复DataSizeUtil无法处理小数的问题
2020-10-11 13:51:57 +08:00
Looly
03e45bc514 fix NumberUtil 2020-10-11 13:19:17 +08:00
totalo
29b6de444f fixed #1155 2020-10-10 23:23:47 +08:00
totalo
d97db8c2e1 Merge branch 'v5-dev' of https://github.com/totalo/hutool into v5-dev 2020-10-10 23:11:43 +08:00
totalo
20d1e8984b Merge remote-tracking branch 'origin/v5-dev' into v5-dev 2020-10-10 23:04:42 +08:00
totalo
5edaf41cae fixed #1155 2020-10-10 23:04:18 +08:00
Golden Looly
3471061626
Merge pull request #1145 from akiyamaneko/credict-code
简化CreditCode逻辑
2020-10-09 16:49:47 +08:00
Looly
1a74642736 enhance StrUtil 2020-10-09 16:48:12 +08:00
Golden Looly
58aba1ab93
Merge pull request #1144 from akiyamaneko/strutils
优化 StrUtil中部分参数校验以及逻辑处理
2020-10-09 16:42:57 +08:00
Looly
c59acb3bac fix equals 2020-10-09 16:30:19 +08:00
Looly
69362f1031 add default value for ArrayUtil.unwrap 2020-10-09 16:01:25 +08:00
Golden Looly
a82d5b2905
Merge pull request #1150 from akiyamaneko/list_util_enhanecd
修复ListUtil潜在的overflow异常
2020-10-09 15:51:39 +08:00
Looly
308fa0f9db fix date bug 2020-10-09 15:25:21 +08:00
Looly
ecedb5fd82 add method 2020-10-09 10:27:22 +08:00
lixiaohua
ec2669d586 update unit test 2020-10-08 09:36:11 +08:00
lixiaohua
2602935b60 add method 2020-10-08 03:25:17 +08:00
neko
ede632714d
修复潜在的overflow异常 2020-10-03 17:12:09 +08:00
neko
050d3e6eac
简化逻辑 2020-10-02 10:57:55 +08:00
neko
a62f2cd34a
优化StrUtil 2020-09-30 18:18:58 +08:00
Looly
49d5fb471f fix code 2020-09-30 15:37:13 +08:00
SunYu
93877205c5 代码优化 2020-09-30 13:50:13 +08:00
Looly
61c0633da7 add readBySax 2020-09-30 11:30:10 +08:00
Looly
f6a18afcba fix test 2020-09-30 10:47:10 +08:00
Looly
17cacc4a03 rename to ConsoleTable 2020-09-30 01:47:48 +08:00
Looly
61439c9138 rename to ConsoleTable 2020-09-30 01:45:27 +08:00
Looly
1c19e612fe rename to ConsoleTable 2020-09-30 01:43:09 +08:00
Looly
a508533f9c fix code 2020-09-29 12:08:19 +08:00
Golden Looly
2619bdd1df
Merge pull request #1137 from akiyamaneko/BOOLEAN_IMPROVED
优化BooleanUtil的校验逻辑
2020-09-29 12:03:14 +08:00
Looly
1c8158dc48 fix color bug 2020-09-29 11:55:18 +08:00
Golden Looly
f3667dd110
Merge pull request #1136 from akiyamaneko/RGB_COLOR
RGB随机颜色的上限值不对且API重复
2020-09-29 11:52:09 +08:00
neko
5d33c34574
Boolean优化字符串转换boolean的逻辑 2020-09-29 11:46:24 +08:00
neko
106aabc245
随机颜色取值范围不正确 2020-09-29 11:12:33 +08:00
neko
699e14acac
随机颜色范围会导致255取不到 2020-09-29 11:07:58 +08:00
Looly
80f85390e4 fix bug 2020-09-28 19:27:57 +08:00
Golden Looly
fb04fb0704
Merge branch 'v5-dev' into factorial_improved 2020-09-28 19:00:19 +08:00
neko
f253ab9269
阶乘优化 2020-09-28 17:13:25 +08:00
Looly
04c918a43d !189 修复控制台打印表格错位bug
Merge pull request !189 from sypro/修复一个Console打印表格的bug
2020-09-28 15:11:43 +08:00
SunYu
7cebc9bf23 修正一个表头错位的bug,并且优化了代码 2020-09-28 15:06:51 +08:00
Golden Looly
d763282047
Merge pull request #1132 from akiyamaneko/patch-4
NumberUtil 增加新功能 isPowerOfTwo 判断整数是否是2的幂
2020-09-28 15:04:09 +08:00
neko
cdee2f32b4
阶乘优化 2020-09-28 14:31:57 +08:00
neko
b06d499279
阶乘计算优化 2020-09-28 14:28:55 +08:00
neko
77cc55a277
新增api补齐单元测试 2020-09-28 14:08:22 +08:00
neko
e59987a334
新增API 2020-09-28 14:02:05 +08:00
Looly
ff10ea0d9c fix numberUtil 2020-09-28 08:44:45 +08:00
Looly
00cd499061 Merge branch 'v5-dev' of github.com:looly/hutool into v5-dev 2020-09-28 08:35:26 +08:00
Looly
e573fa48e7 fix numberUtil 2020-09-28 08:35:05 +08:00
Golden Looly
20bd97e052
Merge pull request #1127 from akiyamaneko/patch-5
优化NumberUtil中针对BigDecimal的一些处理逻辑
2020-09-28 08:34:27 +08:00
neko
31d8b238a3
Update NumberUtil.java 2020-09-27 18:11:42 +08:00
neko
f46a404d9f
优化NumberUtil中针对BigDecimal的一些处理逻辑 2020-09-27 17:57:43 +08:00
neko
43713aab7d
优化NumberUtil中对空值的处理 2020-09-27 17:44:23 +08:00
Looly
d014ccdf0c !187 为Console增加打印表格的方法
Merge pull request !187 from sypro/为Console增加打印表格的方法
2020-09-27 16:18:53 +08:00
hanshuai
c0d5751a8b 常量按照规范应该大写
项目中有的地方大写有的小写,统一部分为大写
2020-09-27 12:41:12 +08:00
hanshuai
73cd33450a equals()规范吧,常量已经写在前面,避免null异常 2020-09-27 11:48:51 +08:00
hanshuai
467865e02c 如果要进行null判断,那直接进行判断null,而不是使用 == 来判断容易引起误解 2020-09-27 11:47:00 +08:00
SunYu
ec0cf6c5db 为Console增加打印表格的功能,为了不污染Console类,先建立一个ConsoleTableUtil,等待路总改造一下。 2020-09-27 09:37:41 +08:00
Looly
73fb1b6735 add method 2020-09-27 09:35:57 +08:00
Looly
e73b2605a4 fix doc 2020-09-26 02:25:48 +08:00
Looly
5b283651b0 add unescape 2020-09-25 18:10:35 +08:00