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

@@ -30,6 +30,11 @@ bigdate.db.url=192.168.102.219:3306
 bigdate.db.password=9nm0icOwt6bMHjMusIfMLw== 
 bigdate.db.username=yh_test
 
+#yhvalue
+jdbc.mysql.yhvalue.master=118.89.235.30:3306
+jdbc.mysql.yhvalue.slave=118.89.235.30:3306
+jdbc.mysql.yhvalue.username=root
+jdbc.mysql.yhvalue.password=t5/oMgwUCmO/GeMHBAQ2Cg==
 
 ##yh_push
 jdbc.mysql.yhpush.master=192.168.102.219:3306
@@ -369,31 +374,31 @@ APP_SECRET  = 1e87e46f115cc813e27ef52eb9915f1e
 UUC_DOMAIN  = http://passport.test.yoho.cn
 
 ####  rabbit config #### 
-rabbit_host = 192.168.102.211:5672
+rabbit_host = 192.168.103.58:5672
 rabbit_user = yoho
 rabbit_password = yoho
 
 ########## common rabbitmq  ##########
 #aws
-rabbit_common_aws = 192.168.102.211:5672
+rabbit_common_aws = 192.168.103.58:5672
 rabbit_common_aws_user = yoho
 rabbit_common_aws_password = yoho
 
 #qq
-rabbit_common_qq = 192.168.102.211:5672
+rabbit_common_qq = 192.168.103.58:5672
 rabbit_common_qq_user = yoho
 rabbit_common_qq_password = yoho
 
 # local, maybe producer using this.
-rabbit_common = 192.168.102.211:5672
+rabbit_common = 192.168.103.58:5672
 rabbit_common_user = yoho
 rabbit_common_password = yoho
 ##########common rabbitmq  ##########
 
 
 #cache clear rabbitmq
-rabbit.cacheclean.producer.host = 192.168.102.211:5672
-rabbit.cacheclean.consumer.host = 192.168.102.211:5672
+rabbit.cacheclean.producer.host = 192.168.103.58:5672
+rabbit.cacheclean.consumer.host = 192.168.103.58:5672
 
 ## mq or call erp
 erp.message.sync.type=MQ
@@ -409,7 +414,7 @@ crf.service.url=https://osprec-ci.crfchina.com
 default.http.type = http
 
 #message-center rabbitmq
-rabbit_message_center = 192.168.102.211:5672
+rabbit_message_center = 192.168.103.58:5672
 rabbit_message_center_user = yoho
 rabbit_message_center_password = yoho
 rabbit_message_center_vhost = yoho

 jdbc.mysql.readonlyinslave=true
 autoconfig.properties  = sharedAutoconfig
-
+is_debug_enable=false
 autoconfig.properties.sharedAutoconfig  = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
 
 yohomars.env.namespace   = yohomars
@@ -8,4 +8,14 @@ yohomars.env.serverport  = 72
 yohomars.env.webapphome  = /home/dev/yoho-mars/deploy
 
 
-uic.api.host=http://192.168.102.48:8096/uic
\ No newline at end of file
+uic.api.host=http://192.168.102.48:8096/uic
+
+exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7
+
+redis.proxy.address=192.168.102.17
+redis.proxy.port=6380
+redis.readonly.proxy.port=6380
+redis.readonly.proxy.address=192.168.102.17
+redis.notsync.twemproxy.addresses=192.168.102.17:6380
+mars.task.switch=true
+exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7
\ No newline at end of file

@@ -8,4 +8,7 @@ yoho.env.serverport  = 62
 yoho.env.webapphome  = /home/dev/yoho-mars-platform/deploy
 
 
-uic.api.host=http://192.168.102.48:8096/uic
\ No newline at end of file
+uic.api.host=http://192.168.102.48:8096/uic
+crontab.message.systemMsgProduce=15 */1 * * * ?
+crontab.majia.aotuAddMajia=30 */30 * * * ?
+mars.platform.task.switch=false
\ No newline at end of file

@@ -11,17 +11,18 @@ yoho.search.producer.env.webapphome  = /home/dev/yoho-search-producer/deploy
 canal.hostType=zkCluster
 canal.server.port=192.168.102.224:2181
 zkAddress=192.168.102.224:2181
+
 ##canal-shop
 canal.destination.shop=shops
-canal.subscribeChannel.shop=yh_shops.brand,yh_shops.goods,yh_shops.goods_images,yh_shops.product,yh_shops.product_color,yh_shops.product_price,yh_shops.product_sort,yh_shops.product_standard_relation,yh_shops.product_style_relation,yh_shops.size,yh_shops.storage,yh_shops.standard,yh_shops.style,yh_shops.product_activities_link,yh_shops.product_search,yh_shops.parameter_make,yh_shops.search_action,yh_shops.product_keywords,yh_shops.product_timing,yh_shops.product_price_plan,yh_shops.limit_product,yh_shops.limit_product_attach
+canal.subscribeChannel.shop=yh_shops.product_attribute_property_values,yh_shops.brand,yh_shops.goods,yh_shops.goods_images,yh_shops.product,yh_shops.product_color,yh_shops.product_price,yh_shops.product_sort,yh_shops.product_standard_relation,yh_shops.product_style_relation,yh_shops.size,yh_shops.storage,yh_shops.standard,yh_shops.style,yh_shops.product_activities_link,yh_shops.product_search,yh_shops.parameter_make,yh_shops.search_action,yh_shops.product_keywords,yh_shops.product_price_plan,yh_shops.product_timing,yh_shops.shops,yh_shops.shops_brands,yh_shops.sales_category
 
 ##canal-operation
 canal.destination.operation=operations
