Merge branch 'master' into jielong

# Conflicts:
#	interface.ini

interface.ini

@@ -126,7 +126,7 @@ interaction.index.syn_account = "http://interact.int.yidian-inc.com/follow/index
 interaction.index.wechat = "http://interact.int.yidian-inc.com/msg/index/wechat_msg"
 interaction.index.ding = "http://interact.int.yidian-inc.com/msg/index/ding"
 interaction.index.mini = "http://interact.int.yidian-inc.com/msg/index/mini"
-interaction.index.is_subscribe = "http://interact.int.yidian-inc.com/msg/index/is_send"
+interaction.index.is_send = "http://interact.int.yidian-inc.com/msg/index/is_send"
 
 
 ;======================= 4000000-prod goods微服务接口 ======================= 
@@ -435,7 +435,7 @@ interaction.index.syn_account = "http://interaction.test.yidian-inc.com/follow/i
 interaction.index.wechat = "http://interaction.test.yidian-inc.com/msg/index/wechat_msg"
 interaction.index.ding = "http://interaction.test.yidian-inc.com/msg/index/ding"
 interaction.index.mini = "http://interaction.test.yidian-inc.com/msg/index/mini"
-interaction.index.is_subscribe = "http://interaction.test.yidian-inc.com/msg/index/is_send"
+interaction.index.is_send = "http://interaction.test.yidian-inc.com/msg/index/is_send"
 
 
 ;======================= 4000000-test goods微服务接口 ======================= 
@@ -701,7 +701,7 @@ interaction.index.syn_account = "http://interaction.dev.yidian-inc.com/follow/in
 interaction.index.wechat = "http://interaction.dev.yidian-inc.com/msg/index/wechat_msg"
 interaction.index.ding = "http://interaction.dev.yidian-inc.com/msg/index/ding"
 interaction.index.mini = "http://interaction.dev.yidian-inc.com/msg/index/mini"
-interaction.index.is_subscribe = "http://interaction.dev.yidian-inc.com/msg/index/is_send"
+interaction.index.is_send = "http://interaction.dev.yidian-inc.com/msg/index/is_send"
 
 
 ;======================= 4000000-dev goods微服务接口 ======================= 
@@ -722,6 +722,7 @@ goods.marketing.generate_share_goods = "http://goods.dev.yidian-inc.com/marketin
 goods.marketing.goods_list = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_list"
 goods.marketing.marketing_goods_rate = "http://goods.dev.yidian-inc.com/marketing/marketing/marketing_goods_rate"
 goods.marketing.get_marketing_goods_list = "http://goods.dev.yidian-inc.com/marketing/marketinggoods/get_marketing_goods_list"
+
 ;团长
 goods.marketing.second_distributor_list = "http://goods.dev.yidian-inc.com/marketing/distributor/second_distributor_list"
 goods.marketing.apply_distributor = "http://goods.dev.yidian-inc.com/marketing/distributor/apply_distributor"