yohoops / auto_deploy_test · Commits

Go to a project

Authored by lingmin
Commit 0d6b562df30f705fb8eed8f59ffe11cbe342d9af 2 parents 4ba41609 0db87d9e

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

Inline Side-by-side
Showing 48 changed files with 636 additions and 241 deletions
@@ -218,11 +218,34 @@ jdbc.mysql.lineshops.username=yh_test @@ -218,11 +218,34 @@ jdbc.mysql.lineshops.username=yh_test
218 jdbc.mysql.lineshops.password=9nm0icOwt6bMHjMusIfMLw== 218 jdbc.mysql.lineshops.password=9nm0icOwt6bMHjMusIfMLw==
219 219
220 # yh_mars 220 # yh_mars
221 -jdbc.mysql.yhmars.master=192.168.102.17:3306  
222 -jdbc.mysql.yhmars.slave=192.168.102.17:3306  
223 -jdbc.mysql.yhmars.username=root  
224 -jdbc.mysql.yhmars.password=Z5BMngayHLUxyWLSv6+koA==  
225 - 221 +jdbc.mysql.yhmars.master=192.168.102.216:3306
  222 +jdbc.mysql.yhmars.slave=192.168.102.216:3306
  223 +jdbc.mysql.yhmars.username=yh_test
  224 +jdbc.mysql.yhmars.password=9nm0icOwt6bMHjMusIfMLw==
  225 +
  226 +#yhgorder
  227 +jdbc.mysql.yhgorder.master=192.168.102.214:5511
  228 +jdbc.mysql.yhgorder.slave=192.168.102.214:5511
  229 +jdbc.mysql.yhgorder.username=yohodb
  230 +jdbc.mysql.yhgorder.password=sptsRfIfzmZJ0JPOnHKN9BIqqFRmY3+jrks0lQGi164=
  231 +
  232 +#yhgproduct
  233 +jdbc.mysql.yhgproduct.master=192.168.102.214:5511
  234 +jdbc.mysql.yhgproduct.slave=192.168.102.214:5511
  235 +jdbc.mysql.yhgproduct.username=yohodb
  236 +jdbc.mysql.yhgproduct.password=sptsRfIfzmZJ0JPOnHKN9BIqqFRmY3+jrks0lQGi164=
  237 +
  238 +#yhgspider
  239 +jdbc.mysql.yhgspider.master=192.168.102.214:5511
  240 +jdbc.mysql.yhgspider.slave=192.168.102.214:5511
  241 +jdbc.mysql.yhgspider.username=yohodb
  242 +jdbc.mysql.yhgspider.password=sptsRfIfzmZJ0JPOnHKN9BIqqFRmY3+jrks0lQGi164=
  243 +
  244 +#yhgeditor
  245 +jdbc.mysql.yhgeditor.master=192.168.102.214:5511
  246 +jdbc.mysql.yhgeditor.slave=192.168.102.214:5511
  247 +jdbc.mysql.yhgeditor.username=yohodb
  248 +jdbc.mysql.yhgeditor.password=sptsRfIfzmZJ0JPOnHKN9BIqqFRmY3+jrks0lQGi164=
226 249
227 # search-es 250 # search-es
228 search.es.cluster.name = yohosearch 251 search.es.cluster.name = yohosearch
@@ -231,6 +254,20 @@ search.index.number_of_replicas = 1 @@ -231,6 +254,20 @@ search.index.number_of_replicas = 1
231 search.index.refresh_interval = 10s 254 search.index.refresh_interval = 10s
232 search.index.translog.flush_threshold_ops = 5000 255 search.index.translog.flush_threshold_ops = 5000
233 256
  257 +
  258 +
  259 +#yhb_promotion_split db split
  260 +jdbc.mysql.yhbpromotionsplit.master=192.168.102.202:8066
  261 +jdbc.mysql.yhbpromotionsplit.slave=192.168.102.202:8066
  262 +jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066
  263 +jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066
  264 +jdbc.mysql.yhbpromotionsplit.username=yh_test
  265 +jdbc.mysql.yhbpromotionsplit.password=9nm0icOwt6bMHjMusIfMLw==
  266 +jdbc.mysql.yhbpromotionsplit.slave2=192.168.102.202:8066
  267 +jdbc.mysql.yhbpromotionsplit.slave3=192.168.102.202:8066
  268 +
  269 +
  270 +
234 # search-mq 271 # search-mq
235 search.mq.server = 192.168.102.224 272 search.mq.server = 192.168.102.224
236 search.mq.port = 5672 273 search.mq.port = 5672
@@ -255,7 +292,7 @@ cache.servers.gateway.level1.expire = 1800 @@ -255,7 +292,7 @@ cache.servers.gateway.level1.expire = 1800
255 cache.servers.gateway.level2.address = 192.168.102.211:11211 292 cache.servers.gateway.level2.address = 192.168.102.211:11211
256 cache.servers.gateway.level2.expire = 43200 293 cache.servers.gateway.level2.expire = 43200
257 294
258 -ip.port.search.server = 192.168.102.224:8080 295 +ip.port.search.server = 192.168.102.216:8080
259 296
260 qiniu.accesskey = atSf7xxIl8alEnsXbhC1bOD1GWVW3qYffz8SlB4m 297 qiniu.accesskey = atSf7xxIl8alEnsXbhC1bOD1GWVW3qYffz8SlB4m
261 qiniu.bucket = yhfair 298 qiniu.bucket = yhfair
@@ -263,18 +300,18 @@ qiniu.domain = http://yhfair.qiniudn.com @@ -263,18 +300,18 @@ qiniu.domain = http://yhfair.qiniudn.com
263 qiniu.secretkey = pyoJzPygXIkFWrc1BAsH6tAJ0yweTchpJwGKEwhm 300 qiniu.secretkey = pyoJzPygXIkFWrc1BAsH6tAJ0yweTchpJwGKEwhm
264 301
265 # outter big data redis 302 # outter big data redis
266 -bigDataRedis.proxy.address = test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn  
267 -bigDataRedis.proxy.port = 6379 303 +bigDataRedis.proxy.address = 123.206.17.17
  304 +bigDataRedis.proxy.port = 16379
268 bigDataRedis.proxy.auth = 305 bigDataRedis.proxy.auth =
269 306
270 # outter big data redis push 307 # outter big data redis push
271 -bigDataRedis-push.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn  
272 -bigDataRedis-push.proxy.port=6379 308 +bigDataRedis-push.proxy.address=123.206.17.17
  309 +bigDataRedis-push.proxy.port=16379
273 bigDataRedis-push.proxy.auth= 310 bigDataRedis-push.proxy.auth=
274 311
275 #bigDataRedis-search 312 #bigDataRedis-search
276 -bigDataRedis-search.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn  
277 -bigDataRedis-search.proxy.port= 6379 313 +bigDataRedis-search.proxy.address=123.206.17.17
  314 +bigDataRedis-search.proxy.port= 16379
278 bigDataRedis-search.proxy.auth= 315 bigDataRedis-search.proxy.auth=
279 316
280 redis.notsync.twemproxy.addresses=192.168.102.12:6379,192.168.102.12:6379 317 redis.notsync.twemproxy.addresses=192.168.102.12:6379,192.168.102.12:6379
  1 +jdbc.mysql.readonlyinslave=true
1 autoconfig.properties = sharedAutoconfig 2 autoconfig.properties = sharedAutoconfig
2 3
3 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
4 5
5 yohomars.env.namespace = yohomars 6 yohomars.env.namespace = yohomars
6 yohomars.env.serverport = 72 7 yohomars.env.serverport = 72
7 -yohomars.env.webapphome = /home/dev/yoho-mars/deploy  
  8 +yohomars.env.webapphome = /home/dev/yoho-mars/deploy
  9 +
  10 +
  11 +uic.api.host=http://192.168.102.48:8096/uic
@@ -4,9 +4,15 @@ autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/auto @@ -4,9 +4,15 @@ autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/auto
4 4
5 uic.service.url=http://192.168.102.48:8096/uic/ 5 uic.service.url=http://192.168.102.48:8096/uic/
6 mag.service.url=http://ezine-test.yohops.com:9999/index.php?r=Apiemag 6 mag.service.url=http://ezine-test.yohops.com:9999/index.php?r=Apiemag
7 -cn.site.url=http://newboys.test.yoho.cn  
8 -hk.site.url=http://hkboys.test.yoho.cn  
9 7
10 yohonow.env.namespace = yohonow 8 yohonow.env.namespace = yohonow
11 yohonow.env.serverport = 1 9 yohonow.env.serverport = 1
12 -yohonow.env.webapphome = /home/dev/yoho-now/deploy  
  10 +yohonow.env.webapphome = /home/dev/yoho-now/deploy
  11 +
  12 +
  13 +boy.cn.site.url=http://newboys.test.yoho.cn
  14 +girl.cn.site.url=http://newgirls.test.yoho.cn
  15 +
  16 +#hongkong site main
  17 +boy.hk.site.url=http://hkboys.test.yoho.cn
  18 +girl.hk.site.url=http://hkgirls.test.yoho.cn
  1 +yohobuy.global.env.webapphome=/home/dev/yohobuy-global/deploy
  2 +yohobuy.global.env.serverport=0
  3 +yohobuy.global.env.namespace=globalbuy
  4 +
  5 +is_debug_enable=false
  6 +
  7 +yhb_api_url=http://api-test3.yohops.com:9999
  8 +yhb_search_url=http://192.168.102.216:8080/yohosearch/tblproduct/search.json
  9 +
  10 +globalbuyRedis.proxy.address=192.168.102.12
  11 +globalbuyRedis.proxy.port=6379
  12 +redis.proxy.auth=
  13 +
  14 +redis.pool.maxTotal=100
  15 +redis.pool.maxIdle=100
  16 +redis.pool.maxWaitMillis=2000
  17 +redis.pool.minIdle=50
  18 +redis.pool.testOnBorrow=false
  19 +redis.pool.testWhileIdle=true
