将闲置的nj_1同步有货环境3的配置，但是iptable替换成环境1的IP。目前环境1中，涉及线下店的服务发布都用test的配置，涉及到有货APP的服务都用te…

…st_nj_1的配置。使环境1的线下店环境及有货环境跟上当前主线5.6.0版本

+autoconfig.properties  = sharedAutoconfig
+
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
+
+yoho.cms_push.env.namespace   = cms_push
+yoho.cms_push.env.webapphome  = /home/test/cms-push/deploy

 yoho.logs.level        = INFO
-yoho.logs.basedir      = /home/test/logs
-yoho.logs.maxHistory   = 7
-yoho.logs.maxFileSize  = 100MB
+yoho.logs.basedir      = /home/test
+yoho.logs.maxHistory   = 2
+yoho.logs.maxFileSize  = 50MB
 
 yoho.env.javahome     = /usr/local/java
 yoho.env.serverhome   = /usr/local/tomcat
 yoho.env.servertype   = tomcat
 yoho.env.productmode  = TEST
 
-file.saveDir=/home/test/
+file.saveDir=/home/test
 
 ###  ******************************  database ***********************************
-##yh_push
-jdbc.mysql.yhpush.master=192.168.102.219:3306
-jdbc.mysql.yhpush.slave=192.168.102.219:3306
-jdbc.mysql.yhpush.password=9nm0icOwt6bMHjMusIfMLw== 
-jdbc.mysql.yhpush.username=yh_test
 
-##YH_RESOURCE
-jdbc.mysql.yhresource.master=192.168.102.219:3306
-jdbc.mysql.yhresource.slave=192.168.102.219:3306
+jdbc.mysql.yhwechat.master=write.passport.yohoops.org:3306
+jdbc.mysql.yhwechat.slave=write.passport.yohoops.org:3306
+jdbc.mysql.yhwechat.username=yh_test
+jdbc.mysql.yhwechat.password=9nm0icOwt6bMHjMusIfMLw==
+
 jdbc.mysql.yhresource.username=yh_test
 jdbc.mysql.yhresource.password=9nm0icOwt6bMHjMusIfMLw==
 
-# yh_shops
-jdbc.mysql.yhshops.master=192.168.102.219:3306
-jdbc.mysql.yhshops.slave=192.168.102.219:3306
-jdbc.mysql.yhshops.username=yh_test
+ jdbc.mysql.yhshops.username=yh_test
 jdbc.mysql.yhshops.password=9nm0icOwt6bMHjMusIfMLw==
 
 # yh_orders
-jdbc.mysql.yhorders.master=192.168.102.219:3306
-jdbc.mysql.yhorders.slave=192.168.102.219:3306
 jdbc.mysql.yhorders.username=yh_test
 jdbc.mysql.yhorders.password=9nm0icOwt6bMHjMusIfMLw==
 
-# yh_orders db split
-jdbc.mysql.yhorderssplit.master=192.168.102.202:8066
-jdbc.mysql.yhorderssplit.slave=192.168.102.202:8066
-jdbc.mysql.yhorderssplit.slave2=192.168.102.202:8066
-jdbc.mysql.yhorderssplit.slave3=192.168.102.202:8066
-jdbc.mysql.yhorderssplit.username=yh_test
-jdbc.mysql.yhorderssplit.password=9nm0icOwt6bMHjMusIfMLw==
-
-# yh_sns
-jdbc.mysql.yhsns.master=192.168.102.219:3306
-jdbc.mysql.yhsns.slave=192.168.102.219:3306
-jdbc.mysql.yhsns.username=yh_test
-jdbc.mysql.yhsns.password=9nm0icOwt6bMHjMusIfMLw==
+# yhb_operations
+jdbc.mysql.yhboperations.username=yh_test
+jdbc.mysql.yhboperations.password=9nm0icOwt6bMHjMusIfMLw==
 
 # yh_comment
-jdbc.mysql.yhcomment.master=192.168.102.219:3306
-jdbc.mysql.yhcomment.slave=192.168.102.219:3306
 jdbc.mysql.yhcomment.username=yh_test
 jdbc.mysql.yhcomment.password=9nm0icOwt6bMHjMusIfMLw==
 
-#yh_passport
-jdbc.mysql.yhpassport.master=192.168.102.219:3306
-jdbc.mysql.yhpassport.slave=192.168.102.219:3306
-jdbc.mysql.yhpassport.username=yh_test
-jdbc.mysql.yhpassport.password=9nm0icOwt6bMHjMusIfMLw==
-
-#yoho_passport读写数据分离
-jdbc.mysql.yohopassport.master=192.168.102.219:3306
-jdbc.mysql.yohopassport.slave=192.168.102.219:3306
-jdbc.mysql.yohopassport.username=yh_test
-jdbc.mysql.yohopassport.password=9nm0icOwt6bMHjMusIfMLw==
-
-#yh_operations读写数据分离
-jdbc.mysql.yhoperations.master=192.168.102.219:3306
-jdbc.mysql.yhoperations.slave=192.168.102.219:3306
-jdbc.mysql.yhoperations.username=yh_test
-jdbc.mysql.yhoperations.password=9nm0icOwt6bMHjMusIfMLw==
-
 #yhb_promotion
-jdbc.mysql.yhbpromotion.master=192.168.102.219:3306
-jdbc.mysql.yhbpromotion.slave=192.168.102.219:3306
 jdbc.mysql.yhbpromotion.username=yh_test
 jdbc.mysql.yhbpromotion.password=9nm0icOwt6bMHjMusIfMLw==
 
-#yh_setting
-jdbc.mysql.yhsetting.master=192.168.102.219:3306
-jdbc.mysql.yhsetting.slave=192.168.102.219:3306
-jdbc.mysql.yhsetting.username=yh_test
-jdbc.mysql.yhsetting.password=9nm0icOwt6bMHjMusIfMLw==
-
-#yoho_sms
-jdbc.mysql.yohosms.master=192.168.102.219:3306
-jdbc.mysql.yohosms.slave=192.168.102.219:3306
+#yoho_sms配置读写分离
 jdbc.mysql.yohosms.username=yh_test
 jdbc.mysql.yohosms.password=9nm0icOwt6bMHjMusIfMLw==
 
-#yh_inbox
-jdbc.mysql.yhinbox.master=192.168.102.219:3306
-jdbc.mysql.yhinbox.slave=192.168.102.219:3306
+#yh_inbox配置读写分离
 jdbc.mysql.yhinbox.username=yh_test
 jdbc.mysql.yhinbox.password=9nm0icOwt6bMHjMusIfMLw==
 
-#yoho_logs
-jdbc.mysql.yohologs.master=192.168.102.219:3306
+#yoho_logs配置读写分离, 暂时将表存在yoho_sms中
 jdbc.mysql.yohologs.username=yh_test
 jdbc.mysql.yohologs.password=9nm0icOwt6bMHjMusIfMLw==
 
+#yoho_passport读写数据分离
+jdbc.mysql.yohopassport.username=yh_test
+jdbc.mysql.yohopassport.password=9nm0icOwt6bMHjMusIfMLw==
+
+#yh_operations配置读写分离
+jdbc.mysql.yhoperations.username=yh_test
+jdbc.mysql.yhoperations.password=9nm0icOwt6bMHjMusIfMLw==
+
+#yh_passport读写分离
+jdbc.mysql.yhpassport.username=yh_test
+jdbc.mysql.yhpassport.password=9nm0icOwt6bMHjMusIfMLw==
+
+#yh_setting读写分离
+jdbc.mysql.yhsetting.username=yh_test
+jdbc.mysql.yhsetting.password=9nm0icOwt6bMHjMusIfMLw==
+
 #yh_pay
-jdbc.mysql.pay.master=192.168.102.219:3306
-jdbc.mysql.pay.slave=192.168.102.219:3306
 jdbc.mysql.pay.username=yh_test
 jdbc.mysql.pay.password=9nm0icOwt6bMHjMusIfMLw==
 
-#yh_coupons
-jdbc.mysql.yhcoupons.master=192.168.102.219:3306
-jdbc.mysql.yhcoupons.slave=192.168.102.219:3306
-jdbc.mysql.yhcoupons.username=yh_test
-jdbc.mysql.yhcoupons.password=9nm0icOwt6bMHjMusIfMLw==
-
-#yh_events
-jdbc.mysql.yhevents.master=192.168.102.219:3306
-jdbc.mysql.yhevents.slave=192.168.102.219:3306
+#event
 jdbc.mysql.yhevents.username=yh_test
 jdbc.mysql.yhevents.password=9nm0icOwt6bMHjMusIfMLw==
 
+
+#event
+jdbc.mysql.yhcoupons.username=yh_test
+jdbc.mysql.yhcoupons.password=9nm0icOwt6bMHjMusIfMLw==
+
 #yh_consult
-jdbc.mysql.yhconsult.master=192.168.102.219:3306
-jdbc.mysql.yhconsult.slave=192.168.102.219:3306
 jdbc.mysql.yhconsult.username=yh_test
 jdbc.mysql.yhconsult.password=9nm0icOwt6bMHjMusIfMLw==
 
-#yhb_operations
-jdbc.mysql.yhboperations.master=192.168.102.219:3306
-jdbc.mysql.yhboperations.slave=192.168.102.219:3306
-jdbc.mysql.yhboperations.username=yh_test
-jdbc.mysql.yhboperations.password=9nm0icOwt6bMHjMusIfMLw==
-
 #unions
-jdbc.mysql.unions.master=192.168.102.219:3306
-jdbc.mysql.unions.slave=192.168.102.219:3306
 jdbc.mysql.unions.username=yh_test
 jdbc.mysql.unions.password=9nm0icOwt6bMHjMusIfMLw==
 
-#push center
-jdbc.mysql.yohopushcenter.master=192.168.102.219:3306
-jdbc.mysql.yohopushcenter.slave=192.168.102.219:3306
+#model
 jdbc.mysql.yohopushcenter.username=yh_test
 jdbc.mysql.yohopushcenter.password=9nm0icOwt6bMHjMusIfMLw==
 
+jdbc.mysql.yhpush.username=yh_test
+jdbc.mysql.yhpush.password=9nm0icOwt6bMHjMusIfMLw==
+
 #yoho-activity
-jdbc.mysql.yohoactivity.master=192.168.102.219:3306
-jdbc.mysql.yohoactivity.slave=192.168.102.219:3306
 jdbc.mysql.yohoactivity.username=yh_test
 jdbc.mysql.yohoactivity.password=9nm0icOwt6bMHjMusIfMLw==
 
-#yh_special
-jdbc.mysql.yhspecial.master=192.168.102.219:3306
-jdbc.mysql.yhspecial.slave=192.168.102.219:3306
-jdbc.mysql.yhspecial.username=yh_test
-jdbc.mysql.yhspecial.password=9nm0icOwt6bMHjMusIfMLw==
-
 #yh_guang
