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

@@ -11,11 +11,30 @@ yoho.env.productmode  = TEST
 
 ###  ******************************  database ***********************************
 
+#yohocrm
+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==
+
+#for crm read db
+jdbc.mysql.yohopassport.onlyslave=192.168.102.219:3306
+jdbc.mysql.yhpassport.onlyslave=192.168.102.219:3306
+jdbc.mysql.yhshops.onlyslave=192.168.102.219:3306
+jdbc.mysql.yhoperations.onlyslave=192.168.102.219:3306
+jdbc.mysql.yh.username=yh_test
+jdbc.mysql.yh.password=9nm0icOwt6bMHjMusIfMLw==
+
 ##yh_push
 bigdate.db.url=192.168.102.219:3306
 bigdate.db.password=9nm0icOwt6bMHjMusIfMLw== 
 bigdate.db.username=yh_test
 
+#yhvalue
+jdbc.mysql.yhvalue.master=118.89.235.30:3306
+jdbc.mysql.yhvalue.slave=118.89.235.30:3306
+jdbc.mysql.yhvalue.username=root
+jdbc.mysql.yhvalue.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 ##yh_push
 jdbc.mysql.yhpush.master=192.168.102.219:3306
@@ -253,7 +272,7 @@ search.es.servers       = 192.168.102.12:9300 192.168.102.13:9300
 search.index.number_of_replicas     = 1
 search.index.refresh_interval       = 10s
 search.index.translog.flush_threshold_ops  = 5000
-
+search.index.translog.flush_threshold_size = 512mb
 
 
 #yhb_promotion_split db split 
@@ -266,6 +285,16 @@ jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
 jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066
 jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066
 
+#bigdataunion
+jdbc.mysql.bigdataunion.slave=118.89.235.30:3306
+jdbc.mysql.bigdataunion.username=yh_test_bigdata
+jdbc.mysql.bigdataunion.password=rALdkYPZCr4QyzBfVCGdXA==
+
+#yh_bigdata_erp
+jdbc.mysql.bigdata.erp.master=192.168.102.219:3306
+jdbc.mysql.bigdata.erp.slave=192.168.102.219:3306
+jdbc.mysql.bigdata.erp.username=yh_test
+jdbc.mysql.bigdata.erp.password=9nm0icOwt6bMHjMusIfMLw==
 
 
 # search-mq
@@ -314,34 +343,34 @@ bigDataRedis-search.proxy.address=123.206.17.17
 bigDataRedis-search.proxy.port= 16379
 bigDataRedis-search.proxy.auth=
 
-redis.notsync.twemproxy.addresses=192.168.102.12:6379
+redis.notsync.twemproxy.addresses=192.168.103.58:6379
 redis.notsync.twemproxy.auth=
 
-redis.proxy.address  = 192.168.102.12
+redis.proxy.address  = 192.168.103.58
 redis.proxy.auth     = 
 redis.proxy.port     = 6379
 
-redis.readonly.proxy.address  = 192.168.102.12
+redis.readonly.proxy.address  = 192.168.103.58
 redis.readonly.proxy.auth     = 
 redis.readonly.proxy.port     = 6379
 
-redis.union.address  = 192.168.102.12
+redis.union.address  = 192.168.103.58
 redis.union.auth     = 
 redis.union.port     = 6379
 
-redis.union.proxy.address  = 192.168.102.12
+redis.union.proxy.address  = 192.168.103.58
 redis.union.proxy.auth     =
 redis.union.proxy.port     = 6379
 
-redis.union.readonly.proxy.address  = 192.168.102.12
+redis.union.readonly.proxy.address  = 192.168.103.58
 redis.union.readonly.proxy.auth     =
 redis.union.readonly.proxy.port     = 6379
 
-redis.brower.proxy.address=192.168.102.12
+redis.brower.proxy.address=192.168.103.58
 redis.brower.proxy.port=6379
 redis.brower.proxy.auth=
 
-redis.brower.readonly.proxy.address=192.168.102.12
+redis.brower.readonly.proxy.address=192.168.103.58
 redis.brower.readonly.proxy.port=6379
 redis.brower.readonly.proxy.auth=
 
@@ -355,31 +384,31 @@ APP_SECRET  = 1e87e46f115cc813e27ef52eb9915f1e
 UUC_DOMAIN  = http://passport.test.yoho.cn
 
 ####  rabbit config #### 
-rabbit_host = 192.168.102.211:5672
+rabbit_host = 192.168.103.58:5672
 rabbit_user = yoho
 rabbit_password = yoho
 
 ########## common rabbitmq  ##########
 #aws
-rabbit_common_aws = 192.168.102.211:5672
+rabbit_common_aws = 192.168.103.58:5672
 rabbit_common_aws_user = yoho
 rabbit_common_aws_password = yoho
 
 #qq
-rabbit_common_qq = 192.168.102.211:5672
+rabbit_common_qq = 192.168.103.58:5672
 rabbit_common_qq_user = yoho
 rabbit_common_qq_password = yoho
 
 # local, maybe producer using this.
-rabbit_common = 192.168.102.211:5672
+rabbit_common = 192.168.103.58: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 = 192.168.103.58:5672
+rabbit.cacheclean.consumer.host = 192.168.103.58:5672
 
 ## mq or call erp
 erp.message.sync.type=MQ
@@ -392,4 +421,16 @@ student.discount.rate=0.9
 
 crf.service.url=https://osprec-ci.crfchina.com
 
-default.http.type = http
\ No newline at end of file
+default.http.type = http
+
+#message-center rabbitmq
+rabbit_message_center = 192.168.103.58:5672
+rabbit_message_center_user = yoho
+rabbit_message_center_password = yoho
+rabbit_message_center_vhost = yoho
+
+
+jdbc.mysql.yhwechat.master=192.168.102.219:3306
+jdbc.mysql.yhwechat.slave=192.168.102.219:3306
+jdbc.mysql.yhwechat.username=yh_test
+jdbc.mysql.yhwechat.password=9nm0icOwt6bMHjMusIfMLw==
\ No newline at end of file

 jdbc.mysql.readonlyinslave=true
 autoconfig.properties  = sharedAutoconfig
-
+is_debug_enable=false
 autoconfig.properties.sharedAutoconfig  = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
 
 yohomars.env.namespace   = yohomars
@@ -8,4 +8,14 @@ yohomars.env.serverport  = 72
 yohomars.env.webapphome  = /home/dev/yoho-mars/deploy
 
 
-uic.api.host=http://192.168.102.48:8096/uic
\ No newline at end of file
+uic.api.host=http://192.168.102.48: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
\ No newline at end of file

@@ -15,4 +15,5 @@ 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
\ No newline at end of file
+girl.hk.site.url=http://hkgirls.test.yoho.cn
+social.domain.url=http://192.168.102.52:8095/social
\ No newline at end of file

@@ -18,9 +18,9 @@ build.productindex.use.code=true
 build.storageskuindex.use.code=true
 
 #consumer index config
-search.index.batch.limit=3000
+search.index.batch.limit=2000
 search.index.batch.limit.tbl=2000
-search.index.batch.max.thread.size=10
+search.index.batch.max.thread.size=5
 
 #suggest count
 suggestion.count.batch.limit=300

