update: 处理冲突

interface.ini

@@ -155,6 +155,8 @@ goods.public.user_wechat_bind = "http://goods.int.yidian-inc.com/user/user/user_
 goods.public.take_place_by_goods_sku_ids = "http://goods.int.yidian-inc.com/goods/goods/take_place_by_goods_sku_ids"
 
 
+
+
 ;团长
 goods.marketing.second_distributor_list = "http://goods.int.yidian-inc.com/marketing/distributor/second_distributor_list"
 goods.marketing.apply_distributor = "http://goods.int.yidian-inc.com/marketing/distributor/apply_distributor"
@@ -183,7 +185,13 @@ goods.marketing.colonel.refund_order_process_logic = "http://goods.int.yidian-in
 goods.marketing.colonel.task_control = "http://goods.int.yidian-inc.com/marketing/colonel/task_control"
 goods.marketing.colonel.colonel_index = "http://goods.int.yidian-inc.com/marketing/colonel/colonel_index"
 goods.marketing.colonel.bill_info = "http://goods.int.yidian-inc.com/marketing/colonel/bill_info"
-
+goods.marketing.colonel_apply_list = "http://goods.int.yidian-inc.com/marketing/colonel/manage_colonel_apply_list"
+goods.marketing.colonel_list = "http://goods.int.yidian-inc.com/marketing/colonel/manage_colonel_list"
+goods.marketing.colonel_audit = "http://goods.int.yidian-inc.com/marketing/colonel/manage_audit"
+goods.marketing.colonel_show_apply_point = "http://goods.int.yidian-inc.com/marketing/colonel/manage_show_apply_point"
+goods.marketing.colonel_add_apply_point = "http://goods.int.yidian-inc.com/marketing/colonel/manage_add_apply_point"
+goods.marketing.colonel_apply = "http://goods.int.yidian-inc.com/marketing/colonel/apply"
+goods.marketing.colonel_is_apply = "http://goods.int.yidian-inc.com/marketing/colonel/is_apply"
 
 ;供应商
 goods.background.add_ota = "http://goods.int.yidian-inc.com/goods/ota/add"
@@ -218,6 +226,7 @@ goods.public.get_goods_sku = "http://goods.int.yidian-inc.com/goods/goods/get_go
 goods.public.goods_spu_shop_list = "http://goods.int.yidian-inc.com/goods/goods/goods_spu_shop_list"
 
 goods.goods.refund = "http://goods.int.yidian-inc.com/goods/goods/refund"
+goods.public.goods_online_site = "http://goods.int.yidian-inc.com/goods/goods/online_site"
 
 
 
@@ -287,7 +296,7 @@ order.order.old_order_refund = "http://order.int.yidian-inc.com/order/order/old_
 order.order.old_order_refund_reject = "http://order.int.yidian-inc.com/order/order/old_order_refund_reject"
 order.order.old_order_export = "http://order.int.yidian-inc.com/order/order/old_order_export"
 order.order.old_order_print = "http://order.int.yidian-inc.com/order/order/old_print_order_list"
- 
+
 
 ;用户老订单
 order.order.old_user_order_list = "http://order.int.yidian-inc.com/order/order/old_user_order_list"
@@ -346,6 +355,7 @@ wallet.accountbackground.record_list = "http://wallet.int.yidian-inc.com/wallet/
 wallet.accountbackground.get_wallet_account_status = "http://wallet.int.yidian-inc.com/wallet/background/get_wallet_account_status"
 wallet.accountbackground.reset_wallet_account_status = "http://wallet.int.yidian-inc.com/wallet/background/reset_wallet_account_status"
 wallet.risk.req = "http://antispamx.yidianzixun.com/risk/req"
+wallet.account.reset_third_account_bind = "http://wallet.int.yidian-inc.com/wallet/account/reset_third_account_bind"
 
 ;======================== 9000000 coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -551,6 +561,13 @@ goods.marketing.colonel.refund_order_process_logic = "http://goods.test.int.yidi
 goods.marketing.colonel.task_control = "http://goods.test.int.yidian-inc.com/marketing/colonel/task_control"
 goods.marketing.colonel.colonel_index = "http://goods.test.int.yidian-inc.com/marketing/colonel/colonel_index"
 goods.marketing.colonel.bill_info = "http://goods.test.int.yidian-inc.com/marketing/colonel/bill_info"
+goods.marketing.colonel_apply_list = "http://goods.test.int.yidian-inc.com/marketing/colonel/manage_colonel_apply_list"
+goods.marketing.colonel_list = "http://goods.test.int.yidian-inc.com/marketing/colonel/manage_colonel_list"
+goods.marketing.colonel_audit = "http://goods.test.int.yidian-inc.com/marketing/colonel/manage_audit"
+goods.marketing.colonel_show_apply_point = "http://goods.test.int.yidian-inc.com/marketing/colonel/manage_show_apply_point"
+goods.marketing.colonel_add_apply_point = "http://goods.test.int.yidian-inc.com/marketing/colonel/manage_add_apply_point"
+goods.marketing.colonel_apply = "http://goods.test.int.yidian-inc.com/marketing/colonel/apply"
+goods.marketing.colonel_is_apply = "http://goods.test.int.yidian-inc.com/marketing/colonel/is_apply"
 
 ;供应商
 goods.background.add_ota = "http://goods.test.int.yidian-inc.com/goods/ota/add"