-jdbc.mysql.yhguang.master=192.168.102.219:3306
-jdbc.mysql.yhguang.slave=192.168.102.219:3306
 jdbc.mysql.yhguang.username=yh_test
 jdbc.mysql.yhguang.password=9nm0icOwt6bMHjMusIfMLw==
 
-#yh_guang
-jdbc.mysql.yohocrm.master=192.168.102.219:3306
-jdbc.mysql.yohocrm.slave=192.168.102.219:3306
-jdbc.mysql.yohocrm.username=yh_test
-jdbc.mysql.yohocrm.password=9nm0icOwt6bMHjMusIfMLw==
-
-#erp_finance
-jdbc.mysql.erpfinance.master=192.168.102.219:3306
-jdbc.mysql.erpfinance.slave=192.168.102.219:3306
-jdbc.mysql.erpfinance.username=yh_test
-jdbc.mysql.erpfinance.password=9nm0icOwt6bMHjMusIfMLw==
-
-jdbc.mysql.platform.erp_supplier.master  = 192.168.102.219:3306
-jdbc.mysql.platform.erp_supplier.password  = 9nm0icOwt6bMHjMusIfMLw==
-jdbc.mysql.platform.erp_supplier.slave   = 192.168.102.219:3306
-jdbc.mysql.platform.erp_supplier.username  = yh_test
+#yhspecial
+jdbc.mysql.yhspecial.username=yh_test
+jdbc.mysql.yhspecial.password=9nm0icOwt6bMHjMusIfMLw==
 
 #yohood
-jdbc.mysql.yohood.master=192.168.102.219:3306
-jdbc.mysql.yohood.slave=192.168.102.219:3306
 jdbc.mysql.yohood.username=yh_test
 jdbc.mysql.yohood.password=9nm0icOwt6bMHjMusIfMLw==
 
-#erp_passport
-jdbc.mysql.erppassport.master=192.168.102.219:3306
-jdbc.mysql.erppassport.slave=192.168.102.219:3306
+#yohocrm
+jdbc.mysql.yohocrm.username=yh_test
+jdbc.mysql.yohocrm.password=9nm0icOwt6bMHjMusIfMLw==
+
+#erppassport
 jdbc.mysql.erppassport.username=yh_test
 jdbc.mysql.erppassport.password=9nm0icOwt6bMHjMusIfMLw==
+# ================
 
-#search-db
-jdbc.mysql.yhbsearch.datasources = yhb_search_2016
-jdbc.mysql.yhbsearch.master    = 192.168.102.216:3306
-jdbc.mysql.yhbsearch.slave     = 192.168.102.216:3306
-jdbc.mysql.yhbsearch.username  = yh_test
-jdbc.mysql.yhbsearch.password  = 9nm0icOwt6bMHjMusIfMLw==
+# yh_orders db split
+jdbc.mysql.yhorderssplit.master=192.168.102.202:8066
+jdbc.mysql.yhorderssplit.slave=192.168.102.202:8066
+jdbc.mysql.yhorderssplit.slave2=192.168.102.202:8066
+jdbc.mysql.yhorderssplit.slave3=192.168.102.202:8066
+jdbc.mysql.yhorderssplit.username=yh_test
+jdbc.mysql.yhorderssplit.password=9nm0icOwt6bMHjMusIfMLw==
 
-# search-es
-search.es.cluster.name  = yohosearch_test
-search.es.servers       = 192.168.102.216:9300 192.168.102.209:9300
-search.index.number_of_replicas     = 1
-search.index.refresh_interval       = 10
-search.index.translog.flush_threshold_ops  = 10000
 
-# search-mq
-search.mq.server       = 192.168.102.216
-search.mq.port         = 5672
-search.mq.username     = admin1
-search.mq.password     = 123qwe
-search.mq.exchange     = yoho_search
-search.mq.virtualHost  = /yohosearch
+#yhb_promotion_split db split 
+jdbc.mysql.yhbpromotionsplit.master=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplit.slave=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplit.username=yh_test
+jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066
+
+
+#yhb_promotion platform split db
+jdbc.mysql.yhbpromotionsplitplatform.master=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplitplatform.slave=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplitplatform.username=yh_test
+jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw==
+
+
+jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306
+jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306
+
+jdbc.mysql.yhshops.master=write.shops.yohoops.org:3306
+jdbc.mysql.yhshops.slave=read.shops.yohoops.org:3306
+
+# yh_orders
+jdbc.mysql.yhorders.master=write.orders.yohoops.org:3306
+jdbc.mysql.yhorders.slave=read.orders.yohoops.org:3306
+
+# yhb_operations
+jdbc.mysql.yhboperations.master=write.cms.yohoops.org:3306
+jdbc.mysql.yhboperations.slave=read.cms.yohoops.org:3306
+
+# yh_comment
+jdbc.mysql.yhcomment.master=write.cms.yohoops.org:3306
+jdbc.mysql.yhcomment.slave=read.cms.yohoops.org:3306
+
+#yhb_promotion
+jdbc.mysql.yhbpromotion.master=write.orders.yohoops.org:3306
+jdbc.mysql.yhbpromotion.slave=read.orders.yohoops.org:3306
+
+#yoho_sms配置读写分离
+jdbc.mysql.yohosms.master=write.passport.yohoops.org:3306
+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: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:3306
+
+#yh_operations配置读写分离
+jdbc.mysql.yhoperations.master=write.cms.yohoops.org:3306
+jdbc.mysql.yhoperations.slave=read.cms.yohoops.org:3306
+
+#yh_passport读写分离
+jdbc.mysql.yhpassport.master=write.passport.yohoops.org:3306
+jdbc.mysql.yhpassport.slave=read.passport.yohoops.org:3306
+
+#yh_setting读写分离
+jdbc.mysql.yhsetting.master=write.cms.yohoops.org:3306
+jdbc.mysql.yhsetting.slave=read.cms.yohoops.org:3306
+
+#yh_pay
+jdbc.mysql.pay.master=write.orders.yohoops.org:3306
+jdbc.mysql.pay.slave=read.orders.yohoops.org:3306
+
+#event
+jdbc.mysql.yhevents.master=write.cms.yohoops.org:3306
+jdbc.mysql.yhevents.slave=read.cms.yohoops.org:3306
+
+#event
+jdbc.mysql.yhcoupons.master=write.orders.yohoops.org:3306
+jdbc.mysql.yhcoupons.slave=read.orders.yohoops.org:3306
+
+#yh_consult
+jdbc.mysql.yhconsult.master=write.cms.yohoops.org:3306
+jdbc.mysql.yhconsult.slave=read.cms.yohoops.org:3306
+
+#unions
+jdbc.mysql.unions.master=write.cms.yohoops.org:3306
+jdbc.mysql.unions.slave=read.cms.yohoops.org:3306
+
+#push center
+jdbc.mysql.yohopushcenter.master=write.passport.yohoops.org:3306
+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:3306
+
+#yoho_activity
+jdbc.mysql.yohoactivity.master=write.passport.yohoops.org:3306
+jdbc.mysql.yohoactivity.slave=read.passport.yohoops.org:3306
+
+#yh_guang
+jdbc.mysql.yhguang.master=write.cms.yohoops.org:3306
+jdbc.mysql.yhguang.slave=read.cms.yohoops.org:3306
+
+#yh_special
+jdbc.mysql.yhspecial.master=write.cms.yohoops.org:3306
+jdbc.mysql.yhspecial.slave=read.cms.yohoops.org:3306
+
+#yh_special
+jdbc.mysql.yhspecial.master=write.cms.yohoops.org:3306
+jdbc.mysql.yhspecial.slave=read.cms.yohoops.org:3306
+
+#yohood
+jdbc.mysql.yohood.master=write.yohood.yohoops.org:3306
+jdbc.mysql.yohood.slave=read.yohood.yohoops.org:3306
+
+#yohocrm
+jdbc.mysql.yohocrm.master=write.passport.yohoops.org:3306
+jdbc.mysql.yohocrm.slave=read.passport.yohoops.org:3306
+
+#erppassport
+jdbc.mysql.erppassport.master=write.erp.yohoops.org:3306
+jdbc.mysql.erppassport.slave=write.erp.yohoops.org:3306
 
-## mq or call erp
-erp.message.sync.type=MQ
 
 #yhcommunity
 jdbc.mysql.yhcommunity.master=192.168.102.219:3306
@@ -229,150 +266,164 @@ jdbc.mysql.yhsocial.slave=192.168.102.219:3306
 jdbc.mysql.yhsocial.username=yh_test
 jdbc.mysql.yhsocial.password=9nm0icOwt6bMHjMusIfMLw==
 
+#erp_supplier
+jdbc.mysql.platform.erp_supplier.master  = write.erp.yohoops.org:3306
+jdbc.mysql.platform.erp_supplier.password  = 9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.platform.erp_supplier.slave   = read1.erp.yohoops.org:3306
+jdbc.mysql.platform.erp_supplier.username  = yh_test
+#yohobuy_task
+jdbc.mysql.kisjob.datasources=yh_distributed_task
+jdbc.mysql.kisjob.master=write.cms.yohoops.org:3306
+jdbc.mysql.kisjob.slave=read.cms.yohoops.org:3306
+
 #yh_cms
 jdbc.mysql.yh_cms.master=192.168.102.219:3306
 jdbc.mysql.yh_cms.slave=192.168.102.219:3306
 jdbc.mysql.yh_cms.username=yh_test
 jdbc.mysql.yh_cms.password=9nm0icOwt6bMHjMusIfMLw==
 
+#yhlottery
+jdbc.mysql.yhlottery.master=192.168.102.219:3306
+jdbc.mysql.yhlottery.slave=192.168.102.219:3306
+jdbc.mysql.yhlottery.username=yh_test
+jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw==
+
+readOnlyInSlave=false
+
+# monogdb
+mongo.inbox.dbname  = inbox
+mongo.inbox.host    = mongo.yohoops.org
+mongo.inbox.port    = 27017
+
+
+#search-db
+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
+jdbc.mysql.yhbsearch.password=9nm0icOwt6bMHjMusIfMLw==
+
 #bigdataunion
 jdbc.mysql.bigdataunion.slave=read.bigdata.yohoops.org:3306
 jdbc.mysql.bigdataunion.username=yh_vpc_bak
 jdbc.mysql.bigdataunion.password=+BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=
 
-readOnlyInSlave=true
+# search-es
+search.es.cluster.name  = yohosearch_testQQ
+search.es.servers       = es.node1.yohoops.org:9300
+search.index.number_of_replicas     = 0
+search.index.refresh_interval       = 1
+search.index.translog.flush_threshold_ops  = 5000
 
-#####  ****************************************  common properties ******************************************************
-users.browse.expire＝7776000
+# search-mq
+search.mq.server=rabbitmq01.yohoops.org
+search.mq.port=5672
+search.mq.username=admin1
+search.mq.password=123qwe
+search.mq.exchange=yoho_search
+search.mq.virtualHost=yohosearch
 
