Merge branch 'master' into feature-cmd-jl-lineplan

interface.ini

@@ -27,6 +27,7 @@ service.jw_user.save_push_token = "http://blend.jwshq.yidian-inc.com/ydInnerToke
 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 +113,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微服务接口 ======================= 
@@ -262,6 +264,8 @@ 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"
 
+
+
 ;idgen发号器
 service.idgen = "http://idgen-test.ini.yidian-inc.com/id/get"
 
@@ -347,6 +351,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微服务接口 ======================= 
@@ -549,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微服务接口 ======================= 

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

@@ -9,7 +9,8 @@ withdraw.day_total_amount = 100000;
 withdraw.pinpp_sync_limit = 100;
 ;提现审核阈值，超过进审核列表 单位 分
 withdraw.withdraw_apply_amount = 3000;
-
+;关闭提现
+withdraw.is_closed = 1;
 [prod-wallet : common]
 ;生产的pingpp key
 withdraw.pingpp_appid = 'app_i58a94Pq1qfDDK4q';
@@ -23,6 +24,8 @@ withdraw.day_count_limit = 2;
 withdraw.day_total_amount = 100000;
 ;测试的pingpp key
 withdraw.pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
+;关闭提现
+withdraw.is_closed = 0;
 
 [dev-wallet : common]
 ;新账户提现延迟(包含当天） 单位：天
@@ -33,3 +36,5 @@ withdraw.day_count_limit = 2;
 withdraw.day_total_amount = 100000;
 ;测试的pingpp key
 withdraw.pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
+;关闭提现
+withdraw.is_closed = 0;
\ No newline at end of file