YPT / auto_deploy_test · Commits

Go to a project

Authored by Ling
Commit 9dde32c065d3dc2faf34de88dfa8adf6bd938a80 2 parents d68fc85f 60772245

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

Inline Side-by-side
Showing 9 changed files with 55 additions and 18 deletions
@@ -80,6 +80,9 @@ jdbc.mysql.platform.yhb_account.master = write.erp.yohoops.org:3306 @@ -80,6 +80,9 @@ jdbc.mysql.platform.yhb_account.master = write.erp.yohoops.org:3306
80 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== 80 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
81 jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306 81 jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306
82 jdbc.mysql.platform.yhb_account.username = yh_test 82 jdbc.mysql.platform.yhb_account.username = yh_test
  83 +jdbc.mysql.platform.bigdata_store.slave = 118.89.235.30:3306
  84 +jdbc.mysql.platform.bigdata_store.username = yh_test_bigdata
  85 +jdbc.mysql.platform.bigdata_store.password = rALdkYPZCr4QyzBfVCGdXA==
83 86
84 malongApi.accessKeyId = 7343a192140f25a59c53dab5652f5f47 87 malongApi.accessKeyId = 7343a192140f25a59c53dab5652f5f47
85 malongApi.imageSetId = 7tm74zfv 88 malongApi.imageSetId = 7tm74zfv
@@ -12,4 +12,8 @@ erp.gateway.url=http://192.168.13.87/erp-gateway-web @@ -12,4 +12,8 @@ erp.gateway.url=http://192.168.13.87/erp-gateway-web
12 12
13 yohocoin.rule.minMultiple=1 13 yohocoin.rule.minMultiple=1
14 yohocoin.rule.maxPayRate=0.2 14 yohocoin.rule.maxPayRate=0.2
15 -yohocoin.rule.amountLimit=20  
  15 +yohocoin.rule.amountLimit=20
  16 +
  17 +invoiceUrl=http://testwx.fapiao.com/fpt-wechat/wxscan/wxkp.do
  18 +invoiceId=1Olh
  19 +invoiceKey=vmXrbKS1
@@ -70,6 +70,9 @@ jdbc.mysql.platform.yhb_account.master = 192.168.102.219:3306 @@ -70,6 +70,9 @@ jdbc.mysql.platform.yhb_account.master = 192.168.102.219:3306
70 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== 70 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
71 jdbc.mysql.platform.yhb_account.slave = 192.168.102.219:3306 71 jdbc.mysql.platform.yhb_account.slave = 192.168.102.219:3306
72 jdbc.mysql.platform.yhb_account.username = yh_test 72 jdbc.mysql.platform.yhb_account.username = yh_test
  73 +jdbc.mysql.platform.bigdata_store.slave = 118.89.235.30:3306
  74 +jdbc.mysql.platform.bigdata_store.username = yh_test_bigdata
  75 +jdbc.mysql.platform.bigdata_store.password = rALdkYPZCr4QyzBfVCGdXA==
73 76
74 malongApi.accessKeyId = 7343a192140f25a59c53dab5652f5f47 77 malongApi.accessKeyId = 7343a192140f25a59c53dab5652f5f47
75 malongApi.imageSetId = 7tm74zfv 78 malongApi.imageSetId = 7tm74zfv
@@ -137,4 +140,8 @@ manager.zkAddress = 192.168.102.220:2181,192.168.102.210:2181 @@ -137,4 +140,8 @@ manager.zkAddress = 192.168.102.220:2181,192.168.102.210:2181
137 ali.check.accessKeyId=LTAIbjgV667m6ujZ 140 ali.check.accessKeyId=LTAIbjgV667m6ujZ
138 ali.check.accessKeySecret=aDJt9zdp0FsOpa4zQ2JzccBFq5Pq6K 141 ali.check.accessKeySecret=aDJt9zdp0FsOpa4zQ2JzccBFq5Pq6K
139 142
140 -shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop  
  143 +shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop
  144 +
  145 +local.task.host = 192.168.102.48
  146 +
  147 +platform.sns.imagesimi.url=http://192.168.103.96:8787/shareOrderAudit
