ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2021-09-09 23:16:58 +08:00
parent 6187217717
commit b4b02f3af2
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/FreemarkerTemplate.java
View File

@ -1,16 +1,17 @@
package cn.hutool.extra.template.engine.freemarker; 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.IORuntimeException;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import cn.hutool.extra.template.AbstractTemplate; import cn.hutool.extra.template.AbstractTemplate;
import cn.hutool.extra.template.TemplateException; 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模板实现 * Freemarker模板实现
* *
@ -25,7 +26,7 @@ public class FreemarkerTemplate extends AbstractTemplate implements Serializable
* 包装Freemarker模板 * 包装Freemarker模板
* *
* @param beetlTemplate Beetl的模板对象 {@link freemarker.template.Template} * @param beetlTemplate Beetl的模板对象 {@link freemarker.template.Template}
* @return {@link FreemarkerTemplate} * @return this
*/ */
public static FreemarkerTemplate wrap(freemarker.template.Template beetlTemplate) { public static FreemarkerTemplate wrap(freemarker.template.Template beetlTemplate) {
return (null == beetlTemplate) ? null : new FreemarkerTemplate(beetlTemplate); return (null == beetlTemplate) ? null : new FreemarkerTemplate(beetlTemplate);
@ -53,7 +54,7 @@ public class FreemarkerTemplate extends AbstractTemplate implements Serializable
@Override @Override
public void render(Map<?, ?> bindingMap, OutputStream out) { 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())));
} }
} }