michaelcao / auto_deploy_test · Commits

Go to a project

Authored by lingmin
Commit 2d54738c62dca4fc314d6e7abf0e37c6ac5d481f 2 parents fd002dc1 0cb0fe82

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

Inline Side-by-side
Showing 69 changed files with 905 additions and 213 deletions
@@ -11,11 +11,30 @@ yoho.env.productmode = TEST @@ -11,11 +11,30 @@ yoho.env.productmode = TEST
11 11
12 ### ****************************** database *********************************** 12 ### ****************************** database ***********************************
13 13
  14 +#yohocrm
  15 +jdbc.mysql.yohocrm.master=192.168.102.219:3306
  16 +jdbc.mysql.yohocrm.slave=192.168.102.219:3306
  17 +jdbc.mysql.yohocrm.username=yh_test
  18 +jdbc.mysql.yohocrm.password=9nm0icOwt6bMHjMusIfMLw==
  19 +
  20 +#for crm read db
  21 +jdbc.mysql.yohopassport.onlyslave=192.168.102.219:3306
  22 +jdbc.mysql.yhpassport.onlyslave=192.168.102.219:3306
  23 +jdbc.mysql.yhshops.onlyslave=192.168.102.219:3306
  24 +jdbc.mysql.yhoperations.onlyslave=192.168.102.219:3306
  25 +jdbc.mysql.yh.username=yh_test
  26 +jdbc.mysql.yh.password=9nm0icOwt6bMHjMusIfMLw==
  27 +
14 ##yh_push 28 ##yh_push
15 bigdate.db.url=192.168.102.219:3306 29 bigdate.db.url=192.168.102.219:3306
16 bigdate.db.password=9nm0icOwt6bMHjMusIfMLw== 30 bigdate.db.password=9nm0icOwt6bMHjMusIfMLw==
17 bigdate.db.username=yh_test 31 bigdate.db.username=yh_test
18 32
  33 +#yhvalue
  34 +jdbc.mysql.yhvalue.master=118.89.235.30:3306
  35 +jdbc.mysql.yhvalue.slave=118.89.235.30:3306
  36 +jdbc.mysql.yhvalue.username=root
  37 +jdbc.mysql.yhvalue.password=t5/oMgwUCmO/GeMHBAQ2Cg==
19 38
20 ##yh_push 39 ##yh_push
21 jdbc.mysql.yhpush.master=192.168.102.219:3306 40 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 @@ -253,7 +272,7 @@ search.es.servers = 192.168.102.12:9300 192.168.102.13:9300
253 search.index.number_of_replicas = 1 272 search.index.number_of_replicas = 1
254 search.index.refresh_interval = 10s 273 search.index.refresh_interval = 10s
255 search.index.translog.flush_threshold_ops = 5000 274 search.index.translog.flush_threshold_ops = 5000
256 - 275 +search.index.translog.flush_threshold_size = 512mb
257 276
258 277
259 #yhb_promotion_split db split 278 #yhb_promotion_split db split
@@ -266,6 +285,16 @@ jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw== @@ -266,6 +285,16 @@ jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
266 jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066 285 jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066
267 jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066 286 jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066
268 287
  288 +#bigdataunion
  289 +jdbc.mysql.bigdataunion.slave=118.89.235.30:3306
  290 +jdbc.mysql.bigdataunion.username=yh_test_bigdata
  291 +jdbc.mysql.bigdataunion.password=rALdkYPZCr4QyzBfVCGdXA==
  292 +
  293 +#yh_bigdata_erp
  294 +jdbc.mysql.bigdata.erp.master=192.168.102.219:3306
  295 +jdbc.mysql.bigdata.erp.slave=192.168.102.219:3306
  296 +jdbc.mysql.bigdata.erp.username=yh_test
  297 +jdbc.mysql.bigdata.erp.password=9nm0icOwt6bMHjMusIfMLw==
269 298
270 299
271 # search-mq 300 # search-mq
@@ -314,34 +343,34 @@ bigDataRedis-search.proxy.address=123.206.17.17 @@ -314,34 +343,34 @@ bigDataRedis-search.proxy.address=123.206.17.17
314 bigDataRedis-search.proxy.port= 16379 343 bigDataRedis-search.proxy.port= 16379
315 bigDataRedis-search.proxy.auth= 344 bigDataRedis-search.proxy.auth=
316 345
317 -redis.notsync.twemproxy.addresses=192.168.102.12:6379 346 +redis.notsync.twemproxy.addresses=192.168.103.58:6379
318 redis.notsync.twemproxy.auth= 347 redis.notsync.twemproxy.auth=
319 348
320 -redis.proxy.address = 192.168.102.12 349 +redis.proxy.address = 192.168.103.58
321 redis.proxy.auth = 350 redis.proxy.auth =
322 redis.proxy.port = 6379 351 redis.proxy.port = 6379
323 352
324 -redis.readonly.proxy.address = 192.168.102.12 353 +redis.readonly.proxy.address = 192.168.103.58
325 redis.readonly.proxy.auth = 354 redis.readonly.proxy.auth =
326 redis.readonly.proxy.port = 6379 355 redis.readonly.proxy.port = 6379
327 356
328 -redis.union.address = 192.168.102.12 357 +redis.union.address = 192.168.103.58
329 redis.union.auth = 358 redis.union.auth =
330 redis.union.port = 6379 359 redis.union.port = 6379
331 360
332 -redis.union.proxy.address = 192.168.102.12 361 +redis.union.proxy.address = 192.168.103.58
333 redis.union.proxy.auth = 362 redis.union.proxy.auth =
334 redis.union.proxy.port = 6379 363 redis.union.proxy.port = 6379
335 364
336 -redis.union.readonly.proxy.address = 192.168.102.12 365 +redis.union.readonly.proxy.address = 192.168.103.58
337 redis.union.readonly.proxy.auth = 366 redis.union.readonly.proxy.auth =
338 redis.union.readonly.proxy.port = 6379 367 redis.union.readonly.proxy.port = 6379
339 368
340 -redis.brower.proxy.address=192.168.102.12 369 +redis.brower.proxy.address=192.168.103.58
341 redis.brower.proxy.port=6379 370 redis.brower.proxy.port=6379
342 redis.brower.proxy.auth= 371 redis.brower.proxy.auth=
343 372
344 -redis.brower.readonly.proxy.address=192.168.102.12 373 +redis.brower.readonly.proxy.address=192.168.103.58
345 redis.brower.readonly.proxy.port=6379 374 redis.brower.readonly.proxy.port=6379
346 redis.brower.readonly.proxy.auth= 375 redis.brower.readonly.proxy.auth=
347 376
@@ -355,31 +384,31 @@ APP_SECRET = 1e87e46f115cc813e27ef52eb9915f1e @@ -355,31 +384,31 @@ APP_SECRET = 1e87e46f115cc813e27ef52eb9915f1e
355 UUC_DOMAIN = http://passport.test.yoho.cn 384 UUC_DOMAIN = http://passport.test.yoho.cn
356 385
357 #### rabbit config #### 386 #### rabbit config ####
358 -rabbit_host = 192.168.102.211:5672 387 +rabbit_host = 192.168.103.58:5672
359 rabbit_user = yoho 388 rabbit_user = yoho
360 rabbit_password = yoho 389 rabbit_password = yoho
361 390
362 ########## common rabbitmq ########## 391 ########## common rabbitmq ##########
363 #aws 392 #aws
364 -rabbit_common_aws = 192.168.102.211:5672 393 +rabbit_common_aws = 192.168.103.58:5672
365 rabbit_common_aws_user = yoho 394 rabbit_common_aws_user = yoho
366 rabbit_common_aws_password = yoho 395 rabbit_common_aws_password = yoho
367 396
368 #qq 397 #qq
369 -rabbit_common_qq = 192.168.102.211:5672 398 +rabbit_common_qq = 192.168.103.58:5672
370 rabbit_common_qq_user = yoho 399 rabbit_common_qq_user = yoho
371 rabbit_common_qq_password = yoho 400 rabbit_common_qq_password = yoho
372 401
373 # local, maybe producer using this. 402 # local, maybe producer using this.
374 -rabbit_common = 192.168.102.211:5672 403 +rabbit_common = 192.168.103.58:5672
375 rabbit_common_user = yoho 404 rabbit_common_user = yoho
376 rabbit_common_password = yoho 405 rabbit_common_password = yoho
377 ##########common rabbitmq ########## 406 ##########common rabbitmq ##########
378 407
379 408
380 #cache clear rabbitmq 409 #cache clear rabbitmq
381 -rabbit.cacheclean.producer.host = 192.168.102.211:5672  
382 -rabbit.cacheclean.consumer.host = 192.168.102.211:5672 410 +rabbit.cacheclean.producer.host = 192.168.103.58:5672
  411 +rabbit.cacheclean.consumer.host = 192.168.103.58:5672
383 412
384 ## mq or call erp 413 ## mq or call erp
385 erp.message.sync.type=MQ 414 erp.message.sync.type=MQ
@@ -392,4 +421,16 @@ student.discount.rate=0.9 @@ -392,4 +421,16 @@ student.discount.rate=0.9
392 421
393 crf.service.url=https://osprec-ci.crfchina.com 422 crf.service.url=https://osprec-ci.crfchina.com
394 423
395 -default.http.type = http  
  424 +default.http.type = http
  425 +
  426 +#message-center rabbitmq
  427 +rabbit_message_center = 192.168.103.58:5672
  428 +rabbit_message_center_user = yoho
  429 +rabbit_message_center_password = yoho
  430 +rabbit_message_center_vhost = yoho
  431 +
  432 +
  433 +jdbc.mysql.yhwechat.master=192.168.102.219:3306
  434 +jdbc.mysql.yhwechat.slave=192.168.102.219:3306
  435 +jdbc.mysql.yhwechat.username=yh_test
  436 +jdbc.mysql.yhwechat.password=9nm0icOwt6bMHjMusIfMLw==
1 jdbc.mysql.readonlyinslave=true 1 jdbc.mysql.readonlyinslave=true
2 autoconfig.properties = sharedAutoconfig 2 autoconfig.properties = sharedAutoconfig
3 - 3 +is_debug_enable=false
4 autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties 4 autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
5 5
6 yohomars.env.namespace = yohomars 6 yohomars.env.namespace = yohomars
@@ -8,4 +8,14 @@ yohomars.env.serverport = 72 @@ -8,4 +8,14 @@ yohomars.env.serverport = 72
8 yohomars.env.webapphome = /home/dev/yoho-mars/deploy 8 yohomars.env.webapphome = /home/dev/yoho-mars/deploy
9 9
10 10
11 -uic.api.host=http://192.168.102.48:8096/uic  
  11 +uic.api.host=http://192.168.102.48:8096/uic
  12 +
  13 +exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7
  14 +
  15 +redis.proxy.address=192.168.102.17
  16 +redis.proxy.port=6380
  17 +redis.readonly.proxy.port=6380
  18 +redis.readonly.proxy.address=192.168.102.17
  19 +redis.notsync.twemproxy.addresses=192.168.102.17:6380
  20 +mars.task.switch=true
  21 +exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7
@@ -15,4 +15,5 @@ girl.cn.site.url=http://newgirls.test.yoho.cn @@ -15,4 +15,5 @@ girl.cn.site.url=http://newgirls.test.yoho.cn
15 15
16 #hongkong site main 16 #hongkong site main
17 boy.hk.site.url=http://hkboys.test.yoho.cn 17 boy.hk.site.url=http://hkboys.test.yoho.cn
18 -girl.hk.site.url=http://hkgirls.test.yoho.cn  
  18 +girl.hk.site.url=http://hkgirls.test.yoho.cn
  19 +social.domain.url=http://192.168.102.52:8095/social
@@ -18,9 +18,9 @@ build.productindex.use.code=true @@ -18,9 +18,9 @@ build.productindex.use.code=true
18 build.storageskuindex.use.code=true 18 build.storageskuindex.use.code=true
19 19
20 #consumer index config 20 #consumer index config
21 -search.index.batch.limit=3000 21 +search.index.batch.limit=2000
22 search.index.batch.limit.tbl=2000 22 search.index.batch.limit.tbl=2000
23 -search.index.batch.max.thread.size=10 23 +search.index.batch.max.thread.size=5
24 24
25 #suggest count 25 #suggest count
26 suggestion.count.batch.limit=300 26 suggestion.count.batch.limit=300
@@ -11,17 +11,18 @@ yoho.search.producer.env.webapphome = /home/dev/yoho-search-producer/deploy @@ -11,17 +11,18 @@ yoho.search.producer.env.webapphome = /home/dev/yoho-search-producer/deploy
11 canal.hostType=zkCluster 11 canal.hostType=zkCluster
12 canal.server.port=192.168.102.224:2181 12 canal.server.port=192.168.102.224:2181
13 zkAddress=192.168.102.224:2181 13 zkAddress=192.168.102.224:2181
  14 +
14 ##canal-shop 15 ##canal-shop
15 canal.destination.shop=shops 16 canal.destination.shop=shops
16 -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 17 +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
17 18
18 ##canal-operation 19 ##canal-operation
19 canal.destination.operation=operations 20 canal.destination.operation=operations
20 -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 21 +canal.subscribeChannel.operation=yhb_operations.suggest_word_custom,yhb_operations.suggest_conversion_custom,yhb_operations.activity_product,yhb_operations.es_word_def
21 22
22 ##cancal-erpproduct 23 ##cancal-erpproduct
23 canal.destination.erpproduct=erpproduct 24 canal.destination.erpproduct=erpproduct
24 -canal.subscribeChannel.erpproduct=erp_product.product_pool_detail,erp_product.promotion_product 25 +canal.subscribeChannel.erpproduct=erp_product.product_pool_detail,erp_product.product_ext,erp_product.product_attribute
25 26
26 ##cancal-erpcustomerservice 27 ##cancal-erpcustomerservice
27 canal.destination.erpcustomerservice=erpcustomerservice 28 canal.destination.erpcustomerservice=erpcustomerservice
@@ -43,4 +44,8 @@ canal.subscribeChannel.yhgproduct=yhg_product.tbl_product,yhg_product.tbl_produc @@ -43,4 +44,8 @@ canal.subscribeChannel.yhgproduct=yhg_product.tbl_product,yhg_product.tbl_produc
43 canal.destination.comment=comment 44 canal.destination.comment=comment
44 canal.subscribeChannel.comment=yh_comment.comments,yh_comment.shareorder,yh_comment.shareorder_image,yh_comment.shareorder_tag 45 canal.subscribeChannel.comment=yh_comment.comments,yh_comment.shareorder,yh_comment.shareorder_image,yh_comment.shareorder_tag
45 46
  47 +##canal-promotion
  48 +canal.destination.promotion=promotion
  49 +canal.subscribeChannel.promotion=yhb_promotion.promotion_info,yhb_promotion.promotion_params
  50 +