@@ -11,17 +11,18 @@ yoho.search.producer.env.webapphome  = /home/dev/yoho-search-producer/deploy
 canal.hostType=zkCluster
 canal.server.port=192.168.102.224:2181
 zkAddress=192.168.102.224:2181
+
 ##canal-shop
 canal.destination.shop=shops
-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,yh_shops.product_timing,yh_shops.product_price_plan,yh_shops.limit_product,yh_shops.limit_product_attach
+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
 
 ##canal-operation
 canal.destination.operation=operations
-canal.subscribeChannel.operation=yhb_operations.activity_product,yhb_operations.es_word_def,yhb_operations.dynamic_rule,yhb_operations.dynamic_rule_details,yhb_operations.dynamic_rule_page_rel
+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.promotion_product
+canal.subscribeChannel.erpproduct=erp_product.product_pool_detail,erp_product.product_ext,erp_product.product_attribute
 
 ##cancal-erpcustomerservice
 canal.destination.erpcustomerservice=erpcustomerservice
@@ -43,4 +44,8 @@ canal.subscribeChannel.yhgproduct=yhg_product.tbl_product,yhg_product.tbl_produc
 canal.destination.comment=comment
 canal.subscribeChannel.comment=yh_comment.comments,yh_comment.shareorder,yh_comment.shareorder_image,yh_comment.shareorder_tag
 
+##canal-promotion
+canal.destination.promotion=promotion
+canal.subscribeChannel.promotion=yhb_promotion.promotion_info,yhb_promotion.promotion_params
+
 zkAddress=192.168.102.224:2181

+yoho.recomand.env.webapphome   = /home/dev/yoho-union-recomand/deploy
+yoho.recomand.env.serverport  = 9
+yoho.recomand.env.namespace  = union-recomand
+
+unions.kafka.consumer.servers=192.168.103.58:9092
+unions.kafka.producer.servers=192.168.103.58:9092
\ No newline at end of file

@@ -21,7 +21,7 @@ yoho.users.env.serverport  = 1
 yoho.users.env.webapphome  = /home/dev/yoho-users/deploy
 
 users.base.isUic=false
-uic.service.url=http://uic.yohoops.org/uic
+uic.service.url=http://192.168.102.48:8096/uic/
 
 
 verify_student_flag=true
@@ -31,3 +31,7 @@ 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
 zmxy_service_url    = https://zmopenapi.zmxy.com.cn/sandbox.do
+
+register.new.user.page.probability=9
+register.image.onoff=off
+union.domain.url=http://webunion_tl.yohobuy.com/union

@@ -28,4 +28,5 @@ yoho.bigData.env.serverport  = 1
 yoho.bigData.env.webapphome  = /home/dev/yohobuy-bigdata/deploy
 bigdata.database.cluster.name = test
 
-bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
\ No newline at end of file
+bigDataRedis.proxy.address=123.206.17.17
+bigDataRedis.proxy.port=16379
\ No newline at end of file

-aesKey  = yoho96461qaz2wsx
-
 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/dev/opps/deploy/autoconfig/dev/global-autoconfig.properties
+yohobuy.crm.env.serverport=3
+yohobuy.crm.env.namespace=crm
+yohobuy.crm.env.webapphome=/home/dev/yohobuy-crm/deploy
+jdbc.mysql.readonlyinslave=true
 
-bigData.url  = http://172.31.54.253:8080/bigdata/crm/
+autoconfig.properties.sharedAutoconfig  = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
 
-crm.send.notice  = false
+bigData.url=http://118.89.210.26:8080/bigdata/crm/
+search.url=192.168.102.216:8080
 
-ftp.ip        = 172.31.54.254
-ftp.port      = 21
-ftp.pwd       = ok83sQlrvHfw8OBMz6xlRA==
-ftp.userName  = ftpuser
+qiniu.domain=http://7xnrdp.com1.z0.glb.clouddn.com
+qiniu.accesskey=atSf7xxIl8alEnsXbhC1bOD1GWVW3qYffz8SlB4m
+qiniu.secretkey=pyoJzPygXIkFWrc1BAsH6tAJ0yweTchpJwGKEwhm
+qiniu.bucket=test
 
-jdbc.mysql.readonlyinslave  = true
+#AES_KEY
+aesKey=yoho96461qaz2wsx
 
-sms.name  = yohoyx@yohoyx
-sms.pwd   = EH+iuWSAfINJYwSdPgVqhA==
-sms.url   = http://211.147.239.62:9050/cgi-bin/sendsms
+#SMS_URL
+sms.url=http://211.147.239.62:9050/cgi-bin/sendsms
+sms.name=yohoyx@yohoyx
+sms.pwd=EH+iuWSAfINJYwSdPgVqhA==
+sms.reprot.flag=false
 
-yohobuy.crm.env.namespace   = crm
-yohobuy.crm.env.serverport  = 3
-yohobuy.crm.env.webapphome  = /home/dev/yohobuy-crm/deploy
+#FTP
+ftp.ip=123.206.26.127
+ftp.port=21
+ftp.userName=ftpuser
+ftp.pwd=ok83sQlrvHfw8OBMz6xlRA==
 
-# ********************  redis servers  ********************
-redis.crm.proxy.address=192.168.102.12
-redis.proxy.port=6379
-redis.proxy.auth=
+rabbit_common=192.168.102.211:5672
+rabbit_common_user=yoho
+rabbit_common_password=yoho
+rabbit_vhost=yoho
 
 redis.crm.proxy.address=192.168.102.12
-redis.readonly.proxy.port=6379
-redis.readonly.proxy.auth=
-
 redis.crm.notsync.twemproxy.addresses=192.168.102.12:6379
-redis.notsync.twemproxy.auth=
+
+crm.send.notice=false
+
+#alarm_mobile
+alarm.mobile=18994021292
+
+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
+
+birthday.coupon.groupid=12
+
+birthday.coupon.sms.templateid=2
+
+aliyun.sms.accessKeyId=wIBL09Z0xu7uJUkX0yNnFWy8tNv+KZEH8req1GsE1+k=
+aliyun.sms.secret=/tnQdyzBuARAcql9ad+yJVzlQNX9bfhEmJxr7wdLz58=
+
+platform.host=http://192.168.102.202:8088/platform
+platform.coupon.userId=10964
+platform.coupon.userName=crm
+
+browse.service.url=http://192.168.103.59:8092/brower/
+
+# ********************  定时器时间配置  ********************
+
+#玄武状态报告和黑名单获取
+xuanwu.scheduler=0 1/3 * * * ?
+
+#梦网状态报告和黑名单获取
+mengwang.scheduler=0/10 * * * * ?
+
+#同步微信公众号的任务
+wechart.scheduler=0 0 0 * * ?
+
+#微信公众号的任务错误重新尝试
+wechart.retry.scheduler=0 0 2 * * ?
+
+#清理短信发送记录
+sms.clean.scheduler=0 0 2 * * ?
+
+#大数据
+jdbc.mysql.bigdataunion.slave=118.89.235.30:3306
+jdbc.mysql.bigdataunion.username=root
+jdbc.mysql.bigdataunion.password=t5/oMgwUCmO/GeMHBAQ2Cg==
\ No newline at end of file

