zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2021-06-16 02:01:56 +08:00
parent 373c30b9f0
commit 8c3298fed4
25 changed files with 246 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-extra/src/main/java/cn/hutool/extra/pinyin/PinyinEngine.java
View File

@@ -1,8 +1,10 @@
package cn.hutool.extra.pinyin;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import java.util.List;
/**
* 拼音引擎接口，具体的拼音实现通过实现此接口，完成具体实现功能
*
@@ -47,7 +49,7 @@ public interface PinyinEngine {
*/
default String getFirstLetter(String str, String separator) {
final String splitSeparator = StrUtil.isEmpty(separator) ? "#" : separator;
final String[] split = StrUtil.split(getPinyin(str, splitSeparator), splitSeparator);
return ArrayUtil.join(split, separator, (s)->String.valueOf(s.length() > 0 ? s.charAt(0) : ""));
final List<String> split = StrUtil.split(getPinyin(str, splitSeparator), splitSeparator);
return CollUtil.join(split, separator, (s)->String.valueOf(s.length() > 0 ? s.charAt(0) : StrUtil.EMPTY));
}
}

3
hutool-extra/src/main/java/cn/hutool/extra/servlet/ServletUtil.java
View File

@@ -570,7 +570,8 @@ public class ServletUtil {
*/
public static void write(HttpServletResponse response, InputStream in, String contentType, String fileName) {
final String charset = ObjectUtil.defaultIfNull(response.getCharacterEncoding(), CharsetUtil.UTF_8);
response.setHeader("Content-Disposition", StrUtil.format("attachment;filename={}", URLUtil.encode(fileName, charset)));
response.setHeader("Content-Disposition", StrUtil.format("attachment;filename={}",
URLUtil.encode(fileName, CharsetUtil.charset(charset))));
response.setContentType(contentType);
write(response, in);
}

34
hutool-extra/src/test/java/cn/hutool/extra/template/BeetlUtilTest.java
View File

@@ -1,34 +0,0 @@
package cn.hutool.extra.template;
import cn.hutool.core.lang.Dict;
import org.beetl.core.Configuration;
import org.beetl.core.GroupTemplate;
import org.beetl.core.Template;
import org.beetl.core.resource.StringTemplateResourceLoader;
import org.junit.Assert;
import org.junit.Test;
import java.io.IOException;
/**
* BeetlUtil单元测试
*
* @author looly
*
*/
@SuppressWarnings("deprecation")
public class BeetlUtilTest {
@Test
public void renderStrTest() throws IOException {
GroupTemplate groupTemplate = BeetlUtil.createGroupTemplate(new StringTemplateResourceLoader(), Configuration.defaultConfiguration());
Template template = BeetlUtil.getTemplate(groupTemplate, "hello,${name}");
String result = BeetlUtil.render(template, Dict.create().set("name", "hutool"));
Assert.assertEquals("hello,hutool", result);
String renderFromStr = BeetlUtil.renderFromStr("hello,${name}", Dict.create().set("name", "hutool"));
Assert.assertEquals("hello,hutool", renderFromStr);
}
}