46 zkAddress=192.168.102.224:2181 51 zkAddress=192.168.102.224:2181
  1 +yoho.recomand.env.webapphome = /home/dev/yoho-union-recomand/deploy
  2 +yoho.recomand.env.serverport = 9
  3 +yoho.recomand.env.namespace = union-recomand
  4 +
  5 +unions.kafka.consumer.servers=192.168.103.58:9092
  6 +unions.kafka.producer.servers=192.168.103.58:9092
@@ -21,7 +21,7 @@ yoho.users.env.serverport = 1 @@ -21,7 +21,7 @@ yoho.users.env.serverport = 1
21 yoho.users.env.webapphome = /home/dev/yoho-users/deploy 21 yoho.users.env.webapphome = /home/dev/yoho-users/deploy
22 22
23 users.base.isUic=false 23 users.base.isUic=false
24 -uic.service.url=http://uic.yohoops.org/uic 24 +uic.service.url=http://192.168.102.48:8096/uic/
25 25
26 26
27 verify_student_flag=true 27 verify_student_flag=true
@@ -31,3 +31,7 @@ zmxy_contract_flag = si201604080002520001 @@ -31,3 +31,7 @@ zmxy_contract_flag = si201604080002520001
31 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== 31 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==
32 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB 32 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB
33 zmxy_service_url = https://zmopenapi.zmxy.com.cn/sandbox.do 33 zmxy_service_url = https://zmopenapi.zmxy.com.cn/sandbox.do
  34 +
  35 +register.new.user.page.probability=9
  36 +register.image.onoff=off
  37 +union.domain.url=http://webunion_tl.yohobuy.com/union
@@ -28,4 +28,5 @@ yoho.bigData.env.serverport = 1 @@ -28,4 +28,5 @@ yoho.bigData.env.serverport = 1
28 yoho.bigData.env.webapphome = /home/dev/yohobuy-bigdata/deploy 28 yoho.bigData.env.webapphome = /home/dev/yohobuy-bigdata/deploy
29 bigdata.database.cluster.name = test 29 bigdata.database.cluster.name = test
30 30
31 -bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn  
  31 +bigDataRedis.proxy.address=123.206.17.17
  32 +bigDataRedis.proxy.port=16379
1 -aesKey = yoho96461qaz2wsx  
2 -  
3 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
4 2
5 -autoconfig.properties.sharedAutoconfig = file:/home/dev/opps/deploy/autoconfig/dev/global-autoconfig.properties 3 +yohobuy.crm.env.serverport=3
  4 +yohobuy.crm.env.namespace=crm
  5 +yohobuy.crm.env.webapphome=/home/dev/yohobuy-crm/deploy
  6 +jdbc.mysql.readonlyinslave=true
6 7
7 -bigData.url = http://172.31.54.253:8080/bigdata/crm/ 8 +autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
8 9
9 -crm.send.notice = false 10 +bigData.url=http://118.89.210.26:8080/bigdata/crm/
  11 +search.url=192.168.102.216:8080
10 12
11 -ftp.ip = 172.31.54.254  
12 -ftp.port = 21  
13 -ftp.pwd = ok83sQlrvHfw8OBMz6xlRA==  
14 -ftp.userName = ftpuser 13 +qiniu.domain=http://7xnrdp.com1.z0.glb.clouddn.com
  14 +qiniu.accesskey=atSf7xxIl8alEnsXbhC1bOD1GWVW3qYffz8SlB4m
  15 +qiniu.secretkey=pyoJzPygXIkFWrc1BAsH6tAJ0yweTchpJwGKEwhm
  16 +qiniu.bucket=test
15 17
16 -jdbc.mysql.readonlyinslave = true 18 +#AES_KEY
  19 +aesKey=yoho96461qaz2wsx
17 20
18 -sms.name = yohoyx@yohoyx  
19 -sms.pwd = EH+iuWSAfINJYwSdPgVqhA==  
20 -sms.url = http://211.147.239.62:9050/cgi-bin/sendsms 21 +#SMS_URL
  22 +sms.url=http://211.147.239.62:9050/cgi-bin/sendsms
  23 +sms.name=yohoyx@yohoyx
  24 +sms.pwd=EH+iuWSAfINJYwSdPgVqhA==
  25 +sms.reprot.flag=false
21 26
22 -yohobuy.crm.env.namespace = crm  
23 -yohobuy.crm.env.serverport = 3  
24 -yohobuy.crm.env.webapphome = /home/dev/yohobuy-crm/deploy 27 +#FTP
  28 +ftp.ip=123.206.26.127
  29 +ftp.port=21
  30 +ftp.userName=ftpuser
  31 +ftp.pwd=ok83sQlrvHfw8OBMz6xlRA==
25 32
26 -# ******************** redis servers ********************  
27 -redis.crm.proxy.address=192.168.102.12  
28 -redis.proxy.port=6379  
29 -redis.proxy.auth= 33 +rabbit_common=192.168.102.211:5672
  34 +rabbit_common_user=yoho
  35 +rabbit_common_password=yoho
  36 +rabbit_vhost=yoho
30 37
31 redis.crm.proxy.address=192.168.102.12 38 redis.crm.proxy.address=192.168.102.12
32 -redis.readonly.proxy.port=6379  
33 -redis.readonly.proxy.auth=  
34 -  
35 redis.crm.notsync.twemproxy.addresses=192.168.102.12:6379 39 redis.crm.notsync.twemproxy.addresses=192.168.102.12:6379
36 -redis.notsync.twemproxy.auth= 40 +
  41 +crm.send.notice=false
  42 +
  43 +#alarm_mobile
  44 +alarm.mobile=18994021292
  45 +
  46 +yohobuyServiceAccessTokenGetUrl=http://127.0.0.1:8082/wechat/?method=wechat.token.get
  47 +wechat.host.name=https://api.weixin.qq.com
  48 +wechat.user.info=/cgi-bin/user/info
  49 +wechat.user.get=/cgi-bin/user/get
  50 +
  51 +wechat.access.yohobuyService.appid=wx75e5a7c0c88e45c2
  52 +wechat.access.yohobuyService.secret=ce21ae4a3f93852279175a167e54509b
  53 +wechat.access.yohobuySubscribe.appid=wx96121aa89f31c5ea
  54 +wechat.access.yohobuySubscribe.secret=7669da1a8842ed1df4c5e1b53868f3ca
  55 +wechat.access.mars.appid=wx9d0d7dfed5bbaa8b
  56 +wechat.access.mars.secret=9f7b00cd2a1d65301352d2783f6eec61
  57 +wechat.access.yohonowTrend.appid=wx1fe49f08f41b6c26
  58 +wechat.access.yohonowTrend.secret=5670f62abcebcd8d321615b46bd19ef4
  59 +wechat.access.yohonowGirl.appid=wxb52ec6a352f0b090
  60 +wechat.access.yohonowGirl.secret=9fe6bedb0b7f30986a168c7fc44f34c0
  61 +
  62 +birthday.coupon.groupid=12
  63 +
  64 +birthday.coupon.sms.templateid=2
  65 +
  66 +aliyun.sms.accessKeyId=wIBL09Z0xu7uJUkX0yNnFWy8tNv+KZEH8req1GsE1+k=
  67 +aliyun.sms.secret=/tnQdyzBuARAcql9ad+yJVzlQNX9bfhEmJxr7wdLz58=
  68 +
  69 +platform.host=http://192.168.102.202:8088/platform
  70 +platform.coupon.userId=10964
  71 +platform.coupon.userName=crm
  72 +
  73 +browse.service.url=http://192.168.103.59:8092/brower/
  74 +
  75 +# ******************** 定时器时间配置 ********************
  76 +
  77 +#玄武状态报告和黑名单获取
  78 +xuanwu.scheduler=0 1/3 * * * ?
  79 +
  80 +#梦网状态报告和黑名单获取
  81 +mengwang.scheduler=0/10 * * * * ?
  82 +
  83 +#同步微信公众号的任务
  84 +wechart.scheduler=0 0 0 * * ?
  85 +
  86 +#微信公众号的任务错误重新尝试
  87 +wechart.retry.scheduler=0 0 2 * * ?
  88 +
  89 +#清理短信发送记录
  90 +sms.clean.scheduler=0 0 2 * * ?
  91 +
  92 +#大数据
  93 +jdbc.mysql.bigdataunion.slave=118.89.235.30:3306
  94 +jdbc.mysql.bigdataunion.username=root
  95 +jdbc.mysql.bigdataunion.password=t5/oMgwUCmO/GeMHBAQ2Cg==
@@ -117,3 +117,6 @@ jdbc.mysql.yhbpromotionsplitplatform.username=yh_test @@ -117,3 +117,6 @@ jdbc.mysql.yhbpromotionsplitplatform.username=yh_test
117 jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw== 117 jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw==
118 118
119 aliyun.accesskey=XLHom1U6wcyl8dec3t0zaJczvsATPf 119 aliyun.accesskey=XLHom1U6wcyl8dec3t0zaJczvsATPf
  120 +mkt.pcwap.domain.url = http://union.yoho.cn/union/go
  121 +mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
  122 +sync.product.isPromotion.advance.minutes = 5
@@ -12,8 +12,8 @@ yohobuy.promotion.env.webapphome = /home/dev/yohobuy-promotion/deploy @@ -12,8 +12,8 @@ yohobuy.promotion.env.webapphome = /home/dev/yohobuy-promotion/deploy
12 12
13 promotion.sendCounpon.broadcast.rate = 0.5 13 promotion.sendCounpon.broadcast.rate = 0.5
14 14
15 -  
16 -wechat.coupons.operators.email=jie.pang@yoho.cn 15 +wechat.coupons.operators.mobile=15651035157
  16 +wechat.coupons.operators.email=ling.tan@yoho.cn
17 weibo.coupons.operators.email=chao.geng@yoho.cn,binbin.lu@yoho.cn 17 weibo.coupons.operators.email=chao.geng@yoho.cn,binbin.lu@yoho.cn
18 weibo.coupons.operators.mobile=13770338135,18551607734 18 weibo.coupons.operators.mobile=13770338135,18551607734
19 -yoho.message.controller.url=http://192.168.102.202:8087/yoho-message-controller  
  19 +yoho.message.controller.url=http://192.168.102.202:8087/yoho-message-controller
@@ -11,3 +11,10 @@ wechat.user.info = /cgi-bin/user/info @@ -11,3 +11,10 @@ wechat.user.info = /cgi-bin/user/info
11 yohobuy.wechat.env.namespace = wechat 11 yohobuy.wechat.env.namespace = wechat
12 yohobuy.wechat.env.serverport = 4 12 yohobuy.wechat.env.serverport = 4
13 yohobuy.wechat.env.webapphome = /home/dev/yohobuy-wechat/deploy 13 yohobuy.wechat.env.webapphome = /home/dev/yohobuy-wechat/deploy
  14 +
  15 +#service appid&secret config
  16 +wechat.service.access.appid=wx1e6997242bcfcdfb
  17 +wechat.service.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd
  18 +#subscription appid&secret config
  19 +wechat.subscription.access.appid=wx1e6997242bcfcdfb
  20 +wechat.subscription.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd
  1 +jdbc.mysql.readonlyinslave=true
  2 +autoconfig.properties = sharedAutoconfig
  3 +
  4 +autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
  5 +
  6 +yoho.env.namespace = yohomars-platform
  7 +yoho.env.serverport = 62
  8 +yoho.env.webapphome = /home/dev/yohomars-platform/deploy
  9 +
  10 +
  11 +uic.api.host=http://192.168.102.48:8096/uic
  12 +crontab.message.systemMsgProduce=15 */1 * * * ?
  13 +crontab.majia.aotuAddMajia=30 */30 * * * ?
  14 +mars.platform.task.switch=false
  1 +jdbc.mysql.readonlyinslave=true
  2 +autoconfig.properties = sharedAutoconfig
  3 +
  4 +autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
  5 +
  6 +yoho.env.namespace = yohonow-platform
  7 +yoho.env.serverport = 61
  8 +yoho.env.webapphome = /home/dev/yohonow-platform/deploy
  9 +
  10 +
  11 +uic.api.host=http://192.168.102.48:8096/uic
  12 +
  13 +now.platform.task.switch=false
@@ -18,6 +18,10 @@ redis.push.address=192.168.102.211 @@ -18,6 +18,10 @@ redis.push.address=192.168.102.211
18 redis.push.port = 6379 18 redis.push.port = 6379
19 redis.push.auth= 19 redis.push.auth=
20 20
  21 +redis.readonly.proxy.address=192.168.102.17
  22 +redis.readonly.proxy.port=6379
  23 +redis.readonly.proxy.auth=
  24 +
21 redis.pool.maxTotal=200 25 redis.pool.maxTotal=200
22 redis.pool.maxIdle=100 26 redis.pool.maxIdle=100
23 redis.pool.minIdle=30 27 redis.pool.minIdle=30
@@ -214,10 +214,10 @@ jdbc.mysql.cmspush.username=root @@ -214,10 +214,10 @@ jdbc.mysql.cmspush.username=root
214 jdbc.mysql.cmspush.password=Z5BMngayHLUxyWLSv6+koA== 214 jdbc.mysql.cmspush.password=Z5BMngayHLUxyWLSv6+koA==
215 215
216 #mars_push_db 216 #mars_push_db
217 -jdbc.mysql.marspush.master=192.168.102.17:3306  
218 -jdbc.mysql.marspush.slave=192.168.102.17:3306  
219 -jdbc.mysql.marspush.username=root  
220 -jdbc.mysql.marspush.password=Z5BMngayHLUxyWLSv6+koA== 217 +jdbc.mysql.marspush.master=192.168.102.216:3306
  218 +jdbc.mysql.marspush.slave=192.168.102.216:3306
  219 +jdbc.mysql.marspush.username=yh_test
  220 +jdbc.mysql.marspush.password=9nm0icOwt6bMHjMusIfMLw==