@@ -117,3 +117,6 @@ jdbc.mysql.yhbpromotionsplitplatform.username=yh_test
 jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw==
 
 aliyun.accesskey=XLHom1U6wcyl8dec3t0zaJczvsATPf
+mkt.pcwap.domain.url               = http://union.yoho.cn/union/go
+mkt.resource.code.url              = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
+sync.product.isPromotion.advance.minutes = 5
\ No newline at end of file

@@ -12,8 +12,8 @@ yohobuy.promotion.env.webapphome  = /home/dev/yohobuy-promotion/deploy
 
 promotion.sendCounpon.broadcast.rate = 0.5
 
-
-wechat.coupons.operators.email=jie.pang@yoho.cn
+wechat.coupons.operators.mobile=15651035157
+wechat.coupons.operators.email=ling.tan@yoho.cn
 weibo.coupons.operators.email=chao.geng@yoho.cn,binbin.lu@yoho.cn
 weibo.coupons.operators.mobile=13770338135,18551607734
-yoho.message.controller.url=http://192.168.102.202:8087/yoho-message-controller
\ No newline at end of file
+yoho.message.controller.url=http://192.168.102.202:8087/yoho-message-controller

@@ -11,3 +11,10 @@ wechat.user.info  = /cgi-bin/user/info
 yohobuy.wechat.env.namespace   = wechat
 yohobuy.wechat.env.serverport  = 4
 yohobuy.wechat.env.webapphome  = /home/dev/yohobuy-wechat/deploy
+
+#service appid&secret config
+wechat.service.access.appid=wx1e6997242bcfcdfb
+wechat.service.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd
+#subscription appid&secret config
+wechat.subscription.access.appid=wx1e6997242bcfcdfb
+wechat.subscription.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd
\ No newline at end of file

+jdbc.mysql.readonlyinslave=true
+autoconfig.properties  = sharedAutoconfig
+
+autoconfig.properties.sharedAutoconfig  = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
+
+yoho.env.namespace   = yohomars-platform
+yoho.env.serverport  = 62
+yoho.env.webapphome  = /home/dev/yohomars-platform/deploy
+
+
+uic.api.host=http://192.168.102.48:8096/uic
+crontab.message.systemMsgProduce=15 */1 * * * ?
+crontab.majia.aotuAddMajia=30 */30 * * * ?
+mars.platform.task.switch=false
\ No newline at end of file

+jdbc.mysql.readonlyinslave=true
+autoconfig.properties  = sharedAutoconfig
+
+autoconfig.properties.sharedAutoconfig  = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
+
+yoho.env.namespace   = yohonow-platform
+yoho.env.serverport  = 61
+yoho.env.webapphome  = /home/dev/yohonow-platform/deploy
+
+
+uic.api.host=http://192.168.102.48:8096/uic
+
+now.platform.task.switch=false
\ No newline at end of file

@@ -18,6 +18,10 @@ redis.push.address=192.168.102.211
 redis.push.port = 6379
 redis.push.auth=
 
+redis.readonly.proxy.address=192.168.102.17
+redis.readonly.proxy.port=6379
+redis.readonly.proxy.auth=
+
 redis.pool.maxTotal=200
 redis.pool.maxIdle=100
 redis.pool.minIdle=30

@@ -214,10 +214,10 @@ jdbc.mysql.cmspush.username=root
 jdbc.mysql.cmspush.password=Z5BMngayHLUxyWLSv6+koA==
 
 #mars_push_db
-jdbc.mysql.marspush.master=192.168.102.17:3306
-jdbc.mysql.marspush.slave=192.168.102.17:3306
-jdbc.mysql.marspush.username=root
-jdbc.mysql.marspush.password=Z5BMngayHLUxyWLSv6+koA==
+jdbc.mysql.marspush.master=192.168.102.216:3306
+jdbc.mysql.marspush.slave=192.168.102.216:3306
+jdbc.mysql.marspush.username=yh_test
+jdbc.mysql.marspush.password=9nm0icOwt6bMHjMusIfMLw==
 
 #yh_cms
 jdbc.mysql.yh_cms.master=192.168.102.219:3306
@@ -235,7 +235,7 @@ jdbc.mysql.yhbsearch.password  = 9nm0icOwt6bMHjMusIfMLw==
 # search-es
 search.es.cluster.name  = yohosearch_test
 search.es.servers       = es.node1.yohoops.org:9300 es.node2.yohoops.org:9300
-search.index.number_of_replicas     = 0
+search.index.number_of_replicas     = 1
 search.index.refresh_interval       = 10s
 search.index.translog.flush_threshold_ops  = 10000
 
@@ -303,6 +303,11 @@ jdbc.mysql.yhlottery.slave=192.168.102.219:3306
 jdbc.mysql.yhlottery.username=yh_test
 jdbc.mysql.yhlottery.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
 
 #####  ****************************************  common properties ******************************************************

 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
+
+gateway.api.url  = http://api.gray.yohops.com/
+
+uic_userInfoRest_enable  = false
 
 yoho.uic.env.namespace   = uic
 yoho.uic.env.serverport  = 6

@@ -4,4 +4,8 @@ autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/aut
 jdbc.mysql.readonlyinslave  = true
 yoho.messagecontroller.env.namespace   = yoho-message-controller
 yoho.messagecontroller.env.serverport  = 7
-yoho.messagecontroller.env.webapphome  = /home/test/yoho-message-controller/deploy
\ No newline at end of file
+yoho.messagecontroller.env.webapphome  = /home/test/yoho-message-controller/deploy
+
+redis.push.address=192.168.102.211
+redis.push.port = 6379
+redis.push.auth=
\ No newline at end of file

@@ -16,7 +16,7 @@ build.productindex.use.code=true
 build.storageskuindex.use.code=true
 
 #consumer index config
-search.index.batch.limit=2500
+search.index.batch.limit=3000
 search.index.batch.limit.tbl=2000
 search.index.batch.max.thread.size=10
 

@@ -17,7 +17,7 @@ canal.subscribeChannel.shop=yh_shops.product_attribute_property_values,yh_shops.
 
 ##canal-operation
 canal.destination.operation=operations
-canal.subscribeChannel.operation=yhb_operations.activity_product,yhb_operations.es_word_def,yhb_operations.dynamic_rule,yhb_operations.dynamic_rule_details,yhb_operations.dynamic_rule_page_rel
+canal.subscribeChannel.operation=yhb_operations.suggest_word_custom,yhb_operations.suggest_conversion_custom,yhb_operations.activity_product,yhb_operations.es_word_def,yhb_operations.score_rule
 
 ##cancal-erpproduct
 canal.destination.erpproduct=erpproduct
@@ -37,4 +37,8 @@ canal.subscribeChannel.yhgeditor=yhg_editor.tbl_brand,yhg_editor.tbl_site,yhg_ed
 
 ##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
+canal.subscribeChannel.yhgproduct=yhg_product.tbl_product,yhg_product.tbl_product_skc,yhg_product.tbl_product_sku
+
+##canal-promotion
+canal.destination.promotion=promotion
+canal.subscribeChannel.promotion=yhb_promotion.promotion_info,yhb_promotion.promotion_params
\ No newline at end of file

@@ -2,6 +2,8 @@ autoconfig.properties  = sharedAutoconfig
 
 autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
 
