Merge branch 'master' into dev_op_wallet

interface.ini

@@ -338,6 +338,7 @@ pay.order.write_off = "http://pay.int.yidian-inc.com/pay/order/write_off"
 pay.callback.pay = "http://pay.int.yidian-inc.com/pay/callback/pay"
 pay.callback.refund = "http://pay.int.yidian-inc.com/pay/callback/refund"
 pay.account.fund = "http://pay.int.yidian-inc.com/pay/account/fund"
+pay.order.charges = "http://pay.int.yidian-inc.com/pay/order/charges"
 
 ;======================= 8000000-prod wallet微服务接口 ======================= 
 ;钱包
@@ -727,6 +728,7 @@ pay.order.write_off = "http://pay.pre.int.yidian-inc.com/pay/order/write_off"
 pay.callback.pay = "http://pay.pre.int.yidian-inc.com/pay/callback/pay"
 pay.callback.refund = "http://pay.pre.int.yidian-inc.com/pay/callback/refund"
 pay.account.fund = "http://pay.pre.int.yidian-inc.com/pay/account/fund"
+pay.order.charges = "http://pay.pre.int.yidian-inc.com/pay/order/charges"
 
 ;======================= 8000000-pre wallet微服务接口 =======================
 ;钱包
@@ -832,8 +834,8 @@ service.tcc.sync = "http://tcc.test.yidian-inc.com/tcc/sync"
 ;======================= 1000000-test gateway微服务接口 ======================= 
 ;登陆上报地理位置
 merchant.user.binding_location = "http://merchant.test.yidian-inc.com/user/user/binding_location"
-yidian.push.android_binding_token = "http://a3.go2yd.com/Website/push/binding-token-for-android"
-yidian.push.ios_binding_token = "http://a3.go2yd.com/Website/push/binding-token"
+yidian.push.android_binding_token = "http://a3.go2yd.com/Website/push/BindingShqTokenForAndroidAction.php"
+yidian.push.ios_binding_token = "http://a3.go2yd.com/Website/push/BindingShqTokenAction.php"
 
 
 ;======================= 2000000-test merchant微服务接口 ======================= 
@@ -1113,7 +1115,7 @@ pay.order.write_off = "http://pay.test.yidian-inc.com/pay/order/write_off"
 pay.callback.pay = "http://pay.test.yidian-inc.com/pay/callback/pay"
 pay.callback.refund = "http://pay.test.yidian-inc.com/pay/callback/refund"
 pay.account.fund = "http://pay.test.yidian-inc.com/pay/account/fund"
-
+pay.order.charges = "http://pay.test.yidian-inc.com/pay/order/charges"
 ;======================= 8000000-test wallet微服务接口 ======================= 
 ;钱包
 wallet.account.transfer = "http://wallet.test.yidian-inc.com/wallet/account/transfer"
@@ -1184,8 +1186,8 @@ service.tcc.sync = "http://tcc.test.yidian-inc.com/tcc/sync"
 ;======================= 1000000-dev gateway微服务接口 ======================= 
 ;登陆上报地理位置
 merchant.user.binding_location = "http://merchant.dev.yidian-inc.com/user/user/binding_location"
-yidian.push.android_binding_token = "http://a3.go2yd.com/Website/push/binding-token-for-android"
-yidian.push.ios_binding_token = "http://a3.go2yd.com/Website/push/binding-token"
+yidian.push.android_binding_token = "http://a3.go2yd.com/Website/push/BindingShqTokenForAndroidAction.php"
+yidian.push.ios_binding_token = "http://a3.go2yd.com/Website/push/BindingShqTokenAction.php"
 
 ;======================= 2000000-dev merchant微服务接口 ======================= 
 merchant.personal.check = "http://merchant.dev.yidian-inc.com/auth/personal/check"
@@ -1462,7 +1464,7 @@ pay.order.write_off = "http://pay.dev.yidian-inc.com/pay/order/write_off"
 pay.callback.pay = "http://pay.dev.yidian-inc.com/pay/callback/pay"
 pay.callback.refund = "http://pay.dev.yidian-inc.com/pay/callback/refund"
 pay.account.fund = "http://pay.dev.yidian-inc.com/pay/account/fund"
-
+pay.order.charges = "http://pay.dev.yidian-inc.com/pay/order/charges"
 ;======================= 8000000-dev wallet微服务接口 ======================= 
 ;钱包
 wallet.account.transfer = "http://wallet.dev.yidian-inc.com/wallet/account/transfer"

kafka.ini

@@ -42,7 +42,7 @@ goods.publish.topic='bp_str_jielong_goods_publish_prod'
 
 [test-goods : goods : common]
 goods.publish.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'
-goods.publish.topic='bp_str_jielong_subscribe_notify_test'
+goods.publish.topic='bp_str_jielong_goods_publish_test'
 
 [dev-goods : test-goods : goods : common]
 goods.publish.broker_list='10.126.14.25:9092,10.126.14.31:9092,10.126.14.32:9092'

redis.ini

@@ -13,7 +13,7 @@ cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 
 
-[perf-gateway : gateway : common]
+[perf-gateway : prod-gateway : gateway : common]
 [test-gateway : gateway : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
 cacheConnect.mode='codis'
@@ -142,7 +142,7 @@ cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 
 
-[perf-goods : goods : common]
+[perf-goods : prod-goods : goods : common]
 [test-goods : goods : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
 cacheConnect.mode='codis'
@@ -168,7 +168,7 @@ cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 
 
-[perf-order : order : common]
+[perf-order : prod-order : order : common]
 [test-order : order : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
 cacheConnect.mode='codis'
@@ -195,7 +195,7 @@ cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 
 
-[perf-order : coupon : common]
+[perf-order : prod-coupon : coupon : common]
 [test-order : coupon : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
 cacheConnect.mode='codis'

request.ini

@@ -5,18 +5,29 @@ log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
 [interaction : common]
 [gateway : common]
 [wallet : common]
+[tcc : common]
+[pay : common]
+
 ; 生产环境
 [prod-merchant : merchant : common]
 [prod-interaction : interaction : common]
+[prod-wallet: wallet : common]
+[prod-tcc: tcc : common]
+[prod-pay: pay : common]
+
 [prod-gateway: gateway : common]
 exclude.url[] = 'merchant/recruitinner/get_enterprise_info'
 exclude.url[] = 'merchant/recruitinner/batch_get_enterprise_info'
 exclude.url[] = 'merchant/lifeinner/batch_get_account_name'
 
-[prod-wallet: wallet : common]
+
 
 ; 预发环境
+[perf-interaction : prod-interaction : interaction : common]
 [perf-merchant : prod-merchant : merchant : common]
+[perf-wallet : prod-wallet: wallet : common]
+[perf-pay : prod-pay: pay : common]
+[perf-tcc : prod-tcc: tcc : common]
 
 ;测试测试
 [test-merchant : prod-merchant : merchant : common]