YPT / auto_deploy_test · Commits

Go to a project

Authored by Ling
Commit af89f6aa4ef37f6d2e4ebd7bf7410de184d9360f 2 parents e213cde9 1e2e4489

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

Inline Side-by-side
Showing 19 changed files with 52 additions and 21 deletions
... ... @@ -46,6 +46,6 @@ canal.subscribeChannel.comment=yh_comment.comments,yh_comment.shareorder,yh_comm
##canal-promotion
canal.destination.promotion=promotion
canal.subscribeChannel.promotion=yhb_promotion.promotion_info,yhb_promotion.promotion_params
canal.subscribeChannel.promotion=yhb_promotion.promotion_info,yhb_promotion.promotion_params,yhb_promotion.promotion_type
zkAddress=192.168.102.224:2181
... ...
... ... @@ -266,7 +266,7 @@ search.es.servers = es.node1.yohoops.org:9300 es.node2.yohoops.org:9300
search.index.number_of_replicas = 1
search.index.refresh_interval = 10s
search.index.translog.flush_threshold_ops = 10000
search.index.translog.flush_threshold_size = 100mb
search.index.translog.flush_threshold_size = 50mb
# search-mq
search.mq.server = rabbitmq01.yohoops.org
... ...
... ... @@ -7,6 +7,7 @@ gateway.api.url = http://api-test1.yohops.com:9999/
gateway.service.url = http://service-test1.yohops.com:9999/
uic_userInfoRest_enable = true
uic.login.ip.limit.times=10
yoho.uic.env.namespace = uic
yoho.uic.env.serverport = 6
... ...
... ... @@ -66,3 +66,6 @@ wechat.wap.notifyurl = http://service-test1.yohops.com:9999/payment/wechatwap_n
yoho.gateway.env.namespace = gateway
yoho.gateway.env.serverport = 0
yoho.gateway.env.webapphome = /home/test/yoho-gateway/deploy
#signature encrypt key salt
gateway.signature.key.salt=mQyMTMwZjlmZTZmYjY4UjkNmYwZGM0OTk0Y
... ...
... ... @@ -41,4 +41,4 @@ canal.subscribeChannel.yhgproduct=yhg_product.tbl_product,yhg_product.tbl_produc
##canal-promotion
canal.destination.promotion=promotion
canal.subscribeChannel.promotion=yhb_promotion.promotion_info,yhb_promotion.promotion_params,yhb_promotion.promotion_product_flags
\ No newline at end of file
canal.subscribeChannel.promotion=yhb_promotion.promotion_info,yhb_promotion.promotion_params,yhb_promotion.promotion_product_flags,yhb_promotion.promotion_type
\ No newline at end of file
... ...
... ... @@ -12,5 +12,8 @@ yohocoin.rule.maxPayRate=0.2
yohocoin.rule.amountLimit=20
invoiceUrl=http://testwx.fapiao.com/fpt-wechat/wxscan/wxkp.do
invoiceId=1Olh
invoiceKey=vmXrbKS1
\ No newline at end of file
invoiceId=9999
invoiceKey=87654321
yohoTaxNo=110109500321654
uic.url=http://192.168.102.31:8096/uic
\ No newline at end of file
... ...
... ... @@ -7,6 +7,8 @@ gateway.api.url = http://api-test1.yohops.com:9999/
gateway.service.url = http://service-test1.yohops.com:9999/
is_debug_enable = true
uic.login.ip.limit.times=10
uic.screen.mobilestart = [\\"147\\",\\"170\\",\\"171\\"]
... ...
... ... @@ -39,9 +39,9 @@ rabbit_vhost=yoho
redis.crm.proxy.address=192.168.102.211
redis.crm.notsync.twemproxy.addresses=192.168.102.211:6379
crm.send.notice=true
crm.send.notice=false
#alarm_mobile
alarm.mobile=18914723870
alarm.mobile=18994021292
#分组同步短信告警
usergroup.alarm.mobile=18994021292
... ...
... ... @@ -307,6 +307,11 @@ jdbc.mysql.yhlottery.slave=read.cms.yohoops.org:3306
jdbc.mysql.yhlottery.username=yh_test
jdbc.mysql.yhlottery.password=9nm0icOwt6bMHjMusIfMLw==
#yoho-message配置读写分离
jdbc.mysql.yhmessage.master=192.168.102.219:3306
jdbc.mysql.yhmessage.slave=192.168.102.219:3306
jdbc.mysql.yhmessage.username=yh_test
jdbc.mysql.yhmessage.password=9nm0icOwt6bMHjMusIfMLw==
readOnlyInSlave=false
... ...
... ... @@ -7,6 +7,8 @@ gateway.api.url = http://api-test2.yohops.com:9999/
gateway.service.url = http://service-test2.yohops.com:9999/
is_debug_enable = true
uic.login.ip.limit.times=10
uic.screen.mobilestart = [\\"147\\",\\"170\\",\\"171\\"]
... ...
... ... @@ -45,7 +45,7 @@ portalGateway.service.url = http://192.168.102.47:8080/portal-gateway
qq.notifyurl = http://service.yoho.cn/payment/qqpay_notify
uic.service.url = http://uic.yohoops.org/uic
uic.service.url = http://uic.yohoops.org:8096/uic
unionpay.notifyurl = https://service.yoho.cn/payment/unionpay_newnotify
... ... @@ -56,3 +56,6 @@ wechat.wap.notifyurl = http://service.yoho.cn/payment/wechatwap_notify
yoho.gateway.env.namespace = gateway
yoho.gateway.env.serverport = 0
yoho.gateway.env.webapphome = /home/test/yoho-gateway/deploy
#signature encrypt key salt
gateway.signature.key.salt=mQyMTMwZjlmZTZmYjY4UjkNmYwZGM0OTk0Y
... ...
... ... @@ -7,6 +7,7 @@ gateway.api.url = http://api-test3.yohops.com:9999/
gateway.service.url = http://service-test3.yohops.com:9999/
is_debug_enable = true
uic.login.ip.limit.times=10
uic.screen.mobilestart = [\\"147\\",\\"170\\",\\"171\\"]
... ...
... ... @@ -69,3 +69,6 @@ wechat.wap.notifyurl = http://service.yoho.cn/payment/wechatwap_notify
yoho.gateway.env.namespace = gateway
yoho.gateway.env.serverport = 0
yoho.gateway.env.webapphome = /home/test/yoho-gateway/deploy
#signature encrypt key salt
gateway.signature.key.salt=mQyMTMwZjlmZTZmYjY4UjkNmYwZGM0OTk0Y
... ...
... ... @@ -10,7 +10,7 @@ aliyun.bucket = yohotest
aliyun.domain = http://7xnrdp.com1.z0.glb.clouddn.com
aliyun.endpoint = oss-cn-shanghai.aliyuncs.com
api.yoho.url = http://api-test3.yohops.com:9999
api.yoho.url = http://erp.yoho.yohoops.org:9999
autoconfig.properties = sharedAutoconfig
... ... @@ -117,7 +117,7 @@ resources_https_enable = true
search.server.address = http://search.yohoops.org:8080/yohosearch/
service.yoho.url = http://service-test3.yohops.com:9999
service.yoho.url = http://erp.yoho.yohoops.org:9999
shop.status.change.phone = 17895010543
... ...
... ... @@ -5,6 +5,8 @@ autoconfig.properties.sharedAutoconfig = file:/home/test/deploy2/auto_deploy_te
gateway.api.url = http://api.gray.yohops.com/
uic_userInfoRest_enable = false
uic.login.ip.limit.times=10
yoho.uic.env.namespace = uic
yoho.uic.env.serverport = 6
... ...
... ... @@ -63,4 +63,5 @@ innerHostSuffix=yohops.com
uic.service.url = http://uic.yohoops.org:8096/uic
#signature encrypt key salt
gateway.signature.key.salt=mQyMTMwZjlmZTZmYjY4UjkNmYwZGM0OTk0Y
... ...
... ... @@ -16,8 +16,8 @@ build.productindex.use.code=true
build.storageskuindex.use.code=true
#consumer index config
search.index.batch.limit=2000
search.index.batch.max.thread.size=5
search.index.batch.limit=1000
search.index.batch.max.thread.size=3
#suggest count
suggestion.count.batch.limit=300
... ...
... ... @@ -306,11 +306,11 @@ jdbc.mysql.yhbsearch.password=t5/oMgwUCmO/GeMHBAQ2Cg==
# search-es
search.es.cluster.name = yohosearch_test
search.es.servers = 192.168.104.55:9300 192.168.104.54:9300 192.168.104.53:9300 192.168.104.51:9300
search.index.number_of_replicas = 2
search.es.servers = 192.168.104.55:9300 192.168.104.54:9300 192.168.104.53:9300 192.168.104.51:9300 192.168.104.36:9300 192.168.104.46:9300
search.index.number_of_replicas = 4
search.index.refresh_interval = 10s
search.index.translog.flush_threshold_ops = 5000
search.index.translog.flush_threshold_size = 100mb
search.index.translog.flush_threshold_size = 1000mb
# search-mq
search.mq.server=rabbitmq01.yohoops.org
... ...
... ... @@ -15,12 +15,16 @@ yoho_message_test_nj_2_ips=(test@192.168.102.25)
yoho_sns_test_nj_2_ips=(test@192.168.102.25)
yohobuy_union_test_nj_2_ips=(test@192.168.102.25)
yohobuy_resources_test_nj_2_ips=(test@192.168.102.27)
yohobuy_order_test_nj_2_ips=(test@192.168.103.98)
#yohobuy_order_test_nj_2_ips=(test@192.168.103.98)
yohobuy_order_test_nj_2_ips=(test@192.168.102.27)
yohobuy_platform_test_nj_2_ips=(test@192.168.102.27)
yohobuy_activity_test_nj_2_ips=(test@192.168.103.98)
yohobuy_brower_test_nj_2_ips=(test@192.168.103.98)
yohobuy_bigdata_test_nj_2_ips=(test@192.168.103.98)
#yohobuy_activity_test_nj_2_ips=(test@192.168.103.98)
#yohobuy_brower_test_nj_2_ips=(test@192.168.103.98)
#yohobuy_bigdata_test_nj_2_ips=(test@192.168.103.98)
yohobuy_activity_test_nj_2_ips=(test@192.168.102.27)
yohobuy_brower_test_nj_2_ips=(test@192.168.102.27)
yohobuy_bigdata_test_nj_2_ips=(test@192.168.102.27)
yohobuy_wechat_test_nj_2_ips=(test@192.168.102.27)
uic_test_nj_2_ips=(test@192.168.102.27)
yoho_social_test_nj_2_ips=(test@192.168.102.27)
... ... @@ -31,7 +35,8 @@ yoho_search_service_test_nj_2_ips=(test@192.168.102.24)
yoho_search_adaptor_test_nj_2_ips=(test@192.168.102.24)
yoho_cobar_test_nj_2_ips=(test@192.168.102.23)
yoho_family_test_nj_2_ips=(test@192.168.103.98)
#yoho_family_test_nj_2_ips=(test@192.168.103.98)
yoho_family_test_nj_2_ips=(test@192.168.102.27)
#####yoho_push_test_nj_2_ips=(test@192.168.102.27)
#####yohobuy_task_test_nj_2_ips=(test@192.168.102.27)
... ...