Merge branch 'master' of https://gitlab.yidian-inc.com/bp/yaconf

interface.ini

@@ -184,7 +184,13 @@ goods.marketing.colonel.place_order_process_logic = "http://goods.int.yidian-inc
 goods.marketing.colonel.refund_order_process_logic = "http://goods.int.yidian-inc.com/marketing/colonel/refund_order_process_logic"
 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_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"
@@ -289,7 +295,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"
@@ -348,6 +354,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" ;领取优惠券
@@ -552,6 +559,13 @@ goods.marketing.colonel.place_order_process_logic = "http://goods.test.int.yidia
 goods.marketing.colonel.refund_order_process_logic = "http://goods.test.int.yidian-inc.com/marketing/colonel/refund_order_process_logic"
 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_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"
@@ -714,6 +728,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" ;领取优惠券
@@ -881,6 +896,13 @@ goods.marketing.colonel.place_order_process_logic = "http://goods.dev.yidian-inc
 goods.marketing.colonel.refund_order_process_logic = "http://goods.dev.yidian-inc.com/marketing/colonel/refund_order_process_logic"
 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_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"
@@ -1042,6 +1064,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,13 +67,23 @@ 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]
 
-[test-interaction : test-merchant : prod-merchant : merchant : common]
 
-[dev-interaction : test-merchant : prod-merchant : merchant : common]
 
-[prod-interaction : prod-merchant : merchant : common]
+
+[interaction : common]
+
+[prod-interaction : interaction : common]
 cacheConnect.mode='codis'
 cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18139/topom'
 cacheConnect.fallback=''
@@ -83,8 +93,38 @@ cacheConnect.timeout=1
 cacheConnect.serializer='none'
 cacheConnect.prefix=''
 
-[pref-interaction : prod-interaction : prod-merchant : merchant : common]
+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]
+;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+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]