@@ -588,6 +605,7 @@ goods.public.user_wechat_bind = "http://goods.test.int.yidian-inc.com/user/user/
 goods.public.take_place_by_goods_sku_ids = "http://goods.test.int.yidian-inc.com/goods/goods/take_place_by_goods_sku_ids"
 
 goods.goods.refund = "http://goods.test.int.yidian-inc.com/goods/goods/refund"
+goods.public.goods_online_site = "http://goods.test.int.yidian-inc.com/goods/goods/online_site"
 
 
 ;用户绑定
@@ -712,6 +730,7 @@ wallet.accountbackground.record_list = "http://wallet.test.yidian-inc.com/wallet
 wallet.accountbackground.get_wallet_account_status = "http://wallet.test.yidian-inc.com/wallet/background/get_wallet_account_status"
 wallet.accountbackground.reset_wallet_account_status = "http://wallet.test.yidian-inc.com/wallet/background/reset_wallet_account_status"
 wallet.risk.req = "http://antispamx.yidianzixun.com/risk/req"
+wallet.account.reset_third_account_bind = "http://wallet.test.yidian-inc.com/wallet/account/reset_third_account_bind"
 
 ;======================== 9000000-test coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -880,6 +899,13 @@ goods.marketing.colonel.refund_order_process_logic = "http://goods.dev.yidian-in
 goods.marketing.colonel.task_control = "http://goods.dev.yidian-inc.com/marketing/colonel/task_control"
 goods.marketing.colonel.colonel_index = "http://goods.dev.yidian-inc.com/marketing/colonel/colonel_index"
 goods.marketing.colonel.bill_info = "http://goods.dev.yidian-inc.com/marketing/colonel/bill_info"
+goods.marketing.colonel_apply_list = "http://goods.dev.yidian-inc.com/marketing/colonel/manage_colonel_apply_list"
+goods.marketing.colonel_list = "http://goods.dev.yidian-inc.com/marketing/colonel/manage_colonel_list"
+goods.marketing.colonel_audit = "http://goods.dev.yidian-inc.com/marketing/colonel/manage_audit"
+goods.marketing.colonel_show_apply_point = "http://goods.dev.yidian-inc.com/marketing/colonel/manage_show_apply_point"
+goods.marketing.colonel_add_apply_point = "http://goods.dev.yidian-inc.com/marketing/colonel/manage_add_apply_point"
+goods.marketing.colonel_apply = "http://goods.dev.yidian-inc.com/marketing/colonel/apply"
+goods.marketing.colonel_is_apply = "http://goods.dev.yidian-inc.com/marketing/colonel/is_apply"
 
 ;供应商
 goods.background.add_ota = "http://goods.dev.yidian-inc.com/goods/ota/add"
@@ -918,6 +944,8 @@ goods.public.take_place_by_goods_sku_ids = "http://goods.dev.yidian-inc.com/good
 
 
 goods.goods.refund = "http://goods.dev.yidian-inc.com/goods/goods/refund"
+goods.public.goods_online_site = "http://goods.dev.yidian-inc.com/goods/goods/online_site"
+
 
 ;用户绑定
 goods.user.wechat_login = "http://goods.dev.yidian-inc.com/user/user/wechat_login"
@@ -1039,6 +1067,7 @@ wallet.accountbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet/
 wallet.accountbackground.get_wallet_account_status = "http://wallet.dev.yidian-inc.com/wallet/background/get_wallet_account_status"
 wallet.accountbackground.reset_wallet_account_status = "http://wallet.dev.yidian-inc.com/wallet/background/reset_wallet_account_status"
 wallet.risk.req = "http://antispamx.yidianzixun.com/risk/req"
+wallet.account.reset_third_account_bind = "http://wallet.dev.yidian-inc.com/wallet/account/reset_third_account_bind"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
 

redis.ini

@@ -67,6 +67,15 @@ cacheConnect.timeout=1
 cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 
+countConnect.mode='codis'
+countConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
+countConnect.fallback=''
+countConnect.password=''
+countConnect.select=0
+countConnect.timeout=1
+countConnect.serializer='none'
+countConnect.prefix=''
+
 [dev-merchant : test-merchant : prod-merchant : merchant : common]
 
 
@@ -84,6 +93,15 @@ cacheConnect.timeout=1
 cacheConnect.serializer='none'
 cacheConnect.prefix=''
 
+countConnect.mode='codis'
+countConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18139/topom'
+countConnect.fallback=''
+countConnect.password=''
+countConnect.select=0
+countConnect.timeout=1
+countConnect.serializer='none'
+countConnect.prefix=''
+
 [pref-interaction : prod-interaction : interaction : common]
 
 [test-interaction : interaction : common]
@@ -94,9 +112,18 @@ cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
 cacheConnect.timeout=1
-cacheConnect.serializer='igbinary'
+cacheConnect.serializer='none'
 cacheConnect.prefix=''
 
+countConnect.mode='codis'
+countConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
+countConnect.fallback=''
+countConnect.password=''
+countConnect.select=0
+countConnect.timeout=1
+countConnect.serializer='none'
+countConnect.prefix=''
+
 [dev-interaction : test-interaction : interaction : common]