-is_debug_enable  = true
+#search-redis
+redis.search.proxy.address =192.168.102.45
+redis.search.proxy.port =6379
+redis.search.proxy.auth =
+
+#for crm read db
+jdbc.mysql.yohopassport.onlyslave=read.passport.yohoops.org:3306
+jdbc.mysql.yhpassport.onlyslave=read.passport.yohoops.org:3306
+jdbc.mysql.yhshops.onlyslave=read.passport.yohoops.org:3306
+jdbc.mysql.yhoperations.onlyslave=read.passport.yohoops.org:3306
+jdbc.mysql.yh.username=yh_test
+jdbc.mysql.yh.password=9nm0icOwt6bMHjMusIfMLw==
 
 
-aliyun.accessid  = mkb5KaMTUeAnfHI5
-aliyun.bucket    = yohotest
-aliyun.domain    = http://7xnrdp.com1.z0.glb.clouddn.com
-aliyun.endpoint  = oss-cn-shanghai.aliyuncs.com
 
-cache.servers.gateway.level1.address  = 192.168.102.211:11211
-cache.servers.gateway.level1.expire   = 1800
-cache.servers.gateway.level2.address  = 192.168.102.211:11211
-cache.servers.gateway.level2.expire   = 1800
 
-cache.servers.union.address = 192.168.102.211:11211
 
-ip.port.search.server  = 192.168.102.216:8080
+#####  ****************************************  common properties ******************************************************
+ 
+ 
 
-qiniu.domain=http://yhfair.qiniudn.com
-qiniu.accesskey=atSf7xxIl8alEnsXbhC1bOD1GWVW3qYffz8SlB4m
-qiniu.secretkey=pyoJzPygXIkFWrc1BAsH6tAJ0yweTchpJwGKEwhm
-qiniu.bucket=yhfair
+cache.servers.gateway.level1.address  = mem01.l1.yohoops.org:21211
+cache.servers.gateway.level1.expire   = 1800
+cache.servers.gateway.level2.address  =  mem01.l2.yohoops.org:21211
+cache.servers.gateway.level2.expire   = 43200
 
-redis.notsync.twemproxy.addresses=192.168.102.211:6379
-redis.notsync.twemproxy.auth=
+cache.servers.union.address  = memcache.union.yohoops.org:11211
 
-redis.new.proxy.address  = 192.168.102.211
-redis.new.proxy.auth     = 
-redis.new.proxy.port     = 6379
+ip.port.search.server  = search.yohoops.org:8080
 
-redis.proxy.address  = 192.168.102.211
+qiniu.accesskey  = atSf7xxIl8alEnsXbhC1bOD1GWVW3qYffz8SlB4m
+qiniu.bucket     = yhfair
+qiniu.domain     = http://yhfair.qiniudn.com
+qiniu.secretkey  = pyoJzPygXIkFWrc1BAsH6tAJ0yweTchpJwGKEwhm
+yoho.service.domain.url=http://service-test1.yohops.com:9999
+# old redis
+redis.proxy.address  = write.redis.yohoops.org
 redis.proxy.auth     = 
-redis.proxy.port     = 	6379
+redis.proxy.port     = 6379
 
-redis.readonly.proxy.address  = 192.168.102.211
+redis.readonly.proxy.address  = read.redis.yohoops.org
 redis.readonly.proxy.auth     = 
 redis.readonly.proxy.port     = 6379
 
-redis.union.address  = 192.168.102.211
-redis.union.auth     =  
-redis.union.port     = 	6379
-
-redis.union.proxy.address=192.168.102.211
-redis.union.proxy.port=6379
-redis.union.proxy.auth=
-
-redis.union.readonly.proxy.address=192.168.102.211
-redis.union.readonly.proxy.port=6379
-redis.union.readonly.proxy.auth=
-
-redis.brower.proxy.address=192.168.102.202
-redis.brower.proxy.port=6379
-redis.brower.proxy.auth=
+redis.notsync.twemproxy.addresses = redis-no-sync-1.yohoops.org:6379
+redis.notsync.twemproxy.auth=
 
-redis.brower.readonly.proxy.address=192.168.102.202
-redis.brower.readonly.proxy.port=6379
-redis.brower.readonly.proxy.auth=
+# union redis
+redis.union.address  = classic.union-redis.yohoops.org
+redis.union.auth     = 
+redis.union.port     = 6379
 
 # outter big data redis
-#bigDataRedis.proxy.address = bigdata-test-972563879.cn-north-1.elb.amazonaws.com.cn
-bigDataRedis.proxy.address = test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
-bigDataRedis.proxy.port = 6379
-bigDataRedis.proxy.auth =
+bigDataRedis.proxy.address=bigdata.redis.yohoops.org
+bigDataRedis.proxy.port=6379
+bigDataRedis.proxy.auth=
 
 # outter big data redis push
-bigDataRedis-push.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
+bigDataRedis-push.proxy.address=bigdata.redis.push.yohoops.org
 bigDataRedis-push.proxy.port=6379
 bigDataRedis-push.proxy.auth=
 
 #bigDataRedis-search
-bigDataRedis-search.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
+bigDataRedis-search.proxy.address=bigdata.redis.yohoops.org
 bigDataRedis-search.proxy.port= 6379
 bigDataRedis-search.proxy.auth=
 
-＃single cloud not sync redis
-single.cloud.redis.proxy.address=192.168.102.211
-single.cloud.redis.proxy.port=6379
-single.cloud.redis.proxy.auth=
-
-＃single cloud not sync redis
-single.cloud.redis.readonly.proxy.address=192.168.102.211
-single.cloud.redis.readonly.proxy.port=6379
-single.cloud.redis.readonly.proxy.auth=
-
-gateway.domain.url=http://testapi.yoho.cn:28078
-yoho.message.controller.url=http://192.168.102.202:8087/yoho-message-controller
-
-zkAddress=192.168.102.211:2181 
-
-order.task.host=192.168.102.207
-
-APP_KEY     = 1392109259
-APP_SECRET  = 1e87e46f115cc813e27ef52eb9915f1e
-UUC_DOMAIN  = http://passport.test.yoho.cn
-
-Gateway_URL=http://192.168.102.202:8080/gateway
-
-alarm.influxdb.url=http://192.168.102.162:8086
-alarm.influxdb.user=root
-alarm.influxdb.password=root
+redis.union.proxy.address=write.redis.yohoops.org
+redis.union.proxy.port=6379
+redis.union.proxy.auth=
 
+redis.union.readonly.proxy.address=read.redis.yohoops.org
+redis.union.readonly.proxy.port=6379
+redis.union.readonly.proxy.auth=
 
-####  rabbit config #### 
-rabbit_host = 192.168.102.211:5672
+##  rabbitmq configure
+rabbit_host = rabbitmq01.yohoops.org:5672
 rabbit_user = yoho
 rabbit_password = yoho
-rabbit_vhost = yoho
 
 ########## common rabbitmq  ##########
 #aws
-rabbit_common_aws = 192.168.102.211:5672
+rabbit_common_aws = rabbitmq-common-aws.yohoops.org:5672
 rabbit_common_aws_user = yoho
 rabbit_common_aws_password = yoho
 
 #qq
-rabbit_common_qq = 192.168.102.211:5672
+rabbit_common_qq = rabbitmq-common-qq.yohoops.org:5672
 rabbit_common_qq_user = yoho
 rabbit_common_qq_password = yoho
 
-# test
 # local, maybe producer using this.
-rabbit_common = 192.168.102.211:5672
+rabbit_common = rabbitmq-common.yohoops.org:5672
 rabbit_common_user = yoho
 rabbit_common_password = yoho
 ##########common rabbitmq  ##########
 
+
 #cache clear rabbitmq
-rabbit.cacheclean.producer.host = 192.168.102.211:5672
-rabbit.cacheclean.consumer.host = 192.168.102.211:5672
+rabbit.cacheclean.producer.host = rabbitmq-common-aws.yohoops.org:5672
+rabbit.cacheclean.consumer.host = rabbitmq-common-qq.yohoops.org:5672
 
 #message-center rabbitmq
 rabbit_message_center = 192.168.102.211:5672
@@ -380,9 +431,76 @@ rabbit_message_center_user = yoho
 rabbit_message_center_password = yoho
 rabbit_message_center_vhost = yoho
 
-trace.exporter.enable = true
 
-###push log name,keep ${} in logback.xml
-android_pushlog_name  = android_push.${local_ip}
-ios_pushlog_name  = ios_push.${local_ip}
+crf.service.url=https://osprec-ci.crfchina.com
+
+gateway.domain.url = http://api-test1.yohops.com:9999
+Gateway_URL=http://gateway.yohoops.org:8080/gateway
+yoho.message.controller.url=http://192.168.102.202:8087/yoho-message-controller
+
+zkAddress=zk01.yohoops.org:2181
+
+# change to order.run-host.yohoops.org later
+order.task.host=192.168.103.74
+
+APP_KEY     = 1392109259
+APP_SECRET  = 1e87e46f115cc813e27ef52eb9915f1e
+UUC_DOMAIN  =  http://sso-test.yohops.com:9999
+
+ #从qcloud拷贝而来
+redis.brower.proxy.address = redis-brower.yohoops.org
+redis.brower.proxy.port = 6379
+redis.brower.proxy.auth =
+
+redis.brower.readonly.proxy.address = redis-brower.yohoops.org
+redis.brower.readonly.proxy.port = 6379
+redis.brower.readonly.proxy.auth =
+
+＃single cloud not sync redis
+single.cloud.redis.proxy.address=write.redis.yohoops.org
+single.cloud.redis.proxy.port=6379
+single.cloud.redis.proxy.auth=
+
+＃single cloud not sync redis
+single.cloud.redis.readonly.proxy.address=read.redis.yohoops.org
+single.cloud.redis.readonly.proxy.port=6379
+single.cloud.redis.readonly.proxy.auth=
+
+
+
+## mq or call erp
+erp.message.sync.type=MQ
+
+#发短信配置项
+sendSMS.password=7jVEde87bLffoTnt6tGxmw==
+
+
+## service call timeout
+service.call.connectReqTimeout=30000
+service.call.socketTimeout=30000
+service.call.connectTimeout=30000
+hystrix.timeout=30000
+
+trace.exporter.enable = false
+
+
+exhibition.ticket.couponid=13272
+package.ticket.couponid=13270
+package.ticket.more.couponid=13268
+
 default.http.type = http 
+
+browse.service.url  = http://192.168.102.31:8092/brower/
+
+
+#mars
+jdbc.mysql.yhmars.master=write.mars.yohoops.org:3306
+jdbc.mysql.yhmars.slave=read.mars.yohoops.org:3306
+jdbc.mysql.yhmars.username=yh_test
+jdbc.mysql.yhmars.password=9nm0icOwt6bMHjMusIfMLw==
+
+#yhnow
+jdbc.mysql.yhnow.master=192.168.102.17:3306
+jdbc.mysql.yhnow.slave=192.168.102.17:3306
+jdbc.mysql.yhnow.username=root
+jdbc.mysql.yhnow.password=Z5BMngayHLUxyWLSv6+koA==
\ No newline at end of file

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
+
+gateway.api.url  =  http://api-test3.yohops.com:9999
+
+uic_userInfoRest_enable  = true
 
 yoho.uic.env.namespace   = uic
 yoho.uic.env.serverport  = 6