@@ -83,6 +83,9 @@ jdbc.mysql.platform.yhb_account.master = write.erp.yohoops.org:3306 @@ -83,6 +83,9 @@ jdbc.mysql.platform.yhb_account.master = write.erp.yohoops.org:3306
83 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== 83 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
84 jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306 84 jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306
85 jdbc.mysql.platform.yhb_account.username = yh_test 85 jdbc.mysql.platform.yhb_account.username = yh_test
  86 +jdbc.mysql.platform.bigdata_store.slave = 118.89.235.30:3306
  87 +jdbc.mysql.platform.bigdata_store.username = yh_test_bigdata
  88 +jdbc.mysql.platform.bigdata_store.password = rALdkYPZCr4QyzBfVCGdXA==
86 89
87 local.task.host = 192.168.102.27 90 local.task.host = 192.168.102.27
88 91
@@ -148,4 +151,6 @@ manager.zkAddress = 192.168.102.220:2181,192.168.102.210:2181 @@ -148,4 +151,6 @@ manager.zkAddress = 192.168.102.220:2181,192.168.102.210:2181
148 ali.check.accessKeyId=LTAIbjgV667m6ujZ 151 ali.check.accessKeyId=LTAIbjgV667m6ujZ
149 ali.check.accessKeySecret=aDJt9zdp0FsOpa4zQ2JzccBFq5Pq6K 152 ali.check.accessKeySecret=aDJt9zdp0FsOpa4zQ2JzccBFq5Pq6K
150 153
151 -shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop  
  154 +shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop
  155 +
  156 +platform.sns.imagesimi.url=http://192.168.103.96:8787/shareOrderAudit
@@ -49,6 +49,9 @@ jdbc.mysql.platform.yhb_account.master = write.erp.yohoops.org:3306 @@ -49,6 +49,9 @@ jdbc.mysql.platform.yhb_account.master = write.erp.yohoops.org:3306
49 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== 49 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
50 jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306 50 jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306
51 jdbc.mysql.platform.yhb_account.username = yh_test 51 jdbc.mysql.platform.yhb_account.username = yh_test
  52 +jdbc.mysql.platform.bigdata_store.slave = 118.89.235.30:3306
  53 +jdbc.mysql.platform.bigdata_store.username = yh_test_bigdata
  54 +jdbc.mysql.platform.bigdata_store.password = rALdkYPZCr4QyzBfVCGdXA==
52 55
53 manager.zkAddress = zk01.yohoops.org:2181 56 manager.zkAddress = zk01.yohoops.org:2181
54 57
@@ -89,4 +92,6 @@ yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy @@ -89,4 +92,6 @@ yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
89 92
90 local.task.host = 192.168.102.48 93 local.task.host = 192.168.102.48
91 94
92 -shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop  
  95 +shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop
  96 +
  97 +platform.sns.imagesimi.url=http://platform.shareOrder.yohoops.org:8787/shareOrderAudit
@@ -80,6 +80,9 @@ jdbc.mysql.platform.yhb_account.master = write.erp.yohoops.org:3306 @@ -80,6 +80,9 @@ jdbc.mysql.platform.yhb_account.master = write.erp.yohoops.org:3306
80 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== 80 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
81 jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306 81 jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306
82 jdbc.mysql.platform.yhb_account.username = yh_test 82 jdbc.mysql.platform.yhb_account.username = yh_test
  83 +jdbc.mysql.platform.bigdata_store.slave = 118.89.235.30:3306
  84 +jdbc.mysql.platform.bigdata_store.username = yh_test_bigdata
  85 +jdbc.mysql.platform.bigdata_store.password = rALdkYPZCr4QyzBfVCGdXA==
83 86
84 malongApi.accessKeyId = 7343a192140f25a59c53dab5652f5f47 87 malongApi.accessKeyId = 7343a192140f25a59c53dab5652f5f47
85 malongApi.imageSetId = 7tm74zfv 88 malongApi.imageSetId = 7tm74zfv
@@ -141,4 +144,5 @@ manager.zkAddress = zk01.yohoops.org:2181 @@ -141,4 +144,5 @@ manager.zkAddress = zk01.yohoops.org:2181
141 ali.check.accessKeyId=LTAIbjgV667m6ujZ 144 ali.check.accessKeyId=LTAIbjgV667m6ujZ
142 ali.check.accessKeySecret=aDJt9zdp0FsOpa4zQ2JzccBFq5Pq6K 145 ali.check.accessKeySecret=aDJt9zdp0FsOpa4zQ2JzccBFq5Pq6K
143 local.task.host = 192.168.102.48 146 local.task.host = 192.168.102.48
144 -shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop  
  147 +shop.yoho.url = http://qbs-h5-newtest1.yohops.com/shop
  148 +platform.sns.imagesimi.url=http://192.168.103.96:8787/shareOrderAudit
