Authored by chunhua.zhang

commit autoconfig.

@@ -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_4/global-autoconfig.properties
6 6
7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA= 7 bigdate.db.password = ZARNTZvqPIYoBOhoTTTGRaMwEu/zaKV31I9S8xDJIUA=
8 bigdate.db.url = 192.168.103.36:3306 8 bigdate.db.url = 192.168.103.36:3306
@@ -10,6 +10,10 @@ bigdate.db.username = yh_bigdata @@ -10,6 +10,10 @@ bigdate.db.username = yh_bigdata
10 10
11 draw.writeFile.delay = 60 11 draw.writeFile.delay = 60
12 12
  13 +exclude.union.type = 100000000000349
  14 +
  15 +gateway.url = http://api.yoho.cn
  16 +
13 jdbc.mysql.readonlyinslave = true 17 jdbc.mysql.readonlyinslave = true
14 18
15 rabbit.mq.host = 192.168.102.56 19 rabbit.mq.host = 192.168.102.56
@@ -18,17 +22,17 @@ rabbit.mq.port = 5672 @@ -18,17 +22,17 @@ rabbit.mq.port = 5672
18 rabbit.mq.username = yoho 22 rabbit.mq.username = yoho
19 rabbit.mq.virtualHost = /yoho 23 rabbit.mq.virtualHost = /yoho
20 24
21 -yoho.unions.env.namespace = union  
22 -yoho.unions.env.serverport = 8  
23 -yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy 25 +redis.proxy.database = 1
24 26
  27 +redis.readonly.proxy.database = 1
25 28
26 -redis.union.proxy.address=192.168.102.56  
27 -redis.union.proxy.port=6379  
28 -redis.union.proxy.auth=  
29 -redis.proxy.database=1 29 +redis.union.proxy.address = 192.168.102.56
  30 +redis.union.readonly.proxy.address = 192.168.102.56
30 31
31 -redis.union.readonly.proxy.address=192.168.102.56  
32 -redis.union.readonly.proxy.port=6379  
33 -redis.union.readonly.proxy.auth=  
34 -redis.readonly.proxy.database=1  
  32 +tencentmkt.shareUrl = http://union.yoho.cn/union/tencentMkt/index.html
  33 +
  34 +union.host = 172.31.16.99
  35 +
  36 +yoho.unions.env.namespace = union
  37 +yoho.unions.env.serverport = 8
  38 +yoho.unions.env.webapphome = /home/test/yohobuy-union/deploy