-applepay.notifyurl  = http://testservice.yoho.cn:28077/payment/applepay_notify
+applepay.notifyurl  = http://service.yoho.cn/payment/applepay_notify
 
 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
-
-browse.blockingqueue.maxSize  = 20000
+autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
 
 browse.service.url  = http://192.168.102.31:8092/brower/
 
-degrade_articleNotice_level    = 0
-degrade_complaintsCount_level  = 0
-degrade_complaintsList_level   = 0
-degrade_likeBrand_level        = 0
-degrade_myIndex_level          = 0
-degrade_redpacketInfo_level    = 0
-degrade_redpacketList_level    = 0
-degrade_redpacket_level        = 0
-degrade_redutionCount_level    = 0
-degrade_shareBrandInfo_level   = 0
-degrade_shareGuang_level       = 0
-degrade_userHabits_level       = 0
-
 erp.order.status.url  = http://portal.admin.yohobuy.com/api/orders/status
 
-erp.gateway.url = http://192.168.102.47:9098/erp-gateway-web/
-
-erp.shops.url  = http://192.168.102.47:9098/erp-gateway-web/stock/get_stock
-
-erp.shops.batch.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_stock
-
-erp.shops.batch.center.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_center_stock
-
 file.uploadTempDir  = /Data
 
-is_checksession_enable  = true
-
-line.shops.url  = http://192.168.102.47:8098/shops/
+is_checksession_enable  = false
+is_debug_enable         = true
 
 message.inboxNum.expire  = 120
 
-password.aes.key  = yoho9646yoho9646
-
-portalGateway.service.url  = http://192.168.102.210:8080/portal-gateway
+qq.notifyurl  = http://service.yoho.cn/payment/qqpay_notify
 
-qq.notifyurl  = http://testservice.yoho.cn:28077/payment/qqpay_notify
 
-unionpay.notifyurl  = http://testservice.yoho.cn:28077/payment/unionpay_newnotify
+unionpay.notifyurl  = https://service.yoho.cn/payment/unionpay_newnotify
 
 users.browse.appVersion  = 4.1.0.***
 users.browse.expire      = 7776000
 users.browse.numPerUser  = 200
 users.browse.sync        = true
 
-wechat.app.newnotifyurl  = http://testservice.yoho.cn:28077/payment/weixin_notify
-wechat.app.notifyurl     = http://testservice.yoho.cn:28077/payment/wechat_notify
+wechat.app.newnotifyurl  = http://service.yoho.cn/payment/weixin_notify
+wechat.app.notifyurl     = http://service.yoho.cn/payment/wechat_notify
 
-wechat.wap.notifyurl  = http://testservice.yoho.cn:28077/payment/wechatwap_notify
+wechat.wap.notifyurl  = http://service.yoho.cn/payment/wechatwap_notify
 
 yoho.gateway.env.namespace   = gateway
 yoho.gateway.env.serverport  = 0
 yoho.gateway.env.webapphome  = /home/test/yoho-gateway/deploy
-platform.service.url=http://192.1638.102.202:8088/platform
\ No newline at end of file
+
+#密码AES加密密钥
+password.aes.key=yoho9646yoho9646
+
+degrade_complaintsCount_level=0
+degrade_complaintsList_level=0
+degrade_likeBrand_level=0
+degrade_myIndex_level=0
+degrade_redutionCount_level=0
+degrade_redpacket_level=0
+degrade_redpacketInfo_level=0
+degrade_redpacketList_level=0
+degrade_userHabits_level=0
+degrade_shareGuang_level=0
+degrade_articleNotice_level=0
+degrade_shareBrandInfo_level=0
+
+line.shops.url = http://192.168.102.47:8098/shops/
+erp.shops.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_stock
+portalGateway.service.url = http://192.168.102.47:8080/portal-gateway
+erp.shops.batch.url = http://192.168.102.47:9098/erp-gateway-web/stock/get_batch_stock
+
+platform.service.url=http://192.1638.102.202:8088/platform
+
+#photoSearch
+photoSearch.access.key.id=7343a192140f25a59c53dab5652f5f47
+photoSearch.secret.key=45c1ce98ee6b4701d55802989ba240f4
+photoSearch.service.id=rdbehn3x
+login.skip.modify.weakPwd=N

+yoho.logs.basedir=/Data/logs
+
+is_debug_enable=false
+jdbc.mysql.readonlyinslave=true
+autoconfig.properties  = sharedAutoconfig
+
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
+
+yohomars.env.namespace   = yohomars
+yohomars.env.serverport  = 72
+yohomars.env.webapphome  = /home/test/yoho-mars/deploy
+
+
+uic.api.host=http://192.168.103.73:8096/uic
+exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7
+
+redis.proxy.address=192.168.102.17
+redis.proxy.port=6380
+redis.readonly.proxy.port=6380
+redis.readonly.proxy.address=192.168.102.17
+redis.notsync.twemproxy.addresses=192.168.102.17:6380
+mars.task.switch=true
+exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7
+

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
 
 jdbc.mysql.readonlyinslave  = true
 

+yoho.logs.basedir=/Data/logs
+autoconfig.properties  = sharedAutoconfig
+is_debug_enable        = true
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
+
+uic.service.url=http://192.168.102.31:8096/uic/
+mag.service.url=http://ezine-test.yohops.com:9999/index.php?r=Apiemag
+
+yohonow.env.namespace   = yohonow
+yohonow.env.serverport  = 1
+yohonow.env.webapphome  = /home/test/yoho-now/deploy
+
+
+boy.cn.site.url=http://newboys.test.yoho.cn
+girl.cn.site.url=http://newgirls.test.yoho.cn
+
+#hongkong site main
+boy.hk.site.url=http://hkboys.test.yoho.cn
+girl.hk.site.url=http://hkgirls.test.yoho.cn
+social.domain.url=http://192.168.102.31:8095/social
+
+redis.notsync.twemproxy.addresses  = 192.168.102.17:6379
+redis.proxy.address  = 192.168.102.17
+redis.readonly.proxy.address  = 192.168.102.17
\ No newline at end of file

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
 
 db.batch.size  = 100000
 
@@ -18,21 +18,19 @@ ios.default.size  = 1000
 ios.keystore  = /yoho_push.p12
 ios.password  = 123456
 
-mongo.inbox.dbname  = inbox
-mongo.inbox.host    = 192.168.50.69
-mongo.inbox.port    = 27017
-
 push.ios.custom.key  = custom_content
 
 push.task.type  = ios
 
-redis.pool.maxIdle        = 100
-redis.pool.maxTotal       = 200
-redis.pool.maxWaitMillis  = 10000
-redis.pool.minIdle        = 30
+rabbit_vhost  = yoho
 
 send.task.batch.size  = 100
 
 yoho.push.env.namespace   = push
 yoho.push.env.serverport  = 9
 yoho.push.env.webapphome  = /home/test/yoho-push/deploy
+
+redis.pool.maxTotal=200
+redis.pool.maxIdle=100
+redis.pool.minIdle=30
+redis.pool.maxWaitMillis=10000

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
 
-jdbc.mysql.yhshops.datasources  = yh_shops
+yoho.search.adaptor.env.serverport  = 5
+yoho.search.adaptor.env.webapphome  = /home/test/yoho-search-adaptor/deploy
+yoho.search.adaptor.env.namespace   = yoho-search-adaptor
 
-tbl.product.url  = http://test.soa.global.yohobuy.com/product/api/v1/detail/
+tbl.product.url = http://service.api.global.yohobuy.com/product/api/v1/detail/
 
 web.context  = yohosearchadaptor
 
-yoho.search.adaptor.env.namespace   = search-adaptor
-yoho.search.adaptor.env.serverport  = 5
-yoho.search.adaptor.env.webapphome  = /home/test/yoho-search-adaptor/deploy
+ip.port.search.server = search.yohoops.org     
+jdbc.mysql.yhshops.datasources = yh_shops
+
+jdbc.mysql.yhshops.master = write.shops.yohoops.org:3306
+jdbc.mysql.yhshops.slave = read.shops.yohoops.org:3306
+jdbc.mysql.yhshops.username = yh_vpc_bak
+jdbc.mysql.yhshops.password = +BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=
\ No newline at end of file

 autoconfig.properties  = sharedAutoconfig
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/dev/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
 
 yoho.search.consumer.env.namespace   = search-consumer
 yoho.search.consumer.env.serverport  = 8
 yoho.search.consumer.env.webapphome  = /home/test/yoho-search-consumer/deploy
 
-tpl.adaptor.valid=false
-tpl.adaptor.domain=http://192.168.102.216:8085/search-adaptor
-tbl.product.url=http://test.soa.global.yohobuy.com/product/api/v1/detail/
+#search-tbl
+tbl.product.url = http://test.soa.global.yohobuy.com/product/api/v1/detail/
+
+#search-adaptor
+tpl.adaptor.valid = false
+tpl.adaptor.domain  = http://search.adaptor.yohoops.org:8085/search-adaptor
 
 #build.productindex.use.code
 build.productindex.use.code=true
 
 #build.storageskuindex.use.code
-build.storageskuindex.use.code=true
\ No newline at end of file
+build.storageskuindex.use.code=true
+
+#consumer index config
+search.index.batch.limit=2500
+search.index.batch.limit.tbl=2000
+search.index.batch.max.thread.size=10
+
+#suggest count
+suggestion.count.batch.limit=300
+suggestion.count.batch.max.thread.size=1
+suggestion.discover.batch.limit=500
+suggestion.discover.batch.max.thread.size=3
+suggestion.count.agg.size=10000
+suggestion.count.agg.mindoc=5

 autoconfig.properties  = sharedAutoconfig
-
 autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
 
-canal.destination.operation  = operations
-canal.destination.shop       = shops
+yoho.search.producer.env.namespace   = search-producer
+yoho.search.producer.env.serverport  = 9
+yoho.search.producer.env.webapphome  = /home/test/yoho-search-producer/deploy
 
-canal.hostType  = zkCluster
+## search configuration  begin
 
-canal.server.port  = 192.168.102.56:2181
+##canal
+canal.hostType=zkCluster
+canal.server.port=zk01.yohoops.org:2181
 
