diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java index 11a377df5..ebc0459e9 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java @@ -1,39 +1,40 @@ package cn.hutool.extra.template.engine.freemarker; -import java.io.IOException; -import java.io.OutputStream; -import java.io.Serializable; -import java.io.Writer; -import java.util.Map; - import cn.hutool.core.io.IORuntimeException; import cn.hutool.core.io.IoUtil; import cn.hutool.extra.template.AbstractTemplate; import cn.hutool.extra.template.TemplateException; +import java.io.IOException; +import java.io.OutputStream; +import java.io.Serializable; +import java.io.Writer; +import java.nio.charset.Charset; +import java.util.Map; + /** * Freemarker模板实现 - * + * * @author looly */ public class FreemarkerTemplate extends AbstractTemplate implements Serializable{ private static final long serialVersionUID = -8157926902932567280L; freemarker.template.Template rawTemplate; - + /** * 包装Freemarker模板 - * + * * @param beetlTemplate Beetl的模板对象 {@link freemarker.template.Template} - * @return {@link FreemarkerTemplate} + * @return this */ public static FreemarkerTemplate wrap(freemarker.template.Template beetlTemplate) { return (null == beetlTemplate) ? null : new FreemarkerTemplate(beetlTemplate); } - + /** * 构造 - * + * * @param freemarkerTemplate Beetl的模板对象 {@link freemarker.template.Template} */ public FreemarkerTemplate(freemarker.template.Template freemarkerTemplate) { @@ -53,7 +54,7 @@ public class FreemarkerTemplate extends AbstractTemplate implements Serializable @Override public void render(Map bindingMap, OutputStream out) { - render(bindingMap, IoUtil.getWriter(out, this.rawTemplate.getEncoding())); + render(bindingMap, IoUtil.getWriter(out, Charset.forName(this.rawTemplate.getEncoding()))); } }