mirror of
https://gitee.com/chinabugotech/hutool.git
synced 2025-05-09 23:51:34 +08:00
TemplateUtil的实现类增加getRawEngine方法
This commit is contained in:
parent
bce8d93ba7
commit
f9f0a5ed1a
@ -10,6 +10,7 @@
|
|||||||
* 【jwt 】 优化JWT自动识别header中的算法,并可自定义header中key的顺序(issue#I5QRUO@Gitee)
|
* 【jwt 】 优化JWT自动识别header中的算法,并可自定义header中key的顺序(issue#I5QRUO@Gitee)
|
||||||
* 【core 】 IdcardUtil增加convert18To15方法(issue#I5QYCP@Gitee)
|
* 【core 】 IdcardUtil增加convert18To15方法(issue#I5QYCP@Gitee)
|
||||||
* 【core 】 新增AnsiColors(改自Spring Boot)、AnsiColorWrapper,优化QrCodeUtil(pr#778@Gitee)
|
* 【core 】 新增AnsiColors(改自Spring Boot)、AnsiColorWrapper,优化QrCodeUtil(pr#778@Gitee)
|
||||||
|
* 【core 】 TemplateUtil的实现类增加getRawEngine方法(issues#2530@Github)
|
||||||
|
|
||||||
### 🐞Bug修复
|
### 🐞Bug修复
|
||||||
* 【core 】 修复ObjectUtil.defaultIfXXX中NPE问题(pr#2603@Github)
|
* 【core 】 修复ObjectUtil.defaultIfXXX中NPE问题(pr#2603@Github)
|
||||||
|
@ -72,6 +72,16 @@ public class BeetlEngine implements TemplateEngine {
|
|||||||
return BeetlTemplate.wrap(engine.getTemplate(resource));
|
return BeetlTemplate.wrap(engine.getTemplate(resource));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取原始引擎的钩子方法,用于自定义特殊属性,如插件等
|
||||||
|
*
|
||||||
|
* @return {@link GroupTemplate}
|
||||||
|
* @since 5.8.7
|
||||||
|
*/
|
||||||
|
public GroupTemplate getRawEngine() {
|
||||||
|
return this.engine;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建引擎
|
* 创建引擎
|
||||||
*
|
*
|
||||||
|
@ -77,6 +77,16 @@ public class EnjoyEngine implements TemplateEngine {
|
|||||||
return EnjoyTemplate.wrap(this.engine.getTemplate(resource));
|
return EnjoyTemplate.wrap(this.engine.getTemplate(resource));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取原始引擎的钩子方法,用于自定义特殊属性,如插件等
|
||||||
|
*
|
||||||
|
* @return {@link com.jfinal.template.Engine}
|
||||||
|
* @since 5.8.7
|
||||||
|
*/
|
||||||
|
public com.jfinal.template.Engine getRawEngine() {
|
||||||
|
return this.engine;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建引擎
|
* 创建引擎
|
||||||
*
|
*
|
||||||
|
@ -15,7 +15,7 @@ import java.io.IOException;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* FreeMarker模板引擎封装<br>
|
* FreeMarker模板引擎封装<br>
|
||||||
* 见:https://freemarker.apache.org/
|
* 见:<a href="https://freemarker.apache.org/">https://freemarker.apache.org/</a>
|
||||||
*
|
*
|
||||||
* @author looly
|
* @author looly
|
||||||
*/
|
*/
|
||||||
@ -82,6 +82,16 @@ public class FreemarkerEngine implements TemplateEngine {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取原始引擎的钩子方法,用于自定义特殊属性,如插件等
|
||||||
|
*
|
||||||
|
* @return {@link Configuration}
|
||||||
|
* @since 5.8.7
|
||||||
|
*/
|
||||||
|
public Configuration getConfiguration() {
|
||||||
|
return this.cfg;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建配置项
|
* 创建配置项
|
||||||
*
|
*
|
||||||
|
@ -66,6 +66,16 @@ public class JetbrickEngine implements TemplateEngine {
|
|||||||
return JetbrickTemplate.wrap(engine.getTemplate(resource));
|
return JetbrickTemplate.wrap(engine.getTemplate(resource));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取原始引擎的钩子方法,用于自定义特殊属性,如插件等
|
||||||
|
*
|
||||||
|
* @return {@link JetEngine}
|
||||||
|
* @since 5.8.7
|
||||||
|
*/
|
||||||
|
public JetEngine getRawEngine() {
|
||||||
|
return this.engine;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建引擎
|
* 创建引擎
|
||||||
*
|
*
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
package cn.hutool.extra.template.engine.rythm;
|
package cn.hutool.extra.template.engine.rythm;
|
||||||
|
|
||||||
import java.util.Properties;
|
|
||||||
|
|
||||||
import cn.hutool.extra.template.Template;
|
import cn.hutool.extra.template.Template;
|
||||||
import cn.hutool.extra.template.TemplateConfig;
|
import cn.hutool.extra.template.TemplateConfig;
|
||||||
import cn.hutool.extra.template.TemplateEngine;
|
import cn.hutool.extra.template.TemplateEngine;
|
||||||
|
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Rythm模板引擎<br>
|
* Rythm模板引擎<br>
|
||||||
* 文档:http://rythmengine.org/doc/index
|
* 文档:http://rythmengine.org/doc/index
|
||||||
@ -51,6 +51,16 @@ public class RythmEngine implements TemplateEngine {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取原始引擎的钩子方法,用于自定义特殊属性,如插件等
|
||||||
|
*
|
||||||
|
* @return {@link org.rythmengine.RythmEngine}
|
||||||
|
* @since 5.8.7
|
||||||
|
*/
|
||||||
|
public org.rythmengine.RythmEngine getRawEngine() {
|
||||||
|
return this.engine;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 初始化引擎
|
* 初始化引擎
|
||||||
* @param engine 引擎
|
* @param engine 引擎
|
||||||
|
@ -25,10 +25,12 @@ public class ThymeleafEngine implements TemplateEngine {
|
|||||||
TemplateConfig config;
|
TemplateConfig config;
|
||||||
|
|
||||||
// --------------------------------------------------------------------------------- Constructor start
|
// --------------------------------------------------------------------------------- Constructor start
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 默认构造
|
* 默认构造
|
||||||
*/
|
*/
|
||||||
public ThymeleafEngine() {}
|
public ThymeleafEngine() {
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 构造
|
* 构造
|
||||||
@ -61,6 +63,7 @@ public class ThymeleafEngine implements TemplateEngine {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 初始化引擎
|
* 初始化引擎
|
||||||
|
*
|
||||||
* @param engine 引擎
|
* @param engine 引擎
|
||||||
*/
|
*/
|
||||||
private void init(org.thymeleaf.TemplateEngine engine) {
|
private void init(org.thymeleaf.TemplateEngine engine) {
|
||||||
@ -75,6 +78,16 @@ public class ThymeleafEngine implements TemplateEngine {
|
|||||||
return ThymeleafTemplate.wrap(this.engine, resource, (null == this.config) ? null : this.config.getCharset());
|
return ThymeleafTemplate.wrap(this.engine, resource, (null == this.config) ? null : this.config.getCharset());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取原始引擎的钩子方法,用于自定义特殊属性,如插件等
|
||||||
|
*
|
||||||
|
* @return {@link org.thymeleaf.TemplateEngine}
|
||||||
|
* @since 5.8.7
|
||||||
|
*/
|
||||||
|
public org.thymeleaf.TemplateEngine getRawEngine() {
|
||||||
|
return this.engine;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建引擎
|
* 创建引擎
|
||||||
*
|
*
|
||||||
|
@ -73,6 +73,16 @@ public class WitEngine implements TemplateEngine {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取原始引擎的钩子方法,用于自定义特殊属性,如插件等
|
||||||
|
*
|
||||||
|
* @return {@link Engine}
|
||||||
|
* @since 5.8.7
|
||||||
|
*/
|
||||||
|
public Engine getRawEngine() {
|
||||||
|
return this.engine;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 创建引擎
|
* 创建引擎
|
||||||
*
|
*
|
||||||
|
@ -1,5 +1,15 @@
|
|||||||
package cn.hutool.extra.template;
|
package cn.hutool.extra.template;
|
||||||
|
|
||||||
|
import cn.hutool.core.date.DateUtil;
|
||||||
|
import cn.hutool.core.lang.Dict;
|
||||||
|
import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Ignore;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.thymeleaf.context.Context;
|
||||||
|
import org.thymeleaf.standard.StandardDialect;
|
||||||
|
import org.thymeleaf.templateresolver.StringTemplateResolver;
|
||||||
|
|
||||||
import java.io.StringWriter;
|
import java.io.StringWriter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@ -8,15 +18,6 @@ import java.util.List;
|
|||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.junit.Assert;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.thymeleaf.context.Context;
|
|
||||||
import org.thymeleaf.templateresolver.StringTemplateResolver;
|
|
||||||
|
|
||||||
import cn.hutool.core.date.DateUtil;
|
|
||||||
import cn.hutool.core.lang.Dict;
|
|
||||||
import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Thymeleaf单元测试
|
* Thymeleaf单元测试
|
||||||
*
|
*
|
||||||
@ -25,6 +26,20 @@ import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
|
|||||||
*/
|
*/
|
||||||
public class ThymeleafTest {
|
public class ThymeleafTest {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <a href="https://github.com/dromara/hutool/issues/2530">...</a>
|
||||||
|
* 自定义操作原始引擎
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
@Ignore
|
||||||
|
public void addDialectTest(){
|
||||||
|
final TemplateEngine engine = TemplateUtil.createEngine();
|
||||||
|
if(engine instanceof ThymeleafEngine){
|
||||||
|
final org.thymeleaf.TemplateEngine rawEngine = ((ThymeleafEngine) engine).getRawEngine();
|
||||||
|
rawEngine.addDialect(new StandardDialect());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void thymeleafEngineTest() {
|
public void thymeleafEngineTest() {
|
||||||
Map<String, Object> map1 = new HashMap<>();
|
Map<String, Object> map1 = new HashMap<>();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user