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

interface.ini

@@ -26,6 +26,8 @@ service.jw_user.get_user_list   = "http://blend.jwshq.yidian-inc.com/ydInner/get
 service.jw_user.save_push_token = "http://blend.jwshq.yidian-inc.com/ydInnerToken/savePushToken"
 service.jw_user.save_update_life = "http://blend.jwshq.yidian-inc.com/ydInnerLifeAccount/saveOrUpdateLifeAccount"
 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"
 
 ;idgen发号器
 service.idgen = "http://idgen.int.yidian-inc.com/id/get"
@@ -112,6 +114,7 @@ interaction.index.is_follow = "http://interact.int.yidian-inc.com/follow/index/i
 interaction.inner.digg = "http://interact.int.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interact.int.yidian-inc.com/follow/index/get_count_and_isfollow"
 interaction.index.syn_account = "http://interact.int.yidian-inc.com/follow/index/syn_account"
+interaction.index.wechat = "http://interact.int.yidian-inc.com/msg/index/wechat"
 
 
 ;======================= 4000000-prod goods微服务接口 ======================= 
@@ -223,6 +226,12 @@ wallet.account.withdraw_validate = "http://wallet.int.yidian-inc.com/wallet/acco
 wallet.account.withdraw_detail = "http://wallet.int.yidian-inc.com/wallet/account/withdraw_detail"
 wallet.account.total_trade = "http://wallet.int.yidian-inc.com/wallet/account/total_trade"
 wallet.callback.withdraw = "http://wallet.int.yidian-inc.com/wallet/callback/withdraw"
+wallet.withdrawbackground.apply_list = "http://wallet.int.yidian-inc.com/wallet/background/apply_list"
+wallet.withdrawbackground.blacklist = "http://wallet.int.yidian-inc.com/wallet/background/blacklist"
+wallet.withdrawbackground.withdraw_audit = "http://wallet.int.yidian-inc.com/wallet/background/withdraw_audit"
+wallet.withdrawbackground.back_freezing_fund = "http://wallet.int.yidian-inc.com/wallet/background/back_freezing_fund"
+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"
 
 
 
@@ -250,6 +259,9 @@ service.jw_user.get_user_list   = "http://blend-test.api.appgc.yidian-inc.com/yd
 service.jw_user.save_push_token = "http://blend-test.api.appgc.yidian-inc.com/ydInnerToken/savePushToken"
 service.jw_user.save_update_life = "http://blend-test.api.appgc.yidian-inc.com/ydInnerLifeAccount/saveOrUpdateLifeAccount"
 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"
+
+
 
 ;idgen发号器
 service.idgen = "http://idgen-test.ini.yidian-inc.com/id/get"
@@ -337,6 +349,7 @@ interaction.index.is_follow = "http://interaction.test.yidian-inc.com/follow/ind
 interaction.inner.digg = "http://interaction.test.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interaction.test.yidian-inc.com/follow/index/get_count_and_isfollow"
 interaction.index.syn_account = "http://interaction.test.yidian-inc.com/follow/index/syn_account"
+interaction.index.wechat = "http://interaction.test.yidian-inc.com/msg/index/wechat"
 
 
 ;======================= 4000000-test goods微服务接口 ======================= 
@@ -448,6 +461,12 @@ wallet.account.withdraw_validate = "http://wallet.test.yidian-inc.com/wallet/acc
 wallet.account.withdraw_detail = "http://wallet.test.yidian-inc.com/wallet/account/withdraw_detail"
 wallet.account.total_trade = "http://wallet.test.yidian-inc.com/wallet/account/total_trade"
 wallet.callback.withdraw = "http://wallet.test.yidian-inc.com/wallet/callback/withdraw"
+wallet.withdrawbackground.apply_list = "http://wallet.test.yidian-inc.com/wallet/background/apply_list"
+wallet.withdrawbackground.blacklist = "http://wallet.test.yidian-inc.com/wallet/background/blacklist"
+wallet.withdrawbackground.withdraw_audit = "http://wallet.test.yidian-inc.com/wallet/background/withdraw_audit"
+wallet.withdrawbackground.back_freezing_fund = "http://wallet.test.yidian-inc.com/wallet/background/back_freezing_fund"
+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"
 
 
 [dev : test : common]
@@ -535,6 +554,7 @@ interaction.index.is_follow = "http://interaction.dev.yidian-inc.com/follow/inde
 interaction.inner.digg = "http://interaction.dev.yidian-inc.com/follow/index/digg"
 interaction.inner.get_count_and_isfollow = "http://interaction.dev.yidian-inc.com/follow/index/get_count_and_isfollow"
 interaction.index.syn_account = "http://interaction.dev.yidian-inc.com/follow/index/syn_account"
