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

dictionary.ini

@@ -20,6 +20,8 @@
 407="商品交易"
 501="平台营销充值"
 502="商户营销充值"
+601="邀请新用户奖励"
+602="邀请下单奖励"
 
 #兼容老数据，从90开始
 9101=私信红包

interface.ini

@@ -28,7 +28,7 @@ service.jw_user.save_update_life = "http://blend.jwshq.yidian-inc.com/ydInnerLif
 service.jw_user.get_user_digg = "http://blend.jwshq.yidian-inc.com/ydInner/getUserAgreeCount"
 service.jw_user.get_share_user_info = "http://blend.jwshq.yidian-inc.com/ydInner/getShareUserInfo"
 service.jw_user.get_wechat_openid = "http://blend.jwshq.yidian-inc.com/ydInner/getUserWXBindingInfo"
-service.jw_user.is_subscribe = "https://api.jwshq.cn/api/wx/hulk/hulk/getUserSubscribedShq"
+service.jw_user.is_subscribe = "http://blend.jwshq.yidian-inc.com/ydInner/getUserIsSubscribedShq"
 service.jw_order.refund = "https://api.jwshq.cn/api/wx/hulk/order/refundByManager"
 service.jw_order.reject = "https://api.jwshq.cn/api/wx/hulk/order/rejectRefundByBuyer"
 service.cms.login = "http://cms.jwshq.cn/j_security_check.jsonr"
@@ -204,6 +204,7 @@ goods.marketing.colonel_is_apply = "http://goods.int.yidian-inc.com/marketing/co
 goods.background.add_ota = "http://goods.int.yidian-inc.com/goods/ota/add"
 goods.background.ota_list = "http://goods.int.yidian-inc.com/goods/ota/list"
 goods.background.delete_ota = "http://goods.int.yidian-inc.com/goods/ota/delete"
+goods.background.undelete_ota = "http://goods.int.yidian-inc.com/goods/ota/undelete"
 goods.background.update_ota = "http://goods.int.yidian-inc.com/goods/ota/update"
 goods.background.ota_list_by_ids = "http://goods.int.yidian-inc.com/goods/ota/ota_list_by_ids"
 
@@ -367,6 +368,8 @@ wallet.accountbackground.get_wallet_account_status = "http://wallet.int.yidian-i
 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"
+wallet.accountbackground.get_user_info_by_ids = "http://wallet.int.yidian-inc.com/wallet/background/get_user_info_by_ids"
+
 
 ;======================== 9000000 coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.int.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -419,7 +422,7 @@ service.jw_user.save_update_life = "http://blend.jwshq.yidian-inc.com/ydInnerLif
 service.jw_user.get_user_digg = "http://blend.jwshq.yidian-inc.com/ydInner/getUserAgreeCount"
 service.jw_user.get_share_user_info = "http://blend.jwshq.yidian-inc.com/ydInner/getShareUserInfo"
 service.jw_user.get_wechat_openid = "http://blend.jwshq.yidian-inc.com/ydInner/getUserWXBindingInfo"
-service.jw_user.is_subscribe = "https://api.jwshq.cn/api/wx/hulk/hulk/getUserSubscribedShq"
+service.jw_user.is_subscribe = "http://blend.jwshq.yidian-inc.com/ydInner/getUserIsSubscribedShq"
 service.jw_order.refund = "https://api.jwshq.cn/api/wx/hulk/order/refundByManager"
 service.jw_order.reject = "https://api.jwshq.cn/api/wx/hulk/order/rejectRefundByBuyer"
 service.cms.login = "http://cms.jwshq.cn/j_security_check.jsonr"
@@ -595,6 +598,7 @@ goods.marketing.colonel_is_apply = "http://goods.pre.int.yidian-inc.com/marketin
 goods.background.add_ota = "http://goods.pre.int.yidian-inc.com/goods/ota/add"
 goods.background.ota_list = "http://goods.pre.int.yidian-inc.com/goods/ota/list"
 goods.background.delete_ota = "http://goods.pre.int.yidian-inc.com/goods/ota/delete"
+goods.background.undelete_ota = "http://goods.pre.int.yidian-inc.com/goods/ota/undelete"
 goods.background.update_ota = "http://goods.pre.int.yidian-inc.com/goods/ota/update"
 goods.background.ota_list_by_ids = "http://goods.pre.int.yidian-inc.com/goods/ota/ota_list_by_ids"
 
@@ -757,6 +761,7 @@ wallet.accountbackground.get_wallet_account_status = "http://wallet.pre.int.yidi
 wallet.accountbackground.reset_wallet_account_status = "http://wallet.pre.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.pre.int.yidian-inc.com/wallet/account/reset_third_account_bind"
+wallet.accountbackground.get_user_info_by_ids = "http://wallet.pre.yidian-inc.com/wallet/background/get_user_info_by_ids"
 
 ;======================== 9000000-pre coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.pre.int.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -808,7 +813,7 @@ service.jw_user.save_update_life = "http://blend-test.api.appgc.yidian-inc.com/y
 service.jw_user.get_user_digg = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserAgreeCount"
 service.jw_user.get_share_user_info = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getShareUserInfo"
 service.jw_user.get_wechat_openid = "http://blend-test.api.appgc.yidian-inc.com/ydInner/getUserWXBindingInfo"
