Merge branch 'master' of http://git.yoho.cn/yohoops/auto_deploy_test

@@ -80,6 +80,9 @@ jdbc.mysql.platform.yhb_account.master  = write.erp.yohoops.org:3306
 jdbc.mysql.platform.yhb_account.password  = 9nm0icOwt6bMHjMusIfMLw==
 jdbc.mysql.platform.yhb_account.slave   = read1.erp.yohoops.org:3306
 jdbc.mysql.platform.yhb_account.username  = yh_test
+jdbc.mysql.platform.bigdata_store.slave = 118.89.235.30:3306
+jdbc.mysql.platform.bigdata_store.username = yh_test_bigdata
+jdbc.mysql.platform.bigdata_store.password = rALdkYPZCr4QyzBfVCGdXA==
 
 malongApi.accessKeyId  = 7343a192140f25a59c53dab5652f5f47
 malongApi.imageSetId   = 7tm74zfv

@@ -12,4 +12,8 @@ erp.gateway.url=http://192.168.13.87/erp-gateway-web
 
 yohocoin.rule.minMultiple=1
 yohocoin.rule.maxPayRate=0.2
-yohocoin.rule.amountLimit=20
\ No newline at end of file
+yohocoin.rule.amountLimit=20
+
+invoiceUrl=http://testwx.fapiao.com/fpt-wechat/wxscan/wxkp.do
+invoiceId=1Olh
+invoiceKey=vmXrbKS1
\ No newline at end of file

@@ -70,6 +70,9 @@ jdbc.mysql.platform.yhb_account.master  = 192.168.102.219:3306
 jdbc.mysql.platform.yhb_account.password  = 9nm0icOwt6bMHjMusIfMLw==
 jdbc.mysql.platform.yhb_account.slave   = 192.168.102.219:3306
 jdbc.mysql.platform.yhb_account.username  = yh_test
+jdbc.mysql.platform.bigdata_store.slave = 118.89.235.30:3306
+jdbc.mysql.platform.bigdata_store.username = yh_test_bigdata
+jdbc.mysql.platform.bigdata_store.password = rALdkYPZCr4QyzBfVCGdXA==
 
 malongApi.accessKeyId  = 7343a192140f25a59c53dab5652f5f47
 malongApi.imageSetId   = 7tm74zfv
@@ -137,4 +140,8 @@ manager.zkAddress = 192.168.102.220:2181,192.168.102.210:2181
 ali.check.accessKeyId=LTAIbjgV667m6ujZ
 ali.check.accessKeySecret=aDJt9zdp0FsOpa4zQ2JzccBFq5Pq6K
 
-shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop
\ No newline at end of file
+shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop
+
+local.task.host = 192.168.102.48
+
+platform.sns.imagesimi.url=http://192.168.103.96:8787/shareOrderAudit
\ No newline at end of file

@@ -83,6 +83,9 @@ jdbc.mysql.platform.yhb_account.master  = write.erp.yohoops.org:3306
 jdbc.mysql.platform.yhb_account.password  = 9nm0icOwt6bMHjMusIfMLw==
 jdbc.mysql.platform.yhb_account.slave   = read1.erp.yohoops.org:3306
 jdbc.mysql.platform.yhb_account.username  = yh_test
+jdbc.mysql.platform.bigdata_store.slave = 118.89.235.30:3306
+jdbc.mysql.platform.bigdata_store.username = yh_test_bigdata
+jdbc.mysql.platform.bigdata_store.password = rALdkYPZCr4QyzBfVCGdXA==
 
 local.task.host  = 192.168.102.27
 
@@ -148,4 +151,6 @@ manager.zkAddress = 192.168.102.220:2181,192.168.102.210:2181
 ali.check.accessKeyId=LTAIbjgV667m6ujZ
 ali.check.accessKeySecret=aDJt9zdp0FsOpa4zQ2JzccBFq5Pq6K
 
-shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop
\ No newline at end of file
+shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop
+
+platform.sns.imagesimi.url=http://192.168.103.96:8787/shareOrderAudit
\ No newline at end of file

@@ -49,6 +49,9 @@ jdbc.mysql.platform.yhb_account.master  = write.erp.yohoops.org:3306
 jdbc.mysql.platform.yhb_account.password  = 9nm0icOwt6bMHjMusIfMLw==
 jdbc.mysql.platform.yhb_account.slave   = read1.erp.yohoops.org:3306
 jdbc.mysql.platform.yhb_account.username  = yh_test