+browse.service.url  = http://api.brower.yohoops.org:8092/brower/
+
 guang.shareGuang.appVersion  = 4.1.0.***
 
 java.logs.home  = /Data/logs

 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
 
 des.password_crypt_key  = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
 
@@ -8,8 +8,14 @@ erp.user.useGiftcard.url  = http://api.erp.yohobuy.com
 
 jdbc.mysql.readonlyinslave  = true
 
+register.image.onoff  = off
+
+register.new.user.page.probability  = 9
+
 uic.service.url  = http://192.168.102.31:8096/uic
 
+union.domain.url  = http://webunion_tl.yohobuy.com/union
+
 user.session.expire  = 10080
 
 users.base.isUic  = false
@@ -20,15 +26,14 @@ users.yoho.default_is_bind  = Y
 
 users.yohocoin  = 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_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=true
\ No newline at end of file
+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
+zmxy_service_url    = https://zmopenapi.zmxy.com.cn/sandbox.do

@@ -8,7 +8,7 @@ autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig
 
 bigData.url  = http://bigdata-crm.yohops.com/bigdata/crm/
 
-crm.send.notice  = true
+crm.send.notice  = false
 
 ftp.ip        = 54.222.156.51
 ftp.port      = 21

@@ -117,3 +117,9 @@ watchService.watchDir      = /Data/ftpdir
 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=444
+
+#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/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
+
+yohomars.search.service.env.namespace   = yohomars-search
+yohomars.search.service.env.serverport  = 7
+yohomars.search.service.env.webapphome  = /home/test/yohomars-search/deploy
\ No newline at end of file

@@ -2,10 +2,6 @@ autoconfig.properties  = sharedAutoconfig
 
 autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
 
-yoho.search.service.env.namespace   = yohomars-search
-yoho.search.service.env.serverport  = 7
-yoho.search.service.env.webapphome  = /home/test/yohomars-search-service/deploy
-
 yohomars.search.service.env.namespace   = yohomars-search
 yohomars.search.service.env.serverport  = 7
-yohomars.search.service.env.webapphome  = /home/test/yohomars-search-service/deploy
+yohomars.search.service.env.webapphome  = /home/test/yohomars-search-service/deploy
\ No newline at end of file

@@ -235,6 +235,11 @@ jdbc.mysql.yh_cms.slave=192.168.102.219:3306
 jdbc.mysql.yh_cms.username=yh_test
 jdbc.mysql.yh_cms.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
 
 #####  ****************************************  common properties ******************************************************

@@ -98,4 +98,10 @@ upload.tencent.product.mark=9.99
 # ********************  tencent upload skn data  ********************
 price.audit.secondCheckRoleName=secondCheck
 
-mkt.app.download.url=http://m.yohobuy.com/app
\ No newline at end of file
+mkt.app.download.url=http://m.yohobuy.com/app
+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

@@ -63,5 +63,6 @@ platform.service.url=http://192.1638.102.202:8088/platform
 photoSearch.access.key.id=7343a192140f25a59c53dab5652f5f47
 photoSearch.secret.key=45c1ce98ee6b4701d55802989ba240f4
 photoSearch.service.id=rdbehn3x
+login.skip.modify.weakPwd=Y
 
 

@@ -2,6 +2,8 @@ autoconfig.properties  = sharedAutoconfig
 
 autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties
 
+crf.service.url  = https://osprec-ci.crfchina.com
+
 des.password_crypt_key  = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
 
 erp.user.useGiftcard.url  = http://api.erp.yohobuy.com
@@ -14,6 +16,8 @@ register.new.user.page.probability  = 9
 
 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
@@ -29,8 +33,6 @@ users.yohocoin.dilute  = true
 
 verify_student_flag  = false
 
-crf.service.url=https://osprec-ci.crfchina.com
-
 yoho.users.env.namespace   = users
 yoho.users.env.serverport  = 1
 yoho.users.env.webapphome  = /home/test/yoho-users/deploy
@@ -40,6 +42,6 @@ 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
 zmxy_service_url    = https://zmopenapi.zmxy.com.cn/sandbox.do
-
-crf.service.url=https://osprec-ci.crfchina.com
+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
+diff.base.flag=1
 

@@ -29,6 +29,6 @@ jdbc.mysql.bigdata.password=ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
 
 bigdata.database.cluster.name = shop
 
-bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
-
+bigDataRedis.proxy.address=123.206.17.17
+bigDataRedis.proxy.port=16379
 ip.port.search.server  = 192.168.102.216:8080
\ No newline at end of file

@@ -66,3 +66,6 @@ watchService.watchDir      = /Data/sftp_images
 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
+
+sync.product.isPromotion.advance.minutes = 5

@@ -12,5 +12,6 @@ promoation.invite.shareCoupon   = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12
 yohobuy.promotion.env.namespace   = promotion
 yohobuy.promotion.env.serverport  = 5
 yohobuy.promotion.env.webapphome  = /home/test/yohobuy-promotion/deploy
-
+wechat.coupons.operators.email=chao.geng@yoho.cn
+wechat.coupons.operators.mobile=13770338135
 promotion.sendCounpon.broadcast.rate=0.9

 activeTime  = 86400
 
+admin.login.url  = http://192.168.102.211:30012
+
 autoconfig.properties  = sharedAutoconfig
 
 autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties
@@ -10,10 +12,18 @@ bigdate.db.username  = yh_bigdata
 
 draw.writeFile.delay  = 60
 
+erp.domain  = http://192.168.102.47:9098/erp-gateway-web
+
+exclude.union.type  = 100000000000349
+
+file.saveDir  = /Data/images
+
 gateway.url  = http://api.yoho.cn
 
 jdbc.mysql.readonlyinslave  = true
 
+platform.login.salt  = yoho9646yoho9646
+
 rabbit.mq.host         = 192.168.102.162
 rabbit.mq.password     = yoho
 rabbit.mq.port         = 32810
@@ -29,18 +39,8 @@ redis.union.readonly.proxy.address  = test-bigdata-redis-1903805580.cn-north-1.e
 
 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
-
-
-file.saveDir        = /Data/images
-platform.login.salt=yoho9646yoho9646
-erp.domain=http://192.168.102.47:9098/erp-gateway-web
-admin.login.url=http://192.168.102.211:30012
-
-
-rabbit_message_center = 192.168.102.211:5672
-rabbit_message_center_user = yoho
-rabbit_message_center_password = yoho
-rabbit_message_center_vhost = yoho

@@ -14,3 +14,5 @@ wechat.user.info  = /cgi-bin/user/info
 yohobuy.wechat.env.namespace   = wechat
 yohobuy.wechat.env.serverport  = 4
 yohobuy.wechat.env.webapphome  = /home/test/yohobuy-wechat/deploy
+wechat.subscription.access.appid=wx1e6997242bcfcdfb
+wechat.subscription.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd

+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

@@ -12,6 +12,11 @@ file.saveDir=/home/test
 
 ###  ******************************  database ***********************************
 
+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==
 
@@ -298,6 +303,11 @@ 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=
+
 # search-es
 search.es.cluster.name  = yohosearch_testQQ
 search.es.servers       = es.node1.yohoops.org:9300
