Merge branch 'master' into jielong

mysql.ini

@@ -472,14 +472,14 @@ wallet.read.host='r.bp_test_mysql1_1.int.yidian-inc.com:3306,r.bp_test_mysql1_2.
 
 ; 生产环境
 [prod-coupon : coupon : common]
-wallet.database_type='mysql'
-wallet.database_name='coupon'
-wallet.connect_timeout=2
-wallet.username=''
-wallet.password=''
-wallet.charset='utf8mb4'
-wallet.write.host=''
-wallet.read.host=''
+coupon.database_type='mysql'
+coupon.database_name='coupon'
+coupon.connect_timeout=2
+coupon.username='bp_coupon_rw'
+coupon.password='wNC@zFJzPf1yM$Cv8yB8#AO3i&Ecgx'
+coupon.charset='utf8mb4'
+coupon.write.host='w.bp_coupon.int.yidian-inc.com:3306'
+coupon.read.host='r.bp_coupon_1.int.yidian-inc.com:3306,r.bp_coupon_2.int.yidian-inc.com:3306'
 
 ; 预发环境
 [perf-coupon : prod-coupon : wallet : common]

redis.ini

@@ -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]