Authored by 梁志锋

merge https 分支

... ... @@ -26,7 +26,7 @@
<link rel="dns-prefetch" href="//static.yohobuy.com">
<link rel="dns-prefetch" href="//img12.static.yhbimg.com">
<link rel="dns-prefetch" href="//img13.static.yhbimg.com">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.15/index.css">
<link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
<link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
<link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
... ... @@ -47,8 +47,8 @@
<script src="//cdn.yoho.cn/myohobuy/1.3.13/lib.js"></script>
<script src="//cdn.yoho.cn/myohobuy/1.3.13/index.js"></script>
<script src="//cdn.yoho.cn/myohobuy/1.3.15/lib.js"></script>
<script src="//cdn.yoho.cn/myohobuy/1.3.15/index.js"></script>
<script>
seajs.use('js/common');
</script>
... ...
... ... @@ -26,7 +26,7 @@
<link rel="dns-prefetch" href="//static.yohobuy.com">
<link rel="dns-prefetch" href="//img12.static.yhbimg.com">
<link rel="dns-prefetch" href="//img13.static.yhbimg.com">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css">
<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.15/index.css">
<link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
<link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
<link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
... ... @@ -65,8 +65,8 @@
<script src="//cdn.yoho.cn/myohobuy/1.3.13/lib.js"></script>
<script src="//cdn.yoho.cn/myohobuy/1.3.13/index.js"></script>
<script src="//cdn.yoho.cn/myohobuy/1.3.15/lib.js"></script>
<script src="//cdn.yoho.cn/myohobuy/1.3.15/index.js"></script>
<script>
seajs.use('js/common');
</script>
... ...
{
"name": "yohobuy",
"version": "1.3.14",
"version": "1.3.15",
"description": "yohobuy statics",
"keywords": [],
"homepage": "",
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "1.3.14"
application.version = "1.3.15"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "1.3.14"
application.version = "1.3.15"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "1.3.14"
application.version = "1.3.15"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
... ... @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
application.assets.path = ROOT_PATH "/assets"
; 应用的版本号
application.version = "1.3.14"
application.version = "1.3.15"
; 网站SEO信息
application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
... ...
[memcached]
master.hosts=192.168.166.16:12111,192.168.166.17:12111
slave.hosts=192.168.166.16:12112,192.168.166.17:12112
session.hosts=192.168.166.16:12111,192.168.166.17:12111
master.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
slave.hosts=172.31.22.1:12112,172.31.20.56:12112,172.31.31.146:12112
session.hosts=172.31.22.1:12111,172.31.20.56:12111,172.31.31.146:12111
[redis]
servers.hosts=127.0.0.1:6379
\ No newline at end of file
... ...
... ... @@ -2,8 +2,8 @@
use Yaf\Application;
define('SITE_MAIN', '//m.dev.yohobuy.com'); // 网站主域名
define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
define('SITE_MAIN', 'http://m.dev.yohobuy.com'); // 网站主域名
define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
define('SUB_DOMAIN', '.dev.yohobuy.com'); // 子域名后缀
define('USE_CACHE', false); // 缓存的开关
... ...
... ... @@ -2,8 +2,8 @@
use Yaf\Application;
define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
define('USE_CACHE', true); // 缓存的开关
... ...
... ... @@ -2,8 +2,8 @@
use Yaf\Application;
define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
define('COOKIE_DOMAIN', '.m.yohobuy.com'); // COOKIE作用域
define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
define('USE_CACHE', false); // 缓存的开关
... ...
... ... @@ -2,8 +2,8 @@
use Yaf\Application;
define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
define('USE_CACHE', false); // 缓存的开关
... ...
... ... @@ -2,8 +2,8 @@
use Yaf\Application;
define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名
define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
define('USE_CACHE', true); // 缓存的开关
... ...