-canal.subscribeChannel.operation=yhb_operations.activity_product,yhb_operations.es_word_def
+canal.subscribeChannel.operation=yhb_operations.suggest_word_custom,yhb_operations.suggest_conversion_custom,yhb_operations.activity_product,yhb_operations.es_word_def
 
 ##cancal-erpproduct
 canal.destination.erpproduct=erpproduct
-canal.subscribeChannel.erpproduct=erp_product.product_pool_detail,erp_product.promotion_product
+canal.subscribeChannel.erpproduct=erp_product.product_pool_detail,erp_product.product_ext,erp_product.product_attribute
 
 ##cancal-erpcustomerservice
 canal.destination.erpcustomerservice=erpcustomerservice

@@ -21,7 +21,7 @@ yoho.users.env.serverport  = 1
 yoho.users.env.webapphome  = /home/dev/yoho-users/deploy
 
 users.base.isUic=false
-uic.service.url=http://uic.yohoops.org/uic
+uic.service.url=http://192.168.102.48:8096/uic/
 
 
 verify_student_flag=true

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

@@ -16,4 +16,6 @@ redis.proxy.address=192.168.102.17
 redis.proxy.port=6380
 redis.readonly.proxy.port=6380
 redis.readonly.proxy.address=192.168.102.17
-redis.notsync.twemproxy.addresses=192.168.102.17:6380
\ No newline at end of file
+redis.notsync.twemproxy.addresses=192.168.102.17:6380
+mars.task.switch=true
+exchange.cur.appkey=8154ce96f69f2bb7755b9f477091d3d7
\ No newline at end of file

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

@@ -121,6 +121,25 @@ jdbc.mysql.yhorderssplit.slave=cobar1.yohoops.org:8066
 jdbc.mysql.yhorderssplit.username=yh_test
 jdbc.mysql.yhorderssplit.password=9nm0icOwt6bMHjMusIfMLw==
 
+
+#yhb_promotion_split db split 
+jdbc.mysql.yhbpromotionsplit.master=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplit.slave=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplit.username=yh_test
+jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
+jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066
+
+
+#yhb_promotion platform split db
+jdbc.mysql.yhbpromotionsplitplatform.master=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplitplatform.slave=192.168.102.202:8066
+jdbc.mysql.yhbpromotionsplitplatform.username=yh_test
+jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw==
+
+
 jdbc.mysql.yhresource.master=write.cms.yohoops.org:3306
 jdbc.mysql.yhresource.slave=read.cms.yohoops.org:3306
 
@@ -128,10 +147,10 @@ jdbc.mysql.yhshops.master=write.shops.yohoops.org:3306
 jdbc.mysql.yhshops.slave=read.shops.yohoops.org:3306
 
 #yhb_promotion_split db split 
-jdbc.mysql.yhbpromotionsplit.master=cobar1.yohoops.org:8066
-jdbc.mysql.yhbpromotionsplit.slave=cobar2.yohoops.org:8066
-jdbc.mysql.yhbpromotionsplit.username=yh_test
-jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
+# jdbc.mysql.yhbpromotionsplit.master=cobar1.yohoops.org:8066
+# jdbc.mysql.yhbpromotionsplit.slave=cobar2.yohoops.org:8066
+# jdbc.mysql.yhbpromotionsplit.username=yh_test
+# jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
 
 # yh_orders
 jdbc.mysql.yhorders.master=write.orders.yohoops.org:3306
@@ -278,6 +297,11 @@ jdbc.mysql.yhbsearch.slave=read.search.yohoops.org:3306
 jdbc.mysql.yhbsearch.username=yh_test
 jdbc.mysql.yhbsearch.password=9nm0icOwt6bMHjMusIfMLw==
 
+#bigdataunion
+jdbc.mysql.bigdataunion.slave=read.bigdata.yohoops.org:3306
+jdbc.mysql.bigdataunion.username=yh_vpc_bak
+jdbc.mysql.bigdataunion.password=+BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=
+
 # search-es
 search.es.cluster.name  = yohosearch_testQQ
 search.es.servers       = es.node1.yohoops.org:9300

@@ -35,3 +35,4 @@ yoho_search_adaptor_test_nj_3_ips=(test@192.168.102.46)
 
 yoho_now_test_nj_3_ips=(test@192.168.102.52)
 yoho_mars_test_nj_3_ips=(test@192.168.102.52)
+yoho_mars_platform_test_nj_3_ips=(test@192.168.102.52)
\ No newline at end of file