Authored by hf

code review by fei.hong: do merge shaofeng.zhou search brand modify logo codes

@@ -25,34 +25,34 @@ class SearchData @@ -25,34 +25,34 @@ class SearchData
25 switch (APPLICATION_ENV) { 25 switch (APPLICATION_ENV) {
26 case 'production': 26 case 'production':
27 if ($type == 'sort') { 27 if ($type == 'sort') {
28 - return 'http://x.yohobuy.com/yohosearch/sortgroup.json'; 28 + return 'http://search.yoho.cn/yohosearch/sortgroup.json';
29 // return 'http://101.200.31.165/yohosearch/sortgroup.json'; 29 // return 'http://101.200.31.165/yohosearch/sortgroup.json';
30 } 30 }
31 elseif ($type == 'discount') { 31 elseif ($type == 'discount') {
32 - return 'http://x.yohobuy.com/yohosearch/discount.json'; 32 + return 'http://search.yoho.cn/yohosearch/discount.json';
33 // return 'http://101.200.31.165/yohosearch/discount.json'; 33 // return 'http://101.200.31.165/yohosearch/discount.json';
34 } 34 }
35 elseif ($type == 'recent') { 35 elseif ($type == 'recent') {
36 - return 'http://x.yohobuy.com/yohosearch/recent.json'; 36 + return 'http://search.yoho.cn/yohosearch/recent.json';
37 // return 'http://101.200.31.165/yohosearch/recent.json'; 37 // return 'http://101.200.31.165/yohosearch/recent.json';
38 } 38 }
39 elseif ($type == 'suggest') { 39 elseif ($type == 'suggest') {
40 - return 'http://x.yohobuy.com/yohosearch/suggest.json'; 40 + return 'http://search.yoho.cn/yohosearch/suggest.json';
41 // return 'http://101.200.31.165/yohosearch/suggest.json'; 41 // return 'http://101.200.31.165/yohosearch/suggest.json';
42 } 42 }
43 else if($type == 'new-shelve') { 43 else if($type == 'new-shelve') {
44 - return 'http://x.yohobuy.com/yohosearch/new-shelve.json'; 44 + return 'http://search.yoho.cn/yohosearch/new-shelve.json';
45 // return 'http://101.200.31.165/yohosearch/new-shelve.json'; 45 // return 'http://101.200.31.165/yohosearch/new-shelve.json';
46 } 46 }
47 elseif ($type == 'shop') { 47 elseif ($type == 'shop') {
48 - return 'http://x.yohobuy.com/yohosearch/shops.json'; 48 + return 'http://search.yoho.cn/yohosearch/shops.json';
49 // return 'http://101.200.31.165/yohosearch/shops.json'; 49 // return 'http://101.200.31.165/yohosearch/shops.json';
50 } 50 }
51 elseif ($type == 'brand') { 51 elseif ($type == 'brand') {
52 - return 'http://x.yohobuy.com/yohosearch/brand/list.json'; 52 + return 'http://search.yoho.cn/yohosearch/brand/list.json';
53 // return 'http://101.200.31.165/yohosearch/brand/list.json'; 53 // return 'http://101.200.31.165/yohosearch/brand/list.json';
54 } 54 }
55 - return 'http://x.yohobuy.com/yohosearch/search.json'; 55 + return 'http://search.yoho.cn/yohosearch/search.json';
56 // return 'http://101.200.31.165/yohosearch/search.json'; 56 // return 'http://101.200.31.165/yohosearch/search.json';
57 57
58 case 'preview': 58 case 'preview':
@@ -82,31 +82,31 @@ class SearchData @@ -82,31 +82,31 @@ class SearchData
82 case 'developer': 82 case 'developer':
83 default: 83 default:
84 if ($type == 'sort') { 84 if ($type == 'sort') {
85 - return 'http://x.yohobuy.com/yohosearch/sortgroup.json'; 85 + return 'http://search.yoho.cn/yohosearch/sortgroup.json';
86 // return 'http://101.200.31.165/yohosearch/sortgroup.json'; 86 // return 'http://101.200.31.165/yohosearch/sortgroup.json';
87 // return 'http://182.92.99.119:8080/yohosearch/sortgroup.json'; 87 // return 'http://182.92.99.119:8080/yohosearch/sortgroup.json';
88 } 88 }
89 elseif ($type == 'discount') { 89 elseif ($type == 'discount') {
90 - return 'http://x.yohobuy.com/yohosearch/discount.json'; 90 + return 'http://search.yoho.cn/yohosearch/discount.json';
91 // return 'http://101.200.31.165/yohosearch/discount.json'; 91 // return 'http://101.200.31.165/yohosearch/discount.json';
92 // return 'http://182.92.99.119:8080/yohosearch/discount.json'; 92 // return 'http://182.92.99.119:8080/yohosearch/discount.json';
93 } 93 }
94 elseif ($type == 'recent') { 94 elseif ($type == 'recent') {
95 - return 'http://x.yohobuy.com/yohosearch/recent.json'; 95 + return 'http://search.yoho.cn/yohosearch/recent.json';
96 // return 'http://101.200.31.165/yohosearch/recent.json'; 96 // return 'http://101.200.31.165/yohosearch/recent.json';
97 // return 'http://182.92.99.119:8080/yohosearch/recent.json'; 97 // return 'http://182.92.99.119:8080/yohosearch/recent.json';
98 } 98 }
99 elseif ($type == 'suggest') { 99 elseif ($type == 'suggest') {
100 - return 'http://x.yohobuy.com/yohosearch/suggest.json'; 100 + return 'http://search.yoho.cn/yohosearch/suggest.json';
101 // return 'http://101.200.31.165/yohosearch/suggest.json'; 101 // return 'http://101.200.31.165/yohosearch/suggest.json';
102 // return 'http://182.92.99.119:8080/yohosearch/suggest.json'; 102 // return 'http://182.92.99.119:8080/yohosearch/suggest.json';
103 } 103 }
104 else if($type == 'new-shelve') { 104 else if($type == 'new-shelve') {
105 - return 'http://x.yohobuy.com/yohosearch/new-shelve.json';//'http://182.92.99.119:8080/yohosearch/new-shelve.json'; 105 + return 'http://search.yoho.cn/yohosearch/new-shelve.json';//'http://182.92.99.119:8080/yohosearch/new-shelve.json';
106 // return 'http://182.92.99.119:8080/yohosearch/new-shelve.json';//'http://182.92.99.119:8080/yohosearch/new-shelve.json'; 106 // return 'http://182.92.99.119:8080/yohosearch/new-shelve.json';//'http://182.92.99.119:8080/yohosearch/new-shelve.json';
107 } 107 }
108 elseif ($type == 'shop') { 108 elseif ($type == 'shop') {
109 - return 'http://x.yohobuy.com/yohosearch/shops.json'; 109 + return 'http://search.yoho.cn/yohosearch/shops.json';
110 // return 'http://101.200.31.165/yohosearch/shops.json'; 110 // return 'http://101.200.31.165/yohosearch/shops.json';
111 // return 'http://182.92.99.119:8080/yohosearch/shops.json'; 111 // return 'http://182.92.99.119:8080/yohosearch/shops.json';
112 } 112 }
@@ -114,11 +114,11 @@ class SearchData @@ -114,11 +114,11 @@ class SearchData
114 return 'http://182.92.99.119:8080/yohosearch/search-once.json'; 114 return 'http://182.92.99.119:8080/yohosearch/search-once.json';
115 } 115 }
116 elseif ($type == 'brand') { 116 elseif ($type == 'brand') {
117 - return 'http://x.yohobuy.com/yohosearch/brand/list.json'; 117 + return 'http://search.yoho.cn/yohosearch/brand/list.json';
118 // return 'http://101.200.31.165/yohosearch/brand/list.json'; 118 // return 'http://101.200.31.165/yohosearch/brand/list.json';
119 // return 'http://182.92.99.119:8080/yohosearch/brand/list.json'; 119 // return 'http://182.92.99.119:8080/yohosearch/brand/list.json';
120 } 120 }
121 - return 'http://x.yohobuy.com/yohosearch/search.json'; 121 + return 'http://search.yoho.cn/yohosearch/search.json';
122 //return 'http://101.200.31.165/yohosearch/search.json'; 122 //return 'http://101.200.31.165/yohosearch/search.json';
123 // return 'http://182.92.99.119:8080/yohosearch/search.json'; 123 // return 'http://182.92.99.119:8080/yohosearch/search.json';
124 } 124 }
1 [memcached] 1 [memcached]
2 -master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111  
3 -slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112  
4 -session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111 2 +master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
  3 +slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
  4 +session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146: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=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111  
3 -slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112  
4 -session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111 2 +master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
  3 +slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
  4 +session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
5 5
6 [redis] 6 [redis]
7 servers.hosts=127.0.0.1:6379 7 servers.hosts=127.0.0.1:6379