@@ -2,7 +2,7 @@ api.yoho.url = http://devapi.yoho.cn:58078 @@ -2,7 +2,7 @@ api.yoho.url = http://devapi.yoho.cn:58078
2 2
3 autoconfig.properties = sharedAutoconfig 3 autoconfig.properties = sharedAutoconfig
4 4
5 -autoconfig.properties.sharedAutoconfig = file:/home/dev/opps/deploy/autoconfig/dev/global-autoconfig.properties 5 +autoconfig.properties.sharedAutoconfig = file:/home/dev/auto_deploy/deploy/autoconfig/dev/global-autoconfig.properties
6 6
7 erp.platform.shops.url = http://api.erp.yohobuy.com 7 erp.platform.shops.url = http://api.erp.yohobuy.com
8 8
@@ -51,4 +51,69 @@ watchService.watchDir = /Data/ftpdir @@ -51,4 +51,69 @@ watchService.watchDir = /Data/ftpdir
51 yohobuy.platform.env.namespace = platform 51 yohobuy.platform.env.namespace = platform
52 yohobuy.platform.env.serverport = 8 52 yohobuy.platform.env.serverport = 8
53 yohobuy.platform.env.webapphome = /home/dev/yohobuy-platform/deploy 53 yohobuy.platform.env.webapphome = /home/dev/yohobuy-platform/deploy
54 -http://analytics.m.yohobuy.com/yas.gif/web/  
  54 +http://analytics.m.yohobuy.com/yas.gif/web/
  55 +
  56 +
  57 +upload.tencent.url=http://data.dm.qcloud.com:8088
  58 +upload.tencent.bid=b_teg_openrecom_opq68unpsix93dy2zjco
  59 +upload.tencent.product.mark=9.99
  60 +
  61 +
  62 +# ******************** bigdata upload skn data ********************
  63 +bigdata.qiniu.accesskey=EJhU5jwtkfMm3k5RTeOCH9_jc0A0o-mIfD3Iba5J
  64 +bigdata.qiniu.secretkey=qAns6jrf9pg6bHNvS1IcKi-pnVBWV46pbpFWKwJ7
  65 +bigdata.qiniu.bucket=db-backup
  66 +qiniu.bigdata.skndada.fileName=/Users/apple/Documents/tmp/sknData.xml
  67 +bigdata.ad.userid=9999
  68 +# ******************** bigdata upload skn data ********************
  69 +# ******************** bigData redis servers start ********************
  70 +bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
  71 +bigDataRedis.proxy.port=6379
  72 +#password, can be empty
  73 +bigDataRedis.proxy.auth=
  74 +
  75 +bigDataRedis.pool.maxTotal=100
  76 +bigDataRedis.pool.maxIdle=100
  77 +bigDataRedis.pool.maxWaitMillis=2000
  78 +bigDataRedis.pool.minIdle=50
  79 +bigDataRedis.pool.testOnBorrow=false
  80 +bigDataRedis.pool.testWhileIdle=true
  81 +# ******************** bigData redis servers end ********************
  82 +
  83 +
  84 +price.selltype.url=http://192.168.102.47:9098/erp-gateway-web/plate_price_form/list_product_info
  85 +
  86 +# price manage audit person config
  87 +price.audit.firstRoleName=zuzhang1
  88 +price.audit.secondPid=100476
  89 +price.audit.thirdPid=100478
  90 +
  91 +price.changed.notice.phone=13512519156
  92 +
  93 +
  94 +shop.status.change.phone=123456
  95 +erp.storage=http://serve.yohobuy.com
  96 +#\u5e73\u53f0\u7aef\u767b\u9646\u5d4c\u5957iframe\u7684salt
  97 +platform.login.salt=yoho9646yoho9646
  98 +resources_https_enable=true
  99 +
  100 +yoho.service.domain.url=http://127.0.0.1:8094
  101 +
  102 +mkt.activity.domain.url=http://union.yoho.cn/union/tencentMkt/index.html
  103 +crawler.host=http://192.168.103.62:9100
  104 +
  105 +
  106 +admin.portal.url=http://192.168.102.211:30012
  107 +
  108 +admin.login.url=http://192.168.102.211:30012
  109 +
  110 +file.image.gif.size=2621440
  111 +erp.realStorage.url=http://192.168.13.24:8099/erp-gateway-web/shift_logs/query_stock_num_by_sku
  112 +erp.domain=http://192.168.102.47:9098/erp-gateway-web
  113 +
  114 +jdbc.mysql.yhbpromotionsplitplatform.master=127.0.0.1:8066
  115 +jdbc.mysql.yhbpromotionsplitplatform.slave=127.0.0.1:8066
  116 +jdbc.mysql.yhbpromotionsplitplatform.username=yh_test
  117 +jdbc.mysql.yhbpromotionsplitplatform.password=9nm0icOwt6bMHjMusIfMLw==
  118 +
  119 +aliyun.accesskey=XLHom1U6wcyl8dec3t0zaJczvsATPf
