diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java index 2fc2ca3c9..dd95382c4 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java @@ -15,7 +15,7 @@ import cn.hutool.extra.template.TemplateEngine; /** * Enjoy库的引擎包装 - * + * * @author looly * @since 4.1.10 */ @@ -25,6 +25,7 @@ public class EnjoyEngine implements TemplateEngine { private ResourceMode resourceMode; // --------------------------------------------------------------------------------- Constructor start + /** * 默认构造 */ @@ -34,7 +35,7 @@ public class EnjoyEngine implements TemplateEngine { /** * 构造 - * + * * @param config 模板配置 */ public EnjoyEngine(TemplateConfig config) { @@ -44,7 +45,7 @@ public class EnjoyEngine implements TemplateEngine { /** * 构造 - * + * * @param engine {@link com.jfinal.template.Engine} */ public EnjoyEngine(com.jfinal.template.Engine engine) { @@ -54,7 +55,7 @@ public class EnjoyEngine implements TemplateEngine { @Override public Template getTemplate(String resource) { - if(ObjectUtil.equal(ResourceMode.STRING, this.resourceMode)) { + if (ObjectUtil.equal(ResourceMode.STRING, this.resourceMode)) { return EnjoyTemplate.wrap(this.engine.getTemplateByString(resource)); } return EnjoyTemplate.wrap(this.engine.getTemplate(resource)); @@ -62,7 +63,7 @@ public class EnjoyEngine implements TemplateEngine { /** * 创建引擎 - * + * * @param config 模板配置 * @return {@link GroupTemplate} */ @@ -72,23 +73,23 @@ public class EnjoyEngine implements TemplateEngine { engine.setEncoding(config.getCharsetStr()); switch (config.getResourceMode()) { - case STRING: - // 默认字符串类型资源: - break; - case CLASSPATH: - engine.setToClassPathSourceFactory(); - engine.setBaseTemplatePath(config.getPath()); - break; - case FILE: - engine.setSourceFactory(new FileSourceFactory()); - engine.setBaseTemplatePath(config.getPath()); - break; - case WEB_ROOT: - engine.setSourceFactory(new FileSourceFactory()); - engine.setBaseTemplatePath(FileUtil.getAbsolutePath(FileUtil.getWebRoot())); - break; - default: - break; + case STRING: + // 默认字符串类型资源: + break; + case CLASSPATH: + engine.setToClassPathSourceFactory(); + engine.setBaseTemplatePath(config.getPath()); + break; + case FILE: + engine.setSourceFactory(new FileSourceFactory()); + engine.setBaseTemplatePath(config.getPath()); + break; + case WEB_ROOT: + engine.setSourceFactory(new FileSourceFactory()); + engine.setBaseTemplatePath(FileUtil.getAbsolutePath(FileUtil.getWebRoot())); + break; + default: + break; } return engine; diff --git a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyTemplate.java b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyTemplate.java index 670733bf0..ab26ddf3d 100644 --- a/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyTemplate.java +++ b/hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyTemplate.java @@ -9,28 +9,28 @@ import cn.hutool.extra.template.AbstractTemplate; /** * Engoy模板实现 - * + * * @author looly * @since 4.1.9 */ -public class EnjoyTemplate extends AbstractTemplate implements Serializable{ - private static final long serialVersionUID = -8157926902932567280L; +public class EnjoyTemplate extends AbstractTemplate implements Serializable { + private static final long serialVersionUID = 1L; private com.jfinal.template.Template rawTemplate; - + /** * 包装Enjoy模板 - * + * * @param EnjoyTemplate Enjoy的模板对象 {@link com.jfinal.template.Template} * @return {@link EnjoyTemplate} */ public static EnjoyTemplate wrap(com.jfinal.template.Template EnjoyTemplate) { return (null == EnjoyTemplate) ? null : new EnjoyTemplate(EnjoyTemplate); } - + /** * 构造 - * + * * @param EnjoyTemplate Enjoy的模板对象 {@link com.jfinal.template.Template} */ public EnjoyTemplate(com.jfinal.template.Template EnjoyTemplate) { diff --git a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java index aafdcaeab..beced5db3 100644 --- a/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java +++ b/hutool-extra/src/test/java/cn/hutool/extra/template/TemplateUtilTest.java @@ -101,7 +101,7 @@ public class TemplateUtilTest { Template template = engine.getTemplate("#(x + 123)"); String result = template.render(Dict.create().set("x", 1)); Assert.assertEquals("124", result); - + //ClassPath模板 engine = new EnjoyEngine(new TemplateConfig("templates", ResourceMode.CLASSPATH)); template = engine.getTemplate("enjoy_test.etl");