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

修改 pr by close的问题

Browse Source
This commit is contained in:
duandazhi 2021-07-14 17:40:09 +08:00
parent 75d5268249
commit 65103f3916
6 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -542,10 +542,7 @@ public class DateUtil extends CalendarUtil {
if (null == format || null == date) {
return null;
}
// java.time.temporal.UnsupportedTemporalTypeException: Unsupported field: YearOfEra
if (format.getZone() == null) {
format = format.withZone(ZoneId.systemDefault());
}
/// java.time.temporal.UnsupportedTemporalTypeException: Unsupported field: YearOfEra
/// return format.format(date.toInstant());
return TemporalAccessorUtil.format(date.toInstant(), format);
}

2
hutool-core/src/test/java/cn/hutool/core/convert/NumberChineseFormatterTest.java
View File

@ -8,7 +8,7 @@ public class NumberChineseFormatterTest {
@Test
public void formatTest() {
String f0 = NumberChineseFormatter.format(50008000, false);
Assert.assertEquals("五千万零8千", f0);
Assert.assertEquals("五千万零八千", f0);
String f1 = NumberChineseFormatter.format(10889.72356, false);
Assert.assertEquals("一万零八百八十九点七二", f1);
f1 = NumberChineseFormatter.format(12653, false);

10
hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
View File

@ -13,7 +13,15 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.Locale;
import java.util.Objects;
import java.util.TimeZone;
import java.util.List;
import java.util.ArrayList;
import java.util.Date;
import java.util.Calendar;
import java.util.LinkedHashSet;
import java.util.GregorianCalendar;
/**
* 时间工具单元测试<br>

4
hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
View File

@ -26,6 +26,10 @@ import java.util.List;
* FTP客户端封装<br>
* 此客户端基于Apache-Commons-Net
*
* 常见搭建ftp的工具有
* 1、filezila server ;根目录一般都是空
* 2、linux vsftpd ; 使用的 系统用户的目录，这里往往都是不是根目录，如：/home/ftpuser/ftp
*
* @author looly
* @since 4.1.8
*/

3
hutool-extra/src/main/java/cn/hutool/extra/qrcode/QrCodeUtil.java
View File

@ -28,7 +28,8 @@ import java.util.HashMap;
/**
* 基于Zxing的二维码工具类
*
* 参见二维码网站：
* <p>https://cli.im/text</p>
* @author looly
* @since 4.0.2
*/

12
hutool-extra/src/test/java/cn/hutool/extra/qrcode/QrCodeUtilTest.java
View File

@ -35,16 +35,22 @@ public class QrCodeUtilTest {
// 背景色透明
config.setBackColor(null);
config.setErrorCorrection(ErrorCorrectionLevel.H);
QrCodeUtil.generate("https://hutool.cn/", config, FileUtil.file("d:/qrcodeCustom.png"));
String path = FileUtil.isWindows() ? "d:/hutool/qrcodeCustom.png" : "~/Desktop/hutool/qrcodeCustom.png";
if (!FileUtil.file(path).getParentFile().exists()) {
FileUtil.file(path).getParentFile().mkdirs();
}
QrCodeUtil.generate("https://hutool.cn/", config, FileUtil.file(path));
}
@Test
@Ignore
public void generateWithLogoTest() {
String icon = FileUtil.isWindows() ? "d:/hutool/pic/face.jpg" : "~/Desktop/hutool/pic/face.jpg";
String targetPath = FileUtil.isWindows() ? "d:/hutool/qrcodeWithLogo.jpg" : "~/Desktop/hutool/qrcodeWithLogo.jpg";
QrCodeUtil.generate(//
"http://hutool.cn/", //
QrConfig.create().setImg("e:/pic/face.jpg"), //
FileUtil.file("e:/qrcodeWithLogo.jpg"));
QrConfig.create().setImg(icon), //
FileUtil.file(targetPath));
}
@Test