diff --git a/javayh-dependencies/javayh-mybatis-starter/src/main/java/com/javayh/mybatis/cache/RedisCache.java b/javayh-dependencies/javayh-mybatis-starter/src/main/java/com/javayh/mybatis/cache/RedisCache.java index 1694966..cd817a1 100644 --- a/javayh-dependencies/javayh-mybatis-starter/src/main/java/com/javayh/mybatis/cache/RedisCache.java +++ b/javayh-dependencies/javayh-mybatis-starter/src/main/java/com/javayh/mybatis/cache/RedisCache.java @@ -1,24 +1,15 @@ package com.javayh.mybatis.cache; -import com.javayh.common.selector.SpringSelector; import com.javayh.common.util.log.Log; -import com.javayh.common.util.spring.SpringUtils; import com.javayh.redis.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.cache.Cache; -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.util.CollectionUtils; +import org.springframework.util.ObjectUtils; import javax.annotation.PostConstruct; -import javax.annotation.Resource; -import javax.sql.DataSource; import java.util.Set; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -53,7 +44,7 @@ public RedisCache(final String id) { @Autowired private RedisUtil redisUtil; private static RedisCache redisCache ; - //通过@PostConstruct实现初始化bean之前进行的操作 + @PostConstruct public void init() { redisCache = this; @@ -76,14 +67,11 @@ public void putObject(Object key, Object value) { @Override public Object getObject(Object key) { try { - if (key != null && readWriteLock.readLock().tryLock()) { + if (key != null) { return redisCache.redisUtil.get(key.toString()); } } catch (Exception e) { Log.error("Mybatis Get Cache",e.getStackTrace()); - }finally { - log.debug(key.toString()); - readWriteLock.readLock().unlock(); } return null; } @@ -91,14 +79,11 @@ public Object getObject(Object key) { @Override public Object removeObject(Object key) { try { - if (key != null && readWriteLock.writeLock().tryLock()) { + if (!ObjectUtils.isEmpty(key)) { redisCache.redisUtil.del(key.toString()); } } catch (Exception e) { Log.error("Mybatis Del Cache",e.getStackTrace()); - }finally { - log.debug(key.toString()); - readWriteLock.writeLock().unlock(); } return null; } @@ -107,13 +92,11 @@ public Object removeObject(Object key) { public void clear() { try { Set keys = redisCache.redisUtil.keys(this.id); - if (!CollectionUtils.isEmpty(keys) && readWriteLock.writeLock().tryLock()) { + if (!CollectionUtils.isEmpty(keys)) { redisCache.redisUtil.del(keys); } } catch (Exception e) { Log.error("Mybatis Clear Cache",e.getStackTrace()); - }finally { - readWriteLock.writeLock().unlock(); } }