-canal.subscribeChannel.operation  = yhb_operations.activity_product
-canal.subscribeChannel.shop       = yh_shops.brand,yh_shops.goods,yh_shops.goods_images,yh_shops.product,yh_shops.product_color,yh_shops.product_price,yh_shops.product_sort,yh_shops.product_standard_relation,yh_shops.product_style_relation,yh_shops.size,yh_shops.storage,yh_shops.standard,yh_shops.style,yh_shops.product_activities_link,yh_shops.product_search,yh_shops.parameter_make,yh_shops.search_action,yh_shops.product_keywords
+##canal-shop
+canal.destination.shop=shops
+canal.subscribeChannel.shop=yh_shops.product_attribute_property_values,yh_shops.brand,yh_shops.goods,yh_shops.goods_images,yh_shops.product,yh_shops.product_color,yh_shops.product_price,yh_shops.product_sort,yh_shops.product_standard_relation,yh_shops.product_style_relation,yh_shops.size,yh_shops.storage,yh_shops.standard,yh_shops.style,yh_shops.product_activities_link,yh_shops.product_search,yh_shops.parameter_make,yh_shops.search_action,yh_shops.product_keywords,yh_shops.product_price_plan,yh_shops.product_timing,yh_shops.shops,yh_shops.shops_brands,yh_shops.sales_category
 
-yoho.search.producer.env.namespace   = search-producer
-yoho.search.producer.env.serverport  = 9
-yoho.search.producer.env.webapphome  = /home/test/yoho-search-producer/deploy
+##canal-operation
+canal.destination.operation=operations
+canal.subscribeChannel.operation=yhb_operations.suggest_word_custom,yhb_operations.suggest_conversion_custom,yhb_operations.activity_product,yhb_operations.es_word_def
+
+##cancal-erpproduct
+canal.destination.erpproduct=erpproduct
+canal.subscribeChannel.erpproduct=erp_product.product_pool_detail,erp_product.product_ext,erp_product.product_attribute
+
+##cancal-erpcustomerservice
+canal.destination.erpcustomerservice=erpcustomerservice
+canal.subscribeChannel.erpcustomerservice=erp_customer_service.robot_question
+
+##cancal-helper
+canal.destination.helper=helper
+canal.subscribeChannel.helper=yh_helper.helper
+
+##cancal-yhgeditor
+canal.destination.yhgeditor=yhgeditor
+canal.subscribeChannel.yhgeditor=yhg_editor.tbl_brand,yhg_editor.tbl_site,yhg_editor.tbl_sort
+
+##cancal-yhgproduct
+canal.destination.yhgproduct=yhgproduct
+canal.subscribeChannel.yhgproduct=yhg_product.tbl_product,yhg_product.tbl_product_skc,yhg_product.tbl_product_sku
\ No newline at end of file

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
 
 yoho.search.service.env.namespace   = yohosearch
 yoho.search.service.env.serverport  = 0
 yoho.search.service.env.webapphome  = /home/test/yoho-search-service/deploy
 
 ##tpl adaptor
-tpl.adaptor.valid = false
-
+	
+tpl.adaptor.valid = true
+ 
 ##search.use.cache[ehCache/redisCache]
 search.use.cache = true
 search.cache.type = redisCache
-
+ 
 search.open.downgrade = true
-
-search.multiMatchQuery.type=BEST_FIELDS
\ No newline at end of file
+search.personalized.switch = true
+search.personalized.max.should = 50
+ 
+ 
+search.multiMatchQuery.type=CROSS_FIELDS
\ No newline at end of file

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
 
-guang.shareGuang.appVersion  = 4.1.0.***
+browse.service.url  = http://api.brower.yohoops.org:8092/brower/
 
 java.logs.home  = /Data/logs
 
+m.yohoblk.com  = http://m.yohoblk.com
+
+www.yohoblk.com  = http://www.yohoblk.com
+
 yoho.sns.env.namespace   = sns
 yoho.sns.env.serverport  = 2
 yoho.sns.env.webapphome  = /home/test/yoho-sns/deploy

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
 
-platform.login.url  = http://serve.yohobuy.com/service/account/v1/Profile/login
+gateway.api.url  =  http://api-test1.yohops.com:9999
 
-product.service.url  = http://192.168.102.211:8083/product
+gateway.service.url  = http://service-test1.yohops.com:9999/
 
-resource.service.url  = http://192.168.102.207:8087/resources
+is_debug_enable  = false
 
-social.post.shareUrl  = http://testservice.yoho.cn:28077/social/share/index.html
+platform.login.url  = http://serve.yohobuy.com/service/account/v1/Profile/login
 
-uic.service.url  = http://192.168.102.31:8096/uic/
+social.post.shareUrl  = http://social-test1.yohops.com:8095/social/share/index.html
+uic.service.url  = http://uic.yohoops.org:8096/uic/
+#uic.service.url  = http://192.168.102.31:8096/uic/
 
 yoho.social.env.namespace   = social
 yoho.social.env.serverport  = 5
 yoho.social.env.webapphome  = /home/test/yoho-social/deploy
+
+yohoboy.service.url  = http://newboys.test.yoho.cn/yohoboyins/v5/channel

+activity.url  = http://service.yoho.cn
+
 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
 
 des.password_crypt_key  = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
 
+diff.base.flag  = 1
+
 erp.user.useGiftcard.url  = http://api.erp.yohobuy.com
 
 jdbc.mysql.readonlyinslave  = true
 
-uic.service.url  = http://192.168.102.206:8096/uic
+register.image.onoff  = off
+
+register.new.user.page.probability  = 5
+
+uic.service.url  = http://uic.yohoops.org:8096/uic
 
+union.domain.url  = http://webunion_tl.yohobuy.com/union
 user.session.expire  = 10080
 
-users.base.isUic  = false
+userday.open.day  = 28
+
+users.base.isUic  = true
 
 users.browse.sync  = true
 
 users.yoho.default_is_bind  = Y
+users.yoho.redpacket        = Y
 
 users.yohocoin  = true
 
+users.yohocoin.dilute  = true
+
+verify_student_flag  = true
+
 yoho.users.env.namespace   = users
 yoho.users.env.serverport  = 1
 yoho.users.env.webapphome  = /home/test/yoho-users/deploy
 
+zmxy_appId          = 1000692
+zmxy_contract_flag  = si201607290001591005
+zmxy_rsa_mySK       = MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBANXVSerwbHEI0GFyfjmXuT+u623YpaBDDfVg9y0hYKRnBzo7cBhJagPuDLX3/v4IcCPOM9mx/9VAX2EL10W7HCdmDD69KDo4JObQakjKkgtikgjgpmLtWjJkq3Wr+4JROOhCyd3QtS+tLYeT8waId+eD5gKyW/yw2/wMNs42LoS9AgMBAAECgYBuriG+i4d10nwZlGulX9UxE1ck2liQZWTaN8B5Cae+MN3a1F0nFQjc0+CcZ6sCzldNETRhX/Lt7I3x63EX1Muy3qr0u64NiJe5ReooCjr0BeVRa8OqDvY6SwwmQ+YYR95yuk9vuUGOtd3HJb0zMB9Vd66x3iUY89S3yCuUYH14wQJBAO7OUQCV3nb7vGKtlf25YcV6KWF+BMzuOKfw+tEezqgI04wr4zqzU5AkDGG5Zw1ze3ECurStF9syWJnm1mj6ecUCQQDlOqxJX2DxGmuilWU7ZfsJUXmMIT6yhjLPn0GqXTiejniJI6lJlFeNUEMJgBZYuJSnA4JV/Nfgn3vGNOLdzqaZAkB5G0CRH3AWv0umb4nlhqJC19UskBA3LYimAtvwOcNsDC3cpFU0a8UxEFcHKFNOywYLJesxvaafj0THp/2Md5pRAkAWTScF3GmqC0/9eVtn8/wAZBTXNUTMSZIX8P6KfJdNlb7UWMvXhL8f2HctLXD/ILYVqZm8k+TMzbdVCUApJDnBAkBxQ608TyPMgow+YriRpxH7O2tZ+S3pyM1SOJ9jzYpQ5idYpU7ZGv/CNMUSnxDweAOPIFahtDf2fsTSloqXd/Sg
+zmxy_rsa_zmPK       = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDn7lB5Pxis6rnI2JkC8Z/RQuF+/RInuZSD9IcK7bnovahZXN3yOEdc5YuWKB0FA9DWONBRkctEmabWbxCYdEbeHV+kh2Zd0DktzZZnDjp6vmRDtihkJ7IJtUKLPeksZCAbbnEq/HmonqNF4qU4qfYuyZGwmHaBVNrg4BxP9s0VTwIDAQAB
+zmxy_service_url    = https://zmopenapi.zmxy.com.cn/openapi.do
 
-zmxy_service_url=https://zmopenapi.zmxy.com.cn/sandbox.do
-zmxy_appId=1000227
-zmxy_contract_flag=si201604080002520001
-zmxy_rsa_mySK=MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIjfNWUXqCNtlaBFpv4KrBTVQb4btX9Gi+UPuz7AMvwbSXmtIxV2awkz4Rg0Q3PtTkuAUpuW958u3uNxypcsCJD3o4qphgqSMVpe33bJ1bZaeL/h8WT9KNBiIxGsYQco44JbJkjrHTAI3Wt+RNhHyn+nKI9wCaeYPCY7ZipVpmL3AgMBAAECgYBn/BxWx1hIQjMQ5pnuGzGNSk9+HRMQtQoHZqI9FEwn2JtDw9QJtEOxZCa4+svcQQfguIcKCfHqj/NqHMNrglqmmJhKrut+ilUt8rqJCmvRSh8AdG7ZnqzxQYdTrrEEKgO932WqPOI98X2H+2cPzLfIOgxN7FhCDg+lVi4CBdfJ8QJBANosNf2b4f50AgAkstAKX1Hqqsb+k5L5reoF9e6eQufPXIpSrbME3cETyRMMLKX+YfhHpv66fpfg0X4JiHZIpdsCQQCgmmPNWs2nbvHY3Eo3xuYs/KJRIltgYaAd9+CCjpCTbU21afqyGkK7zibHfLADh+m5GOkOZ5IFn5Alhg1NQNgVAkBTX/PeEDVEPWcKUPv4nw4gSvKqi10wHLSGq3J5lwdweQEfZ0s0D5cDEyGTYuKpKNadwBwkWnbIacUFSnVY5phjAkAt4Ix73+F5X77kROFKl52u4if350mU+a5EgUd35AO2qXWWSgTcFZZUkaoQODULfSqtvkjs3Xcf9hm2LlnkZI6VAkEAl8+0+a6Rjz119mxJXy9JWKTbWirhja+ijyndLVEAmxTYjWTuNKbRdTYe59ekRYhmMWkiKzggP+PKjXHCHV6eRQ==
-zmxy_rsa_zmPK=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB
 
