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 8a15ab69990e366b902de8ce247e6cf48e48703b..35eb69509929b109232c4e7d8ffe141ba52c343c 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 52373cae632e5623e69d9daafc17471926a3eaec..3d1548973db88fcd28e66b113810c21ff26991a4 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 8fe7148d1e9272be0cdd31460fed24c4207e9a8c..0e6dbb7abc21448318d68870cf524987756ebfa5 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 2087232a127fb754c5256060ed41f42abd8e82c9..2201d3d492903a74fbd3878e8bda9f913030a203 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 90c48982c2d12a8be72a2872857060f51c70835f..87b282e2dbfa8d26b2eebb6c07048ffb41623d39 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 dd88e4bdab7228d59060b4b221125c5e8c07a9bf..4914bf62e34a43aa8906d1a966f3af5cc140ff82 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 cf619fa3b1220afe67a903af3e7d9bde32082fef..d06e538fae4dd14b4277d78f2e2554bce57c3ef9 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 678fa6ea1eec88676b6de2a9e97dee4e57ba7698..d9b9b907fd185d58c7784b2a7bc0e3db50ead2e8 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 6284a0bdca57fc5ce3c575788bfde2cf58338b9a..052b74a898356e5a611e61442d2093d435a27ac4 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 642721d0d1dd33b24b076a761003249f4e6e1a4c..40f62dc8c2ee39a946434a00689f46d73f2c9767 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 fa219810f6f55ade1868340bbca12a011aa93755..669b4f3d1c67b18761728707b34008e78a22572b 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 7c0a1eb1ea271e24c5d2f72c03995bf92f118281..2d16ba9351fe9ff44c68c7d75fd4140312d7036c 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 224796c071ded2ba038c9b216c6fc2baffbb2a79..2226d50d054400bd9d339b26914ecb9566c4de41 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 c9bfa3749fe3fe824fa303a243261610cd2e15d4..17ba28f22c14792f59debdd7aa8cec2cc29f159f 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 fb2ea4b9393c680c2a00eb225120adead85b002f..0000000000000000000000000000000000000000 --- 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 538c35486670333522523e0cb53bbffd5d13dd33..65fad6583845a13975c97669e6eb768ee45bb6c9 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 1c79f18d9a3dc9efce06013ad02b252e779dba0b..70dfde34696f175790e7ce88a725001c014dd0bb 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 48e9ede22d2ae43a8438d23ca684989a95324dc3..b1e1dd8aa60ed85a8049529ef79bac55c763460f 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 11b8e8a376aabe02472edc0717be01d3f6b4a507..451103bc0d036508f437ce1ea26642a0369a504f 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 225df462676830eada1b58919d8433077d7964e0..cd7944e6adcc59835e530ff73441088b3a669978 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 3ee6f6d8d0498ef745749f8e35ca3ef0fa509d58..a866e79bf057d036cdc681dd45f867371a6fde5b 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 8111151460967efe2dcdcb122efdf23882d3e584..ea44db3699b110f54dcc8140eb0d717afe319726 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 d9fd8e717fca00aa8f8cba04b49760df41f50dc9..e1cdb4d8d33c8aa6a379d75427130114c6497b6b 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 a6c98fa0d684927d21df729f9ffef575dd39d793..b2779e407785ab78ce193dd2ed4b276d30e88f8e 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 0589fe80bf2b8ecf578b47254921a1e77eb07f37..717eff72034983b6eb6daf00cf6507490f21d5d8 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