Merge branch '0826_wangdong_account' into 'master'

0826 wangdong account

See merge request bp/yaconf!63

account.ini

+[common]
+;新账户提现延迟(包含当天） 单位：天
+withdraw.defer_day = 7;
+;每日提现次数
+withdraw.day_count_limit = 1;
+;每日提现最大限额 单位：分
+withdraw.day_total_amount = 100000;
+;Ping++轮训条数
+withdraw.pinpp_sync_limit = 100;
+;提现审核阈值，超过进审核列表 单位 分
+withdraw.withdraw_apply_amount = 10;
+;关闭提现 0 打开 1 关闭
+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-account : common]
+;生产的pingpp key
+;新版C端提现appid
+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-account : common]
+;生产的pingpp key
+;新版C端提现appid
+withdraw.pingpp_appid = 'app_f5O4aDrvXvXTiffb';
+;转账服务调用方id和秘钥
+transfer.transfer_service_id='21091014290202205007';
+transfer.transfer_service_secret='33ce7043920123145c998e979637a3b1';
+
+[test-account : common]
+;新账户提现延迟(包含当天） 单位：天
+withdraw.defer_day = 7;
+;每日提现次数
+withdraw.day_count_limit = 20;
+;每日提现最大限额 单位：分
+withdraw.day_total_amount = 100000;
+;测试的pingpp key
+;生活圈-测试-c端-新版本-提现
+withdraw.pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
+;关闭提现
+withdraw.is_closed = 0;
+;转账服务调用方id和秘钥
+transfer.transfer_service_id='21091011380404205008';
+transfer.transfer_service_secret='7a9afab08309ab59ee395703d58cb00c';
+
+[dev-account : common]
+;新账户提现延迟(包含当天） 单位：天
+withdraw.defer_day = 7;
+;每日提现次数
+withdraw.day_count_limit = 2;
+;每日提现最大限额 单位：分
+withdraw.day_total_amount = 100000;
+;测试的pingpp key
+;生活圈-测试-c端-新版本-提现
+withdraw.pingpp_appid = 'app_W10Oe5XrvbzHfP4W';
+;关闭提现
+withdraw.is_closed = 0;
+;转账服务调用方id和秘钥
+transfer.transfer_service_id='21091011280606205005';
+transfer.transfer_service_secret='6aa0c9a562426275940267e035fd769d';
\ No newline at end of file

interface.ini

@@ -440,6 +440,10 @@ shqc.chicken.task.hour_check_list = "http://shqc.int.yidian-inc.com/chicken/task
 shqc.chicken.task.do_hour_check = "http://shqc.int.yidian-inc.com/chicken/task/do_hour_check"
 
 
+;======================= 7000000-prod account微服务接口 =======================
+account.account.create = "http://account.int.yidian-inc.com/account/account/create"
+account.account.get_account = "http://account.int.yidian-inc.com/account/account/get_account"
+
 
 [perf : prod : common]
 ;======================= 基础服务接口 =======================
@@ -864,8 +868,11 @@ coupon.tcc.use_coupon_try = "http://coupon.pre.int.yidian-inc.com/tcc/tcc/use_co
 coupon.tcc.use_coupon_confirm = "http://coupon.pre.int.yidian-inc.com/tcc/tcc/use_coupon_confirm"
 coupon.tcc.use_coupon_cancel = "http://coupon.pre.int.yidian-inc.com/tcc/tcc/use_coupon_cancel"
 
-;======================== 10000000-pre shqc 微服务接口 ==============================
+;======================= 7000000-pre account微服务接口 =======================
+account.account.create = "http://account.pre.int.yidian-inc.com/account/account/create"
+account.account.get_account = "http://account.pre.int.yidian-inc.com/account/account/get_account"
 
+;======================== 10000000-pre shqc 微服务接口 ==============================
 ;生活圈c端  小鸡游戏  task模块
 shqc.chicken.task.sign_in_list = "http://shqc.pre.int.yidian-inc.com/chicken/task/sign_in_list"
 shqc.chicken.task.do_sign_in = "http://shqc.pre.int.yidian-inc.com/chicken/task/do_sign_in"
@@ -1296,8 +1303,11 @@ coupon.tcc.use_coupon_try = "http://coupon.test.yidian-inc.com/tcc/tcc/use_coupo
 coupon.tcc.use_coupon_confirm = "http://coupon.test.yidian-inc.com/tcc/tcc/use_coupon_confirm"
 coupon.tcc.use_coupon_cancel = "http://coupon.test.yidian-inc.com/tcc/tcc/use_coupon_cancel"
 
-;======================== 10000000-test shqc 微服务接口 ==============================
+;======================= 7000000-test account微服务接口 =======================
+account.account.create = "http://account.test.yidian-inc.com/account/account/create"
+account.account.get_account = "http://account.test.yidian-inc.com/account/account/get_account"
 
+;======================== 10000000-test shqc 微服务接口 ==============================
 ;生活圈c端  小鸡游戏  task模块
 shqc.chicken.task.sign_in_list = "http://shqc.test.yidian-inc.com/chicken/task/sign_in_list"
 shqc.chicken.task.do_sign_in = "http://shqc.test.yidian-inc.com/chicken/task/do_sign_in"
@@ -1697,6 +1707,10 @@ shqc.chicken.task.hour_check_list = "http://shqc.dev.yidian-inc.com/chicken/task
 shqc.chicken.task.do_hour_check = "http://shqc.dev.yidian-inc.com/chicken/task/do_hour_check"
 
 
+;======================= 7000000-dev account微服务接口 =======================
+account.account.create = "http://account.dev.yidian-inc.com/account/account/create"
+account.account.get_account = "http://account.dev.yidian-inc.com/account/account/get_account"
+
 ; =======================  gateway ==================================================================================
 
 [prod-gateway : prod]

redis.ini

@@ -234,4 +234,31 @@ cacheConnect.select=0
 cacheConnect.timeout=1
 cacheConnect.serializer='igbinary'
 cacheConnect.prefix=''
-[dev-wallet : test-wallet : wallet : common]
\ No newline at end of file
+[dev-wallet : test-wallet : wallet : common]
+
+;钱包redis
+[account : common]
+
+[prod-account : account : 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-account : prod-account : account : common]
+[test-account : account : 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-account : test-account : account : common]
\ No newline at end of file

request.ini

@@ -7,6 +7,7 @@ log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
 [wallet : common]
 [tcc : common]
 [pay : common]
+[account : common]
 
 ; 生产环境
 [prod-merchant : merchant : common]
@@ -14,6 +15,7 @@ log.exclude[] = "bj2-e05-126-165-6-lg.yidian.com"
 [prod-wallet: wallet : common]
 [prod-tcc: tcc : common]
 [prod-pay: pay : common]
+[prod-account: account : common]
 
 [prod-gateway: gateway : common]
 exclude.url[] = 'merchant/recruitinner/get_enterprise_info'
@@ -28,14 +30,17 @@ exclude.url[] = 'merchant/lifeinner/batch_get_account_name'
 [perf-wallet : prod-wallet: wallet : common]
 [perf-pay : prod-pay: pay : common]
 [perf-tcc : prod-tcc: tcc : common]
+[perf-account : prod-account: account : common]
 
 ;测试测试
 [test-merchant : prod-merchant : merchant : common]
 [test-interaction : prod-interaction : interaction : common]
 [test-gateway : prod-gateway : gateway : common]
 [test-wallet : prod-wallet : wallet : common]
+[test-account : prod-account : account : 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]
+[dev-account : prod-account : account : common]