-verify_student_flag=false
\ No newline at end of file
+user.diff.place.login.message=\u5c0a\u656c\u7684\u7528\u6237\uff0c\u7cfb\u7edf\u68c0\u6d4b\u5230\u60a8\u7684\u8d26\u53f7\u5df2\u5728\u5f02\u5730\u767b\u5f55\u3002\u4e3a\u4fdd\u8bc1\u5e10\u53f7\u5b89\u5168\uff0c\u5982\u975e\u672c\u4eba\u64cd\u4f5c\uff0c\u5efa\u8bae\u60a8\u5c3d\u5feb\u4fee\u6539\u767b\u5f55\u5bc6\u7801\u3002\u656c\u8bf7\u63d0\u9ad8\u8b66\u60d5\uff0c\u8c28\u9632\u8bc8\u9a97\uff01

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
 
-cocacola.wechat.share.url  = http://testservice.yoho.cn:28077/activity/cocacola/html/index1.html
+cocacola.wechat.share.url  = http://service.yoho.cn/activity/cocacola/html/index1.html
 
-drawline.luckyUserNotice.interval  = 120
+drawline.luckyUserNotice.interval  = 5
 
-drawline.luckydraw.interval  = 1440
+drawline.luckydraw.interval  = 360
 
-execute.timetask.host                   = 192.168.102.206
-execute.timetask.host?192.168.102.206  = 
+execute.timetask.host  = 192.168.90.9
 
-gateway.url  = http://testapi.yoho.cn:28078/
+gateway.url  = http://api.yoho.cn
+
+is_debug_enable  = false
 
 jdbc.mysql.readonlyinslave  = true
 
@@ -21,9 +22,13 @@ orderShare.recevied.maxNum  = 5
 
 orderShare.shareUrl  = http://m.yohobuy.com/coupon/index
 
-sendSMS.password  = 7jVEde87bLffoTnt6tGxmw==
+tencentmkt.shareUrl  = http://service.yoho.cn/activity/tencentMkt/index.html
+
+userday.coupon  = {\\"20\\":\\"14146\\", \\"10\\":\\"14144\\"}
+
+userday.coupon.oct  = {\\"10\\":\\"14356\\", \\"40\\":\\"14358\\", \\"70\\":\\"14360\\"}
 
-tencentmkt.shareUrl  = http://m.yohobuy.com/coupon/index
+userday.open.day  = 24
 
 yoho.activity.env.namespace   = activity
 yoho.activity.env.serverport  = 0

-applepay.notifyurl  = http://service.yoho.cn/payment/applepay_notify
-
 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/testQQ/global-autoconfig.properties
+#autoconfig.properties.sharedAutoconfig  = file:/home/gray/opps/deploy/autoconfig/master/global-autoconfig.properties
 
 erp.order.status.url  = http://portal.admin.yohobuy.com/api/orders/status
 
 file.uploadTempDir  = /Data
 
 is_checksession_enable  = true
+is_debug_enable         = false
 
-qq.notifyurl  = http://service.yoho.cn/payment/qqpay_notify
-
-unionpay.notifyurl  = https://service.yoho.cn/payment/unionpay_newnotify
+#jdbc.mysql.bigdata.password  = lRnPI2bQsZRNn/qC/29ZGqMwEu/zaKV31I9S8xDJIUA=
+#jdbc.mysql.bigdata.username  = yh_test_bigdata
+#jdbc.mysql.yhsns.master      = 172.31.11.29:3306
 
 users.browse.appVersion  = 4.1.0.***
 users.browse.expire      = 7776000
 users.browse.numPerUser  = 200
 users.browse.sync        = true
 
-wechat.app.notifyurl  = http://service.yoho.cn/payment/wechat_notify
-
-wechat.wap.notifyurl  = http://service.yoho.cn/payment/wechatwap_notify
-
 yoho.bigData.env.namespace   = bigdata
 yoho.bigData.env.serverport  = 1
 yoho.bigData.env.webapphome  = /home/test/yohobuy-bigdata/deploy
 
-jdbc.mysql.bigdata.master=10.66.2.253:3306
-jdbc.mysql.bigdata.username=yh_test_bigdata
-#hahah@5Y$^7G8dsp
-jdbc.mysql.bigdata.password=lRnPI2bQsZRNn/qC/29ZGqMwEu/zaKV31I9S8xDJIUA=
+
+jdbc.mysql.bigdata.master=192.168.102.219:3306
+
+jdbc.mysql.bigdata.username=yh_test
+
+
+jdbc.mysql.bigdata.password=9nm0icOwt6bMHjMusIfMLw==
 bigdata.database.cluster.name = test
 
+#bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
+
+ip.port.search.server  = 192.168.102.216:8080
+
+
 bigDataRedis.proxy.address=123.206.17.17
 bigDataRedis.proxy.port=16379
\ No newline at end of file

+api.yoho.url  = http://api-test3.yohops.com:9999
+
 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
 
 sers.browse.expire  = 7776000
 
 users.browse.appVersion  = 4.1.0.***
+users.browse.expire      = 7776000
 users.browse.numPerUser  = 100
 
 yohobuy.brower.env.namespace   = brower
 yohobuy.brower.env.serverport  = 2
 yohobuy.brower.env.webapphome  = /home/test/yohobuy-brower/deploy
-
-api.yoho.url=http://testapi.yoho.cn:28078
\ No newline at end of file

 aesKey  = yoho96461qaz2wsx
 
-alarm.mobile  = 17714194699,13951882433
+alarm.mobile  = 18994021292
 
 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
 
-bigData.url  = http://bigdata-crm.yohops.com/bigdata/crm/
+bigData.url  = http://bigdata-crm.yohops.com:8070/bigdata/crm/
 
 crm.send.notice  = true
 
-ftp.ip        = 54.222.156.51
-ftp.port      = 21
-ftp.pwd       = ok83sQlrvHfw8OBMz6xlRA==
-ftp.userName  = ftpuser
+platform.host=http://192.168.102.202:8088/platform
+rabbit_common = 192.168.102.211:5672
+platform.coupon.userId=10964
+platform.coupon.userName=crm
+
+
+ftp.ip=54.222.156.51
+ftp.port=21
+ftp.userName=ftpuser
+ftp.pwd=ok83sQlrvHfw8OBMz6xlRA==
 
 jdbc.mysql.readonlyinslave  = true
 
@@ -24,3 +30,48 @@ sms.url   = http://211.147.239.62:9050/cgi-bin/sendsms
 yohobuy.crm.env.namespace   = crm
 yohobuy.crm.env.serverport  = 3
 yohobuy.crm.env.webapphome  = /home/test/yohobuy-crm/deploy
+
+sms.reprot.flag=false
+
+redis.crm.notsync.twemproxy.addresses=huodong.write.yohoops.org:6379
+redis.notsync.twemproxy.auth=
+
+#阿里云短信发送的
+aliyun.sms.accessKeyId=wIBL09Z0xu7uJUkX0yNnFWy8tNv+KZEH8req1GsE1+k=
+aliyun.sms.secret=/tnQdyzBuARAcql9ad+yJVzlQNX9bfhEmJxr7wdLz58=
+
+
+redis.crm.proxy.address=192.168.102.211
+
+
+
+
+########################### wechat module ########################################
+yohobuyServiceAccessTokenGetUrl=http://127.0.0.1:8082/wechat/?method=wechat.token.get
+wechat.host.name=https://api.weixin.qq.com
+wechat.user.info=/cgi-bin/user/info
+wechat.user.get=/cgi-bin/user/get
+
+
+wechat.access.yohobuyService.appid=wx75e5a7c0c88e45c2
+wechat.access.yohobuyService.secret=ce21ae4a3f93852279175a167e54509b
+wechat.access.yohobuySubscribe.appid=wx96121aa89f31c5ea
+wechat.access.yohobuySubscribe.secret=7669da1a8842ed1df4c5e1b53868f3ca
+wechat.access.mars.appid=wx9d0d7dfed5bbaa8b
+wechat.access.mars.secret=9f7b00cd2a1d65301352d2783f6eec61
+wechat.access.yohonowTrend.appid=wx1fe49f08f41b6c26
+wechat.access.yohonowTrend.secret=5670f62abcebcd8d321615b46bd19ef4
+wechat.access.yohonowGirl.appid=wxb52ec6a352f0b090
+wechat.access.yohonowGirl.secret=9fe6bedb0b7f30986a168c7fc44f34c0
+############################ wechat module #######################################
+
+#redis.notsync.twemproxy.addresses=192.168.102.222:22121,192.168.102.211:22121
+#redis.notsync.twemproxy.auth=
+
+#历史vip用户分组ID
+birthday.coupon.groupid=12
+
+#生日券短信模板ID
+birthday.coupon.sms.templateid=2
+
+browse.service.url=http://192.168.102.31:8092/brower/
\ No newline at end of file

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
-
-degrade.address.query.enable  = false
-
-degrade.buylimit.query.enable  = true
-
-degrade.coupons.queryNotUseCoupons.enable  = true
-
-degrade.product.query.enable  = true
-
-degrade.redenvelopes.query.enable  = true
-
-degrade.vip.query.enable  = true
-
-degrade.yohocoin.query.enable  = true
-
-erp.order.autoCancel.switch.key  = N
-erp.order.change.sync.type       = MQ
-erp.order.close.sync.type        = MQ
-erp.order.express.sync.type      = MQ
-erp.order.refund.sync.type       = MQ
-erp.order.create.url             = http://portal.admin.yohobuy.com/api/orderform/create
-erp.order.status.url             = http://portal.admin.yohobuy.com/api/orders/status
+autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
+
+erp.order.change.sync.type   = MQ
+erp.order.close.sync.type    = MQ
+erp.order.create.url         = http://portal.admin.yohobuy.com/api/orderform/create
+erp.order.express.sync.type  = MQ
+erp.order.refund.sync.type   = MQ
+erp.order.status.url         = http://portal.admin.yohobuy.com/api/orders/status
+
+applepay.notifyurl  = http://service-test1.yohops.com:9999/payment/applepay_notify
+qq.notifyurl  = http://service-test1.yohops.com:9999/payment/qqpay_notify
+unionpay.notifyurl  = http://service-test1.yohops.com:9999/payment/unionpay_newnotify
+wechat.app.newnotifyurl  = http://service-test1.yohops.com:9999/payment/weixin_notify
+wechat.app.notifyurl     = http://service-test1.yohops.com:9999/payment/wechat_notify
+alipay.notifyurl = http://service-test1.yohops.com:9999/payment/alipay_notify
+cmbnetpay.payNoticeUrl=http://payment.yohops.com/payment/cmbpay_notify
+cmbnetpay.signNoticeUrl=http://payment.yohops.com/payment/cmbsign_notify
 
 java.logs.home  = /Data/logs
 
-jdbc.mysql.readonlyinslave  = false
+jdbc.mysql.readonlyinslave  = true
 
 order.codpay.lock.duration  = 1440
 
@@ -34,18 +28,25 @@ yohobuy.order.env.namespace   = order
 yohobuy.order.env.serverport  = 4
 yohobuy.order.env.webapphome  = /home/test/yohobuy-order/deploy
 
