update

src/main/java/org/springblade/core/toolbox/redis/ICallBack.java → src/main/java/org/springblade/core/plugins/redis/ICallBack.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springblade.core.toolbox.redis;
+package org.springblade.core.plugins.redis;
 
 /**
  *  回调用接口

src/main/java/org/springblade/core/toolbox/redis/IJedis.java → src/main/java/org/springblade/core/plugins/redis/IJedis.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springblade.core.toolbox.redis;
+package org.springblade.core.plugins.redis;
 
 import java.util.List;
 import java.util.Map;

src/main/java/org/springblade/core/toolbox/redis/IKeyNamingPolicy.java → src/main/java/org/springblade/core/plugins/redis/IKeyNamingPolicy.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springblade.core.toolbox.redis;
+package org.springblade.core.plugins.redis;
 
 
 /**

src/main/java/org/springblade/core/plugins/redis/Redis.java

@@ -19,9 +19,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.springblade.core.toolbox.redis.IJedis;
-import org.springblade.core.toolbox.redis.IKeyNamingPolicy;
-
 /**
  * Redis操作工具类
  */

src/main/java/org/springblade/core/toolbox/redis/RedisCluster.java → src/main/java/org/springblade/core/plugins/redis/RedisCluster.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springblade.core.toolbox.redis;
+package org.springblade.core.plugins.redis;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -27,7 +27,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.springblade.core.toolbox.kit.LogKit;
-import org.springblade.core.toolbox.redis.serializer.ISerializer;
+import org.springblade.core.plugins.redis.serializer.ISerializer;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisCluster;
 import redis.clients.jedis.JedisPool;

src/main/java/org/springblade/core/plugins/redis/RedisManager.java

@@ -15,8 +15,6 @@
  */
 package org.springblade.core.plugins.redis;
 
-import org.springblade.core.toolbox.redis.IJedis;
-
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 

src/main/java/org/springblade/core/plugins/redis/RedisPlugin.java

@@ -18,11 +18,7 @@ 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 org.springblade.core.plugins.redis.serializer.JdkSerializer;
 import redis.clients.jedis.JedisCluster;
 import redis.clients.jedis.JedisPool;
 

src/main/java/org/springblade/core/toolbox/redis/RedisSingle.java → src/main/java/org/springblade/core/plugins/redis/RedisSingle.java

@@ -14,21 +14,15 @@
  * limitations under the License.
  */
 
-package org.springblade.core.toolbox.redis;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
+package org.springblade.core.plugins.redis;
 
-import org.springblade.core.toolbox.redis.serializer.ISerializer;
+import org.springblade.core.plugins.redis.serializer.ISerializer;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 
+import java.util.*;
+import java.util.Map.Entry;
+
 /**
  * Redis单机工具类
  * Redis 命令参考: http://redisdoc.com/

src/main/java/org/springblade/core/toolbox/redis/serializer/ISerializer.java → src/main/java/org/springblade/core/plugins/redis/serializer/ISerializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springblade.core.toolbox.redis.serializer;
+package org.springblade.core.plugins.redis.serializer;
 
 /**
  * ISerializer.

src/main/java/org/springblade/core/toolbox/redis/serializer/JdkSerializer.java → src/main/java/org/springblade/core/plugins/redis/serializer/JdkSerializer.java

@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-package org.springblade.core.toolbox.redis.serializer;
+package org.springblade.core.plugins.redis.serializer;
+
+import org.springblade.core.toolbox.kit.LogKit;
+import redis.clients.util.SafeEncoder;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import redis.clients.util.SafeEncoder;
-
-import org.springblade.core.toolbox.kit.LogKit;
-
 /**
  * JdkSerializer.
  */

src/main/java/org/springblade/core/shiro/redis/RedisCache.java

@@ -30,8 +30,8 @@ import org.apache.shiro.cache.CacheException;
 import org.apache.shiro.util.CollectionUtils;
 
 import org.springblade.core.plugins.redis.Redis;
-import org.springblade.core.toolbox.redis.IJedis;
-import org.springblade.core.toolbox.redis.IKeyNamingPolicy;
+import org.springblade.core.plugins.redis.IJedis;
+import org.springblade.core.plugins.redis.IKeyNamingPolicy;
 
 /**
  * 缓存接口实现类

src/main/java/org/springblade/core/toolbox/cache/RedisCacheFactory.java

@@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.springblade.core.plugins.redis.Redis;
-import org.springblade.core.toolbox.redis.IJedis;
+import org.springblade.core.plugins.redis.IJedis;
 
 /**
  * Redis缓存工厂

src/main/java/org/springblade/system/meta/intercept/UserValidator.java

@@ -50,7 +50,7 @@ public class UserValidator extends BladeValidator {
 		if (StrKit.isBlank(account)) {
 			addError("请输入账号!");
 		}
-		if (Blade.create(User.class).isExist("SELECT * FROM blade_user WHERE account = #{account} and status=1", CMap.init().set("account", account))) {
+		if (Blade.create(User.class).isExist("SELECT * FROM blade_user WHERE account = #{account}", CMap.init().set("account", account))) {
 			addError(errorMessage);
 		}
 	}