@@ -292,7 +292,7 @@ mongo.inbox.port = 27017 @@ -292,7 +292,7 @@ mongo.inbox.port = 27017
292 292
293 293
294 #search-db 294 #search-db
295 -jdbc.mysql.yhbsearch.datasources=yhb_search_2016 295 +jdbc.mysql.yhbsearch.datasources=yhb_search
296 jdbc.mysql.yhbsearch.master=write.search.yohoops.org:3306 296 jdbc.mysql.yhbsearch.master=write.search.yohoops.org:3306
297 jdbc.mysql.yhbsearch.slave=read.search.yohoops.org:3306 297 jdbc.mysql.yhbsearch.slave=read.search.yohoops.org:3306
298 jdbc.mysql.yhbsearch.username=yh_test 298 jdbc.mysql.yhbsearch.username=yh_test
@@ -45,6 +45,9 @@ jdbc.mysql.platform.yhb_account.master = 192.168.102.219:3306 @@ -45,6 +45,9 @@ jdbc.mysql.platform.yhb_account.master = 192.168.102.219:3306
45 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== 45 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
46 jdbc.mysql.platform.yhb_account.slave = 192.168.102.219:3306 46 jdbc.mysql.platform.yhb_account.slave = 192.168.102.219:3306
47 jdbc.mysql.platform.yhb_account.username = yh_test 47 jdbc.mysql.platform.yhb_account.username = yh_test
  48 +jdbc.mysql.platform.bigdata_store.slave = 118.89.235.30:3306
  49 +jdbc.mysql.platform.bigdata_store.username = yh_test_bigdata
  50 +jdbc.mysql.platform.bigdata_store.password = rALdkYPZCr4QyzBfVCGdXA==
