SearchCacheAble接口去除ehcache,全部使用redis

 package com.yoho.search.aop.cache;
 
-import com.yoho.search.cache.CacheType;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -26,13 +24,6 @@ public @interface SearchCacheAble {
 	public int cacheInMinute();
 
 	/**
-	 * 缓存类型，默认search_redis
-	 *
-	 * @return
-	 */
-	public CacheType cacheType() default CacheType.SEARCH_REDIS;
-
-	/**
 	 * 包含的参数-优先级比去除的参数高
 	 * 
 	 * @return

@@ -62,7 +62,8 @@ public class SearchCacheAspect {
 
         // 4、缓存获取
         SearchCache searchCache = searchCacheFactory.getAspectSearhCache(searchCacheAble);
-        boolean useJsonSerializable = searchCacheAble.cacheType().equals(CacheType.EHCACHE) ? false : true;
+        //boolean useJsonSerializable = searchCacheAble.cacheType().equals(CacheType.EHCACHE) ? false : true;
+        boolean useJsonSerializable = true;
         T result = searchCacheService.getSerializableObjectFromCache(searchCache, redisKeyBuilder, type, useJsonSerializable);
         if (result != null) {
             return result;

@@ -55,7 +55,6 @@ public class SearchCacheFactory {
 	 * @return
 	 */
 	public SearchCache getAspectSearhCache(SearchCacheAble searchCacheAble) {
-		CacheType cacheType = searchCacheAble.cacheType();
-		return this.getOrCreateSearchCache("AOP_" + searchCacheAble.cacheName(), cacheType, searchCacheAble.cacheInMinute());
+		return this.getOrCreateSearchCache("AOP_" + searchCacheAble.cacheName(), CacheType.SEARCH_REDIS, searchCacheAble.cacheInMinute());
 	}
 }