+jdbc.mysql.platform.bigdata_store.slave = 118.89.235.30:3306
+jdbc.mysql.platform.bigdata_store.username = yh_test_bigdata
+jdbc.mysql.platform.bigdata_store.password = rALdkYPZCr4QyzBfVCGdXA==
 
 manager.zkAddress  = zk01.yohoops.org:2181
 
@@ -89,4 +92,6 @@ yohobuy.platform.env.webapphome  = /home/test/yohobuy-platform/deploy
 
 local.task.host = 192.168.102.48
 
-shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop
\ No newline at end of file
+shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop
+
+platform.sns.imagesimi.url=http://platform.shareOrder.yohoops.org:8787/shareOrderAudit
\ No newline at end of file

@@ -80,6 +80,9 @@ jdbc.mysql.platform.yhb_account.master  = write.erp.yohoops.org:3306
 jdbc.mysql.platform.yhb_account.password  = 9nm0icOwt6bMHjMusIfMLw==
 jdbc.mysql.platform.yhb_account.slave   = read1.erp.yohoops.org:3306
 jdbc.mysql.platform.yhb_account.username  = yh_test
+jdbc.mysql.platform.bigdata_store.slave = 118.89.235.30:3306
+jdbc.mysql.platform.bigdata_store.username = yh_test_bigdata
+jdbc.mysql.platform.bigdata_store.password = rALdkYPZCr4QyzBfVCGdXA==
 
 malongApi.accessKeyId  = 7343a192140f25a59c53dab5652f5f47
 malongApi.imageSetId   = 7tm74zfv
@@ -141,4 +144,5 @@ manager.zkAddress = zk01.yohoops.org:2181
 ali.check.accessKeyId=LTAIbjgV667m6ujZ
 ali.check.accessKeySecret=aDJt9zdp0FsOpa4zQ2JzccBFq5Pq6K
 local.task.host = 192.168.102.48
-shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop
\ No newline at end of file
+shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop
+platform.sns.imagesimi.url=http://192.168.103.96:8787/shareOrderAudit
\ No newline at end of file

@@ -292,7 +292,7 @@ mongo.inbox.port    = 27017
 
 
 #search-db
-jdbc.mysql.yhbsearch.datasources=yhb_search_2016
+jdbc.mysql.yhbsearch.datasources=yhb_search
 jdbc.mysql.yhbsearch.master=write.search.yohoops.org:3306 
 jdbc.mysql.yhbsearch.slave=read.search.yohoops.org:3306
 jdbc.mysql.yhbsearch.username=yh_test

@@ -45,6 +45,9 @@ jdbc.mysql.platform.yhb_account.master  = 192.168.102.219:3306
 jdbc.mysql.platform.yhb_account.password  = 9nm0icOwt6bMHjMusIfMLw==
 jdbc.mysql.platform.yhb_account.slave   = 192.168.102.219:3306
 jdbc.mysql.platform.yhb_account.username  = yh_test
+jdbc.mysql.platform.bigdata_store.slave = 118.89.235.30:3306
+jdbc.mysql.platform.bigdata_store.username = yh_test_bigdata
+jdbc.mysql.platform.bigdata_store.password = rALdkYPZCr4QyzBfVCGdXA==
 
 mkt.activity.domain.url  = http://union.yoho.cn/union/tencentMkt/index.html
 

@@ -18,7 +18,7 @@ jdbc.mysql.cobar.username=yh_vpc_bak
 jdbc.mysql.cobar.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 jdbc.mysql.yhwechat.master=write.passport.yohoops.org:3306
-jdbc.mysql.yhwechat.slave=read.passport.yohoops.org:3307
+jdbc.mysql.yhwechat.slave=read.passport.yohoops.org:3306
 jdbc.mysql.yhwechat.username=yh_vpc_bak
 jdbc.mysql.yhwechat.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
@@ -165,18 +165,18 @@ jdbc.mysql.yhbpromotion.slave=read.orders.yohoops.org:3307
 
 #yoho_sms配置读写分离
 jdbc.mysql.yohosms.master=write.passport.yohoops.org:3306
-jdbc.mysql.yohosms.slave=read.passport.yohoops.org:3307
+jdbc.mysql.yohosms.slave=read.passport.yohoops.org:3306
 
 #yh_inbox配置读写分离
 jdbc.mysql.yhinbox.master=write.passport.yohoops.org:3306
-jdbc.mysql.yhinbox.slave=read.passport.yohoops.org:3307
+jdbc.mysql.yhinbox.slave=read.passport.yohoops.org:3306
 
 #yoho_logs配置读写分离, 暂时将表存在yoho_sms中
 jdbc.mysql.yohologs.master=yohologs.yohoops.org:3306
 
 #yoho_passport读写数据分离
 jdbc.mysql.yohopassport.master=write.passport.yohoops.org:3306