221 221
222 #yh_cms 222 #yh_cms
223 jdbc.mysql.yh_cms.master=192.168.102.219:3306 223 jdbc.mysql.yh_cms.master=192.168.102.219:3306
@@ -235,7 +235,7 @@ jdbc.mysql.yhbsearch.password = 9nm0icOwt6bMHjMusIfMLw== @@ -235,7 +235,7 @@ jdbc.mysql.yhbsearch.password = 9nm0icOwt6bMHjMusIfMLw==
235 # search-es 235 # search-es
236 search.es.cluster.name = yohosearch_test 236 search.es.cluster.name = yohosearch_test
237 search.es.servers = es.node1.yohoops.org:9300 es.node2.yohoops.org:9300 237 search.es.servers = es.node1.yohoops.org:9300 es.node2.yohoops.org:9300
238 -search.index.number_of_replicas = 0 238 +search.index.number_of_replicas = 1
239 search.index.refresh_interval = 10s 239 search.index.refresh_interval = 10s
240 search.index.translog.flush_threshold_ops = 10000 240 search.index.translog.flush_threshold_ops = 10000
241 241
@@ -303,6 +303,11 @@ jdbc.mysql.yhlottery.slave=192.168.102.219:3306 @@ -303,6 +303,11 @@ jdbc.mysql.yhlottery.slave=192.168.102.219:3306
303 jdbc.mysql.yhlottery.username=yh_test 303 jdbc.mysql.yhlottery.username=yh_test
304 jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw== 304 jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw==
305 305
  306 +#bigdataunion
  307 +jdbc.mysql.bigdataunion.slave=read.bigdata.yohoops.org:3306
  308 +jdbc.mysql.bigdataunion.username=yh_vpc_bak
  309 +jdbc.mysql.bigdataunion.password=+BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=
  310 +
306 readOnlyInSlave=true 311 readOnlyInSlave=true
307 312
308 ##### **************************************** common properties ****************************************************** 313 ##### **************************************** common properties ******************************************************
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
  4 +
  5 +gateway.api.url = http://api.gray.yohops.com/
  6 +
  7 +uic_userInfoRest_enable = false
4 8
5 yoho.uic.env.namespace = uic 9 yoho.uic.env.namespace = uic
6 yoho.uic.env.serverport = 6 10 yoho.uic.env.serverport = 6
@@ -4,4 +4,8 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut @@ -4,4 +4,8 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut
4 jdbc.mysql.readonlyinslave = true 4 jdbc.mysql.readonlyinslave = true
5 yoho.messagecontroller.env.namespace = yoho-message-controller 5 yoho.messagecontroller.env.namespace = yoho-message-controller
6 yoho.messagecontroller.env.serverport = 7 6 yoho.messagecontroller.env.serverport = 7
7 -yoho.messagecontroller.env.webapphome = /home/test/yoho-message-controller/deploy  
  7 +yoho.messagecontroller.env.webapphome = /home/test/yoho-message-controller/deploy
  8 +
  9 +redis.push.address=192.168.102.211
  10 +redis.push.port = 6379
  11 +redis.push.auth=
@@ -16,7 +16,7 @@ build.productindex.use.code=true @@ -16,7 +16,7 @@ build.productindex.use.code=true
16 build.storageskuindex.use.code=true 16 build.storageskuindex.use.code=true
17 17
18 #consumer index config 18 #consumer index config
19 -search.index.batch.limit=2500 19 +search.index.batch.limit=3000
20 search.index.batch.limit.tbl=2000 20 search.index.batch.limit.tbl=2000
21 search.index.batch.max.thread.size=10 21 search.index.batch.max.thread.size=10
22 22
@@ -17,7 +17,7 @@ canal.subscribeChannel.shop=yh_shops.product_attribute_property_values,yh_shops. @@ -17,7 +17,7 @@ canal.subscribeChannel.shop=yh_shops.product_attribute_property_values,yh_shops.
17 17
18 ##canal-operation 18 ##canal-operation
19 canal.destination.operation=operations 19 canal.destination.operation=operations
20 -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 20 +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
21 21
22 ##cancal-erpproduct 22 ##cancal-erpproduct
23 canal.destination.erpproduct=erpproduct 23 canal.destination.erpproduct=erpproduct
@@ -37,4 +37,8 @@ canal.subscribeChannel.yhgeditor=yhg_editor.tbl_brand,yhg_editor.tbl_site,yhg_ed @@ -37,4 +37,8 @@ canal.subscribeChannel.yhgeditor=yhg_editor.tbl_brand,yhg_editor.tbl_site,yhg_ed
37 37
38 ##cancal-yhgproduct 38 ##cancal-yhgproduct
39 canal.destination.yhgproduct=yhgproduct 39 canal.destination.yhgproduct=yhgproduct
40 -canal.subscribeChannel.yhgproduct=yhg_product.tbl_product,yhg_product.tbl_product_skc,yhg_product.tbl_product_sku  
  40 +canal.subscribeChannel.yhgproduct=yhg_product.tbl_product,yhg_product.tbl_product_skc,yhg_product.tbl_product_sku
  41 +
  42 +##canal-promotion
  43 +canal.destination.promotion=promotion
  44 +canal.subscribeChannel.promotion=yhb_promotion.promotion_info,yhb_promotion.promotion_params
@@ -2,6 +2,8 @@ autoconfig.properties = sharedAutoconfig @@ -2,6 +2,8 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
4 4
  5 +browse.service.url = http://api.brower.yohoops.org:8092/brower/
  6 +
5 guang.shareGuang.appVersion = 4.1.0.*** 7 guang.shareGuang.appVersion = 4.1.0.***
6 8
7 java.logs.home = /Data/logs 9 java.logs.home = /Data/logs
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
4 4
5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^ 5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
6 6
@@ -8,8 +8,14 @@ erp.user.useGiftcard.url = http://api.erp.yohobuy.com @@ -8,8 +8,14 @@ erp.user.useGiftcard.url = http://api.erp.yohobuy.com
8 8
9 jdbc.mysql.readonlyinslave = true 9 jdbc.mysql.readonlyinslave = true
10 10
  11 +register.image.onoff = off
  12 +
  13 +register.new.user.page.probability = 9
  14 +
11 uic.service.url = http://192.168.102.31:8096/uic 15 uic.service.url = http://192.168.102.31:8096/uic
12 16
  17 +union.domain.url = http://webunion_tl.yohobuy.com/union
  18 +
13 user.session.expire = 10080 19 user.session.expire = 10080
14 20
15 users.base.isUic = false 21 users.base.isUic = false
@@ -20,15 +26,14 @@ users.yoho.default_is_bind = Y @@ -20,15 +26,14 @@ users.yoho.default_is_bind = Y
20 26
21 users.yohocoin = true 27 users.yohocoin = true
22 28
  29 +verify_student_flag = true
  30 +
23 yoho.users.env.namespace = users 31 yoho.users.env.namespace = users
24 yoho.users.env.serverport = 1 32 yoho.users.env.serverport = 1
25 yoho.users.env.webapphome = /home/test/yoho-users/deploy 33 yoho.users.env.webapphome = /home/test/yoho-users/deploy
26 34
27 -  
28 -zmxy_service_url=https://zmopenapi.zmxy.com.cn/sandbox.do  
29 -zmxy_appId=1000227  
30 -zmxy_contract_flag=si201604080002520001  
31 -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==  
32 -zmxy_rsa_zmPK=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB  
33 -  
34 -verify_student_flag=true  
  35 +zmxy_appId = 1000227
  36 +zmxy_contract_flag = si201604080002520001
  37 +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==
  38 +zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB
  39 +zmxy_service_url = https://zmopenapi.zmxy.com.cn/sandbox.do
@@ -8,7 +8,7 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig @@ -8,7 +8,7 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig
8 8
9 bigData.url = http://bigdata-crm.yohops.com/bigdata/crm/ 9 bigData.url = http://bigdata-crm.yohops.com/bigdata/crm/
10 10
11 -crm.send.notice = true 11 +crm.send.notice = false
12 12
13 ftp.ip = 54.222.156.51 13 ftp.ip = 54.222.156.51
14 ftp.port = 21 14 ftp.port = 21
@@ -117,3 +117,9 @@ watchService.watchDir = /Data/ftpdir @@ -117,3 +117,9 @@ watchService.watchDir = /Data/ftpdir
117 yohobuy.platform.env.namespace = platform 117 yohobuy.platform.env.namespace = platform
118 yohobuy.platform.env.serverport = 8 118 yohobuy.platform.env.serverport = 8
119 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy 119 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
  120 +bigdata.qiniu.refresh.url=http://fusion.qiniuapi.com/v2/tune/refresh
  121 +activity.url=http://activity.yoho.cn/feature/
  122 +price.over.days.roleName=444
  123 +
  124 +#product isPromotion field plan sync config
  125 +sync.product.isPromotion.advance.minutes=5
  1 +autoconfig.properties = sharedAutoconfig
  2 +
  3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
  4 +
  5 +yohomars.search.service.env.namespace = yohomars-search
  6 +yohomars.search.service.env.serverport = 7
  7 +yohomars.search.service.env.webapphome = /home/test/yohomars-search/deploy
@@ -2,10 +2,6 @@ autoconfig.properties = sharedAutoconfig @@ -2,10 +2,6 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
4 4
5 -yoho.search.service.env.namespace = yohomars-search  
6 -yoho.search.service.env.serverport = 7  
7 -yoho.search.service.env.webapphome = /home/test/yohomars-search-service/deploy  
8 -  
9 yohomars.search.service.env.namespace = yohomars-search 5 yohomars.search.service.env.namespace = yohomars-search
10 yohomars.search.service.env.serverport = 7 6 yohomars.search.service.env.serverport = 7
11 -yohomars.search.service.env.webapphome = /home/test/yohomars-search-service/deploy 7 +yohomars.search.service.env.webapphome = /home/test/yohomars-search-service/deploy
@@ -235,6 +235,11 @@ jdbc.mysql.yh_cms.slave=192.168.102.219:3306 @@ -235,6 +235,11 @@ jdbc.mysql.yh_cms.slave=192.168.102.219:3306
235 jdbc.mysql.yh_cms.username=yh_test 235 jdbc.mysql.yh_cms.username=yh_test
236 jdbc.mysql.yh_cms.password=9nm0icOwt6bMHjMusIfMLw== 236 jdbc.mysql.yh_cms.password=9nm0icOwt6bMHjMusIfMLw==
237 237
  238 +#bigdataunion
  239 +jdbc.mysql.bigdataunion.slave=read.bigdata.yohoops.org:3306
  240 +jdbc.mysql.bigdataunion.username=yh_vpc_bak
  241 +jdbc.mysql.bigdataunion.password=+BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=
  242 +
238 readOnlyInSlave=true 243 readOnlyInSlave=true
239 244
240 ##### **************************************** common properties ****************************************************** 245 ##### **************************************** common properties ******************************************************
@@ -98,4 +98,10 @@ upload.tencent.product.mark=9.99 @@ -98,4 +98,10 @@ upload.tencent.product.mark=9.99
98 # ******************** tencent upload skn data ******************** 98 # ******************** tencent upload skn data ********************
99 price.audit.secondCheckRoleName=secondCheck 99 price.audit.secondCheckRoleName=secondCheck
100 100
101 -mkt.app.download.url=http://m.yohobuy.com/app  
  101 +mkt.app.download.url=http://m.yohobuy.com/app
  102 +bigdata.qiniu.refresh.url=http://fusion.qiniuapi.com/v2/tune/refresh
  103 +activity.url=http://activity.yoho.cn/feature/
  104 +price.over.days.roleName=changeOver180DaysPrice,changeOver180DaysPrice2
  105 +
  106 +#product isPromotion field plan sync config
  107 +sync.product.isPromotion.advance.minutes=5
@@ -63,5 +63,6 @@ platform.service.url=http://192.1638.102.202:8088/platform @@ -63,5 +63,6 @@ platform.service.url=http://192.1638.102.202:8088/platform
63 photoSearch.access.key.id=7343a192140f25a59c53dab5652f5f47 63 photoSearch.access.key.id=7343a192140f25a59c53dab5652f5f47
64 photoSearch.secret.key=45c1ce98ee6b4701d55802989ba240f4 64 photoSearch.secret.key=45c1ce98ee6b4701d55802989ba240f4
65 photoSearch.service.id=rdbehn3x 65 photoSearch.service.id=rdbehn3x
  66 +login.skip.modify.weakPwd=Y
66 67
67 68
@@ -2,6 +2,8 @@ autoconfig.properties = sharedAutoconfig @@ -2,6 +2,8 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties
4 4
  5 +crf.service.url = https://osprec-ci.crfchina.com
  6 +
5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^ 7 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
6 8
7 erp.user.useGiftcard.url = http://api.erp.yohobuy.com 9 erp.user.useGiftcard.url = http://api.erp.yohobuy.com
@@ -14,6 +16,8 @@ register.new.user.page.probability = 9 @@ -14,6 +16,8 @@ register.new.user.page.probability = 9
14 16
15 uic.service.url = http://uic.yohoops.org:8096/uic 17 uic.service.url = http://uic.yohoops.org:8096/uic
16 18
  19 +union.domain.url = http://webunion_tl.yohobuy.com/union
  20 +
17 user.session.expire = 10080 21 user.session.expire = 10080
18 22
19 users.base.isUic = false 23 users.base.isUic = false
@@ -29,8 +33,6 @@ users.yohocoin.dilute = true @@ -29,8 +33,6 @@ users.yohocoin.dilute = true
29 33
30 verify_student_flag = false 34 verify_student_flag = false
31 35
32 -crf.service.url=https://osprec-ci.crfchina.com  
33 -  
34 yoho.users.env.namespace = users 36 yoho.users.env.namespace = users
35 yoho.users.env.serverport = 1 37 yoho.users.env.serverport = 1
36 yoho.users.env.webapphome = /home/test/yoho-users/deploy 38 yoho.users.env.webapphome = /home/test/yoho-users/deploy
@@ -40,6 +42,6 @@ zmxy_contract_flag = si201604080002520001 @@ -40,6 +42,6 @@ zmxy_contract_flag = si201604080002520001
40 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== 42 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==
41 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB 43 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB
42 zmxy_service_url = https://zmopenapi.zmxy.com.cn/sandbox.do 44 zmxy_service_url = https://zmopenapi.zmxy.com.cn/sandbox.do
43 -  
44 -crf.service.url=https://osprec-ci.crfchina.com 45 +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
  46 +diff.base.flag=1
