Authored by chunhua.zhang

commit autoconfig.

  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
  47 +
14 execute.shopmessage.host = 192.168.102.48 48 execute.shopmessage.host = 192.168.102.48
  49 +
15 execute.update_product_price.host = 192.168.102.48 50 execute.update_product_price.host = 192.168.102.48
  51 +
  52 +file.image.gif.size = 2621440
16 file.image.size = 5120000 53 file.image.size = 5120000
17 54
18 file.maxsize = 50000000 55 file.maxsize = 50000000
19 file.saveDir = /Data/images 56 file.saveDir = /Data/images
  57 +file.uploadMalongImgDir = /Data/malong
20 file.uploadTempDir = /Data/images 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
@@ -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.pcwap.domain.url = http://union.yoho.cn/union/go
63 85
  86 +mkt.resource.code.url = https://m.yohobuy.com/channel/f8abd53b5f7c5fe558d3dd567d95ab92.html?nodownload=1
64 87
65 -price.changed.notice.phone=13512519156,17608015989 88 +platform.login.salt = yoho9646yoho9646
66 89
67 -erp.realStorage.url=http://192.168.13.182:8080/erp-gateway-web/shift_logs/query_stock_num_by_sku 90 +price.audit.secondCheckRoleName = secondCheck
  91 +price.audit.secondPid = 100476
  92 +price.audit.thirdPid = 100478
68 93
69 -erp.domain=http://192.168.102.47:9098/erp-gateway-web  
70 -platform.login.salt=yoho9646yoho9646 94 +price.changed.notice.phone = 13512519156,17608015989
71 95
72 -admin.login.url=http://192.168.102.49:30012 96 +price.selltype.url = http://192.168.102.47:9098/erp-gateway-web/plate_price_form/list_product_info
73 97
74 -file.image.gif.size=2621440  
75 -resources_https_enable=true 98 +qiniu.bigdata.skndada.fileName = /Users/apple/Documents/tmp/sknData.xml
76 99
  100 +resources_https_enable = true
77 101
  102 +search.server.address = http://search.yohoops.org:8080/yohosearch/
78 103
79 -shop.status.change.phone= 17895010543  
80 -  
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 +service.yoho.url = http://service-test3.yohops.com:9999
89 105
90 -crawler.host=http://172.31.21.144:9100 106 +shop.status.change.phone = 17895010543
91 107
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 ******************** 108 +upload.tencent.bid = b_teg_openrecom_opq68unpsix93dy2zjco
  109 +upload.tencent.product.mark = 9.99
  110 +upload.tencent.url = http://data.dm.qcloud.com1:8088
100 111
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 ******************** 112 +watchService.waitInterval = 60
  113 +watchService.watchDir = /Data/sftp_images
108 114
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  
  115 +yohobuy.platform.env.namespace = platform
  116 +yohobuy.platform.env.serverport = 8
  117 +yohobuy.platform.env.webapphome = /home/test/yohobuy-platform/deploy