-sales.tax.payers = 9132010058047114XR
-ws.fp.url = https://202.104.113.26:8999/fpt_dsqz/services/DZFPService?wsdl
-invoice.appid = 1b518222b5bbb9c5abe17442d63150978609e5ad27fd594886e3b7a8bcd50e5a
-seller.name = \u7535\u5b50\u53d1\u7968\u6d4b\u8bd5
-seller.contact.info=\u5357\u4eac\u5e02\u5efa\u90ba\u533a\u5609\u9675\u6c5f\u4e1c\u8857\u0031\u0038\u53f7\u0030\u0035\u5e62\u0031\u0037\u3001\u0031\u0038\u5c42 025-87781000
-invoice.soap.receiveTimeout=10000
-invoice.soap.connectionTimeout=30000
-fp.sec.keyStore.file    = /home/test/yohobuy-order/fapiao_ceshi.truststore
-fp.sec.keyStore.sslPwd  = 123456
-
 
+erp.order.autoCancel.switch.key  = N
 
+seller.contact.info=\u5357\u4eac\u5e02\u5efa\u90ba\u533a\u5609\u9675\u6c5f\u4e1c\u8857\u0031\u0038\u53f7\u0030\u0035\u5e62\u0031\u0037\u3001\u0031\u0038\u5c42 025-87781000
+ws.fp.url=https://58.251.156.167:8999/fpt_dsqz/services/DZFPService?wsdl
+invoice.appid=3a7c41af476dcb80cebb82372ad35dbd7433cbae71ecec84034af13e85057575
+sales.tax.payers=110109500321654
+seller.name=百旺电子测试1
+
+invoice.soap.receiveTimeout = 300000
+invoice.soap.connectionTimeout = 300000
+
+degrade.buylimit.query.enable=true
+degrade.vip.query.enable=true
+degrade.yohocoin.query.enable=true
+degrade.redenvelopes.query.enable=true
+degrade.coupons.queryNotUseCoupons.enable=true
+degrade.product.query.enable=true
+degrade.address.query.enable=false
 
 # 优惠券ID
 # 展览票券ID
@@ -55,13 +56,3 @@ package.ticket.couponid=13570
 
 browse.service.url  = http://192.168.102.31:8092/brower/
 
-# 支付回调地址
-applepay.notifyurl  = http://testservice.yoho.cn:28077/payment/applepay_notify
-qq.notifyurl  = http://testservice.yoho.cn:28077/payment/qqpay_notify
-unionpay.notifyurl  = http://testservice.yoho.cn:28077/payment/unionpay_newnotify
-wechat.app.newnotifyurl  = http://testservice.yoho.cn:28077/payment/weixin_notify
-wechat.app.notifyurl     = http://testservice.yoho.cn:28077/payment/wechat_notify
-alipay.notifyurl = http://testservice.yoho.cn:28077/payment/alipay_notify
-
-# unionmpos env: 00,production enviroment; 01,test enviroment
-unionmpos.env=00

+admin.login.url  = http://192.168.102.211:30012
+
 admin.portal.url  = http://192.168.102.211:30012
 
-api.yoho.url  = http://testapi.yoho.cn:28078
+aliyun.accessid   = mkb5KaMTUeAnfHI5
+aliyun.accesskey  = XLHom1U6wcyl8dec3t0zaJczvsATPf
+aliyun.bucket     = yohotest
+aliyun.domain     = http://7xnrdp.com1.z0.glb.clouddn.com
+aliyun.endpoint   = oss-cn-shanghai.aliyuncs.com
+
+api.yoho.url  = http://api-test1.yohops.com:9999
 
 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
+
+bigData.analytics.transfer.url  = http://analytics.m.yohobuy.com/yas.gif/web/
+
+bigDataRedis.pool.maxIdle        = 100
+bigDataRedis.pool.maxTotal       = 100
+bigDataRedis.pool.maxWaitMillis  = 2000
+bigDataRedis.pool.minIdle        = 50
+bigDataRedis.pool.testOnBorrow   = false
+bigDataRedis.pool.testWhileIdle  = true
+
+bigdata.ad.userid  = 9999
+
+bigdata.qiniu.accesskey  = 11111
+bigdata.qiniu.bucket     = db-backup
+bigdata.qiniu.secretkey  = 333333
+
+crawler.host  = http://172.31.21.144:9100
+
+erp.domain  = http://192.168.102.47:9098/erp-gateway-web
 
 erp.platform.shops.url  = http://api.erp.yohobuy.com
 
+erp.realStorage.url  = http://192.168.13.182:8080/erp-gateway-web/shift_logs/query_stock_num_by_sku
+
 erp.shops.account.url     = http://serve.yohobuy.com/service/finance/v1/clearing/balancelist
 erp.shops.change.pwd.url  = http://serve.yohobuy.com/service/account/v1/Profile/updatePassword
 erp.shops.login.url       = http://serve.yohobuy.com/service/account/v1/Profile/login
 
-execute.limitcode.host  = 172.31.20.7
+erp.virtualinventory.setNumberBySkn.url  = http://serve.yohobuy.com/service/supplier/v1/virtualinventory/setNumberBySkn
 
-execute.shopmessage.host  = 172.31.20.7
+execute.limitcode.host  = 192.168.102.202
 
-execute.update_product_price.host  = 172.31.20.7
+execute.shopmessage.host  = 192.168.102.202
 
-file.image.size  = 512000
+execute.update_product_price.host  = 192.168.102.202
 
-file.maxsize        = 5400000
-file.uploadTempDir  = /home/test
+file.image.gif.size  = 2621440
+file.image.size      = 5120000
 
-jdbc.mysql.platform.erp_account.master  = 192.168.102.219:3306
+file.maxsize             = 50000000
+file.saveDir             = /Data/images
+file.uploadMalongImgDir  = /Data/malong
+file.uploadTempDir       = /Data/images
+
+jdbc.mysql.platform.erp_account.master  = write.erp.yohoops.org:3306
 jdbc.mysql.platform.erp_account.password  = 9nm0icOwt6bMHjMusIfMLw==
-jdbc.mysql.platform.erp_account.slave   = 192.168.102.219:3306
+jdbc.mysql.platform.erp_account.slave   = read1.erp.yohoops.org:3306
 jdbc.mysql.platform.erp_account.username  = yh_test
-jdbc.mysql.platform.erp_product.master  = 192.168.102.219:3306
+jdbc.mysql.platform.erp_product.master  = write.erp.yohoops.org:3306
 jdbc.mysql.platform.erp_product.password  = 9nm0icOwt6bMHjMusIfMLw==
-jdbc.mysql.platform.erp_product.slave   = 192.168.102.219:3306
+jdbc.mysql.platform.erp_product.slave   = read1.erp.yohoops.org:3306
 jdbc.mysql.platform.erp_product.username  = yh_test
-jdbc.mysql.platform.yh_guang.master     = 192.168.102.219:3306
+jdbc.mysql.platform.yh_guang.master     = write.cms.yohoops.org:3306
 jdbc.mysql.platform.yh_guang.password   = 9nm0icOwt6bMHjMusIfMLw==
-jdbc.mysql.platform.yh_guang.slave      = 192.168.102.219:3306
+jdbc.mysql.platform.yh_guang.slave      = read.cms.yohoops.org:3306
 jdbc.mysql.platform.yh_guang.username   = yh_test
-jdbc.mysql.platform.yhb_account.master  = 192.168.102.219:3306
+jdbc.mysql.platform.yhb_account.master  = write.erp.yohoops.org:3306
 jdbc.mysql.platform.yhb_account.password  = 9nm0icOwt6bMHjMusIfMLw==
-jdbc.mysql.platform.yhb_account.slave   = 192.168.102.219:3306
+jdbc.mysql.platform.yhb_account.slave   = read1.erp.yohoops.org:3306
 jdbc.mysql.platform.yhb_account.username  = yh_test
 
-search.server.address  = http://192.168.102.216:8080/yohosearch/
+malongApi.accessKeyId  = 7343a192140f25a59c53dab5652f5f47
+malongApi.imageSetId   = 7tm74zfv
+malongApi.paiUserId    = 1714
+malongApi.secretKey    = 45c1ce98ee6b4701d55802989ba240f4
 
-watchService.waitInterval  = 60
-watchService.watchDir      = /Data/ftpdir
+mkt.activity.domain.url  = http://union.yoho.cn/union/tencentMkt/index.html
 
-yohobuy.platform.env.namespace   = platform
-yohobuy.platform.env.serverport  = 8
-yohobuy.platform.env.webapphome  = /home/test/yohobuy-platform/deploy
+mkt.app.download.url  = http://m.yohobuy.com/app
+
+mkt.pcwap.domain.url  = http://union.yoho.cn/union/go
+
+mkt.resource.code.url  = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
 
-price.changed.notice.phone=13512519156
+platform.login.salt  = yoho9646yoho9646
 
-erp.virtualinventory.setNumberBySkn.url=http://serve.yohobuy.com/service/supplier/v1/virtualinventory/setNumberBySkn
+price.audit.secondCheckRoleName  = secondCheck
+price.audit.secondPid            = 100476
+price.audit.thirdPid             = 100478
 
-erp.realStorage.url=http://192.168.13.24:8099/erp-gateway-web/shift_logs/query_stock_num_by_sku
+price.changed.notice.phone  = 13512519156,17608015989
 
-admin.login.url=http://192.168.102.211:30012
+price.selltype.url  = http://192.168.102.47:9098/erp-gateway-web/plate_price_form/list_product_info
 
-file.image.gif.size=2621440
+qiniu.bigdata.skndada.fileName  = /Users/apple/Documents/tmp/sknData.xml
 
-resources_https_enable=true
+sync.product.isPromotion.advance.minutes = 5
 
-shop.status.change.phone= 17895010543
+resources_https_enable  = true
 
-bigData.analytics.transfer.url=http://analytics.m.yohobuy.com/yas.gif/web/
-file.uploadMalongImgDir=/Data/malong
-##图像搜索对接api参数 码隆科技配置信息
-malongApi.accessKeyId=7343a192140f25a59c53dab5652f5f47
-malongApi.secretKey=45c1ce98ee6b4701d55802989ba240f4
-malongApi.paiUserId=1714
-malongApi.imageSetId=7tm74zfv
-mkt.activity.domain.url=http://union.yoho.cn/union/tencentMkt/index.html
+search.server.address  = http://search.yohoops.org:8080/yohosearch/
 
-crawler.host=http://172.31.21.144:9100
+service.yoho.url  = http://service-test1.yohops.com:9999
 
-# ********************  bigdata upload skn data  ********************  
-bigdata.qiniu.accesskey=11111
-bigdata.qiniu.secretkey=333333
-bigdata.qiniu.bucket=db-backup
-qiniu.bigdata.skndada.fileName=/Users/apple/Documents/tmp/sknData.xml
-bigdata.ad.userid=9999
-# ********************  bigdata upload skn data  ********************  
-# ********************  bigData redis servers start ********************
+shop.status.change.phone  = 17895010543
 