45 47
@@ -29,6 +29,6 @@ jdbc.mysql.bigdata.password=ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA= @@ -29,6 +29,6 @@ jdbc.mysql.bigdata.password=ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
29 29
30 bigdata.database.cluster.name = shop 30 bigdata.database.cluster.name = shop
31 31
32 -bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn  
33 - 32 +bigDataRedis.proxy.address=123.206.17.17
  33 +bigDataRedis.proxy.port=16379
34 ip.port.search.server = 192.168.102.216:8080 34 ip.port.search.server = 192.168.102.216:8080
@@ -66,3 +66,6 @@ watchService.watchDir = /Data/sftp_images @@ -66,3 +66,6 @@ watchService.watchDir = /Data/sftp_images
66 yohobuy.platform.env.namespace = platform 66 yohobuy.platform.env.namespace = platform
67 yohobuy.platform.env.serverport = 8 67 yohobuy.platform.env.serverport = 8
68 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy 68 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
  69 +bigdata.qiniu.refresh.url=http://fusion.qiniuapi.com/v2/tune/refresh
  70 +
  71 +sync.product.isPromotion.advance.minutes = 5
@@ -12,5 +12,6 @@ promoation.invite.shareCoupon = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12 @@ -12,5 +12,6 @@ promoation.invite.shareCoupon = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12
12 yohobuy.promotion.env.namespace = promotion 12 yohobuy.promotion.env.namespace = promotion
13 yohobuy.promotion.env.serverport = 5 13 yohobuy.promotion.env.serverport = 5
14 yohobuy.promotion.env.webapphome = /home/test/yohobuy-promotion/deploy 14 yohobuy.promotion.env.webapphome = /home/test/yohobuy-promotion/deploy
15 - 15 +wechat.coupons.operators.email=chao.geng@yoho.cn
  16 +wechat.coupons.operators.mobile=13770338135
16 promotion.sendCounpon.broadcast.rate=0.9 17 promotion.sendCounpon.broadcast.rate=0.9
1 activeTime = 86400 1 activeTime = 86400
2 2
  3 +admin.login.url = http://192.168.102.211:30012
  4 +
3 autoconfig.properties = sharedAutoconfig 5 autoconfig.properties = sharedAutoconfig
4 6
5 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_2/global-autoconfig.properties 7 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 @@ -10,10 +12,18 @@ bigdate.db.username = yh_bigdata
10 12
11 draw.writeFile.delay = 60 13 draw.writeFile.delay = 60
12 14
  15 +erp.domain = http://192.168.102.47:9098/erp-gateway-web
  16 +
  17 +exclude.union.type = 100000000000349
  18 +
  19 +file.saveDir = /Data/images
  20 +
13 gateway.url = http://api.yoho.cn 21 gateway.url = http://api.yoho.cn
14 22
15 jdbc.mysql.readonlyinslave = true 23 jdbc.mysql.readonlyinslave = true
16 24
  25 +platform.login.salt = yoho9646yoho9646
  26 +
17 rabbit.mq.host = 192.168.102.162 27 rabbit.mq.host = 192.168.102.162
18 rabbit.mq.password = yoho 28 rabbit.mq.password = yoho
19 rabbit.mq.port = 32810 29 rabbit.mq.port = 32810
@@ -29,18 +39,8 @@ redis.union.readonly.proxy.address = test-bigdata-redis-1903805580.cn-north-1.e @@ -29,18 +39,8 @@ redis.union.readonly.proxy.address = test-bigdata-redis-1903805580.cn-north-1.e
29 39
30 tencentmkt.shareUrl = http://union.yoho.cn/union/tencentMkt/index.html 40 tencentmkt.shareUrl = http://union.yoho.cn/union/tencentMkt/index.html
31 41
  42 +union.host = 172.31.16.99
  43 +
32 yoho.unions.env.namespace = union 44 yoho.unions.env.namespace = union
33 yoho.unions.env.serverport = 8 45 yoho.unions.env.serverport = 8
34 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy 46 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy
35 -  
36 -  
37 -file.saveDir = /Data/images  
38 -platform.login.salt=yoho9646yoho9646  
39 -erp.domain=http://192.168.102.47:9098/erp-gateway-web  
40 -admin.login.url=http://192.168.102.211:30012  
41 -  
42 -  
43 -rabbit_message_center = 192.168.102.211:5672  
44 -rabbit_message_center_user = yoho  
45 -rabbit_message_center_password = yoho  
46 -rabbit_message_center_vhost = yoho  
@@ -14,3 +14,5 @@ wechat.user.info = /cgi-bin/user/info @@ -14,3 +14,5 @@ wechat.user.info = /cgi-bin/user/info
14 yohobuy.wechat.env.namespace = wechat 14 yohobuy.wechat.env.namespace = wechat
15 yohobuy.wechat.env.serverport = 4 15 yohobuy.wechat.env.serverport = 4
16 yohobuy.wechat.env.webapphome = /home/test/yohobuy-wechat/deploy 16 yohobuy.wechat.env.webapphome = /home/test/yohobuy-wechat/deploy
  17 +wechat.subscription.access.appid=wx1e6997242bcfcdfb
  18 +wechat.subscription.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd
  1 +autoconfig.properties = sharedAutoconfig
  2 +
  3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
  4 +
  5 +yoho.cms_push.env.namespace = cms_push
  6 +yoho.cms_push.env.webapphome = /home/test/cms-push/deploy
@@ -12,6 +12,11 @@ file.saveDir=/home/test @@ -12,6 +12,11 @@ file.saveDir=/home/test
12 12
13 ### ****************************** database *********************************** 13 ### ****************************** database ***********************************
14 14
  15 +jdbc.mysql.yhwechat.master=write.passport.yohoops.org:3306
  16 +jdbc.mysql.yhwechat.slave=write.passport.yohoops.org:3306
  17 +jdbc.mysql.yhwechat.username=yh_test
  18 +jdbc.mysql.yhwechat.password=9nm0icOwt6bMHjMusIfMLw==
  19 +
15 jdbc.mysql.yhresource.username=yh_test 20 jdbc.mysql.yhresource.username=yh_test
16 jdbc.mysql.yhresource.password=9nm0icOwt6bMHjMusIfMLw== 21 jdbc.mysql.yhresource.password=9nm0icOwt6bMHjMusIfMLw==
17 22
@@ -298,6 +303,11 @@ jdbc.mysql.yhbsearch.slave=read.search.yohoops.org:3306 @@ -298,6 +303,11 @@ jdbc.mysql.yhbsearch.slave=read.search.yohoops.org:3306
298 jdbc.mysql.yhbsearch.username=yh_test 303 jdbc.mysql.yhbsearch.username=yh_test
299 jdbc.mysql.yhbsearch.password=9nm0icOwt6bMHjMusIfMLw== 304 jdbc.mysql.yhbsearch.password=9nm0icOwt6bMHjMusIfMLw==
300 305
  306 +#bigdataunion
  307 +jdbc.mysql.bigdataunion.slave=read.bigdata.yohoops.org:3306
  308 +jdbc.mysql.bigdataunion.username=yh_vpc_bak
  309 +jdbc.mysql.bigdataunion.password=+BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=
  310 +
301 # search-es 311 # search-es
302 search.es.cluster.name = yohosearch_testQQ 312 search.es.cluster.name = yohosearch_testQQ
303 search.es.servers = es.node1.yohoops.org:9300 313 search.es.servers = es.node1.yohoops.org:9300
@@ -313,6 +323,10 @@ search.mq.password=123qwe @@ -313,6 +323,10 @@ search.mq.password=123qwe
313 search.mq.exchange=yoho_search 323 search.mq.exchange=yoho_search
314 search.mq.virtualHost=yohosearch 324 search.mq.virtualHost=yohosearch
315 325
  326 +#search-redis
  327 +redis.search.proxy.address =192.168.102.45
  328 +redis.search.proxy.port =6379
  329 +redis.search.proxy.auth =
316 330
317 #for crm read db 331 #for crm read db
318 jdbc.mysql.yohopassport.onlyslave=read.passport.yohoops.org:3306 332 jdbc.mysql.yohopassport.onlyslave=read.passport.yohoops.org:3306
@@ -376,11 +390,11 @@ bigDataRedis-search.proxy.address=bigdata.redis.yohoops.org @@ -376,11 +390,11 @@ bigDataRedis-search.proxy.address=bigdata.redis.yohoops.org
376 bigDataRedis-search.proxy.port= 6379 390 bigDataRedis-search.proxy.port= 6379
377 bigDataRedis-search.proxy.auth= 391 bigDataRedis-search.proxy.auth=
378 392
379 -redis.union.proxy.address=huodong.write.yohoops.org 393 +redis.union.proxy.address=write.redis.yohoops.org
380 redis.union.proxy.port=6379 394 redis.union.proxy.port=6379
381 redis.union.proxy.auth= 395 redis.union.proxy.auth=
382 396
383 -redis.union.readonly.proxy.address=huodong.read.yohoops.org 397 +redis.union.readonly.proxy.address=read.redis.yohoops.org
384 redis.union.readonly.proxy.port=6379 398 redis.union.readonly.proxy.port=6379
385 redis.union.readonly.proxy.auth= 399 redis.union.readonly.proxy.auth=
386 400
@@ -408,8 +422,8 @@ rabbit_common_password = yoho @@ -408,8 +422,8 @@ rabbit_common_password = yoho
408 422
409 423
410 #cache clear rabbitmq 424 #cache clear rabbitmq
411 -rabbit.cacheclean.producer.host = rabbitmq-common-qq.yohoops.org:5672  
412 -rabbit.cacheclean.consumer.host = rabbitmq-common-aws.yohoops.org:5672 425 +rabbit.cacheclean.producer.host = rabbitmq-common-aws.yohoops.org:5672
  426 +rabbit.cacheclean.consumer.host = rabbitmq-common-qq.yohoops.org:5672
413 427
414 #message-center rabbitmq 428 #message-center rabbitmq
415 rabbit_message_center = 192.168.102.211:5672 429 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 @@ -427,7 +441,7 @@ yoho.message.controller.url=http://192.168.102.202:8087/yoho-message-controller
427 zkAddress=zk01.yohoops.org:2181 441 zkAddress=zk01.yohoops.org:2181
428 442
429 # change to order.run-host.yohoops.org later 443 # change to order.run-host.yohoops.org later
430 -order.task.host=192.168.102.48 444 +order.task.host=192.168.103.74
431 445
432 APP_KEY = 1392109259 446 APP_KEY = 1392109259
433 APP_SECRET = 1e87e46f115cc813e27ef52eb9915f1e 447 APP_SECRET = 1e87e46f115cc813e27ef52eb9915f1e
@@ -476,4 +490,17 @@ package.ticket.more.couponid=13268 @@ -476,4 +490,17 @@ package.ticket.more.couponid=13268
476 490
477 default.http.type = http 491 default.http.type = http
478 492
479 -browse.service.url = http://192.168.102.48:8092/brower/  
  493 +browse.service.url = http://192.168.103.74:8092/brower/
  494 +
  495 +
  496 +#mars
  497 +jdbc.mysql.yhmars.master=write.mars.yohoops.org:3306
  498 +jdbc.mysql.yhmars.slave=read.mars.yohoops.org:3306
  499 +jdbc.mysql.yhmars.username=yh_test
  500 +jdbc.mysql.yhmars.password=9nm0icOwt6bMHjMusIfMLw==
  501 +
  502 +#yhnow
  503 +jdbc.mysql.yhnow.master=192.168.102.17:3306
  504 +jdbc.mysql.yhnow.slave=192.168.102.17:3306
  505 +jdbc.mysql.yhnow.username=root
  506 +jdbc.mysql.yhnow.password=Z5BMngayHLUxyWLSv6+koA==
@@ -4,7 +4,7 @@ autoconfig.properties = sharedAutoconfig @@ -4,7 +4,7 @@ autoconfig.properties = sharedAutoconfig
4 4
5 autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties 5 autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties
6 6
7 -browse.service.url = http://192.168.102.48:8092/brower/ 7 +browse.service.url = http://192.168.103.74:8092/brower/
8 8
9 erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status 9 erp.order.status.url = http://portal.admin.yohobuy.com/api/orders/status
10 10
@@ -37,8 +37,6 @@ yoho.gateway.env.webapphome = /home/test/yoho-gateway/deploy @@ -37,8 +37,6 @@ yoho.gateway.env.webapphome = /home/test/yoho-gateway/deploy
37 #密码AES加密密钥 37 #密码AES加密密钥
38 password.aes.key=yoho9646yoho9646 38 password.aes.key=yoho9646yoho9646
39 39
40 -  
41 -  
42 degrade_complaintsCount_level=0 40 degrade_complaintsCount_level=0
43 degrade_complaintsList_level=0 41 degrade_complaintsList_level=0
44 degrade_likeBrand_level=0 42 degrade_likeBrand_level=0
@@ -62,4 +60,5 @@ platform.service.url=http://192.1638.102.48:8088/platform @@ -62,4 +60,5 @@ platform.service.url=http://192.1638.102.48:8088/platform
62 #photoSearch 60 #photoSearch
63 photoSearch.access.key.id=7343a192140f25a59c53dab5652f5f47 61 photoSearch.access.key.id=7343a192140f25a59c53dab5652f5f47
64 photoSearch.secret.key=45c1ce98ee6b4701d55802989ba240f4 62 photoSearch.secret.key=45c1ce98ee6b4701d55802989ba240f4
65 -photoSearch.service.id=rdbehn3x  
  63 +photoSearch.service.id=rdbehn3x
  64 +login.skip.modify.weakPwd=N
  1 +yoho.logs.basedir=/Data/logs
  2 +
  3 +is_debug_enable=false
  4 +jdbc.mysql.readonlyinslave=true
  5 +autoconfig.properties = sharedAutoconfig
  6 +
  7 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
  8 +
  9 +yohomars.env.namespace = yohomars
  10 +yohomars.env.serverport = 72
  11 +yohomars.env.webapphome = /home/test/yoho-mars/deploy
  12 +
  13 +
  14 +uic.api.host=http://192.168.103.73:8096/uic
  15 +exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7
  16 +
  17 +redis.proxy.address=192.168.102.17
  18 +redis.proxy.port=6380
  19 +redis.readonly.proxy.port=6380
  20 +redis.readonly.proxy.address=192.168.102.17
  21 +redis.notsync.twemproxy.addresses=192.168.102.17:6380
  22 +mars.task.switch=true
  23 +exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7
  24 +
  1 +yoho.logs.basedir=/Data/logs
  2 +autoconfig.properties = sharedAutoconfig
  3 +is_debug_enable = true
  4 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
  5 +
  6 +uic.service.url=http://192.168.103.73:8096/uic/
  7 +mag.service.url=http://ezine-test.yohops.com:9999/index.php?r=Apiemag
  8 +
  9 +yohonow.env.namespace = yohonow
  10 +yohonow.env.serverport = 1
  11 +yohonow.env.webapphome = /home/test/yoho-now/deploy
  12 +
  13 +
  14 +boy.cn.site.url=http://newboys.test.yoho.cn
  15 +girl.cn.site.url=http://newgirls.test.yoho.cn
  16 +
  17 +#hongkong site main
  18 +boy.hk.site.url=http://hkboys.test.yoho.cn
  19 +girl.hk.site.url=http://hkgirls.test.yoho.cn
  20 +social.domain.url=http://192.168.102.52:8095/social
  21 +
  22 +redis.notsync.twemproxy.addresses = 192.168.102.17:6379
  23 +redis.proxy.address = 192.168.102.17
  24 +redis.readonly.proxy.address = 192.168.102.17
