Merge branch 'yh_sku_func' into pre

# Conflicts:
#	netflix-service/src/main/java/com/cyksj/service/mange/impl/RefreshCacheServiceImpl.java

netflix-service/src/main/java/com/cyksj/service/mange/impl/RefreshCacheServiceImpl.java

@@ -26,13 +26,15 @@ public class RefreshCacheServiceImpl implements RefreshCacheService {
 
 	@Override
 	public void refreshYhHomeCategoryPageCache() {
-		Set<String> keys = redisService.keys(RedisService.key.YH_HOME_PAGHE_CACHE.getName() + "category" + "*");
+		Set<String> keys = redisService.keys(RedisService.key.YH_HOME_PAGHE_CACHE.getEnvName() + "category" + "*");
+		Set<String> shoKeys = redisService.keys(RedisService.key.YH_HOME_PAGHE_CACHE_SHOP.getEnvName() + "category" + "*");
 		redisService.del(keys.toArray(String[]::new));
+		redisService.del(shoKeys.toArray(String[]::new));
 	}
 
 	@Override
 	public void refreshGoodsSkuSubsidyPageCache() {
-		Set<String> keys = redisService.keys(RedisService.key.YH_HOME_PAGHE_CACHE.getName() + "subsidy" + "*");
+		Set<String> keys = redisService.keys(RedisService.key.YH_HOME_PAGHE_CACHE.getEnvName() + "subsidy" + "*");
 		redisService.del(keys.toArray(String[]::new));
 	}
 
@@ -42,9 +44,10 @@ public class RefreshCacheServiceImpl implements RefreshCacheService {
 		redisService.del(keys.toArray(String[]::new));
 	}
 
+
 	@Override
 	public void refreshShopUserIdCacheByYshId(Long yhsId) {
-		String yhShopCacheKey = RedisService.key.YH_HOME_PAGHE_CACHE_SHOP.getName() + yhsId + "*";
+		String yhShopCacheKey = RedisService.key.YH_HOME_PAGHE_CACHE_SHOP.getEnvName() + yhsId + "*";
 		Set<String> keys = redisService.keys(yhShopCacheKey);
 		redisService.del(keys.toArray(String[]::new));
 	}