+interaction.index.wechat = "http://interaction.dev.yidian-inc.com/msg/index/wechat"
 
 
 ;======================= 4000000-dev goods微服务接口 ======================= 
@@ -645,6 +665,12 @@ wallet.account.withdraw_validate = "http://wallet.dev.yidian-inc.com/wallet/acco
 wallet.account.withdraw_detail = "http://wallet.dev.yidian-inc.com/wallet/account/withdraw_detail"
 wallet.account.total_trade = "http://wallet.dev.yidian-inc.com/wallet/account/total_trade"
 wallet.callback.withdraw = "http://wallet.dev.yidian-inc.com/wallet/callback/withdraw"
+wallet.withdrawbackground.apply_list = "http://wallet.dev.yidian-inc.com/wallet/background/apply_list"
+wallet.withdrawbackground.blacklist = "http://wallet.dev.yidian-inc.com/wallet/background/blacklist"
+wallet.withdrawbackground.withdraw_audit = "http://wallet.dev.yidian-inc.com/wallet/background/withdraw_audit"
+wallet.withdrawbackground.back_freezing_fund = "http://wallet.dev.yidian-inc.com/wallet/background/back_freezing_fund"
+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"
 
 
 

redis.ini

@@ -17,7 +17,7 @@ cacheConnect.prefix=''
 [test-gateway : gateway : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
 cacheConnect.mode='codis'
-cacheConnect.topom='http://10.126.165.6:18080/topom'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
 cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
@@ -59,7 +59,7 @@ countConnect.prefix=''
 [test-merchant : prod-merchant : merchant : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
 cacheConnect.mode='codis'
-cacheConnect.topom='http://10.126.165.6:18080/topom'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
 cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0
@@ -106,7 +106,7 @@ cacheConnect.prefix=''
 [test-goods : goods : common]
 ;codis表示集群业务名，mode表示连接数据源的模式(包括codis|sentinel|redis)，serializer表示自动序列化方式(包括none|php|igbinary)
 cacheConnect.mode='codis'
-cacheConnect.topom='http://10.126.165.6:18080/topom'
+cacheConnect.topom='bj2-e05-126-165-6-lg.yidian.com:18131/topom'
 cacheConnect.fallback=''
 cacheConnect.password=''
 cacheConnect.select=0

wallet.ini

@@ -2,32 +2,39 @@
 ;新账户提现延迟(包含当天） 单位：天
 withdraw.defer_day = 7;
 ;每日提现次数
-withdraw.day_count_limit=1;
+withdraw.day_count_limit = 1;
 ;每日提现最大限额 单位：分
-withdraw.day_total_amount=100000;
+withdraw.day_total_amount = 100000;
 ;Ping++轮训条数
-withdraw.pinpp_sync_limit=100;
+withdraw.pinpp_sync_limit = 100;
+;提现审核阈值，超过进审核列表 单位 分
+withdraw.withdraw_apply_amount = 3000;
 ;关闭提现
-withdraw.close_pingpp=0;
-
+withdraw.is_closed = 1;
 [prod-wallet : common]
+;生产的pingpp key
+withdraw.pingpp_appid = 'app_i58a94Pq1qfDDK4q';
 
 [test-wallet : common]
 ;新账户提现延迟(包含当天） 单位：天
 withdraw.defer_day = 7;
 ;每日提现次数
-withdraw.day_count_limit=2;
+withdraw.day_count_limit = 2;
 ;每日提现最大限额 单位：分
-withdraw.day_total_amount=100000;
+withdraw.day_total_amount = 100000;
+;测试的pingpp key
+withdraw.pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
 ;关闭提现
-withdraw.close_pingpp=1;
+withdraw.is_closed = 0;
 
 [dev-wallet : common]
 ;新账户提现延迟(包含当天） 单位：天
 withdraw.defer_day = 7;
 ;每日提现次数
-withdraw.day_count_limit=2;
+withdraw.day_count_limit = 2;
 ;每日提现最大限额 单位：分
-withdraw.day_total_amount=100000;
+withdraw.day_total_amount = 100000;
+;测试的pingpp key
+withdraw.pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
 ;关闭提现
-withdraw.close_pingpp=1;
\ No newline at end of file
+withdraw.is_closed = 0;
\ No newline at end of file