diff --git a/src/main/java/org/springblade/core/listener/StartupListener.java b/src/main/java/org/springblade/core/listener/StartupListener.java index 2248da376c9410dfd064f8fd0d573f8889742100..5f64c6cd8fb79a16757554eeab22dabd1d98d58e 100644 --- a/src/main/java/org/springblade/core/listener/StartupListener.java +++ b/src/main/java/org/springblade/core/listener/StartupListener.java @@ -20,9 +20,9 @@ import org.springblade.core.constant.Cst; import org.springblade.core.plugins.IPluginHolder; import org.springblade.core.plugins.PluginFactory; import org.springblade.core.plugins.PluginManager; -import org.springblade.core.plugins.connection.LogoPlugin; -import org.springblade.core.plugins.connection.RedisPlugin; -import org.springblade.core.plugins.connection.SQLManagerPlugin; +import org.springblade.core.plugins.logo.LogoPlugin; +import org.springblade.core.plugins.redis.RedisPlugin; +import org.springblade.core.plugins.dao.SQLManagerPlugin; import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.stereotype.Component; diff --git a/src/main/java/org/springblade/core/plugins/dao/Blade.java b/src/main/java/org/springblade/core/plugins/dao/Blade.java index 4d43c71ef677f34f6c1f8caade11841f8df890c8..fcbb22bf22d77b5b3799a3572201018ac8727e9d 100644 --- a/src/main/java/org/springblade/core/plugins/dao/Blade.java +++ b/src/main/java/org/springblade/core/plugins/dao/Blade.java @@ -23,7 +23,6 @@ import org.springblade.core.annotation.BindID; import org.springblade.core.annotation.DbName; import org.springblade.core.constant.Const; import org.springblade.core.constant.Cst; -import org.springblade.core.plugins.connection.SQLManagerPlugin; import org.springblade.core.toolbox.CMap; import org.springblade.core.toolbox.Func; import org.springblade.core.toolbox.grid.BladePage; diff --git a/src/main/java/org/springblade/core/plugins/dao/DbManager.java b/src/main/java/org/springblade/core/plugins/dao/DbManager.java index d1e306809d256f1cf4b42a108c98166275f12a27..0b1440b2659c8196c9ff63de700ecc28b06f9a7f 100644 --- a/src/main/java/org/springblade/core/plugins/dao/DbManager.java +++ b/src/main/java/org/springblade/core/plugins/dao/DbManager.java @@ -26,7 +26,6 @@ import org.beetl.sql.core.SQLReady; import org.springblade.core.aop.AopContext; import org.springblade.core.constant.Cst; import org.springblade.core.meta.IQuery; -import org.springblade.core.plugins.connection.SQLManagerPlugin; import org.springblade.core.toolbox.Func; import org.springblade.core.toolbox.CMap; import org.springblade.core.toolbox.cache.CacheKit; diff --git a/src/main/java/org/springblade/core/plugins/dao/MdManager.java b/src/main/java/org/springblade/core/plugins/dao/MdManager.java index a4b7a7a088b1e641def6da11a32c0b089950b766..fadef195d1aa3ad4b67c078ba9f7b69fc03a666e 100644 --- a/src/main/java/org/springblade/core/plugins/dao/MdManager.java +++ b/src/main/java/org/springblade/core/plugins/dao/MdManager.java @@ -26,7 +26,6 @@ import org.beetl.sql.core.db.KeyHolder; import org.beetl.sql.core.engine.PageQuery; import org.springblade.core.beetl.BeetlTemplate; -import org.springblade.core.plugins.connection.SQLManagerPlugin; import org.springblade.core.toolbox.cache.CacheKit; import org.springblade.core.toolbox.cache.ILoader; import org.springblade.core.toolbox.grid.BladePage; diff --git a/src/main/java/org/springblade/core/plugins/connection/SQLManagerPlugin.java b/src/main/java/org/springblade/core/plugins/dao/SQLManagerPlugin.java similarity index 97% rename from src/main/java/org/springblade/core/plugins/connection/SQLManagerPlugin.java rename to src/main/java/org/springblade/core/plugins/dao/SQLManagerPlugin.java index 046f396748348a536420152f3b822d11180a1aa7..a008ba894151ce0b4bfd3c0ea2bb8a5d1fd6eb09 100644 --- a/src/main/java/org/springblade/core/plugins/connection/SQLManagerPlugin.java +++ b/src/main/java/org/springblade/core/plugins/dao/SQLManagerPlugin.java @@ -13,19 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springblade.core.plugins.connection; - -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; +package org.springblade.core.plugins.dao; import org.beetl.sql.core.IDAutoGen; import org.beetl.sql.core.SQLManager; - import org.springblade.core.config.BladeConfig; import org.springblade.core.plugins.IPlugin; import org.springblade.core.toolbox.kit.LogKit; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; + /** * SQLManager插件 */ diff --git a/src/main/java/org/springblade/core/plugins/connection/LogoPlugin.java b/src/main/java/org/springblade/core/plugins/logo/LogoPlugin.java similarity index 97% rename from src/main/java/org/springblade/core/plugins/connection/LogoPlugin.java rename to src/main/java/org/springblade/core/plugins/logo/LogoPlugin.java index 40012a7df38b7b742b5822e7c19f792376b35e1f..5114427bb0a8b71460ca393a41aedcb7377ce1ed 100644 --- a/src/main/java/org/springblade/core/plugins/connection/LogoPlugin.java +++ b/src/main/java/org/springblade/core/plugins/logo/LogoPlugin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springblade.core.plugins.connection; +package org.springblade.core.plugins.logo; import org.springblade.core.plugins.IPlugin; diff --git a/src/main/java/org/springblade/core/plugins/dao/Redis.java b/src/main/java/org/springblade/core/plugins/redis/Redis.java similarity index 99% rename from src/main/java/org/springblade/core/plugins/dao/Redis.java rename to src/main/java/org/springblade/core/plugins/redis/Redis.java index e160f392d8e7548cab5192a8b293d3d8debff0c2..1a664ec800af46d49b58e7503aadd051b79eeda0 100644 --- a/src/main/java/org/springblade/core/plugins/dao/Redis.java +++ b/src/main/java/org/springblade/core/plugins/redis/Redis.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springblade.core.plugins.dao; +package org.springblade.core.plugins.redis; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/springblade/core/plugins/dao/RedisManager.java b/src/main/java/org/springblade/core/plugins/redis/RedisManager.java similarity index 92% rename from src/main/java/org/springblade/core/plugins/dao/RedisManager.java rename to src/main/java/org/springblade/core/plugins/redis/RedisManager.java index 6cd7fc92d7ee7f951a9342aa9c2364655e9cd238..f30edce4715f20e8ab09f608145a9ae18a8ef0fa 100644 --- a/src/main/java/org/springblade/core/plugins/dao/RedisManager.java +++ b/src/main/java/org/springblade/core/plugins/redis/RedisManager.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springblade.core.plugins.dao; +package org.springblade.core.plugins.redis; + +import org.springblade.core.toolbox.redis.IJedis; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.springblade.core.plugins.connection.RedisPlugin; -import org.springblade.core.toolbox.redis.IJedis; - /** * Redis操作工具类 */ diff --git a/src/main/java/org/springblade/core/plugins/connection/RedisPlugin.java b/src/main/java/org/springblade/core/plugins/redis/RedisPlugin.java similarity index 98% rename from src/main/java/org/springblade/core/plugins/connection/RedisPlugin.java rename to src/main/java/org/springblade/core/plugins/redis/RedisPlugin.java index 8f0cb74070646447c3c3f4d824bba7b71a5dfccb..fb361638dd4eb7c3755c8ba245766c68af8bee8f 100644 --- a/src/main/java/org/springblade/core/plugins/connection/RedisPlugin.java +++ b/src/main/java/org/springblade/core/plugins/redis/RedisPlugin.java @@ -13,22 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springblade.core.plugins.connection; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; +package org.springblade.core.plugins.redis; +import org.springblade.core.config.BladeConfig; import org.springblade.core.plugins.IPlugin; +import org.springblade.core.toolbox.kit.LogKit; import org.springblade.core.toolbox.redis.IJedis; +import org.springblade.core.toolbox.redis.IKeyNamingPolicy; +import org.springblade.core.toolbox.redis.RedisCluster; +import org.springblade.core.toolbox.redis.RedisSingle; import org.springblade.core.toolbox.redis.serializer.JdkSerializer; import redis.clients.jedis.JedisCluster; import redis.clients.jedis.JedisPool; -import org.springblade.core.config.BladeConfig; -import org.springblade.core.toolbox.kit.LogKit; -import org.springblade.core.toolbox.redis.IKeyNamingPolicy; -import org.springblade.core.toolbox.redis.RedisCluster; -import org.springblade.core.toolbox.redis.RedisSingle; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; /** * Redis插件 diff --git a/src/main/java/org/springblade/core/shiro/redis/RedisCache.java b/src/main/java/org/springblade/core/shiro/redis/RedisCache.java index 435e1f3794ca89621dc09f37c07008da050e93fd..d2d58ed24c81124376e636580c0db286e5688c72 100644 --- a/src/main/java/org/springblade/core/shiro/redis/RedisCache.java +++ b/src/main/java/org/springblade/core/shiro/redis/RedisCache.java @@ -29,7 +29,7 @@ import org.apache.shiro.cache.Cache; import org.apache.shiro.cache.CacheException; import org.apache.shiro.util.CollectionUtils; -import org.springblade.core.plugins.dao.Redis; +import org.springblade.core.plugins.redis.Redis; import org.springblade.core.toolbox.redis.IJedis; import org.springblade.core.toolbox.redis.IKeyNamingPolicy; diff --git a/src/main/java/org/springblade/core/toolbox/cache/RedisCacheFactory.java b/src/main/java/org/springblade/core/toolbox/cache/RedisCacheFactory.java index 55a705c6ef7a3d63a17653f4cdb1ea4442648514..40747e12d6f228a22b252bffe42c4aa2b1de409f 100644 --- a/src/main/java/org/springblade/core/toolbox/cache/RedisCacheFactory.java +++ b/src/main/java/org/springblade/core/toolbox/cache/RedisCacheFactory.java @@ -18,7 +18,7 @@ package org.springblade.core.toolbox.cache; import java.util.ArrayList; import java.util.List; -import org.springblade.core.plugins.dao.Redis; +import org.springblade.core.plugins.redis.Redis; import org.springblade.core.toolbox.redis.IJedis; /**