@@ -313,6 +323,10 @@ search.mq.password=123qwe
 search.mq.exchange=yoho_search
 search.mq.virtualHost=yohosearch
 
+#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
@@ -376,11 +390,11 @@ bigDataRedis-search.proxy.address=bigdata.redis.yohoops.org
 bigDataRedis-search.proxy.port= 6379
 bigDataRedis-search.proxy.auth=
 
-redis.union.proxy.address=huodong.write.yohoops.org
+redis.union.proxy.address=write.redis.yohoops.org
 redis.union.proxy.port=6379
 redis.union.proxy.auth=
 
-redis.union.readonly.proxy.address=huodong.read.yohoops.org
+redis.union.readonly.proxy.address=read.redis.yohoops.org
 redis.union.readonly.proxy.port=6379
 redis.union.readonly.proxy.auth=
 
@@ -408,8 +422,8 @@ rabbit_common_password = yoho
 
 
 #cache clear rabbitmq
-rabbit.cacheclean.producer.host = rabbitmq-common-qq.yohoops.org:5672
-rabbit.cacheclean.consumer.host = rabbitmq-common-aws.yohoops.org: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
@@ -427,7 +441,7 @@ 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.102.48
+order.task.host=192.168.103.74
 
 APP_KEY     = 1392109259
 APP_SECRET  = 1e87e46f115cc813e27ef52eb9915f1e
@@ -476,4 +490,17 @@ package.ticket.more.couponid=13268
 
 default.http.type = http 
 
-browse.service.url  = http://192.168.102.48:8092/brower/
\ No newline at end of file
+browse.service.url  = http://192.168.103.74: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

@@ -4,7 +4,7 @@ autoconfig.properties  = sharedAutoconfig
 
 autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
 
-browse.service.url  = http://192.168.102.48:8092/brower/
+browse.service.url  = http://192.168.103.74:8092/brower/
 
 erp.order.status.url  = http://portal.admin.yohobuy.com/api/orders/status
 
@@ -37,8 +37,6 @@ yoho.gateway.env.webapphome  = /home/test/yoho-gateway/deploy
 #密码AES加密密钥
 password.aes.key=yoho9646yoho9646
 
-
-
 degrade_complaintsCount_level=0
 degrade_complaintsList_level=0
 degrade_likeBrand_level=0
@@ -62,4 +60,5 @@ platform.service.url=http://192.1638.102.48:8088/platform
 #photoSearch
 photoSearch.access.key.id=7343a192140f25a59c53dab5652f5f47
 photoSearch.secret.key=45c1ce98ee6b4701d55802989ba240f4
-photoSearch.service.id=rdbehn3x
\ No newline at end of file
+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
+

+yoho.logs.basedir=/Data/logs
+autoconfig.properties  = sharedAutoconfig
+is_debug_enable        = true
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
+
+uic.service.url=http://192.168.103.73: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.52: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

@@ -16,4 +16,17 @@ tpl.adaptor.domain  = http://search.adaptor.yohoops.org:8085/search-adaptor
 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/auto_deploy/deploy/autoconfig/aws/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
 
 yoho.search.producer.env.namespace   = search-producer
 yoho.search.producer.env.serverport  = 9
@@ -7,16 +7,34 @@ yoho.search.producer.env.webapphome  = /home/test/yoho-search-producer/deploy
 
 ## search configuration  begin
 
-//canal
+##canal
 canal.hostType=zkCluster
 canal.server.port=zk01.yohoops.org:2181
 
-//canal-shop
+##canal-shop
 canal.destination.shop=shops
-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.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
 
-//canal-operation
+##canal-operation
 canal.destination.operation=operations
-canal.subscribeChannel.operation=yhb_operations.activity_product
+canal.subscribeChannel.operation=yhb_operations.suggest_word_custom,yhb_operations.suggest_conversion_custom,yhb_operations.activity_product,yhb_operations.es_word_def
 
-## search configuration  fininshed
+##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/master/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
-
-##search.use.cache
+	
+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

@@ -6,6 +6,8 @@ autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/aut
 
 des.password_crypt_key  = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
 
+diff.base.flag  = 1
+
 erp.user.useGiftcard.url  = http://api.erp.yohobuy.com
 
 jdbc.mysql.readonlyinslave  = true
@@ -16,6 +18,7 @@ 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
 
 userday.open.day  = 28
@@ -33,8 +36,6 @@ users.yohocoin.dilute  = true
 
 verify_student_flag  = true
 
-crf.service.url=https://osprec-ci.crfchina.com
-
 yoho.users.env.namespace   = users
 yoho.users.env.serverport  = 1
 yoho.users.env.webapphome  = /home/test/yoho-users/deploy
@@ -44,3 +45,6 @@ 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
+
+
+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

 aesKey  = yoho96461qaz2wsx
 
-alarm.mobile  = 13951882433
+alarm.mobile  = 18994021292
 
 autoconfig.properties  = sharedAutoconfig
 
@@ -10,6 +10,12 @@ bigData.url  = http://bigdata-crm.yohops.com:8070/bigdata/crm/
 
 crm.send.notice  = true
 
+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
@@ -25,7 +31,7 @@ yohobuy.crm.env.namespace   = crm
 yohobuy.crm.env.serverport  = 3
 yohobuy.crm.env.webapphome  = /home/test/yohobuy-crm/deploy
 
-sms.reprot.flag=true
+sms.reprot.flag=false
 
 redis.crm.notsync.twemproxy.addresses=huodong.write.yohoops.org:6379
 redis.notsync.twemproxy.auth=
@@ -59,25 +65,13 @@ 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
-#VIP专享满299减80（全品类）
-birthday.coupon.vip.small.templateid=148
-#VIP专享满499减120（全品类）
-birthday.coupon.vip.templateid=146
-#金、白金专享满599减150（全品类）
-birthday.coupon.gold.platinum.templateid=144
-#白金专享满699减180（全品类）
-birthday.coupon.platinum.templateid=142
-
 #生日券短信模板ID
 birthday.coupon.sms.templateid=2
 
-browse.service.url=http://192.168.102.48:8092/brower/
\ No newline at end of file
+browse.service.url=http://192.168.103.74:8092/brower/
\ No newline at end of file

@@ -54,5 +54,5 @@ exhibition.ticket.couponid=13576
 # 套票券ID
 package.ticket.couponid=13570
 
-browse.service.url  = http://192.168.102.48:8092/brower/
+browse.service.url  = http://192.168.103.74:8092/brower/
 

@@ -83,6 +83,10 @@ mkt.activity.domain.url  = http://union.yoho.cn/union/tencentMkt/index.html
 
 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
+
 platform.login.salt  = yoho9646yoho9646
 
 price.audit.secondCheckRoleName  = secondCheck
@@ -95,6 +99,8 @@ price.selltype.url  = http://192.168.102.47:9098/erp-gateway-web/plate_price_for
 
 qiniu.bigdata.skndada.fileName  = /Users/apple/Documents/tmp/sknData.xml
 
+sync.product.isPromotion.advance.minutes = 5
+
 resources_https_enable  = true
 
 search.server.address  = http://search.yohoops.org:8080/yohosearch/
@@ -113,5 +119,6 @@ watchService.watchDir      = /Data/sftp_images
 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
