1,将plus&star接口换成v3，目前v3接口返回异常，待检查;2,修复cacheConfig问题

@@ -35,18 +35,10 @@ class CacheConfig
     const KEY_ACTION_SEARCH_SEARCH = 'key_action_search_search'; // 搜索的数据
     const KEY_ACTION_SEARCH_FILTER = 'key_action_search_filter'; // 搜索的过滤条件
     
-<<<<<<< HEAD
-    const KEY_ACTION_HOME_GRADE = 'key_action_home_grade';//会员等级
-    const KEY_ACTION_HOME_PREFERENTIAL = 'key_action_home_preferential';//会员特权详情
-    const KEY_ACTION_GUANG_PLUSTAR_DATA = 'key_action_guang_plustar_data'; // 逛PLUSTAR
-    const KEY_ACTION_GUANG_DETAIL_DATA = 'key_action_guang_detail_data'; // 逛内容详情
-    const KEY_ACTION_HOME_ORDER_ORDER = 'key_action_home_order_order';//订单列表
-=======
     const KEY_ACTION_GUANG_PLUSSTAR_INDEX = 'key_action_guang_plusstar_index'; // 国际优选
     const KEY_ACTION_GUANG_PLUSSTAR_LIST = 'key_action_guang_plusstar_list'; // 明星原创
     const KEY_ACTION_GUANG_PLUSTAR_DATA = 'key_action_guang_plustar_data'; // 逛PLUSTAR
     const KEY_ACTION_GUANG_DETAIL_DATA = 'key_action_guang_detail_data'; // 逛内容详情
     const KEY_ACTION_GUANG_RSS_DATA = 'key_action_guang_detail_data'; // 逛订阅内容
->>>>>>> master
 
 }

@@ -22,7 +22,7 @@ class PlusstarData
 {
 
     const URI_BRANDLIST = 'guang/api/v1/plustar/getlist';
-    const URI_BRANDINFO_PLUSSTAR = 'guang/service/v1/plustar/'; // 'guang/service/v3/plustar/'
+    const URI_BRANDINFO_PLUSSTAR = 'guang/service/v3/plustar/'; // 'guang/service/v3/plustar/'
     const URI_BRANDINFO_FAVORITE = 'shops/service/v1/favorite/';
     const URI_BRANDINFO_ARTICLE = 'guang/service/v1/article/';