diff --git a/spring-brick-common/src/main/java/com/gitee/starblues/utils/FilesUtils.java b/spring-brick-common/src/main/java/com/gitee/starblues/utils/FilesUtils.java index 34fa6ce8cff6244b309c1b03a83071a14ac2f0c1..3dd292fd090994119ee67b17437d86c7be85e246 100644 --- a/spring-brick-common/src/main/java/com/gitee/starblues/utils/FilesUtils.java +++ b/spring-brick-common/src/main/java/com/gitee/starblues/utils/FilesUtils.java @@ -96,11 +96,11 @@ public class FilesUtils { } if (i < length - 1) { if (path.endsWith(SLASH)) { - path = path.replace(SLASH, ""); + path = path.substring(0, path.lastIndexOf(SLASH)); } else if (path.endsWith(BACKSLASH)) { - path = path.replace(BACKSLASH, ""); + path = path.substring(0, path.lastIndexOf(BACKSLASH)); } else if (path.endsWith(DOUBLE_SLASH)) { - path = path.replace(DOUBLE_SLASH, ""); + path = path.substring(0, path.lastIndexOf(DOUBLE_SLASH)); } } if (i > 0) { diff --git a/spring-brick-common/src/main/java/com/gitee/starblues/utils/ResourceUtils.java b/spring-brick-common/src/main/java/com/gitee/starblues/utils/ResourceUtils.java index b05979095e118adc6cbfa11c58750d427605d169..1571766f52c4ffa9434140a0dc2acd527fd2ce25 100644 --- a/spring-brick-common/src/main/java/com/gitee/starblues/utils/ResourceUtils.java +++ b/spring-brick-common/src/main/java/com/gitee/starblues/utils/ResourceUtils.java @@ -30,7 +30,7 @@ import java.util.function.Consumer; * * @author starBlues * @since 3.0.0 - * @version 3.0.0 + * @version 3.1.2 */ public class ResourceUtils { @@ -166,7 +166,7 @@ public class ResourceUtils { return false; } final File[] listFiles = rootFile.listFiles(); - if(listFiles == null || listFiles.length == 0){ + if(listFiles == null){ return false; } for (File listFile : listFiles) { diff --git a/spring-brick/src/main/java/com/gitee/starblues/integration/operator/PluginOperator.java b/spring-brick/src/main/java/com/gitee/starblues/integration/operator/PluginOperator.java index 787b548b90b366db5de85209047a29842afea5a0..d30d2eb0ff217f573613bb299ced79382f8ef566 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/integration/operator/PluginOperator.java +++ b/spring-brick/src/main/java/com/gitee/starblues/integration/operator/PluginOperator.java @@ -62,7 +62,9 @@ public interface PluginOperator { /** * 通过路径安装启动插件 [适用于 dev、prod 环境] * @param pluginPath 插件路径 - * @param unpackPlugin 是否解压插件包. (如果插件包为压缩包时生效) + * @param unpackPlugin 是否解压插件包. (如果插件包为压缩包时生效)。 + * 压缩包必须符合zip压缩包, 压缩包不允许出现多级目录 + * 建议将插件和依赖直接压缩为一个zip类型的压缩包 * @return 成功: 返回插件信息PluginInfo; 失败: 抛出异常或者返回null * @throws PluginException 异常信息 */ @@ -125,7 +127,7 @@ public interface PluginOperator { * 相同插件不在启动状态, 则进入覆盖模式, 会对旧插件进行备份(可根据isBackOldPlugin配置不备份), 然后上传新插件包到插件目录, 然后安装、启动。 * 如果在插件根目录存在同文件名称插件, 系统会抛出异常, 建议重命名插件名称, 再上传。 * - * @param uploadParam 上传参数 + * @param uploadParam 上传参数. 如果需要解压文件。则压缩包必须符合zip压缩包, 压缩包不允许出现多级目录, 建议将插件和依赖直接压缩为一个zip类型的压缩包 * @return 成功: 返回插件信息PluginInfo; 失败: 抛出异常或者返回null * @throws PluginException 异常信息 * @see UploadByInputStreamParam diff --git a/spring-brick/src/main/java/com/gitee/starblues/integration/operator/upload/UploadParam.java b/spring-brick/src/main/java/com/gitee/starblues/integration/operator/upload/UploadParam.java index a9576ab3dd71b709761c651500a87c9128f394e2..3288f4d4282bd8d70761d98a066e5ac362103b06 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/integration/operator/upload/UploadParam.java +++ b/spring-brick/src/main/java/com/gitee/starblues/integration/operator/upload/UploadParam.java @@ -40,6 +40,7 @@ public abstract class UploadParam { /** * 是否解压插件文件 + * 压缩包必须符合zip压缩包, 压缩包不允许出现多级目录, 建议将插件和依赖直接压缩为一个zip类型的压缩包 */ private boolean isUnpackPlugin = false;