\ No newline at end of file
+bigdata.qiniu.refresh.url=http://fusion.qiniuapi.com/v2/tune/refresh
+activity.url=http://activity.yoho.cn/feature/
+price.over.days.roleName=changeOver180DaysPrice,changeOver180DaysPrice2

@@ -9,10 +9,11 @@ yohobuy.promotion.env.namespace   = promotion
 yohobuy.promotion.env.serverport  = 5
 yohobuy.promotion.env.webapphome  = /home/test/yohobuy-promotion/deploy
 
-wechat.coupons.operators.email=jie.pang@yoho.cn
+wechat.coupons.operators.email=chao.geng@yoho.cn
+wechat.coupons.operators.mobile=13770338135
 
 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

@@ -4,15 +4,20 @@ autoconfig.properties  = sharedAutoconfig
 
 autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
 
-bigdate.db.password  = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
-bigdate.db.url       = 172.31.6.98:3306
-bigdate.db.username  = yh_bigdata
+bigdate.db.password  = 9nm0icOwt6bMHjMusIfMLw==
+bigdate.db.url       = read.passport.yohoops.org:3306
+bigdate.db.username  = yh_test
 
 draw.writeFile.delay  = 60
 
+exclude.union.type  = 100000000000349
+
 gateway.url  = http://api.yoho.cn
 
-jdbc.mysql.readonlyinslave  = true
+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
@@ -22,6 +27,8 @@ 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

@@ -2,8 +2,8 @@ autoconfig.properties  = sharedAutoconfig
 
 autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
 
-wechat.access.appid   = wx1e6997242bcfcdfb
-wechat.access.secret  = d6fa51581e4c11ee312a1990c2ebf0bd
+wechat.access.appid   = wx75e5a7c0c88e45c2
+wechat.access.secret  = ce21ae4a3f93852279175a167e54509b
 
 wechat.small.program.access.appid   = wx084ab813d88c594b
 wechat.small.program.access.secret  = 0252d67ef15eb07a28d80098e8c186ac
@@ -11,6 +11,12 @@ 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/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

+autoconfig.properties  = sharedAutoconfig
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties
+
+yoho.cms_push.env.namespace   = cms_push
+yoho.cms_push.env.serverport  = 6
+yoho.cms_push.env.webapphome  = /home/test/cms_push/deploy
+
+#db_pool_config
+db.default.initialSize=10
+db.default.maxTotal=20
+db.default.maxIdle=10
+db.default.minIdle=5
+
+#debug_enable
+is_debug_enable=false
+
+##push redis
+redis.push.address=192.168.102.211
+redis.push.port = 6379
+redis.push.auth=
+
+redis.readonly.proxy.address=192.168.102.17
+redis.readonly.proxy.port=6379
+redis.readonly.proxy.auth=
+
+redis.pool.maxTotal=200
+redis.pool.maxIdle=100
+redis.pool.minIdle=30
+redis.pool.maxWaitMillis=10000
+
+#service call timeout
+service.call.connectReqTimeout=6000
+service.call.socketTimeout=6000
+service.call.connectTimeout=3000
+
+#mongo
+mongo.inbox.host=192.168.50.69
+mongo.inbox.port=27017
+mongo.inbox.dbname=inbox
+
+#rabbitMQ
+rabbit_host=192.168.102.211:5672
+rabbit_user=yoho
+rabbit_password=yoho
+rabbit_vhost=yoho
+
+#zkAddress
+zkAddress=192.168.102.216:2181
+
+#getui
+cms.getui.appkey=6mTvGCuFmG61NjZfrHIs24
+cms.getui.appid=TlIHUfi2I66b0DqEfsbjG2
+cms.getui.appsecret=JyVp1IH4AWAEb2PWhaCqXA
+cms.getui.mastersecret=lyT7C3exCG730j6u5GFUj1
+
+mars.getui.appkey=lvd6oGCOCi7Rd9BJFRAmq
+mars.getui.appid=9BVxmH5UW58koOjglnhiZ3
+mars.getui.appsecret=FkzFfHrnli5uC8LHQMBuG5
+mars.getui.mastersecret=6lWE253RTH7zlOHWFszDi3
+
+getui.host=http://sdk.open.api.igexin.com/apiex.htm
+getui.default.size=1000
+
+#ios
+cms.push.ios.custom.key=data
+ios.password=123456
+
+#send.task.batch.size
+send.task.batch.size=50
+
+#web.content
+web.context=cms_push
+
+#devEnv
+mars.push.devEnv = true
+cms.push.devEnv = true
\ No newline at end of file

@@ -11,6 +11,10 @@ yoho.env.productmode  = TEST
 file.saveDir=/home/test
 
 ###  ******************************  database ***********************************
+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==
@@ -267,6 +271,12 @@ jdbc.mysql.yh_cms.slave=read.cms.yohoops.org:3306
 jdbc.mysql.yh_cms.username=yh_test
 jdbc.mysql.yh_cms.password=9nm0icOwt6bMHjMusIfMLw==
 
+#yhlottery
+jdbc.mysql.yhlottery.master=192.168.103.36:3306
+jdbc.mysql.yhlottery.slave=192.168.103.36:3306
+jdbc.mysql.yhlottery.username=yh_test
+jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw==
+
 readOnlyInSlave=false
 
 # monogdb
@@ -297,6 +307,14 @@ search.mq.password=123qwe
 search.mq.exchange=yoho_search
 search.mq.virtualHost=yohosearch
 
+#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==
+
 #####  ****************************************  common properties ******************************************************
  
  

 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_4/global-autoconfig.properties
+
+gateway.api.url  = http://api.gray.yohops.com/
+
+uic_userInfoRest_enable  = false
 
 yoho.uic.env.namespace   = uic
 yoho.uic.env.serverport  = 6

 autoconfig.properties  = sharedAutoconfig
-
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties
 
 db.batch.size  = 100000
-
-getui.appid      = Rzwp6SnIbr5U7sgaxVsLA8
-getui.appkey     = jYlLaLbRm972pOzZx5pzQA
-getui.appsecret  = RF2JGk8cPt7Q9WZMx3QPBA
-
-getui.default.size  = 1000
-
-getui.host          = http://sdk.open.api.igexin.com/apiex.htm
-getui.mastersecret  = iQ6Z7sbDge9I5vHOBI5iA2
-
 ios.default.size  = 1000
-
-ios.keystore  = /yoho_push.p12
-ios.password  = 123456
-
-push.ios.custom.key  = custom_content
-
 push.task.type  = ios
-
 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
 
+##push redis
+redis.push.address=192.168.102.211
+redis.push.port = 6379
+redis.push.auth=
+
 redis.pool.maxTotal=200
 redis.pool.maxIdle=100
 redis.pool.minIdle=30
 redis.pool.maxWaitMillis=10000
+
+send.task.batch.size  = 100
+
+getui.appid      = Rzwp6SnIbr5U7sgaxVsLA8
+getui.appkey     = jYlLaLbRm972pOzZx5pzQA
+getui.appsecret  = RF2JGk8cPt7Q9WZMx3QPBA
+getui.default.size  = 1000
+getui.host          = http://sdk.open.api.igexin.com/apiex.htm
+getui.mastersecret  = iQ6Z7sbDge9I5vHOBI5iA2
+
+ios.keystore=/yoho_developer.p12
+ios.password=666666
+push.ios.custom.key=custom_content
+
+#mongo
+mongo.inbox.host=192.168.50.69
+mongo.inbox.port=27017
+mongo.inbox.dbname=inbox
+

