wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by wangqing
Commit 1aac654f0b07e133612cd297cd5c4176d94a194b 2 parents 23a0645c 4a465406

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 6 changed files with 169 additions and 16 deletions
... ... @@ -482,7 +482,7 @@ class WebAction extends Controller_Abstract
'gobytype'=> 'gobuy'.$channel,
'searchcate'=>'searchcate'.$channel,
'header'=> true,
'apiDomain'=>''
'apiDomain'=> $apiDomain
);
$this->_view->assign('headerdata', $header);
}
... ...
... ... @@ -56,7 +56,7 @@ class SearchData extends \LibModels\Wap\Product\SearchData
return 'http://101.200.31.165/yohosearch/shops.json';
}
return 'http://101.200.31.165/yohosearch/search.json';
case 'test':
case 'testing':
case 'developer':
default:
if ($type == 'sort') {
... ...
... ... @@ -1027,13 +1027,13 @@ class HelperSearch
'order' => 'p_d_asc'
)));
$active = '';
$desc = true;
$desc = '';
}
else if (self::$params['order'] == 'p_d_asc') {
$url = self::buildUrl(array_merge($params, array(
'order' => 'p_d_desc'
)));
$desc = false;
$desc = true;
$active = true;
}
else {
... ...
server
{
listen 80;
server_name www.yohobuy.com;
root /Data/PE/yohobuy-pc/yohobuy/www.yohobuy.com/public;
# 频道相关
location = / {
proxy_redirect off;
proxy_pass http://yohobuy-pc;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location = /woman {
proxy_redirect off;
proxy_pass http://yohobuy-pc;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location = /kids {
proxy_redirect off;
proxy_pass http://yohobuy-pc;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location = /lifestyle {
proxy_redirect off;
proxy_pass http://yohobuy-pc;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location ^~ /common {
proxy_redirect off;
proxy_pass http://yohobuy-pc;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location ^~ /tools {
proxy_redirect off;
proxy_pass http://yohobuy-pc;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
# 其它默认
location / {
proxy_redirect off;
proxy_pass http://yohobuy-old-www;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location =/favicon.ico {
expires 30d;
}
location =/crossdomain.xml {
expires 30d;
}
location =/robots.txt {
expires 1d;
}
}
server
{
listen 80;
server_name new.yohobuy.com;
root /Data/PE/yohobuy-pc/yohobuy/www.yohobuy.com/public;
# 频道相关
location = / {
proxy_redirect off;
proxy_pass http://yohobuy-pc;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location = /woman {
proxy_redirect off;
proxy_pass http://yohobuy-pc;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location = /kids {
proxy_redirect off;
proxy_pass http://yohobuy-pc;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location = /lifestyle {
proxy_redirect off;
proxy_pass http://yohobuy-pc;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location ^~ /common {
proxy_redirect off;
proxy_pass http://yohobuy-pc;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
# 其它默认
location / {
proxy_redirect off;
proxy_pass http://yohobuy-old-new;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Accept-Encoding "gzip";
}
location =/favicon.ico {
expires 30d;
}
location =/crossdomain.xml {
expires 30d;
}
location =/robots.txt {
expires 1d;
}
}
... ...
... ... @@ -9,6 +9,11 @@ use LibModels\Web\Home\IndexData;
use LibModels\Web\Product\SearchData;
use WebPlugin\DataProcess\Channel as ChannelProcess;
define('CODE_BOYS_CHANNEL_TMP', (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '79372627eee75d73afe7f9bac91e5ce6' : 'c15bf0cbfbd4893fd70c869c991f6d3d');
define('CODE_GIRLS_CHANNEL_TMP', (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '75215008957605c05e8cd375eac4f817' : 'a519ba44ef3a85cf3c05e405c6ba8e53');
define('CODE_KIDS_CHANNEL_TMP', (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? 'd71f4b27f2a7229fbb31a4bc490a6f36' : 'a7741b94e8bb9d56d0d36e00c05956f7');
define('CODE_LIFESTYLE_CHANNEL_TMP', (APPLICATION_ENV == 'release' || APPLICATION_ENV == 'preview') ? '8a341ca7eacc069ba80f02dec80eaf34' : '1b053fd044834f5c86d5eb15fb237af9');
/**
* web首页模板数据模型
*
... ... @@ -34,21 +39,21 @@ class HomeModel
const COOKIE_NAME_LIFESTYLE = 'lifestyle';
//release: test:
//boys:79372627eee75d73afe7f9bac91e5ce6, c15bf0cbfbd4893fd70c869c991f6d3d
//girls: 75215008957605c05e8cd375eac4f817, a519ba44ef3a85cf3c05e405c6ba8e53
//kids:d71f4b27f2a7229fbb31a4bc490a6f36,a7741b94e8bb9d56d0d36e00c05956f7
//lifestyle:8a341ca7eacc069ba80f02dec80eaf34,1b053fd044834f5c86d5eb15fb237af9
//boys:79372627eee75d73afe7f9bac91e5ce6, c15bf0cbfbd4893fd70c869c991f6d3d
//girls: 75215008957605c05e8cd375eac4f817, a519ba44ef3a85cf3c05e405c6ba8e53
//kids:d71f4b27f2a7229fbb31a4bc490a6f36,a7741b94e8bb9d56d0d36e00c05956f7
//lifestyle:8a341ca7eacc069ba80f02dec80eaf34,1b053fd044834f5c86d5eb15fb237af9
// 男首首页
const CODE_BOYS_CHANNEL = '79372627eee75d73afe7f9bac91e5ce6';//'c15bf0cbfbd4893fd70c869c991f6d3d';
const CODE_BOYS_CHANNEL = CODE_BOYS_CHANNEL_TMP;
// 女首首页
const CODE_GIRLS_CHANNEL = '75215008957605c05e8cd375eac4f817';//'a519ba44ef3a85cf3c05e405c6ba8e53';
const CODE_GIRLS_CHANNEL = CODE_GIRLS_CHANNEL_TMP;
// 潮童首页
const CODE_KIDS_CHANNEL = 'd71f4b27f2a7229fbb31a4bc490a6f36';//'a7741b94e8bb9d56d0d36e00c05956f7';
const CODE_KIDS_CHANNEL = CODE_KIDS_CHANNEL_TMP;
// 创意生活新
const CODE_LIFESTYLE_CHANNEL = '8a341ca7eacc069ba80f02dec80eaf34';//'8a341ca7eacc069ba80f02dec80eaf34';
const CODE_LIFESTYLE_CHANNEL = CODE_LIFESTYLE_CHANNEL_TMP;
// 创意生活
const CODE_LIFESTYLE_CHANNEL_1 = '380c38155fd8beee10913a3f5b462da6';
... ... @@ -254,7 +259,7 @@ class HomeModel
{
$key = WebCacheConfig::KEY_WEB_HOME_CHANNEL_NEWARRIVAL_DATA . '_' . $channel;
//缓存数据
$result = '';//Cache::get($key);
$result = Cache::get($key);
if (empty($result)) {
$params = array(
'order' => 's_t_desc',
... ...
[memcached]
master.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
slave.hosts=10.170.182.9:12112,10.172.169.31:12112,10.173.8.214:12112
session.hosts=10.170.182.9:12111,10.172.169.31:12111,10.173.8.214:12111
master.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
slave.hosts=192.168.166.16:12112,192.168.166.17:12112,192.168.166.18:12112
session.hosts=192.168.166.16:12111,192.168.166.17:12111,192.168.166.18:12111
[redis]
servers.hosts=127.0.0.1:6379
\ No newline at end of file
... ...