Merge branch 'dev05.30-4.5' into test

# Conflicts:
#	.gitignore

@@ -9,12 +9,4 @@ controller/.settings/
 *.classpath
 *.project
 controller/target/
-/yohobuy-activity.iml
-/web/yohobuy-activity-web.iml
-/service/yohobuy-activity-service.iml
-/common/yohobuy-activity-common.iml
-/controller/yohobuy-activity-controller.iml
-/dal/yohobuy-activity-dal.iml
-/deploy/yohobuy-activity-deploy.iml
-/other/yohobuy-activity-other.iml
-/queue/yohobuy-activity-queue.iml
+*.iml

@@ -2,3 +2,4 @@
 /.settings
 /.classpath
 /.project
+/*.iml

@@ -30,8 +30,8 @@ import com.yoho.queue.dal.model.DrawlineActivity;
 public class RedisCache {
 
 	static Logger log = LoggerFactory.getLogger(RedisCache.class);
-	
-	@Resource
+
+	@Resource(name = "yhValueOperations")
 	YHValueOperations<String, String> yhValueOperations;
 	@Resource(name = "yhRedisTemplate")
 	YHRedisTemplate<String, String> yHRedisTemplate;

@@ -31,7 +31,7 @@ public class RedisListCache {
 	@Resource(name = "yhRedisTemplate")
 	YHRedisTemplate<String, String> yHRedisTemplate;
 
-	@Autowired
+	@Resource(name = "yhListOperations")
 	YHListOperations<String, String> yhListOperations;
 
 	/**

@@ -37,7 +37,7 @@ public class RedisValueCache {
 	@Resource(name = "yhRedisTemplate")
 	YHRedisTemplate<String, String> yHRedisTemplate;
 
-	@Autowired
+	@Resource(name = "yhValueOperations")
 	YHValueOperations<String, String> yhValueOperations;
 
 	/**

+/*.iml

@@ -2,3 +2,4 @@
 /.settings
 /.classpath
 /.project
+/*.iml

@@ -3,3 +3,4 @@
 /.classpath
 /.project
 /bin/
+/*.iml

@@ -2,3 +2,4 @@
 /.settings
 /.classpath
 /.project
+/*.iml

@@ -2,3 +2,4 @@
 /.settings
 /.classpath
 /.project
+/*.iml

@@ -59,10 +59,10 @@ public class CocacolaServiceImpl implements ICocacolaService {
 	@Resource
 	private ServiceCaller service;
 
-	@Autowired
+	@Resource(name = "yhValueOperations")
 	private YHValueOperations<String, String> yhValueOperations;
 
-	@Autowired
+	@Resource(name = "yhRedisTemplate")
 	private YHRedisTemplate<String, String> yhRedisTemplate;
 
 	@Override

@@ -63,10 +63,10 @@ public class ICouponActivityServiceImpl implements ICouponActivityService {
 	@Resource
 	private ServiceCaller service;
 
-	@Autowired
+	@Resource(name = "yhValueOperations")
 	private YHValueOperations<String, String> yhValueOperations;
 
-	@Autowired
+	@Resource(name = "yhRedisTemplate")
 	private YHRedisTemplate<String, String> yhRedisTemplate;
 	
 	@Resource

@@ -2,3 +2,4 @@
 /.settings
 /.classpath
 /.project
+/*.iml