From 2bb6c5b31d88021971f572e0a033e9b5cc8f0bcb Mon Sep 17 00:00:00 2001 From: StarBlues Date: Sun, 10 Apr 2022 10:06:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EmptyMainApplicationContext.java | 2 +- .../common/cipher/AesPluginCipher.java | 1 + .../starblues/plugin/pack/RepackageMojo.java | 2 +- .../plugin/pack/encrypt/AesEncryptPlugin.java | 1 - .../plugin/pack/utils/CommonUtils.java | 2 +- .../starblues/core/DefaultPluginManager.java | 2 +- .../core/DefaultRealizeProvider.java | 4 ++- .../starblues/core/PluginLauncherManager.java | 2 +- .../checker/DefaultPluginLauncherChecker.java | 4 ++- .../AbstractPluginDescriptorLoader.java | 10 ++---- .../descriptor/ComposeDescriptorLoader.java | 2 +- .../descriptor/DevPluginDescriptorLoader.java | 2 +- .../ProdPackagePluginDescriptorLoader.java | 2 +- .../ProdPluginDescriptorLoader.java | 5 +-- .../descriptor/decrypt/DecryptProperties.java | 34 ------------------- .../core/launcher/plugin/PluginLauncher.java | 2 +- .../core/version/SemverVersionInspector.java | 2 +- .../core/version/VersionInspector.java | 2 +- .../DefaultIntegrationConfiguration.java | 2 +- .../integration/ExtendPointConfiguration.java | 2 +- .../integration/IntegrationConfiguration.java | 2 +- .../operator/DefaultPluginOperator.java | 2 +- .../spring/MainApplicationContext.java | 4 +-- .../spring/MainApplicationContextProxy.java | 4 +-- update.md | 3 +- 25 files changed, 30 insertions(+), 70 deletions(-) delete mode 100644 spring-brick/src/main/java/com/gitee/starblues/core/descriptor/decrypt/DecryptProperties.java diff --git a/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptyMainApplicationContext.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptyMainApplicationContext.java index 8a15ab6..35eb695 100644 --- a/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptyMainApplicationContext.java +++ b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptyMainApplicationContext.java @@ -25,7 +25,7 @@ import java.util.Set; /** * 空的MainApplicationContext实现 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class EmptyMainApplicationContext implements MainApplicationContext { diff --git a/spring-brick-common/src/main/java/com/gitee/starblues/common/cipher/AesPluginCipher.java b/spring-brick-common/src/main/java/com/gitee/starblues/common/cipher/AesPluginCipher.java index 52373ca..3d15489 100644 --- a/spring-brick-common/src/main/java/com/gitee/starblues/common/cipher/AesPluginCipher.java +++ b/spring-brick-common/src/main/java/com/gitee/starblues/common/cipher/AesPluginCipher.java @@ -25,6 +25,7 @@ import java.nio.charset.StandardCharsets; import java.security.Key; import java.security.NoSuchAlgorithmException; import java.util.Base64; + /** * AES 加密 * diff --git a/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/RepackageMojo.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/RepackageMojo.java index 8fe7148..0e6dbb7 100644 --- a/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/RepackageMojo.java +++ b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/RepackageMojo.java @@ -42,7 +42,7 @@ import java.util.Set; /** * 重新打包 mojo * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ @Mojo(name = "repackage", defaultPhase = LifecyclePhase.PACKAGE, requiresProject = true, threadSafe = true, requiresDependencyResolution = ResolutionScope.COMPILE_PLUS_RUNTIME, diff --git a/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/encrypt/AesEncryptPlugin.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/encrypt/AesEncryptPlugin.java index 2087232..2201d3d 100644 --- a/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/encrypt/AesEncryptPlugin.java +++ b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/encrypt/AesEncryptPlugin.java @@ -2,7 +2,6 @@ package com.gitee.starblues.plugin.pack.encrypt; import com.gitee.starblues.common.cipher.AbstractPluginCipher; import com.gitee.starblues.common.cipher.AesPluginCipher; -import com.gitee.starblues.common.cipher.RsaPluginCipher; import com.gitee.starblues.plugin.pack.PluginInfo; import com.gitee.starblues.utils.ObjectUtils; import org.apache.maven.plugin.MojoExecutionException; diff --git a/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/CommonUtils.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/CommonUtils.java index 90c4898..87b282e 100644 --- a/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/CommonUtils.java +++ b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/CommonUtils.java @@ -24,7 +24,7 @@ import java.util.Objects; /** * Object 工具类 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class CommonUtils { diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java b/spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java index dd88e4b..4914bf6 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java @@ -49,7 +49,7 @@ import java.util.stream.Collectors; /** * 抽象的插件管理者 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class DefaultPluginManager implements PluginManager{ diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/DefaultRealizeProvider.java b/spring-brick/src/main/java/com/gitee/starblues/core/DefaultRealizeProvider.java index cf619fa..d06e538 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/DefaultRealizeProvider.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/DefaultRealizeProvider.java @@ -34,8 +34,10 @@ import com.gitee.starblues.utils.Assert; import org.springframework.context.ApplicationContext; /** + * 默认的RealizeProvider实现 + * * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class DefaultRealizeProvider implements RealizeProvider { diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/PluginLauncherManager.java b/spring-brick/src/main/java/com/gitee/starblues/core/PluginLauncherManager.java index 678fa6e..d9b9b90 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/PluginLauncherManager.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/PluginLauncherManager.java @@ -43,7 +43,7 @@ import java.util.concurrent.ConcurrentHashMap; /** * 可引导启动的插件管理者 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class PluginLauncherManager extends DefaultPluginManager{ diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/checker/DefaultPluginLauncherChecker.java b/spring-brick/src/main/java/com/gitee/starblues/core/checker/DefaultPluginLauncherChecker.java index 6284a0b..052b74a 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/checker/DefaultPluginLauncherChecker.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/checker/DefaultPluginLauncherChecker.java @@ -28,8 +28,10 @@ import com.gitee.starblues.utils.MsgUtils; import com.gitee.starblues.utils.ObjectUtils; /** + * 默认插件启动检查者 + * * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class DefaultPluginLauncherChecker implements PluginLauncherChecker { diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/AbstractPluginDescriptorLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/AbstractPluginDescriptorLoader.java index 642721d..40f62dc 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/AbstractPluginDescriptorLoader.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/AbstractPluginDescriptorLoader.java @@ -17,23 +17,19 @@ package com.gitee.starblues.core.descriptor; -import com.gitee.starblues.common.*; -import com.gitee.starblues.core.descriptor.decrypt.DecryptProperties; -import com.gitee.starblues.core.descriptor.decrypt.DefaultPluginDescriptorDecrypt; -import com.gitee.starblues.core.descriptor.decrypt.EmptyPluginDescriptorDecrypt; +import com.gitee.starblues.common.AbstractDependencyPlugin; +import com.gitee.starblues.common.Constants; +import com.gitee.starblues.common.DependencyPlugin; import com.gitee.starblues.core.descriptor.decrypt.PluginDescriptorDecrypt; import com.gitee.starblues.core.exception.PluginDecryptException; import com.gitee.starblues.core.exception.PluginException; -import com.gitee.starblues.integration.IntegrationConfiguration; import com.gitee.starblues.utils.FilesUtils; import com.gitee.starblues.utils.ObjectUtils; -import com.gitee.starblues.utils.SpringBeanUtils; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.context.ApplicationContext; import java.io.File; import java.io.IOException; diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ComposeDescriptorLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ComposeDescriptorLoader.java index fa21981..669b4f3 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ComposeDescriptorLoader.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ComposeDescriptorLoader.java @@ -30,7 +30,7 @@ import java.util.List; /** * 组合插件描述加载者 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class ComposeDescriptorLoader implements PluginDescriptorLoader{ diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/DevPluginDescriptorLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/DevPluginDescriptorLoader.java index 7c0a1eb..2d16ba9 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/DevPluginDescriptorLoader.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/DevPluginDescriptorLoader.java @@ -31,7 +31,7 @@ import java.util.Properties; /** * 开发环境 PluginDescriptorLoader 加载者 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ @Slf4j public class DevPluginDescriptorLoader extends AbstractPluginDescriptorLoader{ diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdPackagePluginDescriptorLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdPackagePluginDescriptorLoader.java index 224796c..2226d50 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdPackagePluginDescriptorLoader.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdPackagePluginDescriptorLoader.java @@ -41,7 +41,7 @@ import static com.gitee.starblues.common.PluginDescriptorKey.PLUGIN_RESOURCES_CO * 生产环境打包好的插件 PluginDescriptorLoader 加载者 * 解析 jar、zip * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class ProdPackagePluginDescriptorLoader extends AbstractPluginDescriptorLoader{ diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdPluginDescriptorLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdPluginDescriptorLoader.java index c9bfa37..17ba28f 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdPluginDescriptorLoader.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdPluginDescriptorLoader.java @@ -16,21 +16,18 @@ package com.gitee.starblues.core.descriptor; -import com.gitee.starblues.core.descriptor.decrypt.EmptyPluginDescriptorDecrypt; import com.gitee.starblues.core.descriptor.decrypt.PluginDescriptorDecrypt; import com.gitee.starblues.core.exception.PluginException; import com.gitee.starblues.utils.ResourceUtils; -import com.gitee.starblues.utils.SpringBeanUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.context.ApplicationContext; import java.nio.file.Path; /** * 生产环境插件描述加载者 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class ProdPluginDescriptorLoader implements PluginDescriptorLoader{ diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/decrypt/DecryptProperties.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/decrypt/DecryptProperties.java deleted file mode 100644 index fb2ea4b..0000000 --- a/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/decrypt/DecryptProperties.java +++ /dev/null @@ -1,34 +0,0 @@ -/** - * Copyright [2019-2022] [starBlues] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.gitee.starblues.core.descriptor.decrypt; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Reader; -import java.util.Properties; - -/** - * 需解密的 Properties - * - * @author starBlues - * @version 3.0.1 - */ -public class DecryptProperties extends Properties { - - -} diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginLauncher.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginLauncher.java index 538c354..65fad65 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginLauncher.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginLauncher.java @@ -32,7 +32,7 @@ import java.util.WeakHashMap; /** * 插件启动引导类 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class PluginLauncher extends AbstractLauncher { diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/version/SemverVersionInspector.java b/spring-brick/src/main/java/com/gitee/starblues/core/version/SemverVersionInspector.java index 1c79f18..70dfde3 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/version/SemverVersionInspector.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/version/SemverVersionInspector.java @@ -24,7 +24,7 @@ import com.github.zafarkhaja.semver.Version; /** * Semver标准版本检查 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class SemverVersionInspector implements VersionInspector{ diff --git a/spring-brick/src/main/java/com/gitee/starblues/core/version/VersionInspector.java b/spring-brick/src/main/java/com/gitee/starblues/core/version/VersionInspector.java index 48e9ede..b1e1dd8 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/core/version/VersionInspector.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/version/VersionInspector.java @@ -21,7 +21,7 @@ import com.gitee.starblues.core.exception.PluginException; /** * 版本检查 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public interface VersionInspector { diff --git a/spring-brick/src/main/java/com/gitee/starblues/integration/DefaultIntegrationConfiguration.java b/spring-brick/src/main/java/com/gitee/starblues/integration/DefaultIntegrationConfiguration.java index 11b8e8a..451103b 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/integration/DefaultIntegrationConfiguration.java +++ b/spring-brick/src/main/java/com/gitee/starblues/integration/DefaultIntegrationConfiguration.java @@ -27,7 +27,7 @@ import java.util.Set; * 默认的插件集成配置。给非必须配置设置了默认值 * * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public abstract class DefaultIntegrationConfiguration implements IntegrationConfiguration{ diff --git a/spring-brick/src/main/java/com/gitee/starblues/integration/ExtendPointConfiguration.java b/spring-brick/src/main/java/com/gitee/starblues/integration/ExtendPointConfiguration.java index 225df46..cd7944e 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/integration/ExtendPointConfiguration.java +++ b/spring-brick/src/main/java/com/gitee/starblues/integration/ExtendPointConfiguration.java @@ -34,7 +34,7 @@ import org.springframework.context.support.GenericApplicationContext; /** * 系统Bean配置 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class ExtendPointConfiguration { diff --git a/spring-brick/src/main/java/com/gitee/starblues/integration/IntegrationConfiguration.java b/spring-brick/src/main/java/com/gitee/starblues/integration/IntegrationConfiguration.java index 3ee6f6d..a866e79 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/integration/IntegrationConfiguration.java +++ b/spring-brick/src/main/java/com/gitee/starblues/integration/IntegrationConfiguration.java @@ -29,7 +29,7 @@ import java.util.Set; /** * 插件集成时的配置接口。插件集成的配置接口 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public interface IntegrationConfiguration { diff --git a/spring-brick/src/main/java/com/gitee/starblues/integration/operator/DefaultPluginOperator.java b/spring-brick/src/main/java/com/gitee/starblues/integration/operator/DefaultPluginOperator.java index 8111151..ea44db3 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/integration/operator/DefaultPluginOperator.java +++ b/spring-brick/src/main/java/com/gitee/starblues/integration/operator/DefaultPluginOperator.java @@ -53,7 +53,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * 默认的插件操作者 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class DefaultPluginOperator implements PluginOperator { protected final Logger log = LoggerFactory.getLogger(this.getClass()); diff --git a/spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContext.java b/spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContext.java index d9fd8e7..e1cdb4d 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContext.java +++ b/spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContext.java @@ -16,14 +16,12 @@ package com.gitee.starblues.spring; -import com.gitee.starblues.loader.classloader.GenericClassLoader; - import java.util.Map; /** * 主程序 ApplicationContext 接口 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public interface MainApplicationContext extends ApplicationContext { diff --git a/spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContextProxy.java b/spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContextProxy.java index a6c98fa..b2779e4 100644 --- a/spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContextProxy.java +++ b/spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContextProxy.java @@ -16,7 +16,6 @@ package com.gitee.starblues.spring; -import com.gitee.starblues.loader.classloader.GenericClassLoader; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.EnumerablePropertySource; @@ -24,14 +23,13 @@ import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertySource; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; /** * 主程序 ApplicationContext 的实现 * @author starBlues - * @version 3.0.0 + * @version 3.0.1 */ public class MainApplicationContextProxy extends ApplicationContextProxy implements MainApplicationContext{ diff --git a/update.md b/update.md index 0589fe8..717eff7 100644 --- a/update.md +++ b/update.md @@ -2,4 +2,5 @@ 2. 修复插件动态安装的问题。 3. 修复主程序打包为生产环境jar包后，启动问题。 4. 修复插件更新时, 版本校验问题。 -5. 修复插件排序、启用、禁用配置无效的问题。 \ No newline at end of file +5. 修复插件排序、启用、禁用配置无效的问题。 +6. 修复插件更新时, 新代码不无法变更的问题。 \ No newline at end of file -- Gitee