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 test

Browse Source
This commit is contained in:
Looly
2019-09-16 18:40:22 +08:00
parent 2268831ed5
commit acb54849dd
3 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyEngine.java
View File

@@ -25,6 +25,7 @@ public class EnjoyEngine implements TemplateEngine {
private ResourceMode resourceMode; private ResourceMode resourceMode;
// --------------------------------------------------------------------------------- Constructor start // --------------------------------------------------------------------------------- Constructor start
/** /**
* 默认构造 * 默认构造
*/ */
@@ -54,7 +55,7 @@ public class EnjoyEngine implements TemplateEngine {
@Override @Override
public Template getTemplate(String resource) { 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.getTemplateByString(resource));
} }
return EnjoyTemplate.wrap(this.engine.getTemplate(resource)); return EnjoyTemplate.wrap(this.engine.getTemplate(resource));
@@ -72,23 +73,23 @@ public class EnjoyEngine implements TemplateEngine {
engine.setEncoding(config.getCharsetStr()); engine.setEncoding(config.getCharsetStr());
switch (config.getResourceMode()) { switch (config.getResourceMode()) {
case STRING: case STRING:
// 默认字符串类型资源: // 默认字符串类型资源:
break; break;
case CLASSPATH: case CLASSPATH:
engine.setToClassPathSourceFactory(); engine.setToClassPathSourceFactory();
engine.setBaseTemplatePath(config.getPath()); engine.setBaseTemplatePath(config.getPath());
break; break;
case FILE: case FILE:
engine.setSourceFactory(new FileSourceFactory()); engine.setSourceFactory(new FileSourceFactory());
engine.setBaseTemplatePath(config.getPath()); engine.setBaseTemplatePath(config.getPath());
break; break;
case WEB_ROOT: case WEB_ROOT:
engine.setSourceFactory(new FileSourceFactory()); engine.setSourceFactory(new FileSourceFactory());
engine.setBaseTemplatePath(FileUtil.getAbsolutePath(FileUtil.getWebRoot())); engine.setBaseTemplatePath(FileUtil.getAbsolutePath(FileUtil.getWebRoot()));
break; break;
default: default:
break; break;
} }
return engine; return engine;

4
hutool-extra/src/main/java/cn/hutool/extra/template/engine/enjoy/EnjoyTemplate.java
View File

@@ -13,8 +13,8 @@ import cn.hutool.extra.template.AbstractTemplate;
* @author looly * @author looly
* @since 4.1.9 * @since 4.1.9
*/ */
public class EnjoyTemplate extends AbstractTemplate implements Serializable{ public class EnjoyTemplate extends AbstractTemplate implements Serializable {
private static final long serialVersionUID = -8157926902932567280L; private static final long serialVersionUID = 1L;
private com.jfinal.template.Template rawTemplate; private com.jfinal.template.Template rawTemplate;