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

interface.ini

@@ -204,6 +204,10 @@ goods.public.goods_spu_list = "http://goods.int.yidian-inc.com/goods/goods/goods
 goods.public.get_goods_sku = "http://goods.int.yidian-inc.com/goods/goods/get_goods_sku"
 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.user.wechat_login = "http://goods.int.yidian-inc.com/user/user/wechat_login"
 goods.user.bind_phone = "http://goods.int.yidian-inc.com/user/user/bind_phone"
@@ -266,8 +270,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.op_order_list = "http://order.int.yidian-inc.com/order/order/op_order_list"
+ 
 
 ;用户老订单
 order.order.old_user_order_list = "http://order.int.yidian-inc.com/order/order/old_user_order_list"
@@ -319,6 +322,7 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.int.yidian-inc.com
 wallet.withdrawbackground.apply_detail = "http://wallet.int.yidian-inc.com/wallet/background/apply_detail"
 wallet.withdrawbackground.record_list = "http://wallet.int.yidian-inc.com/wallet/background/record_list"
 wallet.historyapi.sendmsg = "https://ex.jwshq.cn/app/msg/sendMessage"
+wallet.withdrawbackground.account_list = "http://wallet.int.yidian-inc.com/wallet/background/account_list"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -541,6 +545,8 @@ goods.public.get_distributor = "http://goods.test.int.yidian-inc.com/marketing/d
 goods.public.pindan_goods = "http://goods.test.int.yidian-inc.com/goods/goods/pindan_goods"
 goods.public.user_wechat_bind = "http://goods.test.int.yidian-inc.com/user/user/user_wechat_bind"
 
+goods.goods.refund = "http://goods.test.int.yidian-inc.com/goods/goods/refund"
+
 
 ;用户绑定
 goods.user.wechat_login = "http://goods.test.int.yidian-inc.com/user/user/wechat_login"
@@ -602,8 +608,7 @@ order.order.old_order_export = "http://order.test.yidian-inc.com/order/order/old
 order.order.old_order_print = "http://order.test.yidian-inc.com/order/order/old_print_order_list"
 
 
-;新订单后台
-order.order.op_order_list = "http://order.test.yidian-inc.com/order/order/op_order_list"
+
 
 ;用户老订单
 order.order.old_user_order_list = "http://order.test.yidian-inc.com/order/order/old_user_order_list"
@@ -655,6 +660,7 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.test.yidian-inc.co
 wallet.withdrawbackground.apply_detail = "http://wallet.test.yidian-inc.com/wallet/background/apply_detail"
 wallet.withdrawbackground.record_list = "http://wallet.test.yidian-inc.com/wallet/background/record_list"
 wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
+wallet.withdrawbackground.account_list = "http://wallet.test.yidian-inc.com/wallet/background/account_list"
 
 ;======================== 9000000-prod coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -840,6 +846,7 @@ goods.public.get_distributor = "http://goods.dev.yidian-inc.com/marketing/distri
 goods.public.pindan_goods = "http://goods.dev.yidian-inc.com/goods/goods/pindan_goods"
 goods.public.user_wechat_bind = "http://goods.dev.yidian-inc.com/user/user/user_wechat_bind"
 
+goods.goods.refund = "http://goods.dev.yidian-inc.com/goods/goods/refund"
 
 ;用户绑定
 goods.user.wechat_login = "http://goods.dev.yidian-inc.com/user/user/wechat_login"
@@ -900,9 +907,6 @@ order.order.old_order_export = "http://order.dev.yidian-inc.com/order/order/old_
 order.order.old_order_print = "http://order.dev.yidian-inc.com/order/order/old_print_order_list"
 
 
-;新订单后台
-order.order.op_order_list = "http://order.dev.yidian-inc.com/order/order/op_order_list"
-
 
 ;用户老订单
 order.order.old_user_order_list = "http://order.dev.yidian-inc.com/order/order/old_user_order_list"
@@ -954,6 +958,7 @@ wallet.withdrawbackground.back_freezing_fund = "http://wallet.dev.yidian-inc.com
 wallet.withdrawbackground.apply_detail = "http://wallet.dev.yidian-inc.com/wallet/background/apply_detail"
 wallet.withdrawbackground.record_list = "http://wallet.dev.yidian-inc.com/wallet/background/record_list"
 wallet.historyapi.sendmsg = "http://testex.api.appgc.yidian-inc.com/app/msg/sendMessage"
+wallet.withdrawbackground.account_list = "http://wallet.dev.yidian-inc.com/wallet/background/account_list"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
 

redis.ini

@@ -11,7 +11,7 @@ cacheConnect.select=0
 cacheConnect.timeout=1
 cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
- 
+
 
 [perf-gateway : gateway : common]
 [test-gateway : gateway : common]
@@ -100,7 +100,7 @@ cacheConnect.select=0
 cacheConnect.timeout=1
 cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
- 
+
 
 [perf-goods : goods : common]
 [test-goods : goods : common]
@@ -168,3 +168,30 @@ cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
 [dev-coupon : test-coupon : coupon : common]
 
+
+;钱包redis
+[wallet : common]
+
+[prod-wallet : wallet : common]
+cacheConnect.mode='codis'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18138/topom'
+cacheConnect.fallback=''
+cacheConnect.password=''
+cacheConnect.select=0
+cacheConnect.timeout=1
+cacheConnect.serializer='igbinary'
+cacheConnect.prefix=''
+
+
+[perf-wallet : wallet : common]
+[test-wallet : wallet : 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='igbinary'
+cacheConnect.prefix=''
+[dev-wallet : test-wallet : wallet : common]
\ No newline at end of file

request.ini

@@ -4,10 +4,12 @@ log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
 [merchant : common]
 [interaction : common]
 [gateway : common]
+[wallet : common]
 ; 生产环境
 [prod-merchant : merchant : common]
 [prod-interaction : interaction : common]
 [prod-gateway: gateway : common]
+[prod-wallet: wallet : common]
 
 ; 预发环境
 [perf-merchant : prod-merchant : merchant : common]
@@ -16,7 +18,9 @@ log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
 [test-merchant : prod-merchant : merchant : common]
 [test-interaction : prod-interaction : interaction : common]
 [test-gateway : prod-gateway : gateway : common]
+[test-wallet : prod-wallet : wallet : common]
 ;开发联调测试
 [dev-merchant : prod-merchant : merchant : common]
 [dev-interaction : prod-interaction : interaction : common]
 [dev-gateway : prod-gateway : gateway : common]
+[dev-wallet : prod-wallet : wallet : common]