@@ -9,3 +9,11 @@ promoation.invite.shareCoupon = [ \\"11720\\", \\"11721\\", \\"11722\\", \\"11 @@ -9,3 +9,11 @@ promoation.invite.shareCoupon = [ \\"11720\\", \\"11721\\", \\"11722\\", \\"11
9 yohobuy.promotion.env.namespace = promotion 9 yohobuy.promotion.env.namespace = promotion
10 yohobuy.promotion.env.serverport = 5 10 yohobuy.promotion.env.serverport = 5
11 yohobuy.promotion.env.webapphome = /home/dev/yohobuy-promotion/deploy 11 yohobuy.promotion.env.webapphome = /home/dev/yohobuy-promotion/deploy
  12 +
  13 +promotion.sendCounpon.broadcast.rate = 0.5
  14 +
  15 +
  16 +wechat.coupons.operators.email=jie.pang@yoho.cn
  17 +weibo.coupons.operators.email=chao.geng@yoho.cn,binbin.lu@yoho.cn
  18 +weibo.coupons.operators.mobile=13770338135,18551607734
  19 +yoho.message.controller.url=http://192.168.102.202:8087/yoho-message-controller
@@ -19,3 +19,15 @@ rabbit.mq.virtualHost = /yoho @@ -19,3 +19,15 @@ rabbit.mq.virtualHost = /yoho
19 yoho.unions.env.namespace = union 19 yoho.unions.env.namespace = union
20 yoho.unions.env.serverport = 8 20 yoho.unions.env.serverport = 8
21 yoho.unions.env.webapphome = /home/dev/yohobuy-union/deploy 21 yoho.unions.env.webapphome = /home/dev/yohobuy-union/deploy
  22 +
  23 +
  24 +file.saveDir = /Data/images
  25 +platform.login.salt=yoho9646yoho9646
  26 +erp.domain=http://192.168.102.47:9098/erp-gateway-web
  27 +admin.login.url=http://192.168.102.211:30012
  28 +
  29 +
  30 +rabbit_message_center = 192.168.102.211:5672
  31 +rabbit_message_center_user = yoho
  32 +rabbit_message_center_password = yoho
  33 +rabbit_message_center_vhost = yoho
@@ -254,10 +254,10 @@ redis.search.proxy.auth = @@ -254,10 +254,10 @@ redis.search.proxy.auth =
254 254
255 #mars-search-db 255 #mars-search-db
256 jdbc.mysql.yohomarssearch.datasources = yh_mars 256 jdbc.mysql.yohomarssearch.datasources = yh_mars
257 -jdbc.mysql.yohomarssearch.master = 192.168.102.17:3306  
258 -jdbc.mysql.yohomarssearch.slave = 192.168.102.17:3306  
259 -jdbc.mysql.yohomarssearch.username = root  
260 -jdbc.mysql.yohomarssearch.password = Z5BMngayHLUxyWLSv6+koA== 257 +jdbc.mysql.yohomarssearch.master = 192.168.102.216:3306
  258 +jdbc.mysql.yohomarssearch.slave = 192.168.102.216:3306
  259 +jdbc.mysql.yohomarssearch.username = yh_test
  260 +jdbc.mysql.yohomarssearch.password = 9nm0icOwt6bMHjMusIfMLw==
261 261
262 #mars-search-es 262 #mars-search-es
263 yohomarssearch.es.cluster.name = yohosearch_test 263 yohomarssearch.es.cluster.name = yohosearch_test
@@ -15,4 +15,7 @@ redis.push.auth= @@ -15,4 +15,7 @@ redis.push.auth=
15 redis.pool.maxTotal=200 15 redis.pool.maxTotal=200
16 redis.pool.maxIdle=100 16 redis.pool.maxIdle=100
17 redis.pool.minIdle=30 17 redis.pool.minIdle=30
18 -redis.pool.maxWaitMillis=10000  
  18 +redis.pool.maxWaitMillis=10000
  19 +
  20 +#message.sender.isDev
  21 +message.sender.isDev=true
@@ -13,7 +13,7 @@ canal.server.port=zk01.yohoops.org:2181 @@ -13,7 +13,7 @@ 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,yh_shops.product_price_plan,yh_shops.product_timing,yh_shops.shops,yh_shops.shops_brands,yh_shops.sales_category 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
@@ -21,7 +21,7 @@ canal.subscribeChannel.operation=yhb_operations.activity_product,yhb_operations. @@ -21,7 +21,7 @@ canal.subscribeChannel.operation=yhb_operations.activity_product,yhb_operations.
21 21
22 ##cancal-erpproduct 22 ##cancal-erpproduct
23 canal.destination.erpproduct=erpproduct 23 canal.destination.erpproduct=erpproduct
24 -canal.subscribeChannel.erpproduct=erp_product.product_pool_detail 24 +canal.subscribeChannel.erpproduct=erp_product.product_pool_detail,erp_product.product_ext,erp_product.product_attribute
25 25
26 ##cancal-erpcustomerservice 26 ##cancal-erpcustomerservice
27 canal.destination.erpcustomerservice=erpcustomerservice 27 canal.destination.erpcustomerservice=erpcustomerservice
@@ -35,4 +35,5 @@ jdbc.mysql.bigdata.username=yh_test @@ -35,4 +35,5 @@ jdbc.mysql.bigdata.username=yh_test
35 jdbc.mysql.bigdata.password=9nm0icOwt6bMHjMusIfMLw== 35 jdbc.mysql.bigdata.password=9nm0icOwt6bMHjMusIfMLw==
36 bigdata.database.cluster.name = test 36 bigdata.database.cluster.name = test
37 37
38 -bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn  
  38 +bigDataRedis.proxy.address=123.206.17.17
  39 +bigDataRedis.proxy.port=16379
@@ -59,6 +59,8 @@ unionpay.notifyurl = http://service-test1.yohops.com:9999/payment/unionpay_newn @@ -59,6 +59,8 @@ unionpay.notifyurl = http://service-test1.yohops.com:9999/payment/unionpay_newn
59 wechat.app.newnotifyurl =http://service-test1.yohops.com:9999/payment/weixin_notify 59 wechat.app.newnotifyurl =http://service-test1.yohops.com:9999/payment/weixin_notify
60 wechat.app.notifyurl = http://service-test1.yohops.com:9999/payment/wechat_notify 60 wechat.app.notifyurl = http://service-test1.yohops.com:9999/payment/wechat_notify
61 alipay.notifyurl = http://service-test1.yohops.com:9999/payment/alipay_notify 61 alipay.notifyurl = http://service-test1.yohops.com:9999/payment/alipay_notify
  62 +cmbnetpay.payNoticeUrl=http://service-test1.yohops.com:9999/payment/cmbpay_notify
  63 +cmbnetpay.signNoticeUrl=http://service-test1.yohops.com:9999/payment/cmbsign_notify
62 64
63 # unionmpos env: 00,production enviroment; 01,test enviroment 65 # unionmpos env: 00,production enviroment; 01,test enviroment
64 unionmpos.env=00 66 unionmpos.env=00
@@ -10,6 +10,23 @@ autoconfig.properties = sharedAutoconfig @@ -10,6 +10,23 @@ autoconfig.properties = sharedAutoconfig
10 10
11 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties 11 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties
12 12
  13 +bigData.analytics.transfer.url = http://analytics.m.yohobuy.com/yas.gif/web/
  14 +
  15 +bigDataRedis.pool.maxIdle = 100
  16 +bigDataRedis.pool.maxTotal = 100
  17 +bigDataRedis.pool.maxWaitMillis = 2000
  18 +bigDataRedis.pool.minIdle = 50
  19 +bigDataRedis.pool.testOnBorrow = false
  20 +bigDataRedis.pool.testWhileIdle = true
  21 +
  22 +bigdata.ad.userid = 9999
  23 +
  24 +bigdata.qiniu.accesskey = 11111
  25 +bigdata.qiniu.bucket = db-backup
  26 +bigdata.qiniu.secretkey = 333333
  27 +
  28 +crawler.host = http://172.31.21.144:9100
  29 +
13 erp.domain = http://192.168.102.47:9098/erp-gateway-web 30 erp.domain = http://192.168.102.47:9098/erp-gateway-web
14 31
15 erp.platform.shops.url = http://api.erp.yohobuy.com 32 erp.platform.shops.url = http://api.erp.yohobuy.com
@@ -33,8 +50,9 @@ execute.update_product_price.host = 192.168.102.202 @@ -33,8 +50,9 @@ execute.update_product_price.host = 192.168.102.202
33 file.image.gif.size = 2621440 50 file.image.gif.size = 2621440
34 file.image.size = 512000 51 file.image.size = 512000
35 52
36 -file.maxsize = 5400000  
37 -file.uploadTempDir = /home/test 53 +file.maxsize = 5400000
  54 +file.uploadMalongImgDir = /Data/malong
  55 +file.uploadTempDir = /home/test
38 56
39 jdbc.mysql.platform.erp_account.master = 192.168.102.219:3306 57 jdbc.mysql.platform.erp_account.master = 192.168.102.219:3306
40 jdbc.mysql.platform.erp_account.password = 9nm0icOwt6bMHjMusIfMLw== 58 jdbc.mysql.platform.erp_account.password = 9nm0icOwt6bMHjMusIfMLw==
@@ -53,67 +71,49 @@ jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== @@ -53,67 +71,49 @@ jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
53 jdbc.mysql.platform.yhb_account.slave = 192.168.102.219:3306 71 jdbc.mysql.platform.yhb_account.slave = 192.168.102.219:3306
54 jdbc.mysql.platform.yhb_account.username = yh_test 72 jdbc.mysql.platform.yhb_account.username = yh_test
55 73
  74 +malongApi.accessKeyId = 7343a192140f25a59c53dab5652f5f47
  75 +malongApi.imageSetId = 7tm74zfv
  76 +malongApi.paiUserId = 1714
  77 +malongApi.secretKey = 45c1ce98ee6b4701d55802989ba240f4
  78 +
56 mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html 79 mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html
57 80
  81 +mkt.app.download.url = http://m.yohobuy.com/app
  82 +
  83 +mkt.pcwap.domain.url = http://union.yoho.cn/union/go
  84 +
  85 +mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
  86 +
58 offline.shops.url = http://192.168.102.47:8098/shops/ 87 offline.shops.url = http://192.168.102.47:8098/shops/
59 88
60 platform.login.salt = yoho9646yoho9646 89 platform.login.salt = yoho9646yoho9646
61 90
62 -price.audit.firstRoleName = zuzhang1  
63 -price.audit.secondPid = 100476  
64 -price.audit.thirdPid = 100478 91 +price.audit.firstRoleName = zuzhang1
  92 +price.audit.secondCheckRoleName = secondCheck
  93 +price.audit.secondPid = 100476
  94 +price.audit.thirdPid = 100478
65 95
66 price.changed.notice.phone = 13512519156 96 price.changed.notice.phone = 13512519156
67 97
68 price.selltype.url = http://192.168.102.47:9098/erp-gateway-web/plate_price_form/list_product_info 98 price.selltype.url = http://192.168.102.47:9098/erp-gateway-web/plate_price_form/list_product_info
69 99
  100 +qiniu.bigdata.skndada.fileName = /Users/apple/Documents/tmp/sknData.xml
  101 +
70 resources_https_enable = true 102 resources_https_enable = true
71 103
72 search.server.address = http://192.168.102.216:8080/yohosearch/ 104 search.server.address = http://192.168.102.216:8080/yohosearch/
73 105
74 service.yoho.url = http://service-test3.yohops.com:9999 106 service.yoho.url = http://service-test3.yohops.com:9999
75 107
  108 +shop.status.change.phone = 17895010543
  109 +
  110 +upload.tencent.bid = b_teg_openrecom_opq68unpsix93dy2zjco
  111 +upload.tencent.product.mark = 9.99
  112 +upload.tencent.url = http://data.dm.qcloud.com1:8088
  113 +
76 watchService.waitInterval = 60 114 watchService.waitInterval = 60
77 watchService.watchDir = /Data/ftpdir 115 watchService.watchDir = /Data/ftpdir
78 116
79 yohobuy.platform.env.namespace = platform 117 yohobuy.platform.env.namespace = platform
80 yohobuy.platform.env.serverport = 8 118 yohobuy.platform.env.serverport = 8
81 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy 119 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
82 -  
83 -  
84 -shop.status.change.phone= 17895010543  
85 -  
86 -bigData.analytics.transfer.url=http://analytics.m.yohobuy.com/yas.gif/web/  
87 -file.uploadMalongImgDir=/Data/malong  
88 -##图像搜索对接api参数 码隆科技配置信息  
89 -malongApi.accessKeyId=7343a192140f25a59c53dab5652f5f47  
90 -malongApi.secretKey=45c1ce98ee6b4701d55802989ba240f4  
91 -malongApi.paiUserId=1714  
92 -malongApi.imageSetId=7tm74zfv  
93 -mkt.activity.domain.url=http://union.yoho.cn/union/tencentMkt/index.html  
94 -  
95 -crawler.host=http://172.31.21.144:9100  
96 -  
97 -# ******************** bigdata upload skn data ********************  
98 -bigdata.qiniu.accesskey=11111  
99 -bigdata.qiniu.secretkey=333333  
100 -bigdata.qiniu.bucket=db-backup  
101 -qiniu.bigdata.skndada.fileName=/Users/apple/Documents/tmp/sknData.xml  
102 -bigdata.ad.userid=9999  
103 -# ******************** bigdata upload skn data ********************  
104 -# ******************** bigData redis servers start ********************  
105 -  
106 -bigDataRedis.pool.maxTotal=100  
107 -bigDataRedis.pool.maxIdle=100  
108 -bigDataRedis.pool.maxWaitMillis=2000  
109 -bigDataRedis.pool.minIdle=50  
110 -bigDataRedis.pool.testOnBorrow=false  
111 -bigDataRedis.pool.testWhileIdle=true  
112 -# ******************** bigData redis servers end ********************  
113 -  
114 -# ******************** tencent upload skn data ********************  
115 -upload.tencent.url=http://data.dm.qcloud.com1:8088  
116 -upload.tencent.bid=b_teg_openrecom_opq68unpsix93dy2zjco  
117 -upload.tencent.product.mark=9.99  
118 -# ******************** tencent upload skn data ********************  
119 -price.audit.secondCheckRoleName=secondCheck  
@@ -33,4 +33,5 @@ jdbc.mysql.bigdata.username=yh_test_bigdata @@ -33,4 +33,5 @@ jdbc.mysql.bigdata.username=yh_test_bigdata
33 jdbc.mysql.bigdata.password=lRnPI2bQsZRNn/qC/29ZGqMwEu/zaKV31I9S8xDJIUA= 33 jdbc.mysql.bigdata.password=lRnPI2bQsZRNn/qC/29ZGqMwEu/zaKV31I9S8xDJIUA=
34 bigdata.database.cluster.name = test 34 bigdata.database.cluster.name = test
35 35
36 -bigDataRedis.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn  
  36 +bigDataRedis.proxy.address=123.206.17.17
  37 +bigDataRedis.proxy.port=16379
@@ -96,4 +96,6 @@ upload.tencent.url=http://data.dm.qcloud.com1:8088 @@ -96,4 +96,6 @@ upload.tencent.url=http://data.dm.qcloud.com1:8088
96 upload.tencent.bid=b_teg_openrecom_opq68unpsix93dy2zjco 96 upload.tencent.bid=b_teg_openrecom_opq68unpsix93dy2zjco
97 upload.tencent.product.mark=9.99 97 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 +
  101 +mkt.app.download.url=http://m.yohobuy.com/app
@@ -2,6 +2,10 @@ autoconfig.properties = sharedAutoconfig @@ -2,6 +2,10 @@ 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 +gateway.api.url = http://api.gray.yohops.com/
  6 +
  7 +uic_userInfoRest_enable = false
  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
7 yoho.uic.env.webapphome = /home/test/uic/deploy 11 yoho.uic.env.webapphome = /home/test/uic/deploy
@@ -30,6 +30,17 @@ yoho.push.env.namespace = push @@ -30,6 +30,17 @@ yoho.push.env.namespace = push
30 yoho.push.env.serverport = 9 30 yoho.push.env.serverport = 9
31 yoho.push.env.webapphome = /home/test/yoho-push/deploy 31 yoho.push.env.webapphome = /home/test/yoho-push/deploy
32 32
  33 +##just for push
  34 +jdbc.mysql.yhpush.master=write.passport.yohoops.org:3306
  35 +jdbc.mysql.yhpush.slave=dbs.slave.yohoops.org:3307
  36 +jdbc.mysql.yhpush.username=yh_test
  37 +jdbc.mysql.yhpush.password=9nm0icOwt6bMHjMusIfMLw==
  38 +
  39 +##push redis
  40 +redis.push.address=192.168.102.22
  41 +redis.push.port=6379
  42 +redis.push.auth=
  43 +
33 redis.pool.maxTotal=200 44 redis.pool.maxTotal=200
34 redis.pool.maxIdle=100 45 redis.pool.maxIdle=100
35 redis.pool.minIdle=30 46 redis.pool.minIdle=30
@@ -15,5 +15,9 @@ jdbc.mysql.yhshops.datasources = yh_shops @@ -15,5 +15,9 @@ jdbc.mysql.yhshops.datasources = yh_shops
15 15
16 jdbc.mysql.yhshops.master = write.shops.yohoops.org:3306 16 jdbc.mysql.yhshops.master = write.shops.yohoops.org:3306
17 jdbc.mysql.yhshops.slave = read.shops.yohoops.org:3306 17 jdbc.mysql.yhshops.slave = read.shops.yohoops.org:3306
18 -jdbc.mysql.yhshops.username = yh_vpc_bak  
19 -jdbc.mysql.yhshops.password = +BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=  
  18 +jdbc.mysql.yhshops.username = yh_test
  19 +jdbc.mysql.yhshops.password = 9nm0icOwt6bMHjMusIfMLw==
  20 +
  21 +
  22 +
  23 +
@@ -29,6 +29,8 @@ users.yohocoin.dilute = true @@ -29,6 +29,8 @@ users.yohocoin.dilute = true
29 29
30 verify_student_flag = false 30 verify_student_flag = false
31 31
  32 +crf.service.url=https://osprec-ci.crfchina.com
  33 +
32 yoho.users.env.namespace = users 34 yoho.users.env.namespace = users
33 yoho.users.env.serverport = 1 35 yoho.users.env.serverport = 1
34 yoho.users.env.webapphome = /home/test/yoho-users/deploy 36 yoho.users.env.webapphome = /home/test/yoho-users/deploy
@@ -38,3 +40,6 @@ zmxy_contract_flag = si201604080002520001 @@ -38,3 +40,6 @@ zmxy_contract_flag = si201604080002520001
38 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== 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==
39 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB 41 zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB
40 zmxy_service_url = https://zmopenapi.zmxy.com.cn/sandbox.do 42 zmxy_service_url = https://zmopenapi.zmxy.com.cn/sandbox.do
  43 +
  44 +crf.service.url=https://osprec-ci.crfchina.com
  45 +
@@ -11,3 +11,7 @@ users.browse.numPerUser = 100 @@ -11,3 +11,7 @@ users.browse.numPerUser = 100
11 yohobuy.brower.env.namespace = brower 11 yohobuy.brower.env.namespace = brower
12 yohobuy.brower.env.serverport = 2 12 yohobuy.brower.env.serverport = 2
13 yohobuy.brower.env.webapphome = /home/test/yohobuy-brower/deploy 13 yohobuy.brower.env.webapphome = /home/test/yohobuy-brower/deploy
  14 +
  15 +rabbit_concurrent=3
  16 +
  17 +api.yoho.url = http://api.yoho.yohoops.org
@@ -18,7 +18,8 @@ execute.shopmessage.host = 192.168.102.27 @@ -18,7 +18,8 @@ execute.shopmessage.host = 192.168.102.27
18 18
19 execute.update_product_price.host = 192.168.102.27 19 execute.update_product_price.host = 192.168.102.27
20 20
21 -file.image.size = 512000 21 +file.image.gif.size = 2621440
  22 +file.image.size = 512000
22 23
23 file.maxsize = 50000000 24 file.maxsize = 50000000
24 file.saveDir = /Data/images 25 file.saveDir = /Data/images
@@ -32,8 +33,6 @@ jdbc.mysql.platform.erp_product.master = write.erp.yohoops.org:3306 @@ -32,8 +33,6 @@ jdbc.mysql.platform.erp_product.master = write.erp.yohoops.org:3306
32 jdbc.mysql.platform.erp_product.password = 9nm0icOwt6bMHjMusIfMLw== 33 jdbc.mysql.platform.erp_product.password = 9nm0icOwt6bMHjMusIfMLw==
33 jdbc.mysql.platform.erp_product.slave = read1.erp.yohoops.org:3306 34 jdbc.mysql.platform.erp_product.slave = read1.erp.yohoops.org:3306
34 jdbc.mysql.platform.erp_product.username = yh_test 35 jdbc.mysql.platform.erp_product.username = yh_test
35 -jdbc.mysql.platform.erp_supplier.password = 9nm0icOwt6bMHjMusIfMLw==  
36 -jdbc.mysql.platform.erp_supplier.username = yh_test  
37 jdbc.mysql.platform.yh_guang.master = write.cms.yohoops.org:3306 36 jdbc.mysql.platform.yh_guang.master = write.cms.yohoops.org:3306
38 jdbc.mysql.platform.yh_guang.password = 9nm0icOwt6bMHjMusIfMLw== 37 jdbc.mysql.platform.yh_guang.password = 9nm0icOwt6bMHjMusIfMLw==
39 jdbc.mysql.platform.yh_guang.slave = read.cms.yohoops.org:3306 38 jdbc.mysql.platform.yh_guang.slave = read.cms.yohoops.org:3306
@@ -43,23 +42,27 @@ jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== @@ -43,23 +42,27 @@ jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
43 jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306 42 jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306
44 jdbc.mysql.platform.yhb_account.username = yh_test 43 jdbc.mysql.platform.yhb_account.username = yh_test
45 44
46 -search.server.address = http://search.yohoops.org/yohosearch/ 45 +mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html
47 46
48 -watchService.waitInterval = 60  
49 -watchService.watchDir = /Data/sftp_images 47 +mkt.pcwap.domain.url = http://union.yoho.cn/union/go
  48 +
  49 +mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
50 50
51 -price.selltype.url = http://192.168.102.47:9098/erp-gateway-web/plate_price_form/list_product_info  
52 price.audit.firstRoleName = Ʒ 51 price.audit.firstRoleName = Ʒ
53 price.audit.secondPid = 100476 52 price.audit.secondPid = 100476
54 price.audit.thirdPid = 100478 53 price.audit.thirdPid = 100478
55 54
  55 +price.selltype.url = http://192.168.102.47:9098/erp-gateway-web/plate_price_form/list_product_info
  56 +
  57 +resources_https_enable = true
  58 +
  59 +search.server.address = http://search.yohoops.org/yohosearch/
  60 +
  61 +service.yoho.url = http://service-test2.yohops.com:9999
  62 +
  63 +watchService.waitInterval = 60
  64 +watchService.watchDir = /Data/sftp_images
56 65
57 yohobuy.platform.env.namespace = platform 66 yohobuy.platform.env.namespace = platform
58 yohobuy.platform.env.serverport = 8 67 yohobuy.platform.env.serverport = 8
59 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy 68 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
60 -  
61 -api.yoho.url = http://api-test2.yohops.com:9999  
62 -service.yoho.url = http://service-test2.yohops.com:9999  
63 -  
64 -file.image.gif.size=2621440  
65 -resources_https_enable=true  
@@ -4,3 +4,36 @@ yohobuy.task.env.namespace = task @@ -4,3 +4,36 @@ 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 +yoho.logs.level=INFO
  9 +
  10 +##jdbc
  11 +jdbc.mysql.kisjob.datasources = yh_distributed_task
  12 +jdbc.mysql.kisjob.master = write.cms.yohoops.org:3306
  13 +jdbc.mysql.kisjob.slave = read.cms.yohoops.org:3306
  14 +jdbc.mysql.kisjob.username = yh_test
  15 +jdbc.mysql.kisjob.password = 9nm0icOwt6bMHjMusIfMLw==
  16 +
  17 +##redis
  18 +redis.pool.maxIdle = 100
  19 +redis.pool.maxTotal = 200
  20 +redis.pool.maxWaitMillis = 10000
  21 +redis.pool.minIdle = 100
  22 +redis.pool.testOnBorrow = false
  23 +redis.pool.testWhileIdle = false
  24 +
  25 +##redis for push
  26 +redis.push.address=192.168.102.22
  27 +redis.push.port=6379
  28 +redis.push.auth=
  29 +
  30 +##config
  31 +task.brands.number = 19
  32 +task.addNewBrand.status = on
  33 +task.discountBrand.status = off
  34 +task.vipBrand.status = off
  35 +task.msgnum = 10000
  36 +task.send.limit = 3
  37 +filter.status = off
  38 +
  39 +
@@ -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_2/global-autoconfig.properties
6 6
7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA= 7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
8 bigdate.db.url = 172.31.6.98:3306 8 bigdate.db.url = 172.31.6.98:3306
@@ -10,6 +10,8 @@ bigdate.db.username = yh_bigdata @@ -10,6 +10,8 @@ bigdate.db.username = yh_bigdata
10 10
11 draw.writeFile.delay = 60 11 draw.writeFile.delay = 60
12 12
  13 +gateway.url = http://api.yoho.cn
  14 +
13 jdbc.mysql.readonlyinslave = true 15 jdbc.mysql.readonlyinslave = true
14 16
15 rabbit.mq.host = 192.168.102.162 17 rabbit.mq.host = 192.168.102.162
@@ -18,17 +20,27 @@ rabbit.mq.port = 32810 @@ -18,17 +20,27 @@ rabbit.mq.port = 32810
18 rabbit.mq.username = yoho 20 rabbit.mq.username = yoho
19 rabbit.mq.virtualHost = /yoho 21 rabbit.mq.virtualHost = /yoho
20 22
  23 +redis.proxy.database = 1
  24 +
  25 +redis.readonly.proxy.database = 1
  26 +
  27 +redis.union.proxy.address = test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
  28 +redis.union.readonly.proxy.address = test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn
  29 +
  30 +tencentmkt.shareUrl = http://union.yoho.cn/union/tencentMkt/index.html
  31 +
21 yoho.unions.env.namespace = union 32 yoho.unions.env.namespace = union
22 yoho.unions.env.serverport = 8 33 yoho.unions.env.serverport = 8
23 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy 34 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy
24 35
25 -redis.union.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn  
26 -redis.union.proxy.port=6379  
27 -redis.union.proxy.auth=  
28 -redis.proxy.database=1  
29 36
30 -redis.union.readonly.proxy.address=test-bigdata-redis-1903805580.cn-north-1.elb.amazonaws.com.cn  
31 -redis.union.readonly.proxy.port=6379  
32 -redis.union.readonly.proxy.auth=  
33 -redis.readonly.proxy.database=1 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 +
34 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
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_2/global-autoconfig.properties
4 4
5 -#wechat.access.appid = wx75e5a7c0c88e45c2  
6 -#wechat.access.secret = ce21ae4a3f93852279175a167e54509b 5 +wechat.access.appid = wxa93ae0ebf9277248
  6 +wechat.access.secret = 871bd302c7d0603657b68a0354f36868
7 7
8 -wechat.access.appid =wxa93ae0ebf9277248  
9 -wechat.access.secret =871bd302c7d0603657b68a0354f36868 8 +wechat.small.program.access.appid = wx084ab813d88c594b
  9 +wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac
10 10
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
@@ -33,6 +33,8 @@ users.yohocoin.dilute = true @@ -33,6 +33,8 @@ users.yohocoin.dilute = true
33 33
34 verify_student_flag = true 34 verify_student_flag = true
35 35
  36 +crf.service.url=https://osprec-ci.crfchina.com
  37 +
36 yoho.users.env.namespace = users 38 yoho.users.env.namespace = users
37 yoho.users.env.serverport = 1 39 yoho.users.env.serverport = 1
38 yoho.users.env.webapphome = /home/test/yoho-users/deploy 40 yoho.users.env.webapphome = /home/test/yoho-users/deploy
@@ -15,6 +15,8 @@ unionpay.notifyurl = http://service-test3.yohops.com:9999/payment/unionpay_newn @@ -15,6 +15,8 @@ unionpay.notifyurl = http://service-test3.yohops.com:9999/payment/unionpay_newn
15 wechat.app.newnotifyurl = http://service-test3.yohops.com:9999/payment/weixin_notify 15 wechat.app.newnotifyurl = http://service-test3.yohops.com:9999/payment/weixin_notify
16 wechat.app.notifyurl = http://service-test3.yohops.com:9999/payment/wechat_notify 16 wechat.app.notifyurl = http://service-test3.yohops.com:9999/payment/wechat_notify
17 alipay.notifyurl = http://service-test3.yohops.com:9999/payment/alipay_notify 17 alipay.notifyurl = http://service-test3.yohops.com:9999/payment/alipay_notify
  18 +cmbnetpay.payNoticeUrl=http://payment.yohops.com/payment/cmbpay_notify
  19 +cmbnetpay.signNoticeUrl=http://payment.yohops.com/payment/cmbsign_notify
18 20
19 java.logs.home = /Data/logs 21 java.logs.home = /Data/logs
20 22
  1 +admin.login.url = http://192.168.102.49:30012
  2 +
  3 +admin.portal.url = http://192.168.102.49:30012
  4 +
  5 +aliyun.accessid = mkb5KaMTUeAnfHI5
  6 +aliyun.accesskey = XLHom1U6wcyl8dec3t0zaJczvsATPf
  7 +aliyun.bucket = yohotest
  8 +aliyun.domain = http://7xnrdp.com1.z0.glb.clouddn.com
  9 +aliyun.endpoint = oss-cn-shanghai.aliyuncs.com
  10 +
  11 +api.yoho.url = http://api-test3.yohops.com:9999
  12 +
1 autoconfig.properties = sharedAutoconfig 13 autoconfig.properties = sharedAutoconfig
2 14
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/master/global-autoconfig.properties 15 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_3/global-autoconfig.properties
  16 +
  17 +bigData.analytics.transfer.url = http://analytics.m.yohobuy.com/yas.gif/web/
  18 +
  19 +bigDataRedis.pool.maxIdle = 100
  20 +bigDataRedis.pool.maxTotal = 100
  21 +bigDataRedis.pool.maxWaitMillis = 2000
  22 +bigDataRedis.pool.minIdle = 50
  23 +bigDataRedis.pool.testOnBorrow = false
  24 +bigDataRedis.pool.testWhileIdle = true
  25 +
  26 +bigdata.ad.userid = 9999
  27 +
  28 +bigdata.qiniu.accesskey = 11111
  29 +bigdata.qiniu.bucket = db-backup
  30 +bigdata.qiniu.secretkey = 333333
  31 +
  32 +crawler.host = http://172.31.21.144:9100
  33 +
  34 +erp.domain = http://192.168.102.47:9098/erp-gateway-web
4 35
5 erp.platform.shops.url = http://api.erp.yohobuy.com 36 erp.platform.shops.url = http://api.erp.yohobuy.com
6 37
  38 +erp.realStorage.url = http://192.168.13.182:8080/erp-gateway-web/shift_logs/query_stock_num_by_sku
  39 +
7 erp.shops.account.url = http://serve.yohobuy.com/service/finance/v1/clearing/balancelist 40 erp.shops.account.url = http://serve.yohobuy.com/service/finance/v1/clearing/balancelist
8 erp.shops.change.pwd.url = http://serve.yohobuy.com/service/account/v1/Profile/updatePassword 41 erp.shops.change.pwd.url = http://serve.yohobuy.com/service/account/v1/Profile/updatePassword
9 erp.shops.login.url = http://serve.yohobuy.com/service/account/v1/Profile/login 42 erp.shops.login.url = http://serve.yohobuy.com/service/account/v1/Profile/login
10 43
11 -erp.virtualinventory.setNumberBySkn.url=http://serve.yohobuy.com/service/supplier/v1/virtualinventory/setNumberBySkn 44 +erp.virtualinventory.setNumberBySkn.url = http://serve.yohobuy.com/service/supplier/v1/virtualinventory/setNumberBySkn
12 45
13 execute.limitcode.host = 192.168.102.48 46 execute.limitcode.host = 192.168.102.48
14 -execute.shopmessage.host = 192.168.102.48  
15 -execute.update_product_price.host = 192.168.102.48  
16 -file.image.size = 5120000  
17 47
18 -file.maxsize = 50000000  
19 -file.saveDir = /Data/images  
20 -file.uploadTempDir = /Data/images 48 +execute.shopmessage.host = 192.168.102.48
  49 +
  50 +execute.update_product_price.host = 192.168.102.48
  51 +
  52 +file.image.gif.size = 2621440
  53 +file.image.size = 5120000
  54 +
  55 +file.maxsize = 50000000
  56 +file.saveDir = /Data/images
  57 +file.uploadMalongImgDir = /Data/malong
  58 +file.uploadTempDir = /Data/images
21 59
22 jdbc.mysql.platform.erp_account.master = write.erp.yohoops.org:3306 60 jdbc.mysql.platform.erp_account.master = write.erp.yohoops.org:3306
23 jdbc.mysql.platform.erp_account.password = 9nm0icOwt6bMHjMusIfMLw== 61 jdbc.mysql.platform.erp_account.password = 9nm0icOwt6bMHjMusIfMLw==
@@ -27,8 +65,6 @@ jdbc.mysql.platform.erp_product.master = write.erp.yohoops.org:3306 @@ -27,8 +65,6 @@ jdbc.mysql.platform.erp_product.master = write.erp.yohoops.org:3306
27 jdbc.mysql.platform.erp_product.password = 9nm0icOwt6bMHjMusIfMLw== 65 jdbc.mysql.platform.erp_product.password = 9nm0icOwt6bMHjMusIfMLw==
28 jdbc.mysql.platform.erp_product.slave = read1.erp.yohoops.org:3306 66 jdbc.mysql.platform.erp_product.slave = read1.erp.yohoops.org:3306
29 jdbc.mysql.platform.erp_product.username = yh_test 67 jdbc.mysql.platform.erp_product.username = yh_test
30 -jdbc.mysql.platform.erp_supplier.password = 9nm0icOwt6bMHjMusIfMLw==  
31 -jdbc.mysql.platform.erp_supplier.username = yh_test  
32 jdbc.mysql.platform.yh_guang.master = write.cms.yohoops.org:3306 68 jdbc.mysql.platform.yh_guang.master = write.cms.yohoops.org:3306
33 jdbc.mysql.platform.yh_guang.password = 9nm0icOwt6bMHjMusIfMLw== 69 jdbc.mysql.platform.yh_guang.password = 9nm0icOwt6bMHjMusIfMLw==
34 jdbc.mysql.platform.yh_guang.slave = read.cms.yohoops.org:3306 70 jdbc.mysql.platform.yh_guang.slave = read.cms.yohoops.org:3306
@@ -38,77 +74,44 @@ jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== @@ -38,77 +74,44 @@ jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
38 jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306 74 jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306
39 jdbc.mysql.platform.yhb_account.username = yh_test 75 jdbc.mysql.platform.yhb_account.username = yh_test
40 76
41 -search.server.address = http://search.yohoops.org:8080/yohosearch/  
42 -  
43 -watchService.waitInterval = 60  
44 -watchService.watchDir = /Data/sftp_images  
45 -  
46 -yohobuy.platform.env.namespace = platform  
47 -yohobuy.platform.env.serverport = 8  
48 -yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy  
49 -  
50 -api.yoho.url = http://api-test3.yohops.com:9999  
51 -service.yoho.url = http://service-test3.yohops.com:9999 77 +malongApi.accessKeyId = 7343a192140f25a59c53dab5652f5f47
  78 +malongApi.imageSetId = 7tm74zfv
  79 +malongApi.paiUserId = 1714
  80 +malongApi.secretKey = 45c1ce98ee6b4701d55802989ba240f4
52 81
53 -admin.portal.url=http://192.168.102.49:30012 82 +mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html
54 83
55 -aliyun.domain=http://7xnrdp.com1.z0.glb.clouddn.com  
56 -price.selltype.url=http://192.168.102.47:9098/erp-gateway-web/plate_price_form/list_product_info  
57 -aliyun.accessid=mkb5KaMTUeAnfHI5  
58 -aliyun.accesskey=XLHom1U6wcyl8dec3t0zaJczvsATPf  
59 -aliyun.bucket=yohotest  
60 -aliyun.endpoint=oss-cn-shanghai.aliyuncs.com  
61 -price.audit.secondPid=100476  
62 -price.audit.thirdPid=100478 84 +mkt.app.download.url = http://m.yohobuy.com/app
63 85
  86 +platform.login.salt = yoho9646yoho9646
64 87
65 -price.changed.notice.phone=13512519156,17608015989 88 +price.audit.secondCheckRoleName = secondCheck
  89 +price.audit.secondPid = 100476
  90 +price.audit.thirdPid = 100478
66 91
67 -erp.realStorage.url=http://192.168.13.182:8080/erp-gateway-web/shift_logs/query_stock_num_by_sku 92 +price.changed.notice.phone = 13512519156,17608015989
68 93
69 -erp.domain=http://192.168.102.47:9098/erp-gateway-web  
70 -platform.login.salt=yoho9646yoho9646 94 +price.selltype.url = http://192.168.102.47:9098/erp-gateway-web/plate_price_form/list_product_info
71 95
72 -admin.login.url=http://192.168.102.49:30012  
73 -  
74 -file.image.gif.size=2621440  
75 -resources_https_enable=true 96 +qiniu.bigdata.skndada.fileName = /Users/apple/Documents/tmp/sknData.xml
76 97
  98 +resources_https_enable = true
77 99
  100 +search.server.address = http://search.yohoops.org:8080/yohosearch/
78 101
79 -shop.status.change.phone= 17895010543 102 +service.yoho.url = http://service-test3.yohops.com:9999
80 103
81 -bigData.analytics.transfer.url=http://analytics.m.yohobuy.com/yas.gif/web/  
82 -file.uploadMalongImgDir=/Data/malong  
83 -##图像搜索对接api参数 码隆科技配置信息  
84 -malongApi.accessKeyId=7343a192140f25a59c53dab5652f5f47  
85 -malongApi.secretKey=45c1ce98ee6b4701d55802989ba240f4  
86 -malongApi.paiUserId=1714  
87 -malongApi.imageSetId=7tm74zfv  
88 -mkt.activity.domain.url=http://union.yoho.cn/union/tencentMkt/index.html 104 +shop.status.change.phone = 17895010543
89 105
90 -crawler.host=http://172.31.21.144:9100 106 +upload.tencent.bid = b_teg_openrecom_opq68unpsix93dy2zjco
  107 +upload.tencent.product.mark = 9.99
  108 +upload.tencent.url = http://data.dm.qcloud.com1:8088
91 109
92 -# ******************** bigdata upload skn data ********************  
93 -bigdata.qiniu.accesskey=11111  
94 -bigdata.qiniu.secretkey=333333  
95 -bigdata.qiniu.bucket=db-backup  
96 -qiniu.bigdata.skndada.fileName=/Users/apple/Documents/tmp/sknData.xml  
97 -bigdata.ad.userid=9999  
98 -# ******************** bigdata upload skn data ********************  
99 -# ******************** bigData redis servers start ******************** 110 +watchService.waitInterval = 60
  111 +watchService.watchDir = /Data/sftp_images
100 112
101 -bigDataRedis.pool.maxTotal=100  
102 -bigDataRedis.pool.maxIdle=100  
103 -bigDataRedis.pool.maxWaitMillis=2000  
104 -bigDataRedis.pool.minIdle=50  
105 -bigDataRedis.pool.testOnBorrow=false  
106 -bigDataRedis.pool.testWhileIdle=true  
107 -# ******************** bigData redis servers end ******************** 113 +yohobuy.platform.env.namespace = platform
  114 +yohobuy.platform.env.serverport = 8
  115 +yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
108 116
109 -# ******************** tencent upload skn data ********************  
110 -upload.tencent.url=http://data.dm.qcloud.com1:8088  
111 -upload.tencent.bid=b_teg_openrecom_opq68unpsix93dy2zjco  
112 -upload.tencent.product.mark=9.99  
113 -# ******************** tencent upload skn data ********************  
114 -price.audit.secondCheckRoleName=secondCheck  
  117 +mkt.app.download.url=http://m.yohobuy.com/app
@@ -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_3/global-autoconfig.properties
6 6
7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA= 7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
8 bigdate.db.url = 172.31.6.98:3306 8 bigdate.db.url = 172.31.6.98:3306
@@ -10,6 +10,8 @@ bigdate.db.username = yh_bigdata @@ -10,6 +10,8 @@ bigdate.db.username = yh_bigdata
10 10
11 draw.writeFile.delay = 60 11 draw.writeFile.delay = 60
12 12
  13 +gateway.url = http://api.yoho.cn
  14 +
13 jdbc.mysql.readonlyinslave = true 15 jdbc.mysql.readonlyinslave = true
14 16
15 rabbit.mq.host = 192.168.102.162 17 rabbit.mq.host = 192.168.102.162
@@ -18,6 +20,8 @@ rabbit.mq.port = 32810 @@ -18,6 +20,8 @@ rabbit.mq.port = 32810
18 rabbit.mq.username = yoho 20 rabbit.mq.username = yoho
19 rabbit.mq.virtualHost = /yoho 21 rabbit.mq.virtualHost = /yoho
20 22
  23 +tencentmkt.shareUrl = http://union.yoho.cn/union/tencentMkt/index.html
  24 +
21 yoho.unions.env.namespace = union 25 yoho.unions.env.namespace = union
22 yoho.unions.env.serverport = 8 26 yoho.unions.env.serverport = 8
23 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy 27 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy
@@ -23,10 +23,14 @@ yoho.bigData.env.serverport = 1 @@ -23,10 +23,14 @@ yoho.bigData.env.serverport = 1
23 yoho.bigData.env.webapphome = /home/test/yohobuy-bigdata/deploy 23 yoho.bigData.env.webapphome = /home/test/yohobuy-bigdata/deploy
24 24
25 jdbc.mysql.bigdata.master=192.168.103.36:3306 25 jdbc.mysql.bigdata.master=192.168.103.36:3306
26 -jdbc.mysql.bigdata.username=yh_bigdata 26 +jdbc.mysql.bigdata.username=yh_test
27 #yoho@7Y$^YpNb7hp 27 #yoho@7Y$^YpNb7hp
28 -jdbc.mysql.bigdata.password=ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA= 28 +jdbc.mysql.bigdata.password=9nm0icOwt6bMHjMusIfMLw==
29 29
30 -bigdata.database.cluster.name = shop 30 +bigdata.database.cluster.name = test
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=192.168.102.56
  34 +
  35 +bigDataRedis.proxy.address=123.206.17.17
  36 +bigDataRedis.proxy.port=16379
@@ -4,7 +4,7 @@ api.yoho.url = http://api-test4.yohops.com:9999 @@ -4,7 +4,7 @@ api.yoho.url = http://api-test4.yohops.com:9999
4 4
5 autoconfig.properties = sharedAutoconfig 5 autoconfig.properties = sharedAutoconfig
6 6
7 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties 7 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties
8 8
9 erp.domain = http://serve.yohobuy.com 9 erp.domain = http://serve.yohobuy.com
10 10
@@ -22,9 +22,8 @@ execute.shopmessage.host = 192.168.102.202 @@ -22,9 +22,8 @@ execute.shopmessage.host = 192.168.102.202
22 22
23 execute.update_product_price.host = 192.168.102.202 23 execute.update_product_price.host = 192.168.102.202
24 24
25 -file.image.size = 512000  
26 -  
27 -zkAddress=192.168.102.56:2181 25 +file.image.gif.size = 2621440
  26 +file.image.size = 512000
28 27
29 file.maxsize = 104857600 28 file.maxsize = 104857600
30 file.uploadTempDir = /home/test 29 file.uploadTempDir = /home/test
@@ -46,6 +45,11 @@ jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== @@ -46,6 +45,11 @@ jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
46 jdbc.mysql.platform.yhb_account.slave = 192.168.103.36:3306 45 jdbc.mysql.platform.yhb_account.slave = 192.168.103.36:3306
47 jdbc.mysql.platform.yhb_account.username = yh_test 46 jdbc.mysql.platform.yhb_account.username = yh_test
48 47
  48 +mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html
  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
49 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
@@ -55,6 +59,8 @@ price.audit.firstRoleName = Ʒ @@ -55,6 +59,8 @@ price.audit.firstRoleName = Ʒ
55 price.audit.secondPid = 100476 59 price.audit.secondPid = 100476
56 price.audit.thirdPid = 100478 60 price.audit.thirdPid = 100478
57 61
  62 +resources_https_enable = true
  63 +
58 search.server.address = http://192.168.103.52:8080/yohosearch/ 64 search.server.address = http://192.168.103.52:8080/yohosearch/
59 65
60 watchService.waitInterval = 60 66 watchService.waitInterval = 60
@@ -64,5 +70,4 @@ yohobuy.platform.env.namespace = platform @@ -64,5 +70,4 @@ yohobuy.platform.env.namespace = platform
64 yohobuy.platform.env.serverport = 8 70 yohobuy.platform.env.serverport = 8
65 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy 71 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
66 72
67 -file.image.gif.size=2621440  
68 -resources_https_enable=true  
  73 +zkAddress = 192.168.102.56:2181
@@ -4,7 +4,7 @@ api.yoho.url = http://api-test3.yohops.com:9999 @@ -4,7 +4,7 @@ api.yoho.url = http://api-test3.yohops.com:9999
4 4
5 autoconfig.properties = sharedAutoconfig 5 autoconfig.properties = sharedAutoconfig
6 6
7 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties 7 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_5/global-autoconfig.properties
8 8
9 erp.domain = http://serve.yohobuy.com 9 erp.domain = http://serve.yohobuy.com
10 10
@@ -22,9 +22,8 @@ execute.shopmessage.host = 192.168.102.202 @@ -22,9 +22,8 @@ execute.shopmessage.host = 192.168.102.202
22 22
23 execute.update_product_price.host = 192.168.102.202 23 execute.update_product_price.host = 192.168.102.202
24 24
25 -file.image.size = 512000  
26 -  
27 -zkAddress=192.168.102.211:2181 25 +file.image.gif.size = 2621440
  26 +file.image.size = 512000
28 27
29 file.maxsize = 104857600 28 file.maxsize = 104857600
30 file.uploadTempDir = /home/test 29 file.uploadTempDir = /home/test
@@ -46,6 +45,7 @@ jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== @@ -46,6 +45,7 @@ jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
46 jdbc.mysql.platform.yhb_account.slave = 192.168.102.219:3306 45 jdbc.mysql.platform.yhb_account.slave = 192.168.102.219:3306
47 jdbc.mysql.platform.yhb_account.username = yh_test 46 jdbc.mysql.platform.yhb_account.username = yh_test
48 47
  48 +mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html
49 49
50 offline.shops.url = http://192.168.102.47:8098/shops/ 50 offline.shops.url = http://192.168.102.47:8098/shops/
51 51
@@ -55,6 +55,8 @@ price.audit.firstRoleName = Ʒ @@ -55,6 +55,8 @@ price.audit.firstRoleName = Ʒ
55 price.audit.secondPid = 100476 55 price.audit.secondPid = 100476
56 price.audit.thirdPid = 100478 56 price.audit.thirdPid = 100478
57 57
  58 +resources_https_enable = true
  59 +
58 search.server.address = http://192.168.102.216:8080/yohosearch/ 60 search.server.address = http://192.168.102.216:8080/yohosearch/
59 61
60 watchService.waitInterval = 60 62 watchService.waitInterval = 60
@@ -64,5 +66,4 @@ yohobuy.platform.env.namespace = platform @@ -64,5 +66,4 @@ yohobuy.platform.env.namespace = platform
64 yohobuy.platform.env.serverport = 8 66 yohobuy.platform.env.serverport = 8
65 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy 67 yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy
66 68
67 -file.image.gif.size=2621440  
68 -resources_https_enable=true  
  69 +zkAddress = 192.168.102.211:2181
@@ -2,6 +2,10 @@ autoconfig.properties = sharedAutoconfig @@ -2,6 +2,10 @@ autoconfig.properties = sharedAutoconfig
2 2
3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_5/global-autoconfig.properties 3 autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_5/global-autoconfig.properties
4 4
  5 +gateway.api.url = http://api.yoho.yohoops.org
  6 +
  7 +uic_userInfoRest_enable = true
  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
7 yoho.uic.env.webapphome = /home/test/uic/deploy 11 yoho.uic.env.webapphome = /home/test/uic/deploy
@@ -56,3 +56,12 @@ wechat.wap.notifyurl = http://service-test1.yohops.com:9999/payment/wechatwap_n @@ -56,3 +56,12 @@ wechat.wap.notifyurl = http://service-test1.yohops.com:9999/payment/wechatwap_n
56 yoho.gateway.env.namespace = gateway 56 yoho.gateway.env.namespace = gateway
57 yoho.gateway.env.serverport = 0 57 yoho.gateway.env.serverport = 0
58 yoho.gateway.env.webapphome = /home/test/yoho-gateway/deploy 58 yoho.gateway.env.webapphome = /home/test/yoho-gateway/deploy
  59 +
  60 +student.discount.rate = 0.9
  61 +platform.service.url=http://api.platform.yohoops.org:8088/platform
  62 +
  63 +#photoSearch
  64 +photoSearch.access.key.id=7343a192140f25a59c53dab5652f5f47
  65 +photoSearch.secret.key=45c1ce98ee6b4701d55802989ba240f4
  66 +photoSearch.service.id=rdbehn3x
  67 +
@@ -13,7 +13,7 @@ web.context = yohosearchadaptor @@ -13,7 +13,7 @@ web.context = yohosearchadaptor
13 ip.port.search.server = search.yohoops.org 13 ip.port.search.server = search.yohoops.org
14 jdbc.mysql.yhshops.datasources = yh_shops 14 jdbc.mysql.yhshops.datasources = yh_shops
15 15
16 -jdbc.mysql.yhshops.master = write.shops.yohoops.org:3306  
17 -jdbc.mysql.yhshops.slave = read.shops.yohoops.org:3306  
18 -jdbc.mysql.yhshops.username = yh_vpc_bak  
19 -jdbc.mysql.yhshops.password = +BfhVxZQ4LuPKt+QxSy9naMwEu/zaKV31I9S8xDJIUA=  
  16 +jdbc.mysql.yhshops.master = write.shops.yohoops.org:3309
  17 +jdbc.mysql.yhshops.slave = read.shops.yohoops.org:3309
  18 +jdbc.mysql.yhshops.username = yh_test
  19 +jdbc.mysql.yhshops.password = 9nm0icOwt6bMHjMusIfMLw==
@@ -16,4 +16,18 @@ tpl.adaptor.domain = http://search.adaptor.yohoops.org:8085/search-adaptor @@ -16,4 +16,18 @@ 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=5000
  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
  33 +
@@ -21,3 +21,19 @@ canal.subscribeChannel.shop = yh_shops.brand,yh_shops.goods,yh_shops.good @@ -21,3 +21,19 @@ canal.subscribeChannel.shop = yh_shops.brand,yh_shops.goods,yh_shops.good
21 yoho.search.producer.env.namespace = search-producer 21 yoho.search.producer.env.namespace = search-producer
22 yoho.search.producer.env.serverport = 9 22 yoho.search.producer.env.serverport = 9
23 yoho.search.producer.env.webapphome = /home/test/yoho-search-producer/deploy 23 yoho.search.producer.env.webapphome = /home/test/yoho-search-producer/deploy
  24 +
  25 +##cancal-erpcustomerservice
  26 +canal.destination.erpcustomerservice=erpcustomerservice
  27 +canal.subscribeChannel.erpcustomerservice=erp_customer_service.robot_question
  28 +
  29 +##cancal-helper
  30 +canal.destination.helper=helper
  31 +canal.subscribeChannel.helper=yh_helper.helper
  32 +
  33 +##cancal-yhgeditor
  34 +canal.destination.yhgeditor=yhgeditor
  35 +canal.subscribeChannel.yhgeditor=yhg_editor.tbl_brand,yhg_editor.tbl_site,yhg_editor.tbl_sort
  36 +
  37 +##cancal-yhgproduct
  38 +canal.destination.yhgproduct=yhgproduct
  39 +canal.subscribeChannel.yhgproduct=yhg_product.tbl_product,yhg_product.tbl_product_skc,yhg_product.tbl_product_sku
@@ -6,6 +6,9 @@ yoho.search.service.env.namespace = yohosearch @@ -6,6 +6,9 @@ yoho.search.service.env.namespace = yohosearch
6 yoho.search.service.env.serverport = 0 6 yoho.search.service.env.serverport = 0
7 yoho.search.service.env.webapphome = /home/test/yoho-search-service/deploy 7 yoho.search.service.env.webapphome = /home/test/yoho-search-service/deploy
8 8
  9 +yoho.logs.level = WARN
  10 +yoho.logs.maxHistory = 10
  11 +
9 ##tpl adaptor 12 ##tpl adaptor
10 tpl.adaptor.valid = false 13 tpl.adaptor.valid = false
11 14
@@ -18,4 +21,4 @@ search.personalized.switch = true @@ -18,4 +21,4 @@ search.personalized.switch = true
18 search.personalized.max.should = 50 21 search.personalized.max.should = 50
19 22
20 23
21 -search.multiMatchQuery.type=BEST_FIELDS  
  24 +search.multiMatchQuery.type=BEST_FIELDS
1 autoconfig.properties = sharedAutoconfig 1 autoconfig.properties = sharedAutoconfig
2 2
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test_nj_4/global-autoconfig.properties 3 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/yunying/global-autoconfig.properties
  4 +
  5 +browse.service.url = http://api.brower.yohoops.org:8092/brower/
4 6
5 java.logs.home = /Data/logs 7 java.logs.home = /Data/logs
6 8
@@ -17,3 +17,6 @@ yoho.social.env.serverport = 5 @@ -17,3 +17,6 @@ yoho.social.env.serverport = 5
17 yoho.social.env.webapphome = /home/test/yoho-social/deploy 17 yoho.social.env.webapphome = /home/test/yoho-social/deploy
18 18
19 yohoboy.service.url = http://new.yohoboys.com/yohoboyins/v5/channel 19 yohoboy.service.url = http://new.yohoboys.com/yohoboyins/v5/channel
  20 +
  21 +is_debug_enable=false
  22 +
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/yunying/global-autoconfig.properties
4 4
5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^ 5 des.password_crypt_key = _+@#$%^kEHrDooxWHCWtfeSxvDvgqZq_+@#$%^
6 6
@@ -8,6 +8,10 @@ erp.user.useGiftcard.url = http://api.erp.yohobuy.com @@ -8,6 +8,10 @@ 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.206:8096/uic 15 uic.service.url = http://192.168.102.206:8096/uic
12 16
13 user.session.expire = 10080 17 user.session.expire = 10080
@@ -20,15 +24,14 @@ users.yoho.default_is_bind = Y @@ -20,15 +24,14 @@ users.yoho.default_is_bind = Y
20 24
21 users.yohocoin = true 25 users.yohocoin = true
22 26
  27 +verify_student_flag = true
  28 +
23 yoho.users.env.namespace = users 29 yoho.users.env.namespace = users
24 yoho.users.env.serverport = 1 30 yoho.users.env.serverport = 1
25 yoho.users.env.webapphome = /home/test/yoho-users/deploy 31 yoho.users.env.webapphome = /home/test/yoho-users/deploy
26 32
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  
  33 +zmxy_appId = 1000227
  34 +zmxy_contract_flag = si201604080002520001
  35 +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==
  36 +zmxy_rsa_zmPK = MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRbbYbNdGkD9TD/bQiNEejfnkBAudsE1bnmsgZ6wUeVBnzPgHVC+f6UxM8HHDOlM2eICaUvQbSsAXsITy3OQzLkV+nWA1pKlpy/OEm0+8HoHJ5gjqDS117/QQWjMdILx7Bed5VPw+AtrVyKs+1qg5MBciP7RHh2A2BDckj+m7bkwIDAQAB
  37 +zmxy_service_url = https://zmopenapi.zmxy.com.cn/sandbox.do
  1 +api.yoho.url = http://api-yunying.yohops.com:9999
  2 +
1 autoconfig.properties = sharedAutoconfig 3 autoconfig.properties = sharedAutoconfig
2 4
3 -autoconfig.properties.sharedAutoconfig = file:/home/test/opps/deploy/autoconfig/test/global-autoconfig.properties 5 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/yunying/global-autoconfig.properties
4 6
5 sers.browse.expire = 7776000 7 sers.browse.expire = 7776000
6 8
7 users.browse.appVersion = 4.1.0.*** 9 users.browse.appVersion = 4.1.0.***
  10 +users.browse.expire = 7776000
8 users.browse.numPerUser = 100 11 users.browse.numPerUser = 100
9 12
10 yohobuy.brower.env.namespace = brower 13 yohobuy.brower.env.namespace = brower
11 yohobuy.brower.env.serverport = 2 14 yohobuy.brower.env.serverport = 2
12 yohobuy.brower.env.webapphome = /home/test/yohobuy-brower/deploy 15 yohobuy.brower.env.webapphome = /home/test/yohobuy-brower/deploy
13 -  
14 -api.yoho.url=http://api-test1.yohops.com:9999  
1 -admin.portal.url = http://192.168.102.211:30012 1 +admin.login.url = http://192.168.102.84:30012
2 2
3 -api.yoho.url = http://api-test1.yohops.com:9999 3 +admin.portal.url = http://192.168.102.84:30012
  4 +
  5 +aliyun.accessid = mkb5KaMTUeAnfHI5
  6 +aliyun.accesskey = XLHom1U6wcyl8dec3t0zaJczvsATPf
  7 +aliyun.bucket = yohotest
  8 +aliyun.domain = http://7xnrdp.com1.z0.glb.clouddn.com
  9 +aliyun.endpoint = oss-cn-shanghai.aliyuncs.com
  10 +
  11 +api.yoho.url = http://api-yunying.yohops.com:9999
4 12
5 autoconfig.properties = sharedAutoconfig 13 autoconfig.properties = sharedAutoconfig
6 14
7 -autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/test/global-autoconfig.properties 15 +autoconfig.properties.sharedAutoconfig = file:/home/test/auto_deploy/deploy/autoconfig/yunying/global-autoconfig.properties
  16 +
  17 +bigData.analytics.transfer.url = http://analytics.m.yohobuy.com/yas.gif/web/
  18 +
  19 +bigDataRedis.pool.maxIdle = 100
  20 +bigDataRedis.pool.maxTotal = 100
  21 +bigDataRedis.pool.maxWaitMillis = 2000
  22 +bigDataRedis.pool.minIdle = 50
  23 +bigDataRedis.pool.testOnBorrow = false
  24 +bigDataRedis.pool.testWhileIdle = true
  25 +
  26 +bigdata.ad.userid = 9999
8 27
9 -erp.domain = http://serve.yohobuy.com 28 +bigdata.qiniu.accesskey = 11111
  29 +bigdata.qiniu.bucket = db-backup
  30 +bigdata.qiniu.secretkey = 333333
  31 +
  32 +crawler.host = http://172.31.21.144:9100
  33 +
  34 +erp.domain = http://192.168.102.47:9098/erp-gateway-web
10 35
11 erp.platform.shops.url = http://api.erp.yohobuy.com 36 erp.platform.shops.url = http://api.erp.yohobuy.com
12 37
  38 +erp.realStorage.url = http://192.168.13.182:8080/erp-gateway-web/shift_logs/query_stock_num_by_sku
  39 +
13 erp.shops.account.url = http://serve.yohobuy.com/service/finance/v1/clearing/balancelist 40 erp.shops.account.url = http://serve.yohobuy.com/service/finance/v1/clearing/balancelist
14 erp.shops.change.pwd.url = http://serve.yohobuy.com/service/account/v1/Profile/updatePassword 41 erp.shops.change.pwd.url = http://serve.yohobuy.com/service/account/v1/Profile/updatePassword
15 erp.shops.login.url = http://serve.yohobuy.com/service/account/v1/Profile/login 42 erp.shops.login.url = http://serve.yohobuy.com/service/account/v1/Profile/login
16 43
17 -erp.storage = http://192.168.102.47:9098/erp-gateway-web 44 +erp.virtualinventory.setNumberBySkn.url = http://serve.yohobuy.com/service/supplier/v1/virtualinventory/setNumberBySkn
18 45
19 -execute.limitcode.host = 192.168.102.202 46 +execute.limitcode.host = 192.168.102.83
20 47
21 -execute.shopmessage.host = 192.168.102.202 48 +execute.shopmessage.host = 192.168.102.83
22 49
23 -execute.update_product_price.host = 192.168.102.202 50 +execute.update_product_price.host = 192.168.102.83
24 51
25 -file.image.size = 512000 52 +file.image.gif.size = 2621440
  53 +file.image.size = 5120000
26 54
27 -zkAddress=192.168.102.211:2181 55 +file.maxsize = 50000000
  56 +file.saveDir = /Data/images
  57 +file.uploadMalongImgDir = /Data/malong
  58 +file.uploadTempDir = /Data/images
28 59
29 -file.maxsize = 104857600  
30 -file.uploadTempDir = /home/test  
31 -  
32 -jdbc.mysql.platform.erp_account.master = 192.168.102.219:3306 60 +jdbc.mysql.platform.erp_account.master = write.erp.yohoops.org:3310
33 jdbc.mysql.platform.erp_account.password = 9nm0icOwt6bMHjMusIfMLw== 61 jdbc.mysql.platform.erp_account.password = 9nm0icOwt6bMHjMusIfMLw==
34 -jdbc.mysql.platform.erp_account.slave = 192.168.102.219:3306 62 +jdbc.mysql.platform.erp_account.slave = read1.erp.yohoops.org:3310
35 jdbc.mysql.platform.erp_account.username = yh_test 63 jdbc.mysql.platform.erp_account.username = yh_test
36 -jdbc.mysql.platform.erp_product.master = 192.168.102.219:3306 64 +jdbc.mysql.platform.erp_product.master = write.erp.yohoops.org:3310
37 jdbc.mysql.platform.erp_product.password = 9nm0icOwt6bMHjMusIfMLw== 65 jdbc.mysql.platform.erp_product.password = 9nm0icOwt6bMHjMusIfMLw==
38 -jdbc.mysql.platform.erp_product.slave = 192.168.102.219:3306 66 +jdbc.mysql.platform.erp_product.slave = read1.erp.yohoops.org:3310
39 jdbc.mysql.platform.erp_product.username = yh_test 67 jdbc.mysql.platform.erp_product.username = yh_test
40 -jdbc.mysql.platform.yh_guang.master = 192.168.102.219:3306 68 +jdbc.mysql.platform.yh_guang.master = write.cms.yohoops.org:3306
41 jdbc.mysql.platform.yh_guang.password = 9nm0icOwt6bMHjMusIfMLw== 69 jdbc.mysql.platform.yh_guang.password = 9nm0icOwt6bMHjMusIfMLw==
42 -jdbc.mysql.platform.yh_guang.slave = 192.168.102.219:3306 70 +jdbc.mysql.platform.yh_guang.slave = read.cms.yohoops.org:3306
43 jdbc.mysql.platform.yh_guang.username = yh_test 71 jdbc.mysql.platform.yh_guang.username = yh_test
44 -jdbc.mysql.platform.yhb_account.master = 192.168.102.219:3306 72 +jdbc.mysql.platform.yhb_account.master = write.erp.yohoops.org:3306
45 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw== 73 jdbc.mysql.platform.yhb_account.password = 9nm0icOwt6bMHjMusIfMLw==
46 -jdbc.mysql.platform.yhb_account.slave = 192.168.102.219:3306 74 +jdbc.mysql.platform.yhb_account.slave = read1.erp.yohoops.org:3306
47 jdbc.mysql.platform.yhb_account.username = yh_test 75 jdbc.mysql.platform.yhb_account.username = yh_test
48 76
  77 +malongApi.accessKeyId = 7343a192140f25a59c53dab5652f5f47
  78 +malongApi.imageSetId = 7tm74zfv
  79 +malongApi.paiUserId = 1714
  80 +malongApi.secretKey = 45c1ce98ee6b4701d55802989ba240f4
  81 +
  82 +mkt.activity.domain.url = http://union.yoho.cn/union/tencentMkt/index.html
49 83
50 -offline.shops.url = http://192.168.102.47:8098/shops/ 84 +mkt.app.download.url = http://m.yohobuy.com/app
  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
51 89
52 platform.login.salt = yoho9646yoho9646 90 platform.login.salt = yoho9646yoho9646
53 91
54 -price.audit.firstRoleName = Ʒ  
55 -price.audit.secondPid = 100476  
56 -price.audit.thirdPid = 100478 92 +price.audit.secondCheckRoleName = secondCheck
  93 +price.audit.secondPid = 100476
  94 +price.audit.thirdPid = 100478
  95 +
  96 +price.changed.notice.phone = 13512519156,17608015989
  97 +
  98 +price.selltype.url = http://192.168.102.47:9098/erp-gateway-web/plate_price_form/list_product_info
  99 +
  100 +qiniu.bigdata.skndada.fileName = /Users/apple/Documents/tmp/sknData.xml
  101 +
  102 +resources_https_enable = true
  103 +
  104 +search.server.address = http://search.yohoops.org:8080/yohosearch/
  105 +
  106 +service.yoho.url = http://service-yunying.yohops.com:9999
  107 +
  108 +shop.status.change.phone = 17895010543
57 109
58 -search.server.address = http://192.168.102.216:8080/yohosearch/ 110 +upload.tencent.bid = b_teg_openrecom_opq68unpsix93dy2zjco
  111 +upload.tencent.product.mark = 9.99
  112 +upload.tencent.url = http://data.dm.qcloud.com1:8088
59 113
60 watchService.waitInterval = 60 114 watchService.waitInterval = 60
61 -watchService.watchDir = /Data/ftpdir 115 +watchService.watchDir = /Data/sftp_images
62 116
63 yohobuy.platform.env.namespace = platform 117 yohobuy.platform.env.namespace = platform
64 yohobuy.platform.env.serverport = 8 118 yohobuy.platform.env.serverport = 8
@@ -2,6 +2,9 @@ autoconfig.properties = sharedAutoconfig @@ -2,6 +2,9 @@ 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/opps/deploy/autoconfig/test/global-autoconfig.properties
4 4
  5 +jdbc.mysql.yhbpromotion.master.password = input_password
  6 +jdbc.mysql.yhbpromotion.master.username = guang_res
  7 +
5 promoation.invite.failCoupon = {\\"old\\":12085,\\"fail\\":12087} 8 promoation.invite.failCoupon = {\\"old\\":12085,\\"fail\\":12087}
6 promoation.invite.newCouponMap = {\\"12091\\":25,\\"12097\\":20,\\"12095\\":23,\\"12093\\":22,\\"12089\\":20} 9 promoation.invite.newCouponMap = {\\"12091\\":25,\\"12097\\":20,\\"12095\\":23,\\"12093\\":22,\\"12089\\":20}
7 promoation.invite.shareCoupon = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12079\\", \\"12081\\", \\"12083\\" ] 10 promoation.invite.shareCoupon = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12079\\", \\"12081\\", \\"12083\\" ]
@@ -9,3 +12,9 @@ promoation.invite.shareCoupon = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12 @@ -9,3 +12,9 @@ promoation.invite.shareCoupon = [ \\"12073\\", \\"12075\\", \\"12077\\", \\"12
9 yohobuy.promotion.env.namespace = promotion 12 yohobuy.promotion.env.namespace = promotion
10 yohobuy.promotion.env.serverport = 5 13 yohobuy.promotion.env.serverport = 5
11 yohobuy.promotion.env.webapphome = /home/test/yohobuy-promotion/deploy 14 yohobuy.promotion.env.webapphome = /home/test/yohobuy-promotion/deploy
  15 +
  16 +wechat.coupons.operators.email=flown.wang@yoho.cn,xintong.xu@yoho.cn
  17 +
  18 +resource_coupon_contentcode=b78b32ed81b18dde8ac84fd33602b88b
  19 +
  20 +promotion.sendCounpon.broadcast.rate=0.9
@@ -10,3 +10,8 @@ yohobuy.resources.env.namespace = resources @@ -10,3 +10,8 @@ yohobuy.resources.env.namespace = resources
10 yohobuy.resources.env.productmode = PRODUCT 10 yohobuy.resources.env.productmode = PRODUCT
11 yohobuy.resources.env.serverport = 7 11 yohobuy.resources.env.serverport = 7
12 yohobuy.resources.env.webapphome = /home/test/yohobuy-resources/deploy 12 yohobuy.resources.env.webapphome = /home/test/yohobuy-resources/deploy
  13 +
  14 +service.online.type=3
  15 +service.online.type.h5=http://m.yohobuy.com/service/im
  16 +
  17 +
@@ -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/yunying/global-autoconfig.properties
6 6
7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA= 7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
8 bigdate.db.url = 172.31.6.98:3306 8 bigdate.db.url = 172.31.6.98:3306
@@ -10,6 +10,8 @@ bigdate.db.username = yh_bigdata @@ -10,6 +10,8 @@ bigdate.db.username = yh_bigdata
10 10
11 draw.writeFile.delay = 60 11 draw.writeFile.delay = 60
12 12
  13 +gateway.url = http://api.yoho.cn
  14 +
13 jdbc.mysql.readonlyinslave = true 15 jdbc.mysql.readonlyinslave = true
14 16
15 rabbit.mq.host = 192.168.102.162 17 rabbit.mq.host = 192.168.102.162
@@ -18,6 +20,8 @@ rabbit.mq.port = 32810 @@ -18,6 +20,8 @@ rabbit.mq.port = 32810
18 rabbit.mq.username = yoho 20 rabbit.mq.username = yoho
19 rabbit.mq.virtualHost = /yoho 21 rabbit.mq.virtualHost = /yoho
20 22
  23 +tencentmkt.shareUrl = http://union.yoho.cn/union/tencentMkt/index.html
  24 +
21 yoho.unions.env.namespace = union 25 yoho.unions.env.namespace = union
22 yoho.unions.env.serverport = 8 26 yoho.unions.env.serverport = 8
23 yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy 27 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.subscription.access.appid=wx96121aa89f31c5ea
  9 +wechat.subscription.access.secret=7669da1a8842ed1df4c5e1b53868f3ca
  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.small.program.access.appid = wx084ab813d88c594b
  15 +wechat.small.program.access.secret = 0252d67ef15eb07a28d80098e8c186ac
  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 +bigData.analytics.transfer.url=http://analytics.m.yohobuy.com/yas.gif/web/
  21 +
  22 +
@@ -222,16 +222,16 @@ package(){ @@ -222,16 +222,16 @@ package(){
222 fi 222 fi
223 223
224 echo "package 5" 224 echo "package 5"
225 - echo "current path is " pwd 225 + echo "current path is " `pwd`
226 echo "result cmd is sh $ROJECT_SOURCE_BRANCH_DIR/bin/mvn-package.sh $AUTOCONFIG_HOME/${APP_NAME}-autoconfig.properties $AUTOCONFIG_HOME/global-autoconfig.properties" 226 echo "result cmd is sh $ROJECT_SOURCE_BRANCH_DIR/bin/mvn-package.sh $AUTOCONFIG_HOME/${APP_NAME}-autoconfig.properties $AUTOCONFIG_HOME/global-autoconfig.properties"
227 227
228 - result=`sh $ROJECT_SOURCE_BRANCH_DIR/bin/mvn-package.sh $AUTOCONFIG_HOME/${APP_NAME}-autoconfig.properties $AUTOCONFIG_HOME/global-autoconfig.properties`  
229 - echo "result = $result"  
230 - if [[ "$result" =~ "FAILURE" ]] && [[ "$result" =~ "ERROR" ]];then  
231 - PACKAGE_RESULT="FAILED"  
232 - else  
233 - PACKAGE_RESULT="SUCCESS"  
234 - fi 228 + sh $ROJECT_SOURCE_BRANCH_DIR/bin/mvn-package.sh $AUTOCONFIG_HOME/${APP_NAME}-autoconfig.properties $AUTOCONFIG_HOME/global-autoconfig.properties
  229 + #echo "result = $result"
  230 + #if [[ "$result" =~ "FAILURE" ]] && [[ "$result" =~ "ERROR" ]];then
  231 + # PACKAGE_RESULT="FAILED"
  232 + # else
  233 + # PACKAGE_RESULT="SUCCESS"
  234 + #fi
235 echo "[INFO] package application finish." 235 echo "[INFO] package application finish."
236 236
237 ###commit autoconfig 237 ###commit autoconfig
@@ -35,5 +35,7 @@ yoho_search_service_dev_ips=(dev@192.168.102.224) @@ -35,5 +35,7 @@ yoho_search_service_dev_ips=(dev@192.168.102.224)
35 yohobuy_wechat_dev_ips=(dev@192.168.102.224) 35 yohobuy_wechat_dev_ips=(dev@192.168.102.224)
36 yohomars_search_service_dev_ips=(dev@192.168.102.214) 36 yohomars_search_service_dev_ips=(dev@192.168.102.214)
37 37
  38 +uic_dev_ips=(dev@192.168.102.210)
  39 +
38 yoho_now_dev_ips=(dev@192.168.102.214) 40 yoho_now_dev_ips=(dev@192.168.102.214)
39 yoho_mars_dev_ips=(dev@192.168.102.214) 41 yoho_mars_dev_ips=(dev@192.168.102.214)