-bigDataRedis.pool.maxTotal=100
-bigDataRedis.pool.maxIdle=100
-bigDataRedis.pool.maxWaitMillis=2000
-bigDataRedis.pool.minIdle=50
-bigDataRedis.pool.testOnBorrow=false
-bigDataRedis.pool.testWhileIdle=true
-# ********************  bigData redis servers end ********************
+upload.tencent.bid           = b_teg_openrecom_opq68unpsix93dy2zjco
+upload.tencent.product.mark  = 9.99
+upload.tencent.url           = http://data.dm.qcloud.com1:8088
 
-# ********************  tencent upload skn data  ********************  
-upload.tencent.url=http://data.dm.qcloud.com1:8088
-upload.tencent.bid=b_teg_openrecom_opq68unpsix93dy2zjco
-upload.tencent.product.mark=9.99
-# ********************  tencent upload skn data  ********************
-price.audit.secondCheckRoleName=secondCheck
+watchService.waitInterval  = 60
+watchService.watchDir      = /Data/sftp_images
 
-mkt.app.download.url=http://m.yohobuy.com/app
+yohobuy.platform.env.namespace   = platform
+yohobuy.platform.env.serverport  = 8
+yohobuy.platform.env.webapphome  = /home/test/yohobuy-platform/deploy
 bigdata.qiniu.refresh.url=http://fusion.qiniuapi.com/v2/tune/refresh
 activity.url=http://activity.yoho.cn/feature/
 price.over.days.roleName=changeOver180DaysPrice,changeOver180DaysPrice2
-
-#product isPromotion field plan sync config
-sync.product.isPromotion.advance.minutes=5
\ No newline at end of file

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
 
-jdbc.mysql.readonlyinslave  = true
+jdbc.mysql.readonlyinslave  = false
 
 rabbitAddress  = 192.168.102.162:32810
 

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
 
-promoation.invite.failCoupon    = {\\"old\\":12085,\\"fail\\":12087}
-promoation.invite.newCouponMap  = {\\"12091\\":25,\\"12097\\":20,\\"12095\\":23,\\"12093\\":22,\\"12089\\":20}
-promoation.invite.shareCoupon   = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12079\\", \\"12081\\", \\"12083\\" ]
+jdbc.mysql.yhbpromotion.master.password  = input_password
+jdbc.mysql.yhbpromotion.master.username  = guang_res
 
 yohobuy.promotion.env.namespace   = promotion
 yohobuy.promotion.env.serverport  = 5
 yohobuy.promotion.env.webapphome  = /home/test/yohobuy-promotion/deploy
 
-jdbc.mysql.yhbpromotion.master.password  = input_password
-jdbc.mysql.yhbpromotion.master.username  = guang_res
+wechat.coupons.operators.email=chao.geng@yoho.cn
+wechat.coupons.operators.mobile=13770338135
 
-wechat.coupons.operators.email=jie.pang@yoho.cn
+promoation.invite.newCouponMap = {"17593":15,"17597":15,"17599":15,"17601":15,"17603":15}
+promoation.invite.shareCoupon = [ "12073", "12075", "12077", "12079", "12081", "12083" ]
+promoation.invite.failCoupon = {"old":17591,"fail":17595}
 
-promotion.sendCounpon.broadcast.rate=0.9
\ No newline at end of file
+promotion.sendCounpon.broadcast.rate=0.9

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
 
-jdbc.mysql.readonlyinslave  = true
+jdbc.mysql.readonlyinslave  = false
 
-yoho.env.serverhome  = /usr/local/${yoho.env.servertype}
+yohobuy.resources.env.namespace   = resources
+yohobuy.resources.env.serverport  = 7
+yohobuy.resources.env.webapphome  = /home/test/yohobuy-resources/deploy
 
-yohobuy.resources.env.namespace    = resources
-yohobuy.resources.env.productmode  = PRODUCT
-yohobuy.resources.env.serverport   = 7
-yohobuy.resources.env.webapphome   = /home/test/yohobuy-resources/deploy
+service.online.type=3
+service.online.type.h5=http://m.yohobuy.com/service/im
\ No newline at end of file

@@ -2,15 +2,22 @@ activeTime  = 86400
 
 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
 
 bigdate.db.password  = 9nm0icOwt6bMHjMusIfMLw==
-bigdate.db.url       = 192.168.102.219:3306
+bigdate.db.url       = read.passport.yohoops.org:3306
 bigdate.db.username  = yh_test
 
 draw.writeFile.delay  = 60
 
-jdbc.mysql.readonlyinslave  = true
+exclude.union.type  = 100000000000349
+
+gateway.url  = http://api.yoho.cn
+
+jdbc.mysql.bigdataunion.password  = rALdkYPZCr4QyzBfVCGdXA==
+jdbc.mysql.bigdataunion.slave     = 118.89.235.30:3306
+jdbc.mysql.bigdataunion.username  = yh_test_bigdata
+jdbc.mysql.readonlyinslave        = true
 
 rabbit.mq.host         = 192.168.102.162
 rabbit.mq.password     = yoho
@@ -18,6 +25,10 @@ rabbit.mq.port         = 32810
 rabbit.mq.username     = yoho
 rabbit.mq.virtualHost  = /yoho
 
+tencentmkt.shareUrl  = http://union.yoho.cn/union/tencentMkt/index.html
+
+union.host  = 172.31.16.99
+
 yoho.unions.env.namespace   = union
 yoho.unions.env.serverport  = 8
 yoho.unions.env.webapphome  = /home/test/yohobuy-union/deploy

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/master/opps/deploy/autoconfig/master/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_1/global-autoconfig.properties
 
 wechat.access.appid   = wx75e5a7c0c88e45c2
 wechat.access.secret  = ce21ae4a3f93852279175a167e54509b
 
+wechat.small.program.access.appid   = wx084ab813d88c594b
+wechat.small.program.access.secret  = 0252d67ef15eb07a28d80098e8c186ac
+
 wechat.user.get   = /cgi-bin/user/get
 wechat.user.info  = /cgi-bin/user/info
 
+wechat.yohoshow.access.appid   = wx1e6997242bcfcdfb
+wechat.yohoshow.access.secret  = d6fa51581e4c11ee312a1990c2ebf0bd
+
 yohobuy.wechat.env.namespace   = wechat
 yohobuy.wechat.env.serverport  = 4
-yohobuy.wechat.env.webapphome  = /home/master/yohobuy-wechat/deploy
+yohobuy.wechat.env.webapphome  = /home/test/yohobuy-wechat/deploy
+
+wechat.subscription.access.appid=wx1e6997242bcfcdfb
+wechat.subscription.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd
\ No newline at end of file

+yoho.logs.basedir=/Data/logs
+
+jdbc.mysql.readonlyinslave=true
+autoconfig.properties  = sharedAutoconfig
+
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
+
+yoho.env.namespace   = yohomars-platform
+yoho.env.serverport  = 62
+yoho.env.webapphome  = /home/test/yohomars-platform/deploy
+
+redis.proxy.address=192.168.102.17
+redis.proxy.port=6380
+redis.readonly.proxy.port=6380
+redis.readonly.proxy.address=192.168.102.17
+redis.notsync.twemproxy.addresses=192.168.102.17:6380
+
+uic.api.host=http://192.168.102.48:8096/uic
+
+crontab.message.systemMsgProduce=15 */1 * * * ?
+crontab.majia.aotuAddMajia=30 */30 * * * ?
+mars.platform.task.switch=true
+crontab.majia.autoUpdateMajiaFavNum=0 */1 * * * ?
+
+#yoho social context
+yoho.social.context=http://192.168.102.52:8095/social
\ No newline at end of file

@@ -4,20 +4,56 @@
 #@Date 2007-08-09
 ################################################################
 
-
 #####测试环境配置
-yohobuy_resources_test_ips=(test@192.168.102.25)
-yoho_users_test_ips=(test@192.168.102.25)
-yohobuy_order_test_ips=(test@192.168.102.25)
-yohobuy_promotion_test_ips=(test@192.168.102.25)
-yoho_gateway_test_ips=(test@192.168.102.25)
-yohobuy_product_test_ips=(test@192.168.102.25)
-yoho_message_test_ips=(test@192.168.102.25)
-yoho_sns_test_ips=(test@192.168.102.25)
-yohobuy_union_test_ips=(test@192.168.102.25)
-yohobuy_platform_test_ips=(test@192.168.102.25)
-yohobuy_activity_test_ips=(test@192.168.102.25)
-yohobuy_brower_test_ips=(test@192.168.102.25)
-
-#####yoho_push_test_ips=(test@192.168.102.25)
-#####yohobuy_task_test_ips=(test@192.168.102.25)
+
+
+# 192.168.102.207
+yohobuy_resources_test_ips=(test@192.168.102.207)
+yoho_users_test_ips=(test@192.168.102.207)
+yohobuy_order_test_ips=(test@192.168.102.207)
+yohobuy_bigdata_test_ips=(test@192.168.102.207)
+
+
+# 192.168.102.211
+yohobuy_promotion_test_ips=(test@192.168.102.211)
+yohobuy_product_test_ips=(test@192.168.102.211)
+yoho_sns_test_ips=(test@192.168.102.211)
+yohobuy_crm_test_ips=(test@192.168.102.211)
+yoho_message_test_ips=(test@192.168.102.211)
+#yoho_unions_test_ips=(test@192.168.102.211)
+yohobuy_union_test_ips=(test@192.168.102.211)
+
+
+# 192.168.102.202
+yoho_gateway_test_ips=(test@192.168.102.202)
+yoho_message_controller_test_ips=(test@192.168.102.202)
+yoho_message_sender_test_ips=(test@192.168.102.202)
+yoho_push_test_ips=(test@192.168.102.202)
+cms_push_test_ips=(test@192.168.102.202)
+yohobuy_task_test_ips=(test@192.168.102.202)
+yoho_cobar_test_ips=(test@192.168.102.202)
+#yohobuy_platform_test_ips=(test@192.168.102.202 test@192.168.102.216)
+yohobuy_platform_test_ips=(test@192.168.102.202)
+yohobuy_platform_testBLK_ips=(test@192.168.102.202)
+
+
+# 192.168.102.31
+yohobuy_activity_test_ips=(test@192.168.102.31)
+yohobuy_brower_test_ips=(test@192.168.102.31)
+uic_test_ips=(test@192.168.102.31)
+yoho_social_test_ips=(test@192.168.102.31)
+
+
+# 192.168.102.47
+yohobuy_shops_test_ips=(test@192.168.102.47)
+yohobuy_portal_gateway_test_ips=(test@192.168.102.47)
+
+
+#yoho_search 102.209&102.216&102.17 
+yoho_search_producer_test_ips=(test@192.168.102.209)
+yoho_search_consumer_test_ips=(test@192.168.102.216)
+yoho_search_service_test_ips=(test@192.168.102.216)
+yoho_search_adaptor_test_ips=(test@192.168.102.216)
+yohomars_search_service_test_ips=(test@192.168.102.17)
+
+