@@ -4,6 +4,8 @@ autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/aut
 
 des.password_crypt_key  = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
 
+diff.base.flag  = 1
+
 erp.user.useGiftcard.url  = http://api.erp.yohobuy.com
 
 jdbc.mysql.readonlyinslave  = true
@@ -14,6 +16,10 @@ register.new.user.page.probability  = 9
 
 uic.service.url  = http://192.168.103.54:8096/uic
 
+union.domain.url  = http://webunion_tl.yohobuy.com/union
+
+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
+
 user.session.expire  = 10080
 
 userday.open.day  = 28

 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties
 
 cocacola.wechat.share.url  = http://service.yoho.cn/activity/cocacola/html/index1.html
 
@@ -8,7 +8,7 @@ drawline.luckyUserNotice.interval  = 5
 
 drawline.luckydraw.interval  = 360
 
-execute.timetask.host  =  192.168.90.9
+execute.timetask.host  = 192.168.90.9
 
 gateway.url  = http://api.yoho.cn
 
@@ -24,6 +24,12 @@ orderShare.shareUrl  = http://m.yohobuy.com/coupon/index
 
 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\\"}
+
+userday.open.day  = 28
+
 yoho.activity.env.namespace   = activity
 yoho.activity.env.serverport  = 0
 yoho.activity.env.webapphome  = /home/test/yohobuy-activity/deploy

+aesKey  = yoho96461qaz2wsx
+
+alarm.mobile  = 18994021292
+
+autoconfig.properties  = sharedAutoconfig
+
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
+
+bigData.url  = http://bigdata-crm.yohops.com:8070/bigdata/crm/
+
+crm.send.notice  = true
+
+platform.host=http://192.168.102.59: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
+
+sms.name  = yohoyx@yohoyx
+sms.pwd   = EH+iuWSAfINJYwSdPgVqhA==
+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.103.74:8092/brower/
+
+# ********************  定时器时间配置  ********************
+
+#玄武状态报告和黑名单获取
+xuanwu.scheduler=0 1/3 * * * ?
+
+#梦网状态报告和黑名单获取
+mengwang.scheduler=0/10 * * * * ?
+
+#同步微信公众号的任务
+wechart.scheduler=0 0 0 * * ?
+
+#微信公众号的任务错误重新尝试
+wechart.retry.scheduler=0 0 2 * * ?
+
+#清理短信发送记录
+sms.clean.scheduler=0 0 2 * * ?
+
+#大数据
+jdbc.mysql.bigdataunion.slave=118.89.235.30:3306
+jdbc.mysql.bigdataunion.username=root
+jdbc.mysql.bigdataunion.password=t5/oMgwUCmO/GeMHBAQ2Cg==
+

@@ -71,3 +71,8 @@ yohobuy.platform.env.serverport  = 8
 yohobuy.platform.env.webapphome  = /home/test/yohobuy-platform/deploy
 
 zkAddress  = 192.168.102.56:2181
+
+#product isPromotion field plan sync config
+sync.product.isPromotion.advance.minutes=5
+
+

@@ -3,4 +3,39 @@ autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig
 yohobuy.task.env.namespace   = task
 yohobuy.task.env.serverport  = 4
 yohobuy.task.env.webapphome  = /home/test/yohobuy-task/deploy
-web.context  = task
\ No newline at end of file
+web.context  = task
+
+#
+jdbc.mysql.readonlyinslave  = true
+jdbc.mysql.kisjob.datasources = yoho_kisjob
+jdbc.mysql.kisjob.master      = 192.168.103.36:3306 
+jdbc.mysql.kisjob.slave       = 192.168.103.36:3306 
+jdbc.mysql.kisjob.username    = yh_test
+jdbc.mysql.kisjob.password    = 9nm0icOwt6bMHjMusIfMLw==
+
+#redis
+redis.pool.maxTotal        = 200
+redis.pool.maxIdle        = 100
+redis.pool.maxWaitMillis  = 2000
+redis.pool.minIdle        = 50
+redis.pool.testOnBorrow   = false
+redis.pool.testWhileIdle  = true
+
+#bigDataRedis-push.proxy.address=192.168.102.211
+bigDataRedis-push.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
+bigDataRedis-push.proxy.port=6379
+bigDataRedis-push.proxy.auth=
+
+##redis for push
+redis.push.address=192.168.102.211
+redis.push.port=6379
+redis.push.auth=
+
+task.addNewBrand.status  = on
+task.discountBrand.status  = on
+task.vipBrand.status  = on
+task.brands.number  = 19
+task.msgnum  = 10000
+task.send.limit  = 3
+mobile.limit.sendTimes  = 50
+

@@ -2,7 +2,7 @@ activeTime  = 86400
 
 autoconfig.properties  = sharedAutoconfig
 
-autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
+autoconfig.properties.sharedAutoconfig  = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties
 
 bigdate.db.password  = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
 bigdate.db.url       = 192.168.103.36:3306
@@ -10,6 +10,10 @@ bigdate.db.username  = yh_bigdata
 
 draw.writeFile.delay  = 60
 
+exclude.union.type  = 100000000000349
+
+gateway.url  = http://api.yoho.cn
+
 jdbc.mysql.readonlyinslave  = true
 
 rabbit.mq.host         = 192.168.102.56
@@ -18,17 +22,17 @@ rabbit.mq.port         = 5672
 rabbit.mq.username     = yoho
 rabbit.mq.virtualHost  = /yoho
 
-yoho.unions.env.namespace   = union
-yoho.unions.env.serverport  = 8
-yoho.unions.env.webapphome  = /home/test/yohobuy-union/deploy
+redis.proxy.database  = 1
 
+redis.readonly.proxy.database  = 1
 
-redis.union.proxy.address=192.168.102.56
-redis.union.proxy.port=6379
-redis.union.proxy.auth=
-redis.proxy.database=1
+redis.union.proxy.address           = 192.168.102.56
+redis.union.readonly.proxy.address  = 192.168.102.56
 
-redis.union.readonly.proxy.address=192.168.102.56
-redis.union.readonly.proxy.port=6379
-redis.union.readonly.proxy.auth=
-redis.readonly.proxy.database=1
\ No newline at end of file
+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

@@ -5,9 +5,18 @@ autoconfig.properties.sharedAutoconfig  = file:/home/test/opps/deploy/autoconfig
 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/test/yohobuy-wechat/deploy
+
+wechat.subscription.access.appid=wx1e6997242bcfcdfb
+wechat.subscription.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd

@@ -121,6 +121,25 @@ jdbc.mysql.yhorderssplit.slave=cobar1.yohoops.org:8066
 jdbc.mysql.yhorderssplit.username=yh_test
 jdbc.mysql.yhorderssplit.password=9nm0icOwt6bMHjMusIfMLw==
 
+
+#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
 