48 51
49 mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html 52 mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html
50 53
@@ -18,7 +18,7 @@ jdbc.mysql.cobar.username=yh_vpc_bak @@ -18,7 +18,7 @@ jdbc.mysql.cobar.username=yh_vpc_bak
18 jdbc.mysql.cobar.password=t5/oMgwUCmO/GeMHBAQ2Cg== 18 jdbc.mysql.cobar.password=t5/oMgwUCmO/GeMHBAQ2Cg==
19 19
20 jdbc.mysql.yhwechat.master=write.passport.yohoops.org:3306 20 jdbc.mysql.yhwechat.master=write.passport.yohoops.org:3306
21 -jdbc.mysql.yhwechat.slave=read.passport.yohoops.org:3307 21 +jdbc.mysql.yhwechat.slave=read.passport.yohoops.org:3306
22 jdbc.mysql.yhwechat.username=yh_vpc_bak 22 jdbc.mysql.yhwechat.username=yh_vpc_bak
23 jdbc.mysql.yhwechat.password=t5/oMgwUCmO/GeMHBAQ2Cg== 23 jdbc.mysql.yhwechat.password=t5/oMgwUCmO/GeMHBAQ2Cg==
24 24
@@ -165,18 +165,18 @@ jdbc.mysql.yhbpromotion.slave=read.orders.yohoops.org:3307 @@ -165,18 +165,18 @@ jdbc.mysql.yhbpromotion.slave=read.orders.yohoops.org:3307
165 165
166 #yoho_sms配置读写分离 166 #yoho_sms配置读写分离
167 jdbc.mysql.yohosms.master=write.passport.yohoops.org:3306 167 jdbc.mysql.yohosms.master=write.passport.yohoops.org:3306
168 -jdbc.mysql.yohosms.slave=read.passport.yohoops.org:3307 168 +jdbc.mysql.yohosms.slave=read.passport.yohoops.org:3306
169 169
170 #yh_inbox配置读写分离 170 #yh_inbox配置读写分离
171 jdbc.mysql.yhinbox.master=write.passport.yohoops.org:3306 171 jdbc.mysql.yhinbox.master=write.passport.yohoops.org:3306
172 -jdbc.mysql.yhinbox.slave=read.passport.yohoops.org:3307 172 +jdbc.mysql.yhinbox.slave=read.passport.yohoops.org:3306
173 173
174 #yoho_logs配置读写分离, 暂时将表存在yoho_sms中 174 #yoho_logs配置读写分离, 暂时将表存在yoho_sms中
175 jdbc.mysql.yohologs.master=yohologs.yohoops.org:3306 175 jdbc.mysql.yohologs.master=yohologs.yohoops.org:3306
176 176
177 #yoho_passport读写数据分离 177 #yoho_passport读写数据分离
178 jdbc.mysql.yohopassport.master=write.passport.yohoops.org:3306 178 jdbc.mysql.yohopassport.master=write.passport.yohoops.org:3306
179 -jdbc.mysql.yohopassport.slave=read.passport.yohoops.org:3307 179 +jdbc.mysql.yohopassport.slave=read.passport.yohoops.org:3306
180 180
181 #yh_operations配置读写分离 181 #yh_operations配置读写分离
182 jdbc.mysql.yhoperations.master=write.cms.yohoops.org:3307 182 jdbc.mysql.yhoperations.master=write.cms.yohoops.org:3307
@@ -184,7 +184,7 @@ jdbc.mysql.yhoperations.slave=read.cms.yohoops.org:3307 @@ -184,7 +184,7 @@ jdbc.mysql.yhoperations.slave=read.cms.yohoops.org:3307
184 184
185 #yh_passport读写分离 185 #yh_passport读写分离
186 jdbc.mysql.yhpassport.master=write.passport.yohoops.org:3306 186 jdbc.mysql.yhpassport.master=write.passport.yohoops.org:3306
187 -jdbc.mysql.yhpassport.slave=read.passport.yohoops.org:3307 187 +jdbc.mysql.yhpassport.slave=read.passport.yohoops.org:3306
188 188
189 #yh_setting读写分离 189 #yh_setting读写分离
190 jdbc.mysql.yhsetting.master=write.cms.yohoops.org:3307 190 jdbc.mysql.yhsetting.master=write.cms.yohoops.org:3307
@@ -212,15 +212,15 @@ jdbc.mysql.unions.slave=read.cms.yohoops.org:3307 @@ -212,15 +212,15 @@ jdbc.mysql.unions.slave=read.cms.yohoops.org:3307
212 212
213 #push center 213 #push center
214 jdbc.mysql.yohopushcenter.master=write.passport.yohoops.org:3306 214 jdbc.mysql.yohopushcenter.master=write.passport.yohoops.org:3306
215 -jdbc.mysql.yohopushcenter.slave=read.passport.yohoops.org:3307 215 +jdbc.mysql.yohopushcenter.slave=read.passport.yohoops.org:3306
216 216
217 #q_msg_system 217 #q_msg_system
218 jdbc.mysql.yhpush.master=write.passport.yohoops.org:3306 218 jdbc.mysql.yhpush.master=write.passport.yohoops.org:3306
219 -jdbc.mysql.yhpush.slave=read.passport.yohoops.org:3307 219 +jdbc.mysql.yhpush.slave=read.passport.yohoops.org:3306
220 220
221 #yoho_activity 221 #yoho_activity
222 jdbc.mysql.yohoactivity.master=write.passport.yohoops.org:3306 222 jdbc.mysql.yohoactivity.master=write.passport.yohoops.org:3306
223 -jdbc.mysql.yohoactivity.slave=read.passport.yohoops.org:3307 223 +jdbc.mysql.yohoactivity.slave=read.passport.yohoops.org:3306
224 224
225 #yh_guang 225 #yh_guang
226 jdbc.mysql.yhguang.master=write.cms.yohoops.org:3307 226 jdbc.mysql.yhguang.master=write.cms.yohoops.org:3307
@@ -240,7 +240,7 @@ jdbc.mysql.yohood.slave=read.yohood.yohoops.org:3307 @@ -240,7 +240,7 @@ jdbc.mysql.yohood.slave=read.yohood.yohoops.org:3307
240 240
241 #yohocrm 241 #yohocrm
242 jdbc.mysql.yohocrm.master=write.passport.yohoops.org:3306 242 jdbc.mysql.yohocrm.master=write.passport.yohoops.org:3306
243 -jdbc.mysql.yohocrm.slave=read.passport.yohoops.org:3307 243 +jdbc.mysql.yohocrm.slave=read.passport.yohoops.org:3306
244 244
245 #erppassport 245 #erppassport
246 jdbc.mysql.erppassport.master=write.erp.yohoops.org:3306 246 jdbc.mysql.erppassport.master=write.erp.yohoops.org:3306
@@ -277,6 +277,12 @@ jdbc.mysql.yh_cms.slave=read.cms.yohoops.org:3307 @@ -277,6 +277,12 @@ jdbc.mysql.yh_cms.slave=read.cms.yohoops.org:3307
277 jdbc.mysql.yh_cms.username=yh_vpc_bak 277 jdbc.mysql.yh_cms.username=yh_vpc_bak
278 jdbc.mysql.yh_cms.password=t5/oMgwUCmO/GeMHBAQ2Cg== 278 jdbc.mysql.yh_cms.password=t5/oMgwUCmO/GeMHBAQ2Cg==
279 279
  280 +#sso
  281 +jdbc.mysql.yhuuc.master=write.yhuuc.yohoops.org:3307
  282 +jdbc.mysql.yhuuc.slave=read.yhuuc.yohoops.org:3307
  283 +jdbc.mysql.yhuuc.username=yh_vpc_bak
  284 +jdbc.mysql.yhuuc.password=t5/oMgwUCmO/GeMHBAQ2Cg==
  285 +
