Authored by 梁志锋

Merge remote-tracking branch 'origin/master'

@@ -23,9 +23,9 @@ class Yohobuy @@ -23,9 +23,9 @@ class Yohobuy
23 // const YOHOBUY_URL = 'http://www.yohobuy.com/'; 23 // const YOHOBUY_URL = 'http://www.yohobuy.com/';
24 24
25 //java API 25 //java API
26 - const API_URL = 'http://api.yoho.cn/';  
27 - const API_URL2 = 'http://api.yoho.cn/';  
28 - const SERVICE_URL = 'http://service.yoho.cn/'; 26 + const API_URL = 'http://api.yoho.yohoops.org/';
  27 + const API_URL2 = 'http://api.yoho.yohoops.org/';
  28 + const SERVICE_URL = 'http://service.yoho.yohoops.org/';
29 const YOHOBUY_URL = 'http://www.yohobuy.com/'; 29 const YOHOBUY_URL = 'http://www.yohobuy.com/';
30 const API_OLD = 'http://api2.open.yohobuy.com/'; 30 const API_OLD = 'http://api2.open.yohobuy.com/';
31 31
1 [memcached] 1 [memcached]
2 -master.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311  
3 -slave.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311  
4 -session.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311 2 +master.hosts=10.66.1.6:12111,10.66.1.7:12111,10.66.1.8:12111
  3 +slave.hosts=10.66.1.6:12112,10.66.1.7:12112,10.66.1.8:12112
  4 +session.hosts=10.66.1.6:12111,10.66.1.7:12111,10.66.1.8:12111
5 5
6 [redis] 6 [redis]
7 servers.hosts=127.0.0.1:6379 7 servers.hosts=127.0.0.1:6379
1 [memcached] 1 [memcached]
2 -master.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311  
3 -slave.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311  
4 -session.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311 2 +master.hosts=10.66.1.6:12111,10.66.1.7:12111,10.66.1.8:12111
  3 +slave.hosts=10.66.1.6:12112,10.66.1.7:12112,10.66.1.8:12112
  4 +session.hosts=10.66.1.6:12111,10.66.1.7:12111,10.66.1.8:12111
5 5
6 [redis] 6 [redis]
7 servers.hosts=127.0.0.1:6379 7 servers.hosts=127.0.0.1:6379
  1 +[memcached]
  2 +master.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  3 +slave.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  4 +session.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  5 +
  6 +[redis]
  7 +servers.hosts=127.0.0.1:6379
  1 +[memcached]
  2 +master.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  3 +slave.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  4 +session.hosts=10.66.101.9:11111,10.66.101.9:11211,10.66.101.9:11311
  5 +
  6 +[redis]
  7 +servers.hosts=127.0.0.1:6379