@@ -128,10 +147,10 @@ jdbc.mysql.yhshops.master=write.shops.yohoops.org:3306
 jdbc.mysql.yhshops.slave=read.shops.yohoops.org:3306
 
 #yhb_promotion_split db split 
-jdbc.mysql.yhbpromotionsplit.master=cobar1.yohoops.org:8066
-jdbc.mysql.yhbpromotionsplit.slave=cobar2.yohoops.org:8066
-jdbc.mysql.yhbpromotionsplit.username=yh_test
-jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
+# jdbc.mysql.yhbpromotionsplit.master=cobar1.yohoops.org:8066
+# jdbc.mysql.yhbpromotionsplit.slave=cobar2.yohoops.org:8066
+# jdbc.mysql.yhbpromotionsplit.username=yh_test
+# jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
 
 # yh_orders
 jdbc.mysql.yhorders.master=write.orders.yohoops.org:3306
@@ -278,6 +297,11 @@ 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=
+
 # search-es
 search.es.cluster.name  = yohosearch_testQQ
 search.es.servers       = es.node1.yohoops.org:9300

@@ -47,6 +47,10 @@ jdbc.mysql.platform.yhb_account.username  = yh_test
 
 mkt.activity.domain.url  = http://union.yoho.cn/union/tencentMkt/index.html
 
+mkt.pcwap.domain.url  = http://union.yoho.cn/union/go
+
+mkt.resource.code.url  = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
+
 offline.shops.url  = http://192.168.102.47:8098/shops/
 
 platform.login.salt  = yoho9646yoho9646

@@ -29,4 +29,8 @@ jdbc.mysql.bigdata.password=ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
 
 bigdata.database.cluster.name = shop
 
-bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
\ No newline at end of file
+#bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
+bigDataRedis.proxy.address=123.206.17.17
+bigDataRedis.proxy.port=16379
+
+

@@ -39,3 +39,5 @@ uic_dev_ips=(dev@192.168.102.210)
 
 yoho_now_dev_ips=(dev@192.168.102.214)
 yoho_mars_dev_ips=(dev@192.168.102.214)
+yohomars_platform_dev_ips=(dev@192.168.102.214)
+yohonow_platform_dev_ips=(dev@192.168.102.214)
\ No newline at end of file

@@ -29,7 +29,7 @@ yoho_message_test_ips=(test@192.168.102.211)
 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.207 test@192.168.102.202)
+cms_push_test_ips=(test@192.168.102.202)
 yohobuy_task_test_ips=(test@192.168.102.202)
 
 

@@ -4,31 +4,41 @@
 #@Date 2007-08-09
 ################################################################
 
+# 192.168.103.73
+yoho_gateway_test_nj_3_ips=(test@192.168.103.73)
+yoho_users_test_nj_3_ips=(test@192.168.103.73)
+uic_test_nj_3_ips=(test@192.168.103.73)
+yohobuy_resources_test_nj_3_ips=(test@192.168.103.73)
+yoho_message_test_nj_3_ips=(test@192.168.103.73)
 
+# 192.168.103.74
+yohobuy_product_test_nj_3_ips=(test@192.168.103.74)
+yohobuy_order_test_nj_3_ips=(test@192.168.103.74)
+yohobuy_activity_test_nj_3_ips=(test@192.168.103.74)
+yohobuy_brower_test_nj_3_ips=(test@192.168.103.74)
+yohobuy_promotion_test_nj_3_ips=(test@192.168.103.74)
 
-#####测试环境配置
-yoho_users_test_nj_3_ips=(test@192.168.102.52)
-yohobuy_promotion_test_nj_3_ips=(test@192.168.102.52)
-yoho_gateway_test_nj_3_ips=(test@192.168.102.52)
-yohobuy_product_test_nj_3_ips=(test@192.168.102.52)
-yoho_message_test_nj_3_ips=(test@192.168.102.52)
-yoho_sns_test_nj_3_ips=(test@192.168.102.52)
-yohobuy_union_test_nj_3_ips=(test@192.168.102.52)
-yoho_social_test_nj_3_ips=(test@192.168.102.52)
-uic_test_nj_3_ips=(test@192.168.102.48)
-yohobuy_resources_test_nj_3_ips=(test@192.168.102.48)
-yohobuy_order_test_nj_3_ips=(test@192.168.102.48)
-yohobuy_platform_test_nj_3_ips=(test@192.168.102.48)
-yohobuy_activity_test_nj_3_ips=(test@192.168.102.48)
-yohobuy_brower_test_nj_3_ips=(test@192.168.102.48)
-yohobuy_bigdata_test_nj_3_ips=(test@192.168.102.48)
+# 192.168.102.48
+yoho_sns_test_nj_3_ips=(test@192.168.102.48)
 yohobuy_wechat_test_nj_3_ips=(test@192.168.102.48)
 yohobuy_crm_test_nj_3_ips=(test@192.168.102.48)
+yoho_push_test_nj_3_ips=(test@192.168.102.48)
+cms_push_test_nj_3_ips=(test@192.168.102.48)
+yohobuy_platform_test_nj_3_ips=(test@192.168.102.48)
 
+# 192.168.102.52
+yohobuy_union_test_nj_3_ips=(test@192.168.102.52)
+yoho_social_test_nj_3_ips=(test@192.168.102.52)
+yohobuy_bigdata_test_nj_3_ips=(test@192.168.102.52)
+yoho_now_test_nj_3_ips=(test@192.168.102.52)
+yohobuy_task_test_nj_3_ips=(test@192.168.102.52)
+yoho_mars_test_nj_3_ips=(test@192.168.102.52)
+yohomars_platform_test_nj_3_ips=(test@192.168.102.52)
+
+# 192.168.102.46
 yoho_search_producer_test_nj_3_ips=(test@192.168.102.46)
 yoho_search_consumer_test_nj_3_ips=(test@192.168.102.46)
 yoho_search_service_test_nj_3_ips=(test@192.168.102.46)
 yoho_search_adaptor_test_nj_3_ips=(test@192.168.102.46)
 
-#####yoho_push_test_nj_3_ips=(test@192.168.102.48)
-#####yohobuy_task_test_nj_3_ips=(test@192.168.102.48)
+

@@ -23,11 +23,14 @@ yohobuy_platform_test_nj_4_ips=(test@192.168.102.59)
 yohobuy_bigdata_test_nj_4_ips=(test@192.168.102.59)
 yoho_social_test_nj_4_ips=(test@192.168.102.59)
 ####yoho_push_test_ips=(test@192.168.102.59)
-####yohobuy_task_test_ips=(test@192.168.102.59)
+yohobuy_task_test_nj_4_ips=(test@192.168.102.59)
 
 yohobuy_promotion_test_nj_4_ips=(test@192.168.102.61)
 yoho_sns_test_nj_4_ips=(test@192.168.102.61)
 yohobuy_brower_test_nj_4_ips=(test@192.168.102.61)
+yohobuy_crm_test_nj_4_ips=(test@192.168.102.61)
+yoho_push_test_nj_4_ips=(test@192.168.102.61)
+cms_push_test_nj_4_ips=(test@192.168.102.61)
 
 yoho_search_producer_test_nj_4_ips=(test@192.168.103.52)
 yoho_search_consumer_test_nj_4_ips=(test@192.168.103.52)