280 #yhlottery 286 #yhlottery
281 jdbc.mysql.yhlottery.master=write.yhlottery.yohoops.org:3307 287 jdbc.mysql.yhlottery.master=write.yhlottery.yohoops.org:3307
282 jdbc.mysql.yhlottery.slave=read.yhlottery.yohoops.org:3307 288 jdbc.mysql.yhlottery.slave=read.yhlottery.yohoops.org:3307
@@ -301,7 +307,7 @@ jdbc.mysql.yhbsearch.password=t5/oMgwUCmO/GeMHBAQ2Cg== @@ -301,7 +307,7 @@ jdbc.mysql.yhbsearch.password=t5/oMgwUCmO/GeMHBAQ2Cg==
301 # search-es 307 # search-es
302 search.es.cluster.name = yohosearch_test 308 search.es.cluster.name = yohosearch_test
303 search.es.servers = 192.168.104.55:9300 192.168.104.54:9300 192.168.104.53:9300 192.168.104.51:9300 309 search.es.servers = 192.168.104.55:9300 192.168.104.54:9300 192.168.104.53:9300 192.168.104.51:9300
304 -search.index.number_of_replicas = 0 310 +search.index.number_of_replicas = 3
305 search.index.refresh_interval = 10s 311 search.index.refresh_interval = 10s
306 search.index.translog.flush_threshold_ops = 5000 312 search.index.translog.flush_threshold_ops = 5000
307 313
@@ -314,8 +320,8 @@ search.mq.exchange=yoho_search @@ -314,8 +320,8 @@ search.mq.exchange=yoho_search
314 search.mq.virtualHost=/ 320 search.mq.virtualHost=/
315 321
316 #for crm read db 322 #for crm read db
317 -jdbc.mysql.yohopassport.onlyslave=read.passport.yohoops.org:3307  
318 -jdbc.mysql.yhpassport.onlyslave=read.passport.yohoops.org:3307 323 +jdbc.mysql.yohopassport.onlyslave=read.passport.yohoops.org:3306
  324 +jdbc.mysql.yhpassport.onlyslave=read.passport.yohoops.org:3306
319 jdbc.mysql.yhshops.onlyslave=read.shops.yohoops.org:3306 325 jdbc.mysql.yhshops.onlyslave=read.shops.yohoops.org:3306
320 jdbc.mysql.yhoperations.onlyslave=read.cms.yohoops.org:3307 326 jdbc.mysql.yhoperations.onlyslave=read.cms.yohoops.org:3307
321 jdbc.mysql.yh.username=yh_vpc_bak 327 jdbc.mysql.yh.username=yh_vpc_bak