@@ -16,4 +16,17 @@ tpl.adaptor.domain = http://search.adaptor.yohoops.org:8085/search-adaptor @@ -16,4 +16,17 @@ tpl.adaptor.domain = http://search.adaptor.yohoops.org:8085/search-adaptor
16 build.productindex.use.code=true 16 build.productindex.use.code=true
17 17
18 #build.storageskuindex.use.code 18 #build.storageskuindex.use.code
19 -build.storageskuindex.use.code=true  
  19 +build.storageskuindex.use.code=true
  20 +
  21 +#consumer index config
  22 +search.index.batch.limit=2500
  23 +search.index.batch.limit.tbl=2000
  24 +search.index.batch.max.thread.size=10
  25 +
  26 +#suggest count
  27 +suggestion.count.batch.limit=300
  28 +suggestion.count.batch.max.thread.size=1
  29 +suggestion.discover.batch.limit=500
  30 +suggestion.discover.batch.max.thread.size=3
  31 +suggestion.count.agg.size=10000
  32 +suggestion.count.agg.mindoc=5
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/aws/global-autoconfig.properties 2 +autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties
3 3
4 yoho.search.producer.env.namespace = search-producer 4 yoho.search.producer.env.namespace = search-producer
5 yoho.search.producer.env.serverport = 9 5 yoho.search.producer.env.serverport = 9
@@ -7,16 +7,34 @@ yoho.search.producer.env.webapphome = /home/test/yoho-search-producer/deploy @@ -7,16 +7,34 @@ yoho.search.producer.env.webapphome = /home/test/yoho-search-producer/deploy
7 7
8 ## search configuration begin 8 ## search configuration begin
9 9
10 -//canal 10 +##canal
11 canal.hostType=zkCluster 11 canal.hostType=zkCluster
12 canal.server.port=zk01.yohoops.org:2181 12 canal.server.port=zk01.yohoops.org:2181
13 13
14 -//canal-shop 14 +##canal-shop
15 canal.destination.shop=shops 15 canal.destination.shop=shops
16 -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 16 +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
17 17
18 -//canal-operation 18 +##canal-operation
19 canal.destination.operation=operations 19 canal.destination.operation=operations
20 -canal.subscribeChannel.operation=yhb_operations.activity_product 20 +canal.subscribeChannel.operation=yhb_operations.suggest_word_custom,yhb_operations.suggest_conversion_custom,yhb_operations.activity_product,yhb_operations.es_word_def
21 21
22 -## search configuration fininshed 22 +##cancal-erpproduct
  23 +canal.destination.erpproduct=erpproduct
  24 +canal.subscribeChannel.erpproduct=erp_product.product_pool_detail,erp_product.product_ext,erp_product.product_attribute
  25 +
  26 +##cancal-erpcustomerservice
  27 +canal.destination.erpcustomerservice=erpcustomerservice
  28 +canal.subscribeChannel.erpcustomerservice=erp_customer_service.robot_question
  29 +
  30 +##cancal-helper
  31 +canal.destination.helper=helper
  32 +canal.subscribeChannel.helper=yh_helper.helper
  33 +
  34 +##cancal-yhgeditor
  35 +canal.destination.yhgeditor=yhgeditor
  36 +canal.subscribeChannel.yhgeditor=yhg_editor.tbl_brand,yhg_editor.tbl_site,yhg_editor.tbl_sort
  37 +
  38 +##cancal-yhgproduct
  39 +canal.destination.yhgproduct=yhgproduct
  40 +canal.subscribeChannel.yhgproduct=yhg_product.tbl_product,yhg_product.tbl_product_skc,yhg_product.tbl_product_sku
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties 2 +
  3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
3 4
4 yoho.search.service.env.namespace = yohosearch 5 yoho.search.service.env.namespace = yohosearch
5 yoho.search.service.env.serverport = 0 6 yoho.search.service.env.serverport = 0
6 yoho.search.service.env.webapphome = /home/test/yoho-search-service/deploy 7 yoho.search.service.env.webapphome = /home/test/yoho-search-service/deploy
7 8
8 ##tpl adaptor 9 ##tpl adaptor
9 -tpl.adaptor.valid = false  
10 -  
11 -##search.use.cache 10 +
  11 +tpl.adaptor.valid = true
  12 +
  13 +##search.use.cache[ehCache/redisCache]
12 search.use.cache = true 14 search.use.cache = true
13 - 15 +search.cache.type = redisCache
  16 +
14 search.open.downgrade = true 17 search.open.downgrade = true
15 -  
16 -search.multiMatchQuery.type=BEST_FIELDS  
  18 +search.personalized.switch = true
  19 +search.personalized.max.should = 50
  20 +
  21 +
  22 +search.multiMatchQuery.type=CROSS_FIELDS
@@ -6,6 +6,8 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut @@ -6,6 +6,8 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut
6 6
7 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^ 7 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
8 8
  9 +diff.base.flag = 1
  10 +
9 erp.user.useGiftcard.url = http://api.erp.yohobuy.com 11 erp.user.useGiftcard.url = http://api.erp.yohobuy.com
10 12
11 jdbc.mysql.readonlyinslave = true 13 jdbc.mysql.readonlyinslave = true
@@ -16,6 +18,7 @@ register.new.user.page.probability = 5 @@ -16,6 +18,7 @@ register.new.user.page.probability = 5
16 18
17 uic.service.url = http://uic.yohoops.org:8096/uic 19 uic.service.url = http://uic.yohoops.org:8096/uic
18 20
  21 +union.domain.url = http://webunion_tl.yohobuy.com/union
19 user.session.expire = 10080 22 user.session.expire = 10080
20 23
21 userday.open.day = 28 24 userday.open.day = 28
@@ -33,8 +36,6 @@ users.yohocoin.dilute = true @@ -33,8 +36,6 @@ users.yohocoin.dilute = true
33 36
34 verify_student_flag = true 37 verify_student_flag = true
35 38
36 -crf.service.url=https://osprec-ci.crfchina.com  
37 -  
38 yoho.users.env.namespace = users 39 yoho.users.env.namespace = users
39 yoho.users.env.serverport = 1 40 yoho.users.env.serverport = 1
40 yoho.users.env.webapphome = /home/test/yoho-users/deploy 41 yoho.users.env.webapphome = /home/test/yoho-users/deploy
@@ -44,3 +45,6 @@ zmxy_contract_flag = si201607290001591005 @@ -44,3 +45,6 @@ zmxy_contract_flag = si201607290001591005
44 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 45 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
45 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDn7lB5Pxis6rnI2JkC8Z/RQuF+/RInuZSD9IcK7bnovahZXN3yOEdc5YuWKB0FA9DWONBRkctEmabWbxCYdEbeHV+kh2Zd0DktzZZnDjp6vmRDtihkJ7IJtUKLPeksZCAbbnEq/HmonqNF4qU4qfYuyZGwmHaBVNrg4BxP9s0VTwIDAQAB 46 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDn7lB5Pxis6rnI2JkC8Z/RQuF+/RInuZSD9IcK7bnovahZXN3yOEdc5YuWKB0FA9DWONBRkctEmabWbxCYdEbeHV+kh2Zd0DktzZZnDjp6vmRDtihkJ7IJtUKLPeksZCAbbnEq/HmonqNF4qU4qfYuyZGwmHaBVNrg4BxP9s0VTwIDAQAB
46 zmxy_service_url = https://zmopenapi.zmxy.com.cn/openapi.do 47 zmxy_service_url = https://zmopenapi.zmxy.com.cn/openapi.do
  48 +
  49 +
  50 +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
1 aesKey = yoho96461qaz2wsx 1 aesKey = yoho96461qaz2wsx
2 2
3 -alarm.mobile = 13951882433 3 +alarm.mobile = 18994021292
4 4
5 autoconfig.properties = sharedAutoconfig 5 autoconfig.properties = sharedAutoconfig
6 6
@@ -10,6 +10,12 @@ bigData.url = http://bigdata-crm.yohops.com:8070/bigdata/crm/ @@ -10,6 +10,12 @@ bigData.url = http://bigdata-crm.yohops.com:8070/bigdata/crm/
10 10
11 crm.send.notice = true 11 crm.send.notice = true
12 12
  13 +platform.host=http://192.168.102.202:8088/platform
  14 +rabbit_common = 192.168.102.211:5672
  15 +platform.coupon.userId=10964
  16 +platform.coupon.userName=crm
  17 +
  18 +
13 ftp.ip=54.222.156.51 19 ftp.ip=54.222.156.51
14 ftp.port=21 20 ftp.port=21
15 ftp.userName=ftpuser 21 ftp.userName=ftpuser
@@ -25,7 +31,7 @@ yohobuy.crm.env.namespace = crm @@ -25,7 +31,7 @@ yohobuy.crm.env.namespace = crm
25 yohobuy.crm.env.serverport = 3 31 yohobuy.crm.env.serverport = 3
26 yohobuy.crm.env.webapphome = /home/test/yohobuy-crm/deploy 32 yohobuy.crm.env.webapphome = /home/test/yohobuy-crm/deploy
27 33
28 -sms.reprot.flag=true 34 +sms.reprot.flag=false
29 35
30 redis.crm.notsync.twemproxy.addresses=huodong.write.yohoops.org:6379 36 redis.crm.notsync.twemproxy.addresses=huodong.write.yohoops.org:6379
31 redis.notsync.twemproxy.auth= 37 redis.notsync.twemproxy.auth=
@@ -59,25 +65,13 @@ wechat.access.yohonowGirl.appid=wxb52ec6a352f0b090 @@ -59,25 +65,13 @@ wechat.access.yohonowGirl.appid=wxb52ec6a352f0b090
59 wechat.access.yohonowGirl.secret=9fe6bedb0b7f30986a168c7fc44f34c0 65 wechat.access.yohonowGirl.secret=9fe6bedb0b7f30986a168c7fc44f34c0
60 ############################ wechat module ####################################### 66 ############################ wechat module #######################################
61 67
62 -  
63 #redis.notsync.twemproxy.addresses=192.168.102.222:22121,192.168.102.211:22121 68 #redis.notsync.twemproxy.addresses=192.168.102.222:22121,192.168.102.211:22121
64 #redis.notsync.twemproxy.auth= 69 #redis.notsync.twemproxy.auth=
65 70
66 #历史vip用户分组ID 71 #历史vip用户分组ID
67 birthday.coupon.groupid=12 72 birthday.coupon.groupid=12
68 73
69 -  
70 -#生日券模板ID  
71 -#VIP专享满299减80（全品类）  
72 -birthday.coupon.vip.small.templateid=148  
73 -#VIP专享满499减120（全品类）  
74 -birthday.coupon.vip.templateid=146  
75 -#金、白金专享满599减150（全品类）  
76 -birthday.coupon.gold.platinum.templateid=144  
77 -#白金专享满699减180（全品类）  
78 -birthday.coupon.platinum.templateid=142  
79 -  
80 #生日券短信模板ID 74 #生日券短信模板ID
81 birthday.coupon.sms.templateid=2 75 birthday.coupon.sms.templateid=2
82 76
83 -browse.service.url=http://192.168.102.48:8092/brower/  
  77 +browse.service.url=http://192.168.103.74:8092/brower/
@@ -54,5 +54,5 @@ exhibition.ticket.couponid=13576 @@ -54,5 +54,5 @@ exhibition.ticket.couponid=13576
54 # 套票券ID 54 # 套票券ID
55 package.ticket.couponid=13570 55 package.ticket.couponid=13570
56 56
57 -browse.service.url = http://192.168.102.48:8092/brower/ 57 +browse.service.url = http://192.168.103.74:8092/brower/
58 58
@@ -83,6 +83,10 @@ mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html @@ -83,6 +83,10 @@ mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html
83 83
84 mkt.app.download.url = http://m.yohobuy.com/app 84 mkt.app.download.url = http://m.yohobuy.com/app
85 85
  86 +mkt.pcwap.domain.url = http://union.yoho.cn/union/go
  87 +
  88 +mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
  89 +
86 platform.login.salt = yoho9646yoho9646 90 platform.login.salt = yoho9646yoho9646
87 91
88 price.audit.secondCheckRoleName = secondCheck 92 price.audit.secondCheckRoleName = secondCheck
@@ -95,6 +99,8 @@ price.selltype.url = http://192.168.102.47:9098/erp-gateway-web/plate_price_for @@ -95,6 +99,8 @@ price.selltype.url = http://192.168.102.47:9098/erp-gateway-web/plate_price_for
95 99
96 qiniu.bigdata.skndada.fileName = /Users/apple/Documents/tmp/sknData.xml 100 qiniu.bigdata.skndada.fileName = /Users/apple/Documents/tmp/sknData.xml
97 101
  102 +sync.product.isPromotion.advance.minutes = 5
  103 +
98 resources_https_enable = true 104 resources_https_enable = true
99 105
100 search.server.address = http://search.yohoops.org:8080/yohosearch/ 106 search.server.address = http://search.yohoops.org:8080/yohosearch/
@@ -113,5 +119,6 @@ watchService.watchDir = /Data/sftp_images @@ -113,5 +119,6 @@ watchService.watchDir = /Data/sftp_images
113 yohobuy.platform.env.namespace = platform 119 yohobuy.platform.env.namespace = platform
114 yohobuy.platform.env.serverport = 8 120 yohobuy.platform.env.serverport = 8
115 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy 121 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
116 -  
117 -mkt.app.download.url=http://m.yohobuy.com/app  
  122 +bigdata.qiniu.refresh.url=http://fusion.qiniuapi.com/v2/tune/refresh
  123 +activity.url=http://activity.yoho.cn/feature/
  124 +price.over.days.roleName=changeOver180DaysPrice,changeOver180DaysPrice2
@@ -9,10 +9,11 @@ yohobuy.promotion.env.namespace = promotion @@ -9,10 +9,11 @@ yohobuy.promotion.env.namespace = promotion
9 yohobuy.promotion.env.serverport = 5 9 yohobuy.promotion.env.serverport = 5
10 yohobuy.promotion.env.webapphome = /home/test/yohobuy-promotion/deploy 10 yohobuy.promotion.env.webapphome = /home/test/yohobuy-promotion/deploy
11 11
12 -wechat.coupons.operators.email=jie.pang@yoho.cn 12 +wechat.coupons.operators.email=chao.geng@yoho.cn
  13 +wechat.coupons.operators.mobile=13770338135
13 14
14 promoation.invite.newCouponMap = {"17593":15,"17597":15,"17599":15,"17601":15,"17603":15} 15 promoation.invite.newCouponMap = {"17593":15,"17597":15,"17599":15,"17601":15,"17603":15}
15 promoation.invite.shareCoupon = [ "12073", "12075", "12077", "12079", "12081", "12083" ] 16 promoation.invite.shareCoupon = [ "12073", "12075", "12077", "12079", "12081", "12083" ]
16 promoation.invite.failCoupon = {"old":17591,"fail":17595} 17 promoation.invite.failCoupon = {"old":17591,"fail":17595}
17 18
18 -promotion.sendCounpon.broadcast.rate=0.9  
  19 +promotion.sendCounpon.broadcast.rate=0.9
@@ -4,15 +4,20 @@ autoconfig.properties = sharedAutoconfig @@ -4,15 +4,20 @@ autoconfig.properties = sharedAutoconfig
4 4
5 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties 5 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
6 6
7 -bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=  
8 -bigdate.db.url = 172.31.6.98:3306  
9 -bigdate.db.username = yh_bigdata 7 +bigdate.db.password = 9nm0icOwt6bMHjMusIfMLw==
  8 +bigdate.db.url = read.passport.yohoops.org:3306
  9 +bigdate.db.username = yh_test
10 10
11 draw.writeFile.delay = 60 11 draw.writeFile.delay = 60
12 12
  13 +exclude.union.type = 100000000000349
  14 +
13 gateway.url = http://api.yoho.cn 15 gateway.url = http://api.yoho.cn
14 16
15 -jdbc.mysql.readonlyinslave = true 17 +jdbc.mysql.bigdataunion.password = rALdkYPZCr4QyzBfVCGdXA==
  18 +jdbc.mysql.bigdataunion.slave = 118.89.235.30:3306
  19 +jdbc.mysql.bigdataunion.username = yh_test_bigdata
  20 +jdbc.mysql.readonlyinslave = true
16 21
17 rabbit.mq.host = 192.168.102.162 22 rabbit.mq.host = 192.168.102.162
18 rabbit.mq.password = yoho 23 rabbit.mq.password = yoho
@@ -22,6 +27,8 @@ rabbit.mq.virtualHost = /yoho @@ -22,6 +27,8 @@ rabbit.mq.virtualHost = /yoho
22 27
23 tencentmkt.shareUrl = http://union.yoho.cn/union/tencentMkt/index.html 28 tencentmkt.shareUrl = http://union.yoho.cn/union/tencentMkt/index.html
24 29
  30 +union.host = 172.31.16.99
  31 +
25 yoho.unions.env.namespace = union 32 yoho.unions.env.namespace = union
26 yoho.unions.env.serverport = 8 33 yoho.unions.env.serverport = 8
27 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy 34 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy
@@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig @@ -2,8 +2,8 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
4 4
5 -wechat.access.appid = wx1e6997242bcfcdfb  
6 -wechat.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd 5 +wechat.access.appid = wx75e5a7c0c88e45c2
  6 +wechat.access.secret = ce21ae4a3f93852279175a167e54509b
7 7
8 wechat.small.program.access.appid = wx084ab813d88c594b 8 wechat.small.program.access.appid = wx084ab813d88c594b
9 wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac 9 wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac
@@ -11,6 +11,12 @@ wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac @@ -11,6 +11,12 @@ wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac
11 wechat.user.get = /cgi-bin/user/get 11 wechat.user.get = /cgi-bin/user/get
12 wechat.user.info = /cgi-bin/user/info 12 wechat.user.info = /cgi-bin/user/info
13 13
  14 +wechat.yohoshow.access.appid = wx1e6997242bcfcdfb
  15 +wechat.yohoshow.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd
  16 +
14 yohobuy.wechat.env.namespace = wechat 17 yohobuy.wechat.env.namespace = wechat
15 yohobuy.wechat.env.serverport = 4 18 yohobuy.wechat.env.serverport = 4
16 yohobuy.wechat.env.webapphome = /home/test/yohobuy-wechat/deploy 19 yohobuy.wechat.env.webapphome = /home/test/yohobuy-wechat/deploy
  20 +
  21 +wechat.subscription.access.appid=wx1e6997242bcfcdfb
  22 +wechat.subscription.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd
  1 +yoho.logs.basedir=/Data/logs
  2 +
  3 +jdbc.mysql.readonlyinslave=true
  4 +autoconfig.properties = sharedAutoconfig
  5 +
  6 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
  7 +
  8 +yoho.env.namespace = yohomars-platform
  9 +yoho.env.serverport = 62
  10 +yoho.env.webapphome = /home/test/yohomars-platform/deploy
  11 +
  12 +redis.proxy.address=192.168.102.17
  13 +redis.proxy.port=6380
  14 +redis.readonly.proxy.port=6380
  15 +redis.readonly.proxy.address=192.168.102.17
  16 +redis.notsync.twemproxy.addresses=192.168.102.17:6380
  17 +
  18 +uic.api.host=http://192.168.102.48:8096/uic
  19 +
  20 +crontab.message.systemMsgProduce=15 */1 * * * ?
  21 +crontab.majia.aotuAddMajia=30 */30 * * * ?
  22 +mars.platform.task.switch=true
  23 +crontab.majia.autoUpdateMajiaFavNum=0 */1 * * * ?
  24 +
  25 +#yoho social context
  26 +yoho.social.context=http://192.168.102.52:8095/social
  1 +autoconfig.properties = sharedAutoconfig
  2 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties
  3 +
  4 +yoho.cms_push.env.namespace = cms_push
  5 +yoho.cms_push.env.serverport = 6
  6 +yoho.cms_push.env.webapphome = /home/test/cms_push/deploy
  7 +
  8 +#db_pool_config
  9 +db.default.initialSize=10
  10 +db.default.maxTotal=20
  11 +db.default.maxIdle=10
  12 +db.default.minIdle=5
  13 +
  14 +#debug_enable
  15 +is_debug_enable=false
  16 +
  17 +##push redis
  18 +redis.push.address=192.168.102.211
  19 +redis.push.port = 6379
  20 +redis.push.auth=
  21 +
  22 +redis.readonly.proxy.address=192.168.102.17
  23 +redis.readonly.proxy.port=6379
  24 +redis.readonly.proxy.auth=
  25 +
  26 +redis.pool.maxTotal=200
  27 +redis.pool.maxIdle=100
  28 +redis.pool.minIdle=30
  29 +redis.pool.maxWaitMillis=10000
  30 +
  31 +#service call timeout
  32 +service.call.connectReqTimeout=6000
  33 +service.call.socketTimeout=6000
  34 +service.call.connectTimeout=3000
  35 +
  36 +#mongo
  37 +mongo.inbox.host=192.168.50.69
  38 +mongo.inbox.port=27017
  39 +mongo.inbox.dbname=inbox
  40 +
  41 +#rabbitMQ
  42 +rabbit_host=192.168.102.211:5672
  43 +rabbit_user=yoho
  44 +rabbit_password=yoho
  45 +rabbit_vhost=yoho
  46 +
  47 +#zkAddress
  48 +zkAddress=192.168.102.216:2181
  49 +
  50 +#getui
  51 +cms.getui.appkey=6mTvGCuFmG61NjZfrHIs24
  52 +cms.getui.appid=TlIHUfi2I66b0DqEfsbjG2
  53 +cms.getui.appsecret=JyVp1IH4AWAEb2PWhaCqXA
  54 +cms.getui.mastersecret=lyT7C3exCG730j6u5GFUj1
  55 +
  56 +mars.getui.appkey=lvd6oGCOCi7Rd9BJFRAmq
  57 +mars.getui.appid=9BVxmH5UW58koOjglnhiZ3
  58 +mars.getui.appsecret=FkzFfHrnli5uC8LHQMBuG5
  59 +mars.getui.mastersecret=6lWE253RTH7zlOHWFszDi3
  60 +
  61 +getui.host=http://sdk.open.api.igexin.com/apiex.htm
  62 +getui.default.size=1000
  63 +
  64 +#ios
  65 +cms.push.ios.custom.key=data
  66 +ios.password=123456
  67 +
  68 +#send.task.batch.size
  69 +send.task.batch.size=50
  70 +
  71 +#web.content
  72 +web.context=cms_push
  73 +
  74 +#devEnv
  75 +mars.push.devEnv = true
  76 +cms.push.devEnv = true
@@ -11,6 +11,10 @@ yoho.env.productmode = TEST @@ -11,6 +11,10 @@ yoho.env.productmode = TEST
11 file.saveDir=/home/test 11 file.saveDir=/home/test
12 12
13 ### ****************************** database *********************************** 13 ### ****************************** database ***********************************
  14 +jdbc.mysql.yhwechat.master=write.passport.yohoops.org:3306
  15 +jdbc.mysql.yhwechat.slave=write.passport.yohoops.org:3306
  16 +jdbc.mysql.yhwechat.username=yh_test
  17 +jdbc.mysql.yhwechat.password=9nm0icOwt6bMHjMusIfMLw==
14 18
15 jdbc.mysql.yhresource.username=yh_test 19 jdbc.mysql.yhresource.username=yh_test
16 jdbc.mysql.yhresource.password=9nm0icOwt6bMHjMusIfMLw== 20 jdbc.mysql.yhresource.password=9nm0icOwt6bMHjMusIfMLw==
@@ -267,6 +271,12 @@ jdbc.mysql.yh_cms.slave=read.cms.yohoops.org:3306 @@ -267,6 +271,12 @@ jdbc.mysql.yh_cms.slave=read.cms.yohoops.org:3306
267 jdbc.mysql.yh_cms.username=yh_test 271 jdbc.mysql.yh_cms.username=yh_test
268 jdbc.mysql.yh_cms.password=9nm0icOwt6bMHjMusIfMLw== 272 jdbc.mysql.yh_cms.password=9nm0icOwt6bMHjMusIfMLw==
269 273
  274 +#yhlottery
  275 +jdbc.mysql.yhlottery.master=192.168.103.36:3306
  276 +jdbc.mysql.yhlottery.slave=192.168.103.36:3306
  277 +jdbc.mysql.yhlottery.username=yh_test
  278 +jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw==
  279 +
270 readOnlyInSlave=false 280 readOnlyInSlave=false
271 281
272 # monogdb 282 # monogdb
@@ -297,6 +307,14 @@ search.mq.password=123qwe @@ -297,6 +307,14 @@ search.mq.password=123qwe
297 search.mq.exchange=yoho_search 307 search.mq.exchange=yoho_search
298 search.mq.virtualHost=yohosearch 308 search.mq.virtualHost=yohosearch
299 309
  310 +#for crm read db
  311 +jdbc.mysql.yohopassport.onlyslave=read.passport.yohoops.org:3306
  312 +jdbc.mysql.yhpassport.onlyslave=read.passport.yohoops.org:3306
  313 +jdbc.mysql.yhshops.onlyslave=read.passport.yohoops.org:3306
  314 +jdbc.mysql.yhoperations.onlyslave=read.passport.yohoops.org:3306
  315 +jdbc.mysql.yh.username=yh_test
  316 +jdbc.mysql.yh.password=9nm0icOwt6bMHjMusIfMLw==
  317 +
300 ##### **************************************** common properties ****************************************************** 318 ##### **************************************** common properties ******************************************************
301 319
302 320
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties
  4 +
  5 +gateway.api.url = http://api.gray.yohops.com/
  6 +
  7 +uic_userInfoRest_enable = false
4 8
5 yoho.uic.env.namespace = uic 9 yoho.uic.env.namespace = uic
6 yoho.uic.env.serverport = 6 10 yoho.uic.env.serverport = 6
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 -  
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties 2 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties
4 3
5 db.batch.size = 100000 4 db.batch.size = 100000
6 -  
7 -getui.appid = Rzwp6SnIbr5U7sgaxVsLA8  
8 -getui.appkey = jYlLaLbRm972pOzZx5pzQA  
9 -getui.appsecret = RF2JGk8cPt7Q9WZMx3QPBA  
10 -  
11 -getui.default.size = 1000  
12 -  
13 -getui.host = http://sdk.open.api.igexin.com/apiex.htm  
14 -getui.mastersecret = iQ6Z7sbDge9I5vHOBI5iA2  
15 -  
16 ios.default.size = 1000 5 ios.default.size = 1000
17 -  
18 -ios.keystore = /yoho_push.p12  
19 -ios.password = 123456  
20 -  
21 -push.ios.custom.key = custom_content  
22 -  
23 push.task.type = ios 6 push.task.type = ios
24 -  
25 rabbit_vhost = yoho 7 rabbit_vhost = yoho
26 8
27 -send.task.batch.size = 100  
28 -  
29 yoho.push.env.namespace = push 9 yoho.push.env.namespace = push
30 yoho.push.env.serverport = 9 10 yoho.push.env.serverport = 9
31 yoho.push.env.webapphome = /home/test/yoho-push/deploy 11 yoho.push.env.webapphome = /home/test/yoho-push/deploy
32 12
  13 +##push redis
  14 +redis.push.address=192.168.102.211
  15 +redis.push.port = 6379
  16 +redis.push.auth=
  17 +
33 redis.pool.maxTotal=200 18 redis.pool.maxTotal=200
34 redis.pool.maxIdle=100 19 redis.pool.maxIdle=100
35 redis.pool.minIdle=30 20 redis.pool.minIdle=30
36 redis.pool.maxWaitMillis=10000 21 redis.pool.maxWaitMillis=10000
  22 +
  23 +send.task.batch.size = 100
  24 +
  25 +getui.appid = Rzwp6SnIbr5U7sgaxVsLA8
  26 +getui.appkey = jYlLaLbRm972pOzZx5pzQA
  27 +getui.appsecret = RF2JGk8cPt7Q9WZMx3QPBA
  28 +getui.default.size = 1000
  29 +getui.host = http://sdk.open.api.igexin.com/apiex.htm
  30 +getui.mastersecret = iQ6Z7sbDge9I5vHOBI5iA2
  31 +
  32 +ios.keystore=/yoho_developer.p12
  33 +ios.password=666666
  34 +push.ios.custom.key=custom_content
  35 +
  36 +#mongo
  37 +mongo.inbox.host=192.168.50.69
  38 +mongo.inbox.port=27017
  39 +mongo.inbox.dbname=inbox
  40 +
@@ -4,6 +4,8 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut @@ -4,6 +4,8 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/aut
4 4
5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^ 5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
6 6
  7 +diff.base.flag = 1
  8 +
7 erp.user.useGiftcard.url = http://api.erp.yohobuy.com 9 erp.user.useGiftcard.url = http://api.erp.yohobuy.com
8 10
9 jdbc.mysql.readonlyinslave = true 11 jdbc.mysql.readonlyinslave = true
@@ -14,6 +16,10 @@ register.new.user.page.probability = 9 @@ -14,6 +16,10 @@ register.new.user.page.probability = 9
14 16
15 uic.service.url = http://192.168.103.54:8096/uic 17 uic.service.url = http://192.168.103.54:8096/uic
16 18
  19 +union.domain.url = http://webunion_tl.yohobuy.com/union
  20 +
  21 +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
  22 +
17 user.session.expire = 10080 23 user.session.expire = 10080
18 24
19 userday.open.day = 28 25 userday.open.day = 28
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties
4 4
5 cocacola.wechat.share.url = http://service.yoho.cn/activity/cocacola/html/index1.html 5 cocacola.wechat.share.url = http://service.yoho.cn/activity/cocacola/html/index1.html
6 6
@@ -8,7 +8,7 @@ drawline.luckyUserNotice.interval = 5 @@ -8,7 +8,7 @@ drawline.luckyUserNotice.interval = 5
8 8
9 drawline.luckydraw.interval = 360 9 drawline.luckydraw.interval = 360
10 10
11 -execute.timetask.host = 192.168.90.9 11 +execute.timetask.host = 192.168.90.9
12 12
13 gateway.url = http://api.yoho.cn 13 gateway.url = http://api.yoho.cn
14 14
@@ -24,6 +24,12 @@ orderShare.shareUrl = http://m.yohobuy.com/coupon/index @@ -24,6 +24,12 @@ orderShare.shareUrl = http://m.yohobuy.com/coupon/index
24 24
25 tencentmkt.shareUrl = http://service.yoho.cn/activity/tencentMkt/index.html 25 tencentmkt.shareUrl = http://service.yoho.cn/activity/tencentMkt/index.html
26 26
  27 +userday.coupon = {\\"20\\":\\"14146\\", \\"10\\":\\"14144\\"}
  28 +
  29 +userday.coupon.oct = {\\"10\\":\\"14356\\", \\"40\\":\\"14358\\", \\"70\\":\\"14360\\"}
  30 +
  31 +userday.open.day = 28
  32 +
27 yoho.activity.env.namespace = activity 33 yoho.activity.env.namespace = activity
28 yoho.activity.env.serverport = 0 34 yoho.activity.env.serverport = 0
29 yoho.activity.env.webapphome = /home/test/yohobuy-activity/deploy 35 yoho.activity.env.webapphome = /home/test/yohobuy-activity/deploy
  1 +aesKey = yoho96461qaz2wsx
  2 +
  3 +alarm.mobile = 18994021292
  4 +
  5 +autoconfig.properties = sharedAutoconfig
  6 +
  7 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
  8 +
  9 +bigData.url = http://bigdata-crm.yohops.com:8070/bigdata/crm/
  10 +
  11 +crm.send.notice = true
  12 +
  13 +platform.host=http://192.168.102.59:8088/platform
  14 +rabbit_common = 192.168.102.211:5672
  15 +platform.coupon.userId=10964
  16 +platform.coupon.userName=crm
  17 +
  18 +ftp.ip=54.222.156.51
  19 +ftp.port=21
  20 +ftp.userName=ftpuser
  21 +ftp.pwd=ok83sQlrvHfw8OBMz6xlRA==
  22 +
  23 +jdbc.mysql.readonlyinslave = true
  24 +
  25 +sms.name = yohoyx@yohoyx
  26 +sms.pwd = EH+iuWSAfINJYwSdPgVqhA==
  27 +sms.url = http://211.147.239.62:9050/cgi-bin/sendsms
  28 +
  29 +yohobuy.crm.env.namespace = crm
  30 +yohobuy.crm.env.serverport = 3
  31 +yohobuy.crm.env.webapphome = /home/test/yohobuy-crm/deploy
  32 +
  33 +sms.reprot.flag=false
  34 +
  35 +redis.crm.notsync.twemproxy.addresses=huodong.write.yohoops.org:6379
  36 +redis.notsync.twemproxy.auth=
  37 +
  38 +#阿里云短信发送的
  39 +aliyun.sms.accessKeyId=wIBL09Z0xu7uJUkX0yNnFWy8tNv+KZEH8req1GsE1+k=
  40 +aliyun.sms.secret=/tnQdyzBuARAcql9ad+yJVzlQNX9bfhEmJxr7wdLz58=
  41 +
  42 +redis.crm.proxy.address=192.168.102.211
  43 +
  44 +########################### wechat module ########################################
  45 +yohobuyServiceAccessTokenGetUrl=http://127.0.0.1:8082/wechat/?method=wechat.token.get
  46 +wechat.host.name=https://api.weixin.qq.com
  47 +wechat.user.info=/cgi-bin/user/info
  48 +wechat.user.get=/cgi-bin/user/get
  49 +
  50 +
  51 +wechat.access.yohobuyService.appid=wx75e5a7c0c88e45c2
  52 +wechat.access.yohobuyService.secret=ce21ae4a3f93852279175a167e54509b
  53 +wechat.access.yohobuySubscribe.appid=wx96121aa89f31c5ea
  54 +wechat.access.yohobuySubscribe.secret=7669da1a8842ed1df4c5e1b53868f3ca
  55 +wechat.access.mars.appid=wx9d0d7dfed5bbaa8b
  56 +wechat.access.mars.secret=9f7b00cd2a1d65301352d2783f6eec61
  57 +wechat.access.yohonowTrend.appid=wx1fe49f08f41b6c26
  58 +wechat.access.yohonowTrend.secret=5670f62abcebcd8d321615b46bd19ef4
  59 +wechat.access.yohonowGirl.appid=wxb52ec6a352f0b090
  60 +wechat.access.yohonowGirl.secret=9fe6bedb0b7f30986a168c7fc44f34c0
  61 +############################ wechat module #######################################
  62 +
  63 +#redis.notsync.twemproxy.addresses=192.168.102.222:22121,192.168.102.211:22121
  64 +#redis.notsync.twemproxy.auth=
  65 +
  66 +#历史vip用户分组ID
  67 +birthday.coupon.groupid=12
  68 +
  69 +#生日券短信模板ID
  70 +birthday.coupon.sms.templateid=2
  71 +
  72 +browse.service.url=http://192.168.103.74:8092/brower/
  73 +
  74 +# ******************** 定时器时间配置 ********************
  75 +
  76 +#玄武状态报告和黑名单获取
  77 +xuanwu.scheduler=0 1/3 * * * ?
  78 +
  79 +#梦网状态报告和黑名单获取
  80 +mengwang.scheduler=0/10 * * * * ?
  81 +
  82 +#同步微信公众号的任务
  83 +wechart.scheduler=0 0 0 * * ?
  84 +
  85 +#微信公众号的任务错误重新尝试
  86 +wechart.retry.scheduler=0 0 2 * * ?
  87 +
  88 +#清理短信发送记录
  89 +sms.clean.scheduler=0 0 2 * * ?
  90 +
  91 +#大数据
  92 +jdbc.mysql.bigdataunion.slave=118.89.235.30:3306
  93 +jdbc.mysql.bigdataunion.username=root
  94 +jdbc.mysql.bigdataunion.password=t5/oMgwUCmO/GeMHBAQ2Cg==
  95 +
@@ -71,3 +71,8 @@ yohobuy.platform.env.serverport = 8 @@ -71,3 +71,8 @@ yohobuy.platform.env.serverport = 8
71 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy 71 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
72 72
73 zkAddress = 192.168.102.56:2181 73 zkAddress = 192.168.102.56:2181
  74 +
  75 +#product isPromotion field plan sync config
  76 +sync.product.isPromotion.advance.minutes=5
  77 +
  78 +
@@ -3,4 +3,39 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig @@ -3,4 +3,39 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig
3 yohobuy.task.env.namespace = task 3 yohobuy.task.env.namespace = task
4 yohobuy.task.env.serverport = 4 4 yohobuy.task.env.serverport = 4
5 yohobuy.task.env.webapphome = /home/test/yohobuy-task/deploy 5 yohobuy.task.env.webapphome = /home/test/yohobuy-task/deploy
6 -web.context = task  
  6 +web.context = task
  7 +
  8 +#
  9 +jdbc.mysql.readonlyinslave = true
  10 +jdbc.mysql.kisjob.datasources = yoho_kisjob
  11 +jdbc.mysql.kisjob.master = 192.168.103.36:3306
  12 +jdbc.mysql.kisjob.slave = 192.168.103.36:3306
  13 +jdbc.mysql.kisjob.username = yh_test
  14 +jdbc.mysql.kisjob.password = 9nm0icOwt6bMHjMusIfMLw==
  15 +
  16 +#redis
  17 +redis.pool.maxTotal = 200
  18 +redis.pool.maxIdle = 100
  19 +redis.pool.maxWaitMillis = 2000
  20 +redis.pool.minIdle = 50
  21 +redis.pool.testOnBorrow = false
  22 +redis.pool.testWhileIdle = true
  23 +
  24 +#bigDataRedis-push.proxy.address=192.168.102.211
  25 +bigDataRedis-push.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
  26 +bigDataRedis-push.proxy.port=6379
  27 +bigDataRedis-push.proxy.auth=
  28 +
  29 +##redis for push
  30 +redis.push.address=192.168.102.211
  31 +redis.push.port=6379
  32 +redis.push.auth=
  33 +
  34 +task.addNewBrand.status = on
  35 +task.discountBrand.status = on
  36 +task.vipBrand.status = on
  37 +task.brands.number = 19
  38 +task.msgnum = 10000
  39 +task.send.limit = 3
  40 +mobile.limit.sendTimes = 50
  41 +
@@ -2,7 +2,7 @@ activeTime = 86400 @@ -2,7 +2,7 @@ activeTime = 86400
2 2
3 autoconfig.properties = sharedAutoconfig 3 autoconfig.properties = sharedAutoconfig
4 4
5 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties 5 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties
6 6
7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA= 7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
8 bigdate.db.url = 192.168.103.36:3306 8 bigdate.db.url = 192.168.103.36:3306
@@ -10,6 +10,10 @@ bigdate.db.username = yh_bigdata @@ -10,6 +10,10 @@ bigdate.db.username = yh_bigdata
10 10
11 draw.writeFile.delay = 60 11 draw.writeFile.delay = 60
12 12
  13 +exclude.union.type = 100000000000349
  14 +
  15 +gateway.url = http://api.yoho.cn
  16 +
13 jdbc.mysql.readonlyinslave = true 17 jdbc.mysql.readonlyinslave = true
14 18
15 rabbit.mq.host = 192.168.102.56 19 rabbit.mq.host = 192.168.102.56
@@ -18,17 +22,17 @@ rabbit.mq.port = 5672 @@ -18,17 +22,17 @@ rabbit.mq.port = 5672
18 rabbit.mq.username = yoho 22 rabbit.mq.username = yoho
19 rabbit.mq.virtualHost = /yoho 23 rabbit.mq.virtualHost = /yoho
20 24
21 -yoho.unions.env.namespace = union  
22 -yoho.unions.env.serverport = 8  
23 -yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy 25 +redis.proxy.database = 1
24 26
  27 +redis.readonly.proxy.database = 1
25 28
26 -redis.union.proxy.address=192.168.102.56  
27 -redis.union.proxy.port=6379  
28 -redis.union.proxy.auth=  
29 -redis.proxy.database=1 29 +redis.union.proxy.address = 192.168.102.56
  30 +redis.union.readonly.proxy.address = 192.168.102.56
30 31
31 -redis.union.readonly.proxy.address=192.168.102.56  
32 -redis.union.readonly.proxy.port=6379  
33 -redis.union.readonly.proxy.auth=  
34 -redis.readonly.proxy.database=1  
  32 +tencentmkt.shareUrl = http://union.yoho.cn/union/tencentMkt/index.html
  33 +
  34 +union.host = 172.31.16.99
  35 +
  36 +yoho.unions.env.namespace = union
  37 +yoho.unions.env.serverport = 8
  38 +yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy
@@ -5,9 +5,18 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig @@ -5,9 +5,18 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig
5 wechat.access.appid = wx75e5a7c0c88e45c2 5 wechat.access.appid = wx75e5a7c0c88e45c2
6 wechat.access.secret = ce21ae4a3f93852279175a167e54509b 6 wechat.access.secret = ce21ae4a3f93852279175a167e54509b
7 7
  8 +wechat.small.program.access.appid = wx084ab813d88c594b
  9 +wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac
  10 +
8 wechat.user.get = /cgi-bin/user/get 11 wechat.user.get = /cgi-bin/user/get
9 wechat.user.info = /cgi-bin/user/info 12 wechat.user.info = /cgi-bin/user/info
10 13
  14 +wechat.yohoshow.access.appid = wx1e6997242bcfcdfb
  15 +wechat.yohoshow.access.secret = d6fa51581e4c11ee312a1990c2ebf0bd
  16 +
11 yohobuy.wechat.env.namespace = wechat 17 yohobuy.wechat.env.namespace = wechat
12 yohobuy.wechat.env.serverport = 4 18 yohobuy.wechat.env.serverport = 4
13 yohobuy.wechat.env.webapphome = /home/test/yohobuy-wechat/deploy 19 yohobuy.wechat.env.webapphome = /home/test/yohobuy-wechat/deploy
  20 +
  21 +wechat.subscription.access.appid=wx1e6997242bcfcdfb
  22 +wechat.subscription.access.secret=d6fa51581e4c11ee312a1990c2ebf0bd
@@ -121,6 +121,25 @@ jdbc.mysql.yhorderssplit.slave=cobar1.yohoops.org:8066 @@ -121,6 +121,25 @@ jdbc.mysql.yhorderssplit.slave=cobar1.yohoops.org:8066
121 jdbc.mysql.yhorderssplit.username=yh_test 121 jdbc.mysql.yhorderssplit.username=yh_test
122 jdbc.mysql.yhorderssplit.password=9nm0icOwt6bMHjMusIfMLw== 122 jdbc.mysql.yhorderssplit.password=9nm0icOwt6bMHjMusIfMLw==
123 123
  124 +
  125 +#yhb_promotion_split db split
  126 +jdbc.mysql.yhbpromotionsplit.master=192.168.102.202:8066
  127 +jdbc.mysql.yhbpromotionsplit.slave=192.168.102.202:8066
  128 +jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066
  129 +jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066
  130 +jdbc.mysql.yhbpromotionsplit.username=yh_test
  131 +jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
  132 +jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066
  133 +jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066
  134 +
  135 +
  136 +#yhb_promotion platform split db
  137 +jdbc.mysql.yhbpromotionsplitplatform.master=192.168.102.202:8066
  138 +jdbc.mysql.yhbpromotionsplitplatform.slave=192.168.102.202:8066
  139 +jdbc.mysql.yhbpromotionsplitplatform.username=yh_test
  140 +jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw==
  141 +
  142 +
124 jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306 143 jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306
125 jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306 144 jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306
126 145
@@ -128,10 +147,10 @@ jdbc.mysql.yhshops.master=write.shops.yohoops.org:3306 @@ -128,10 +147,10 @@ jdbc.mysql.yhshops.master=write.shops.yohoops.org:3306
128 jdbc.mysql.yhshops.slave=read.shops.yohoops.org:3306 147 jdbc.mysql.yhshops.slave=read.shops.yohoops.org:3306
129 148
130 #yhb_promotion_split db split 149 #yhb_promotion_split db split
131 -jdbc.mysql.yhbpromotionsplit.master=cobar1.yohoops.org:8066  
132 -jdbc.mysql.yhbpromotionsplit.slave=cobar2.yohoops.org:8066  
133 -jdbc.mysql.yhbpromotionsplit.username=yh_test  
134 -jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw== 150 +# jdbc.mysql.yhbpromotionsplit.master=cobar1.yohoops.org:8066
  151 +# jdbc.mysql.yhbpromotionsplit.slave=cobar2.yohoops.org:8066
  152 +# jdbc.mysql.yhbpromotionsplit.username=yh_test
  153 +# jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
135 154
136 # yh_orders 155 # yh_orders
137 jdbc.mysql.yhorders.master=write.orders.yohoops.org:3306 156 jdbc.mysql.yhorders.master=write.orders.yohoops.org:3306
@@ -278,6 +297,11 @@ jdbc.mysql.yhbsearch.slave=read.search.yohoops.org:3306 @@ -278,6 +297,11 @@ jdbc.mysql.yhbsearch.slave=read.search.yohoops.org:3306
278 jdbc.mysql.yhbsearch.username=yh_test 297 jdbc.mysql.yhbsearch.username=yh_test
279 jdbc.mysql.yhbsearch.password=9nm0icOwt6bMHjMusIfMLw== 298 jdbc.mysql.yhbsearch.password=9nm0icOwt6bMHjMusIfMLw==
280 299
  300 +#bigdataunion
  301 +jdbc.mysql.bigdataunion.slave=read.bigdata.yohoops.org:3306
  302 +jdbc.mysql.bigdataunion.username=yh_vpc_bak
  303 +jdbc.mysql.bigdataunion.password=+BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=
  304 +
281 # search-es 305 # search-es
282 search.es.cluster.name = yohosearch_testQQ 306 search.es.cluster.name = yohosearch_testQQ
283 search.es.servers = es.node1.yohoops.org:9300 307 search.es.servers = es.node1.yohoops.org:9300
@@ -47,6 +47,10 @@ jdbc.mysql.platform.yhb_account.username = yh_test @@ -47,6 +47,10 @@ jdbc.mysql.platform.yhb_account.username = yh_test
47 47
48 mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html 48 mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html
49 49
  50 +mkt.pcwap.domain.url = http://union.yoho.cn/union/go
  51 +
  52 +mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
  53 +
50 offline.shops.url = http://192.168.102.47:8098/shops/ 54 offline.shops.url = http://192.168.102.47:8098/shops/
51 55
52 platform.login.salt = yoho9646yoho9646 56 platform.login.salt = yoho9646yoho9646
@@ -29,4 +29,8 @@ jdbc.mysql.bigdata.password=ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA= @@ -29,4 +29,8 @@ jdbc.mysql.bigdata.password=ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
29 29
30 bigdata.database.cluster.name = shop 30 bigdata.database.cluster.name = shop
31 31
32 -bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn  
  32 +#bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
  33 +bigDataRedis.proxy.address=123.206.17.17
  34 +bigDataRedis.proxy.port=16379
  35 +
  36 +
@@ -39,3 +39,5 @@ uic_dev_ips=(dev@192.168.102.210) @@ -39,3 +39,5 @@ uic_dev_ips=(dev@192.168.102.210)
39 39
40 yoho_now_dev_ips=(dev@192.168.102.214) 40 yoho_now_dev_ips=(dev@192.168.102.214)
41 yoho_mars_dev_ips=(dev@192.168.102.214) 41 yoho_mars_dev_ips=(dev@192.168.102.214)
  42 +yohomars_platform_dev_ips=(dev@192.168.102.214)
  43 +yohonow_platform_dev_ips=(dev@192.168.102.214)
@@ -29,7 +29,7 @@ yoho_message_test_ips=(test@192.168.102.211) @@ -29,7 +29,7 @@ yoho_message_test_ips=(test@192.168.102.211)
29 yoho_message_controller_test_ips=(test@192.168.102.202) 29 yoho_message_controller_test_ips=(test@192.168.102.202)
30 yoho_message_sender_test_ips=(test@192.168.102.202) 30 yoho_message_sender_test_ips=(test@192.168.102.202)
31 yoho_push_test_ips=(test@192.168.102.202) 31 yoho_push_test_ips=(test@192.168.102.202)
32 -cms_push_test_ips=(test@192.168.102.207 test@192.168.102.202) 32 +cms_push_test_ips=(test@192.168.102.202)
33 yohobuy_task_test_ips=(test@192.168.102.202) 33 yohobuy_task_test_ips=(test@192.168.102.202)
34 34
35 35
@@ -4,31 +4,41 @@ @@ -4,31 +4,41 @@
4 #@Date 2007-08-09 4 #@Date 2007-08-09
5 ################################################################ 5 ################################################################
6 6
  7 +# 192.168.103.73
  8 +yoho_gateway_test_nj_3_ips=(test@192.168.103.73)
  9 +yoho_users_test_nj_3_ips=(test@192.168.103.73)
  10 +uic_test_nj_3_ips=(test@192.168.103.73)
  11 +yohobuy_resources_test_nj_3_ips=(test@192.168.103.73)
  12 +yoho_message_test_nj_3_ips=(test@192.168.103.73)
7 13
  14 +# 192.168.103.74
  15 +yohobuy_product_test_nj_3_ips=(test@192.168.103.74)
  16 +yohobuy_order_test_nj_3_ips=(test@192.168.103.74)
  17 +yohobuy_activity_test_nj_3_ips=(test@192.168.103.74)
  18 +yohobuy_brower_test_nj_3_ips=(test@192.168.103.74)
  19 +yohobuy_promotion_test_nj_3_ips=(test@192.168.103.74)
8 20
9 -#####测试环境配置  
10 -yoho_users_test_nj_3_ips=(test@192.168.102.52)  
11 -yohobuy_promotion_test_nj_3_ips=(test@192.168.102.52)  
12 -yoho_gateway_test_nj_3_ips=(test@192.168.102.52)  
13 -yohobuy_product_test_nj_3_ips=(test@192.168.102.52)  
14 -yoho_message_test_nj_3_ips=(test@192.168.102.52)  
15 -yoho_sns_test_nj_3_ips=(test@192.168.102.52)  
16 -yohobuy_union_test_nj_3_ips=(test@192.168.102.52)  
17 -yoho_social_test_nj_3_ips=(test@192.168.102.52)  
18 -uic_test_nj_3_ips=(test@192.168.102.48)  
19 -yohobuy_resources_test_nj_3_ips=(test@192.168.102.48)  
20 -yohobuy_order_test_nj_3_ips=(test@192.168.102.48)  
21 -yohobuy_platform_test_nj_3_ips=(test@192.168.102.48)  
22 -yohobuy_activity_test_nj_3_ips=(test@192.168.102.48)  
23 -yohobuy_brower_test_nj_3_ips=(test@192.168.102.48)  
24 -yohobuy_bigdata_test_nj_3_ips=(test@192.168.102.48) 21 +# 192.168.102.48
  22 +yoho_sns_test_nj_3_ips=(test@192.168.102.48)
25 yohobuy_wechat_test_nj_3_ips=(test@192.168.102.48) 23 yohobuy_wechat_test_nj_3_ips=(test@192.168.102.48)
26 yohobuy_crm_test_nj_3_ips=(test@192.168.102.48) 24 yohobuy_crm_test_nj_3_ips=(test@192.168.102.48)
  25 +yoho_push_test_nj_3_ips=(test@192.168.102.48)
  26 +cms_push_test_nj_3_ips=(test@192.168.102.48)
  27 +yohobuy_platform_test_nj_3_ips=(test@192.168.102.48)
27 28
  29 +# 192.168.102.52
  30 +yohobuy_union_test_nj_3_ips=(test@192.168.102.52)
  31 +yoho_social_test_nj_3_ips=(test@192.168.102.52)
  32 +yohobuy_bigdata_test_nj_3_ips=(test@192.168.102.52)
  33 +yoho_now_test_nj_3_ips=(test@192.168.102.52)
  34 +yohobuy_task_test_nj_3_ips=(test@192.168.102.52)
  35 +yoho_mars_test_nj_3_ips=(test@192.168.102.52)
  36 +yohomars_platform_test_nj_3_ips=(test@192.168.102.52)
  37 +
  38 +# 192.168.102.46
28 yoho_search_producer_test_nj_3_ips=(test@192.168.102.46) 39 yoho_search_producer_test_nj_3_ips=(test@192.168.102.46)
29 yoho_search_consumer_test_nj_3_ips=(test@192.168.102.46) 40 yoho_search_consumer_test_nj_3_ips=(test@192.168.102.46)
30 yoho_search_service_test_nj_3_ips=(test@192.168.102.46) 41 yoho_search_service_test_nj_3_ips=(test@192.168.102.46)
31 yoho_search_adaptor_test_nj_3_ips=(test@192.168.102.46) 42 yoho_search_adaptor_test_nj_3_ips=(test@192.168.102.46)
32 43
33 -#####yoho_push_test_nj_3_ips=(test@192.168.102.48)  
34 -#####yohobuy_task_test_nj_3_ips=(test@192.168.102.48) 44 +
@@ -23,11 +23,14 @@ yohobuy_platform_test_nj_4_ips=(test@192.168.102.59) @@ -23,11 +23,14 @@ yohobuy_platform_test_nj_4_ips=(test@192.168.102.59)
23 yohobuy_bigdata_test_nj_4_ips=(test@192.168.102.59) 23 yohobuy_bigdata_test_nj_4_ips=(test@192.168.102.59)
24 yoho_social_test_nj_4_ips=(test@192.168.102.59) 24 yoho_social_test_nj_4_ips=(test@192.168.102.59)
25 ####yoho_push_test_ips=(test@192.168.102.59) 25 ####yoho_push_test_ips=(test@192.168.102.59)
26 -####yohobuy_task_test_ips=(test@192.168.102.59) 26 +yohobuy_task_test_nj_4_ips=(test@192.168.102.59)
27 27
28 yohobuy_promotion_test_nj_4_ips=(test@192.168.102.61) 28 yohobuy_promotion_test_nj_4_ips=(test@192.168.102.61)
29 yoho_sns_test_nj_4_ips=(test@192.168.102.61) 29 yoho_sns_test_nj_4_ips=(test@192.168.102.61)
30 yohobuy_brower_test_nj_4_ips=(test@192.168.102.61) 30 yohobuy_brower_test_nj_4_ips=(test@192.168.102.61)
  31 +yohobuy_crm_test_nj_4_ips=(test@192.168.102.61)
  32 +yoho_push_test_nj_4_ips=(test@192.168.102.61)
  33 +cms_push_test_nj_4_ips=(test@192.168.102.61)
31 34
32 yoho_search_producer_test_nj_4_ips=(test@192.168.103.52) 35 yoho_search_producer_test_nj_4_ips=(test@192.168.103.52)
33 yoho_search_consumer_test_nj_4_ips=(test@192.168.103.52) 36 yoho_search_consumer_test_nj_4_ips=(test@192.168.103.52)