From 334ad373c27b75bf7a89adc6dfb7c14e1a9c4c65 Mon Sep 17 00:00:00 2001 From: Looly Date: Wed, 18 Sep 2019 17:46:53 +0800 Subject: [PATCH] fix bugs --- CHANGELOG.md | 7 ++++--- .../src/test/java/cn/hutool/captcha/CaptchaTest.java | 11 +++++++++++ .../main/java/cn/hutool/core/util/RuntimeUtil.java | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4214a3b64..c2c4a89ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,11 @@ ### 新特性 * 【core】 ImgUtil.rotate支持负数(issue#543@Github) -* 【http】 body方法传null跳过而非报错(issue#I12AP2@Github) -* 【core】 TimeInterval增加intervalPretty方法(issue#I12A6T@Github) +* 【http】 body方法传null跳过而非报错(issue#I12AP2@Gitee) +* 【core】 TimeInterval增加intervalPretty方法(issue#I12A6T@Gitee) ### Bug修复 -* 【core】 修复DateUtil.offset导致的时区错误问题(issue#I1294O@Github) +* 【core】 修复DateUtil.offset导致的时区错误问题(issue#I1294O@Gitee) +* 【core】 修复RuntimeUtil.exec重载导致的问题(issue#544@Github) ------------------------------------------------------------------------------------------------------------- diff --git a/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java b/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java index 8c79327a5..3d3a99190 100644 --- a/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java +++ b/hutool-captcha/src/test/java/cn/hutool/captcha/CaptchaTest.java @@ -7,6 +7,8 @@ import org.junit.Test; import cn.hutool.captcha.generator.MathGenerator; import cn.hutool.core.lang.Console; +import java.awt.*; + /** * 直线干扰验证码单元测试 * @@ -22,6 +24,15 @@ public class CaptchaTest { Assert.assertNotNull(lineCaptcha.getCode()); Assert.assertTrue(lineCaptcha.verify(lineCaptcha.getCode())); } + + @Test + @Ignore + public void lineCaptchaTest3() { + // 定义图形验证码的长和宽 + LineCaptcha lineCaptcha = CaptchaUtil.createLineCaptcha(200, 70, 4, 15); + lineCaptcha.setBackground(Color.yellow); + lineCaptcha.write("f:/test/captcha/tellow.png"); + } @Test @Ignore diff --git a/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java index 5c687c464..a612534a1 100644 --- a/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/RuntimeUtil.java @@ -106,7 +106,7 @@ public class RuntimeUtil { * @since 4.1.6 */ public static Process exec(String[] envp, String... cmds) { - return exec(envp, cmds); + return exec(envp, null, cmds); } /**