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 bug

Browse Source
This commit is contained in:
Looly
2022-09-15 02:19:44 +08:00
parent 23c8d40ad0
commit a081bdc5e1
13 changed files with 170 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
hutool-extra/src/main/java/cn/hutool/extra/ftp/Ftp.java
View File

@@ -229,6 +229,7 @@ public class Ftp extends AbstractFtp {
}
this.client = client;
if (mode != null) {
//noinspection resource
setMode(mode);
}
return this;
@@ -375,7 +376,7 @@ public class Ftp extends AbstractFtp {
String pwd = null;
if (StrUtil.isNotBlank(path)) {
pwd = pwd();
if (false == isDir(path)) {
if (false == cd(path)) {
throw new FtpException("Change dir to [{}] error, maybe path not exist!", path);
}
}
@@ -439,7 +440,7 @@ public class Ftp extends AbstractFtp {
final String pwd = pwd();
final String fileName = FileUtil.getName(path);
final String dir = StrUtil.removeSuffix(path, fileName);
if (false == isDir(dir)) {
if (false == cd(dir)) {
throw new FtpException("Change dir to [{}] error, maybe dir not exist!", path);
}
@@ -557,7 +558,7 @@ public class Ftp extends AbstractFtp {
if (StrUtil.isNotBlank(destPath)) {
mkDirs(destPath);
if (false == isDir(destPath)) {
if (false == cd(destPath)) {
throw new FtpException("Change dir to [{}] error, maybe dir not exist!", destPath);
}
}
@@ -665,7 +666,7 @@ public class Ftp extends AbstractFtp {
pwd = pwd();
}
if (false == isDir(path)) {
if (false == cd(path)) {
throw new FtpException("Change dir to [{}] error, maybe dir not exist!", path);
}

7
hutool-extra/src/main/java/cn/hutool/extra/template/TemplateEngine.java
View File

@@ -23,4 +23,11 @@ public interface TemplateEngine {
*/
Template getTemplate(String resource);
/**
* 获取原始引擎的钩子方法，用于自定义特殊属性，如插件等
*
* @return 对应模板实现的引擎对象
* @since 6.0.0
*/
Object getRawEngine();
}

11
hutool-extra/src/main/java/cn/hutool/extra/template/engine/beetl/BeetlEngine.java
View File

@@ -72,6 +72,17 @@ public class BeetlEngine implements TemplateEngine {
return BeetlTemplate.wrap(engine.getTemplate(resource));
}
/**
* 获取原始引擎的钩子方法，用于自定义特殊属性，如插件等
*
* @return {@link GroupTemplate}
* @since 5.8.7
*/
@Override
public GroupTemplate getRawEngine() {
return this.engine;
}
/**
* 创建引擎
*

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

@@ -77,6 +77,17 @@ public class EnjoyEngine implements TemplateEngine {
return EnjoyTemplate.wrap(this.engine.getTemplate(resource));
}
/**
* 获取原始引擎的钩子方法，用于自定义特殊属性，如插件等
*
* @return {@link com.jfinal.template.Engine}
* @since 5.8.7
*/
@Override
public com.jfinal.template.Engine getRawEngine() {
return this.engine;
}
/**
* 创建引擎
*

13
hutool-extra/src/main/java/cn/hutool/extra/template/engine/freemarker/FreemarkerEngine.java
View File

@@ -15,7 +15,7 @@ import java.io.IOException;
/**
* FreeMarker模板引擎封装<br>
* 见：https://freemarker.apache.org/
* 见：<a href="https://freemarker.apache.org/">https://freemarker.apache.org/</a>
*
* @author looly
*/
@@ -82,6 +82,17 @@ public class FreemarkerEngine implements TemplateEngine {
}
}
/**
* 获取原始引擎的钩子方法，用于自定义特殊属性，如插件等
*
* @return {@link Configuration}
* @since 5.8.7
*/
@Override
public Configuration getRawEngine() {
return this.cfg;
}
/**
* 创建配置项
*

11
hutool-extra/src/main/java/cn/hutool/extra/template/engine/jetbrick/JetbrickEngine.java
View File

@@ -66,6 +66,17 @@ public class JetbrickEngine implements TemplateEngine {
return JetbrickTemplate.wrap(engine.getTemplate(resource));
}
/**
* 获取原始引擎的钩子方法，用于自定义特殊属性，如插件等
*
* @return {@link JetEngine}
* @since 5.8.7
*/
@Override
public JetEngine getRawEngine() {
return this.engine;
}
/**
* 创建引擎
*

15
hutool-extra/src/main/java/cn/hutool/extra/template/engine/rythm/RythmEngine.java
View File

@@ -1,11 +1,11 @@
package cn.hutool.extra.template.engine.rythm;
import java.util.Properties;
import cn.hutool.extra.template.Template;
import cn.hutool.extra.template.TemplateConfig;
import cn.hutool.extra.template.TemplateEngine;
import java.util.Properties;
/**
* Rythm模板引擎<br>
* 文档：http://rythmengine.org/doc/index
@@ -67,6 +67,17 @@ public class RythmEngine implements TemplateEngine {
return RythmTemplate.wrap(this.engine.getTemplate(resource));
}
/**
* 获取原始引擎的钩子方法，用于自定义特殊属性，如插件等
*
* @return {@link org.rythmengine.RythmEngine}
* @since 5.8.7
*/
@Override
public org.rythmengine.RythmEngine getRawEngine() {
return this.engine;
}
/**
* 创建引擎
*

76
hutool-extra/src/main/java/cn/hutool/extra/template/engine/thymeleaf/ThymeleafEngine.java
View File

@@ -25,10 +25,12 @@ public class ThymeleafEngine implements TemplateEngine {
TemplateConfig config;
// --------------------------------------------------------------------------------- Constructor start
/**
* 默认构造
*/
public ThymeleafEngine() {}
public ThymeleafEngine() {
}
/**
* 构造
@@ -51,7 +53,7 @@ public class ThymeleafEngine implements TemplateEngine {
@Override
public TemplateEngine init(TemplateConfig config) {
if(null == config){
if (null == config) {
config = TemplateConfig.DEFAULT;
}
this.config = config;
@@ -61,20 +63,32 @@ public class ThymeleafEngine implements TemplateEngine {
/**
* 初始化引擎
*
* @param engine 引擎
*/
private void init(final org.thymeleaf.TemplateEngine engine){
private void init(final org.thymeleaf.TemplateEngine engine) {
this.engine = engine;
}
@Override
public Template getTemplate(final String resource) {
if(null == this.engine){
if (null == this.engine) {
init(TemplateConfig.DEFAULT);
}
return ThymeleafTemplate.wrap(this.engine, resource, (null == this.config) ? null : this.config.getCharset());
}
/**
* 获取原始引擎的钩子方法，用于自定义特殊属性，如插件等
*
* @return {@link org.thymeleaf.TemplateEngine}
* @since 5.8.7
*/
@Override
public org.thymeleaf.TemplateEngine getRawEngine() {
return this.engine;
}
/**
* 创建引擎
*
@@ -88,33 +102,33 @@ public class ThymeleafEngine implements TemplateEngine {
final ITemplateResolver resolver;
switch (config.getResourceMode()) {
case CLASSPATH:
final ClassLoaderTemplateResolver classLoaderResolver = new ClassLoaderTemplateResolver();
classLoaderResolver.setCharacterEncoding(config.getCharsetStr());
classLoaderResolver.setTemplateMode(TemplateMode.HTML);
classLoaderResolver.setPrefix(StrUtil.addSuffixIfNot(config.getPath(), "/"));
resolver = classLoaderResolver;
break;
case FILE:
final FileTemplateResolver fileResolver = new FileTemplateResolver();
fileResolver.setCharacterEncoding(config.getCharsetStr());
fileResolver.setTemplateMode(TemplateMode.HTML);
fileResolver.setPrefix(StrUtil.addSuffixIfNot(config.getPath(), "/"));
resolver = fileResolver;
break;
case WEB_ROOT:
final FileTemplateResolver webRootResolver = new FileTemplateResolver();
webRootResolver.setCharacterEncoding(config.getCharsetStr());
webRootResolver.setTemplateMode(TemplateMode.HTML);
webRootResolver.setPrefix(StrUtil.addSuffixIfNot(FileUtil.getAbsolutePath(FileUtil.file(FileUtil.getWebRoot(), config.getPath())), "/"));
resolver = webRootResolver;
break;
case STRING:
resolver = new StringTemplateResolver();
break;
default:
resolver = new DefaultTemplateResolver();
break;
case CLASSPATH:
final ClassLoaderTemplateResolver classLoaderResolver = new ClassLoaderTemplateResolver();
classLoaderResolver.setCharacterEncoding(config.getCharsetStr());
classLoaderResolver.setTemplateMode(TemplateMode.HTML);
classLoaderResolver.setPrefix(StrUtil.addSuffixIfNot(config.getPath(), "/"));
resolver = classLoaderResolver;
break;
case FILE:
final FileTemplateResolver fileResolver = new FileTemplateResolver();
fileResolver.setCharacterEncoding(config.getCharsetStr());
fileResolver.setTemplateMode(TemplateMode.HTML);
fileResolver.setPrefix(StrUtil.addSuffixIfNot(config.getPath(), "/"));
resolver = fileResolver;
break;
case WEB_ROOT:
final FileTemplateResolver webRootResolver = new FileTemplateResolver();
webRootResolver.setCharacterEncoding(config.getCharsetStr());
webRootResolver.setTemplateMode(TemplateMode.HTML);
webRootResolver.setPrefix(StrUtil.addSuffixIfNot(FileUtil.getAbsolutePath(FileUtil.file(FileUtil.getWebRoot(), config.getPath())), "/"));
resolver = webRootResolver;
break;
case STRING:
resolver = new StringTemplateResolver();
break;
default:
resolver = new DefaultTemplateResolver();
break;
}
final org.thymeleaf.TemplateEngine engine = new org.thymeleaf.TemplateEngine();

1
hutool-extra/src/main/java/cn/hutool/extra/template/engine/velocity/VelocityEngine.java
View File

@@ -70,6 +70,7 @@ public class VelocityEngine implements TemplateEngine {
* @return 原始引擎对象
* @since 5.5.8
*/
@Override
public org.apache.velocity.app.VelocityEngine getRawEngine() {
return this.engine;
}

11
hutool-extra/src/main/java/cn/hutool/extra/template/engine/wit/WitEngine.java
View File

@@ -73,6 +73,17 @@ public class WitEngine implements TemplateEngine {
}
}
/**
* 获取原始引擎的钩子方法，用于自定义特殊属性，如插件等
*
* @return {@link Engine}
* @since 5.8.7
*/
@Override
public Engine getRawEngine() {
return this.engine;
}
/**
* 创建引擎
*

33
hutool-extra/src/test/java/cn/hutool/extra/template/ThymeleafTest.java
View File

@@ -1,5 +1,15 @@
package cn.hutool.extra.template;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.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.util.ArrayList;
import java.util.HashMap;
@@ -8,15 +18,6 @@ import java.util.List;
import java.util.Locale;
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.map.Dict;
import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
/**
* Thymeleaf单元测试
*
@@ -25,6 +26,20 @@ import cn.hutool.extra.template.engine.thymeleaf.ThymeleafEngine;
*/
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
public void thymeleafEngineTest() {
final Map<String, Object> map1 = new HashMap<>();