-jdbc.mysql.yohopassport.slave=read.passport.yohoops.org:3307
+jdbc.mysql.yohopassport.slave=read.passport.yohoops.org:3306
 
 #yh_operations配置读写分离
 jdbc.mysql.yhoperations.master=write.cms.yohoops.org:3307
@@ -184,7 +184,7 @@ jdbc.mysql.yhoperations.slave=read.cms.yohoops.org:3307
 
 #yh_passport读写分离
 jdbc.mysql.yhpassport.master=write.passport.yohoops.org:3306
-jdbc.mysql.yhpassport.slave=read.passport.yohoops.org:3307
+jdbc.mysql.yhpassport.slave=read.passport.yohoops.org:3306
 
 #yh_setting读写分离
 jdbc.mysql.yhsetting.master=write.cms.yohoops.org:3307
@@ -212,15 +212,15 @@ jdbc.mysql.unions.slave=read.cms.yohoops.org:3307
 
 #push center
 jdbc.mysql.yohopushcenter.master=write.passport.yohoops.org:3306
-jdbc.mysql.yohopushcenter.slave=read.passport.yohoops.org:3307
+jdbc.mysql.yohopushcenter.slave=read.passport.yohoops.org:3306
 
 #q_msg_system
 jdbc.mysql.yhpush.master=write.passport.yohoops.org:3306
-jdbc.mysql.yhpush.slave=read.passport.yohoops.org:3307
+jdbc.mysql.yhpush.slave=read.passport.yohoops.org:3306
 
 #yoho_activity
 jdbc.mysql.yohoactivity.master=write.passport.yohoops.org:3306
-jdbc.mysql.yohoactivity.slave=read.passport.yohoops.org:3307
+jdbc.mysql.yohoactivity.slave=read.passport.yohoops.org:3306
 
 #yh_guang
 jdbc.mysql.yhguang.master=write.cms.yohoops.org:3307
@@ -240,7 +240,7 @@ jdbc.mysql.yohood.slave=read.yohood.yohoops.org:3307
 
 #yohocrm
 jdbc.mysql.yohocrm.master=write.passport.yohoops.org:3306
-jdbc.mysql.yohocrm.slave=read.passport.yohoops.org:3307
+jdbc.mysql.yohocrm.slave=read.passport.yohoops.org:3306
 
 #erppassport
 jdbc.mysql.erppassport.master=write.erp.yohoops.org:3306
@@ -277,6 +277,12 @@ jdbc.mysql.yh_cms.slave=read.cms.yohoops.org:3307
 jdbc.mysql.yh_cms.username=yh_vpc_bak
 jdbc.mysql.yh_cms.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
+#sso
+jdbc.mysql.yhuuc.master=write.yhuuc.yohoops.org:3307
+jdbc.mysql.yhuuc.slave=read.yhuuc.yohoops.org:3307
+jdbc.mysql.yhuuc.username=yh_vpc_bak
+jdbc.mysql.yhuuc.password=t5/oMgwUCmO/GeMHBAQ2Cg==
+
 #yhlottery
 jdbc.mysql.yhlottery.master=write.yhlottery.yohoops.org:3307
 jdbc.mysql.yhlottery.slave=read.yhlottery.yohoops.org:3307
@@ -301,7 +307,7 @@ jdbc.mysql.yhbsearch.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 # search-es
 search.es.cluster.name  = yohosearch_test
 search.es.servers       = 192.168.104.55:9300 192.168.104.54:9300 192.168.104.53:9300 192.168.104.51:9300
-search.index.number_of_replicas     = 0
+search.index.number_of_replicas     = 3
 search.index.refresh_interval       = 10s
 search.index.translog.flush_threshold_ops  = 5000
 
@@ -314,8 +320,8 @@ search.mq.exchange=yoho_search
 search.mq.virtualHost=/
 
 #for crm read db
-jdbc.mysql.yohopassport.onlyslave=read.passport.yohoops.org:3307
-jdbc.mysql.yhpassport.onlyslave=read.passport.yohoops.org:3307
+jdbc.mysql.yohopassport.onlyslave=read.passport.yohoops.org:3306
+jdbc.mysql.yhpassport.onlyslave=read.passport.yohoops.org:3306
 jdbc.mysql.yhshops.onlyslave=read.shops.yohoops.org:3306
 jdbc.mysql.yhoperations.onlyslave=read.cms.yohoops.org:3307
 jdbc.mysql.yh.username=yh_vpc_bak