-service.jw_user.is_subscribe = "http://test.zhiyueapp.cn/api/wx/hulk/hulk/getUserSubscribedShq"
+service.jw_user.is_subscribe = "http://blend.jwshq.yidian-inc.com/ydInner/getUserIsSubscribedShq"
 service.cms.login = "http://cms.jwshq.cn/j_security_check.jsonr"
 
 
@@ -980,6 +985,7 @@ goods.marketing.toogle_yingxiao_online_status = "http://goods.test.int.yidian-in
 goods.background.add_ota = "http://goods.test.int.yidian-inc.com/goods/ota/add"
 goods.background.ota_list = "http://goods.test.int.yidian-inc.com/goods/ota/list"
 goods.background.delete_ota = "http://goods.test.int.yidian-inc.com/goods/ota/delete"
+goods.background.undelete_ota = "http://goods.test.int.yidian-inc.com/goods/ota/undelete"
 goods.background.update_ota = "http://goods.test.int.yidian-inc.com/goods/ota/update"
 goods.background.ota_list_by_ids = "http://goods.test.int.yidian-inc.com/goods/ota/ota_list_by_ids"
 
@@ -1143,6 +1149,7 @@ wallet.accountbackground.get_wallet_account_status = "http://wallet.test.yidian-
 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"
+wallet.accountbackground.get_user_info_by_ids = "http://wallet.test.yidian-inc.com/wallet/background/get_user_info_by_ids"
 
 ;======================== 9000000-test coupon 微服务接口 ==============================
 coupon.wxapp.apply_coupon = "http://coupon.test.yidian-inc.com/coupon/wxapp/apply" ;领取优惠券
@@ -1333,6 +1340,7 @@ goods.marketing.toogle_yingxiao_online_status = "http://goods.dev.yidian-inc.com
 goods.background.add_ota = "http://goods.dev.yidian-inc.com/goods/ota/add"
 goods.background.ota_list = "http://goods.dev.yidian-inc.com/goods/ota/list"
 goods.background.delete_ota = "http://goods.dev.yidian-inc.com/goods/ota/delete"
+goods.background.undelete_ota = "http://goods.dev.yidian-inc.com/goods/ota/undelete"
 goods.background.update_ota = "http://goods.dev.yidian-inc.com/goods/ota/update"
 goods.background.ota_list_by_ids = "http://goods.dev.yidian-inc.com/goods/ota/ota_list_by_ids"
 
@@ -1492,6 +1500,7 @@ wallet.accountbackground.get_wallet_account_status = "http://wallet.dev.yidian-i
 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"
+wallet.accountbackground.get_user_info_by_ids = "http://wallet.dev.yidian-inc.com/wallet/background/get_user_info_by_ids"
 
 ;======================== 9000000-dev coupon 微服务接口 ==============================
 

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]

wallet.ini

@@ -15,6 +15,9 @@ withdraw.is_closed = 0;
 withdraw.whitelist = ',510234788199,510227177373,510233204694,510239348329,';
 ;兼容老钱包提现，发消息的验签
 withdraw.old_sign = '9e41321e688048d289678dba73be8a28';
+;转账服务调用方id和秘钥
+transfer.transfer_service_id='21091014290202205007';
+transfer.transfer_service_secret='33ce7043920123145c998e979637a3b1';
 
 [prod-wallet : common]
 ;生产的pingpp key
@@ -22,6 +25,9 @@ withdraw.old_sign = '9e41321e688048d289678dba73be8a28';
 withdraw.new_pingpp_appid = 'app_i58a94Pq1qfDDK4q';
 ;生活圈-线上-c端app-老版-提现
 withdraw.old_pingpp_appid = 'app_HGej90rbPiXTHmf5';
+;转账服务调用方id和秘钥
+transfer.transfer_service_id='21091014290202205007';
+transfer.transfer_service_secret='33ce7043920123145c998e979637a3b1';
 
 [perf-wallet : common]
 ;生产的pingpp key
@@ -29,6 +35,9 @@ withdraw.old_pingpp_appid = 'app_HGej90rbPiXTHmf5';
 withdraw.new_pingpp_appid = 'app_f5O4aDrvXvXTiffb';
 ;生活圈-线上-c端app-老版-提现
 withdraw.old_pingpp_appid = 'app_HGej90rbPiXTHmf5';
+;转账服务调用方id和秘钥
+transfer.transfer_service_id='21091014290202205007';
+transfer.transfer_service_secret='33ce7043920123145c998e979637a3b1';
 
 [test-wallet : common]
 ;新账户提现延迟(包含当天） 单位：天
@@ -44,6 +53,9 @@ withdraw.new_pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
 withdraw.old_pingpp_appid = 'app_GirTKSbHG088SCqj';
 ;关闭提现
 withdraw.is_closed = 0;
+;转账服务调用方id和秘钥
+transfer.transfer_service_id='21091011380404205008';
+transfer.transfer_service_secret='7a9afab08309ab59ee395703d58cb00c';
 
 [dev-wallet : common]
 ;新账户提现延迟(包含当天） 单位：天
@@ -58,4 +70,7 @@ withdraw.new_pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
 ;生活圈-测试-c端-老版本-提现
 withdraw.old_pingpp_appid = 'app_GirTKSbHG088SCqj';
 ;关闭提现
-withdraw.is_closed = 0;
\ No newline at end of file
+withdraw.is_closed = 0;
+;转账服务调用方id和秘钥
+transfer.transfer_service_id='21091011280606205005';
+transfer.transfer_service_secret='6aa0c9a562426275940267e035fd769d';
\ No newline at end of file