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 code

Browse Source
This commit is contained in:
Looly
2023-09-27 10:15:56 +08:00
parent 7230b074ac
commit 997f2af8cd
12 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-extra/src/main/java/org/dromara/hutool/extra/ftp/Ftp.java
View File

@@ -113,7 +113,7 @@ public class Ftp extends AbstractFtp {
* @param password 密码
* @param charset 编码
* @param serverLanguageCode 服务器语言 例如：zh
* @param systemKey 服务器标识 例如：org.mina.commons.net.ftp.FTPClientConfig.SYST_NT
* @param systemKey 服务器标识 例如：org.apache.commons.net.ftp.FTPClientConfig.SYST_NT
*/
public Ftp(final String host, final int port, final String user, final String password, final Charset charset, final String serverLanguageCode, final String systemKey) {
this(host, port, user, password, charset, serverLanguageCode, systemKey, null);

4
hutool-extra/src/main/java/org/dromara/hutool/extra/template/engine/velocity/VelocityEngine.java
View File

@@ -134,7 +134,7 @@ public class VelocityEngine implements TemplateEngine {
// loader
switch (config.getResourceMode()) {
case CLASSPATH:
ve.setProperty("resource.loader.file.class", "org.mina.velocity.runtime.resource.loader.ClasspathResourceLoader");
ve.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
break;
case FILE:
// path
@@ -145,7 +145,7 @@ public class VelocityEngine implements TemplateEngine {
break;
case WEB_ROOT:
ve.setProperty(Velocity.RESOURCE_LOADERS, "webapp");
ve.setProperty("webapp.resource.loader.class", "org.mina.velocity.tools.view.servlet.WebappLoader");
ve.setProperty("webapp.resource.loader.class", "org.apache.velocity.tools.view.servlet.WebappLoader");
ve.setProperty("webapp.resource.loader.path", ObjUtil.defaultIfNull(config.getPath(), StrUtil.SLASH));
break;
case STRING: