michaelcao / auto_deploy_test · Commits

Go to a project

Authored by chunhua.zhang
Commit 26371b05f5520c88c02b9fa36bd623e0caf3f61b 2 parents e90768c1 06b5fb52

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

Inline Side-by-side
Showing 10 changed files with 82 additions and 20 deletions
@@ -30,6 +30,11 @@ bigdate.db.url=192.168.102.219:3306 @@ -30,6 +30,11 @@ bigdate.db.url=192.168.102.219:3306
30 bigdate.db.password=9nm0icOwt6bMHjMusIfMLw== 30 bigdate.db.password=9nm0icOwt6bMHjMusIfMLw==
31 bigdate.db.username=yh_test 31 bigdate.db.username=yh_test
32 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==
33 38
34 ##yh_push 39 ##yh_push
35 jdbc.mysql.yhpush.master=192.168.102.219:3306 40 jdbc.mysql.yhpush.master=192.168.102.219:3306
@@ -369,31 +374,31 @@ APP_SECRET = 1e87e46f115cc813e27ef52eb9915f1e @@ -369,31 +374,31 @@ APP_SECRET = 1e87e46f115cc813e27ef52eb9915f1e
369 UUC_DOMAIN = http://passport.test.yoho.cn 374 UUC_DOMAIN = http://passport.test.yoho.cn
370 375
371 #### rabbit config #### 376 #### rabbit config ####
372 -rabbit_host = 192.168.102.211:5672 377 +rabbit_host = 192.168.103.58:5672
373 rabbit_user = yoho 378 rabbit_user = yoho
374 rabbit_password = yoho 379 rabbit_password = yoho
375 380
376 ########## common rabbitmq ########## 381 ########## common rabbitmq ##########
377 #aws 382 #aws
378 -rabbit_common_aws = 192.168.102.211:5672 383 +rabbit_common_aws = 192.168.103.58:5672
379 rabbit_common_aws_user = yoho 384 rabbit_common_aws_user = yoho
380 rabbit_common_aws_password = yoho 385 rabbit_common_aws_password = yoho
381 386
382 #qq 387 #qq
383 -rabbit_common_qq = 192.168.102.211:5672 388 +rabbit_common_qq = 192.168.103.58:5672
384 rabbit_common_qq_user = yoho 389 rabbit_common_qq_user = yoho
385 rabbit_common_qq_password = yoho 390 rabbit_common_qq_password = yoho
386 391
387 # local, maybe producer using this. 392 # local, maybe producer using this.
388 -rabbit_common = 192.168.102.211:5672 393 +rabbit_common = 192.168.103.58:5672
389 rabbit_common_user = yoho 394 rabbit_common_user = yoho
390 rabbit_common_password = yoho 395 rabbit_common_password = yoho
391 ##########common rabbitmq ########## 396 ##########common rabbitmq ##########
392 397
393 398
394 #cache clear rabbitmq 399 #cache clear rabbitmq
395 -rabbit.cacheclean.producer.host = 192.168.102.211:5672  
396 -rabbit.cacheclean.consumer.host = 192.168.102.211:5672 400 +rabbit.cacheclean.producer.host = 192.168.103.58:5672
  401 +rabbit.cacheclean.consumer.host = 192.168.103.58:5672
397 402
398 ## mq or call erp 403 ## mq or call erp
399 erp.message.sync.type=MQ 404 erp.message.sync.type=MQ
@@ -409,7 +414,7 @@ crf.service.url=https://osprec-ci.crfchina.com @@ -409,7 +414,7 @@ crf.service.url=https://osprec-ci.crfchina.com
409 default.http.type = http 414 default.http.type = http
410 415
411 #message-center rabbitmq 416 #message-center rabbitmq
412 -rabbit_message_center = 192.168.102.211:5672 417 +rabbit_message_center = 192.168.103.58:5672
413 rabbit_message_center_user = yoho 418 rabbit_message_center_user = yoho
414 rabbit_message_center_password = yoho 419 rabbit_message_center_password = yoho
415 rabbit_message_center_vhost = yoho 420 rabbit_message_center_vhost = yoho
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
@@ -8,4 +8,7 @@ yoho.env.serverport = 62 @@ -8,4 +8,7 @@ yoho.env.serverport = 62
8 yoho.env.webapphome = /home/dev/yoho-mars-platform/deploy 8 yoho.env.webapphome = /home/dev/yoho-mars-platform/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 +crontab.message.systemMsgProduce=15 */1 * * * ?
  13 +crontab.majia.aotuAddMajia=30 */30 * * * ?
  14 +mars.platform.task.switch=false
@@ -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 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
@@ -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
@@ -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
@@ -16,4 +16,6 @@ redis.proxy.address=192.168.102.17 @@ -16,4 +16,6 @@ redis.proxy.address=192.168.102.17
16 redis.proxy.port=6380 16 redis.proxy.port=6380
17 redis.readonly.proxy.port=6380 17 redis.readonly.proxy.port=6380
18 redis.readonly.proxy.address=192.168.102.17 18 redis.readonly.proxy.address=192.168.102.17
19 -redis.notsync.twemproxy.addresses=192.168.102.17:6380  
  19 +redis.notsync.twemproxy.addresses=192.168.102.17:6380
  20 +mars.task.switch=true
  21 +exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7
  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 = yoho-mars-platform
  7 +yoho.env.serverport = 62
  8 +yoho.env.webapphome = /home/dev/yoho-mars-platform/deploy
  9 +
  10 +
  11 +uic.api.host=http://192.168.102.48:8096/uic
  12 +
  13 +crontab.message.systemMsgProduce=15 */1 * * * ?
  14 +crontab.majia.aotuAddMajia=30 */30 * * * ?
  15 +mars.platform.task.switch=true
@@ -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
@@ -35,3 +35,4 @@ yoho_search_adaptor_test_nj_3_ips=(test@192.168.102.46) @@ -35,3 +35,4 @@ yoho_search_adaptor_test_nj_3_ips=(test@192.168.102.46)
35 35
36 yoho_now_test_nj_3_ips=(test@192.168.102.52) 36 yoho_now_test_nj_3_ips=(test@192.168.102.52)
37 yoho_mars_test_nj_3_ips=(test@192.168.102.52) 37 yoho_mars_test_nj_3_ips=(test@192.168.102.52)
  38 +yoho_mars_platform_test_nj_3_ips=(test@192.168.102.52)