Authored by whb

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

@@ -4,7 +4,7 @@ application.directory = APPLICATION_PATH "/application" @@ -4,7 +4,7 @@ application.directory = APPLICATION_PATH "/application"
4 ;;website library 4 ;;website library
5 application.library = ROOT_PATH "/library" 5 application.library = ROOT_PATH "/library"
6 ;;默认模块 6 ;;默认模块
7 -application.modules = "Index,Category,Channel,Guang,Passport,Product,Cart" 7 +application.modules = "Index,Product,Passport,Order"
8 ;;加载 8 ;;加载
9 application.bootstrap = APPLICATION_PATH "/application/Bootstrap.php" 9 application.bootstrap = APPLICATION_PATH "/application/Bootstrap.php"
10 ;;view文件的扩展名 10 ;;view文件的扩展名
@@ -41,16 +41,16 @@ application.dispatcher.throwException = False @@ -41,16 +41,16 @@ application.dispatcher.throwException = False
41 application.dispatcher.catchException = False 41 application.dispatcher.catchException = False
42 42
43 ;模板预编译目录,该目录需要有读写权限 43 ;模板预编译目录,该目录需要有读写权限
44 -application.template.compile = ROOT_PATH "/compile/m.yohobuy.com"  
45 -application.template.path = ROOT_PATH "/template/m.yohobuy.com/actions"  
46 -application.template.partials = ROOT_PATH "/template/m.yohobuy.com/partials" 44 +application.template.compile = ROOT_PATH "/compile/www.yohobuy.com"
  45 +application.template.path = ROOT_PATH "/template/www.yohobuy.com/actions"
  46 +application.template.partials = ROOT_PATH "/template/www.yohobuy.com/partials"
47 application.template.ext = ".phtml" 47 application.template.ext = ".phtml"
48 48
49 ;静态HTML页面的存放目录, 该目录需要有读写权限 49 ;静态HTML页面的存放目录, 该目录需要有读写权限
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.2.0" 53 +application.version = "0.0.1"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证" 56 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"
1 <?php 1 <?php
2 use Yaf\Application; 2 use Yaf\Application;
3 3
4 -define('SITE_MAIN', 'http://web.yohobuy.com'); // 网站主域名  
5 -define('OLD_MAIN', 'http://web.yohobuy.com'); // 网站旧域名 4 +define('SITE_MAIN', 'http://www.yohobuy.com'); // 网站主域名
  5 +define('OLD_MAIN', 'http://www.yohobuy.com'); // 网站旧域名
6 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域 6 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
7 -define('SUB_DOMAIN', '.web.yohobuy.com'); // 子域名后缀 7 +define('SUB_DOMAIN', '.yohobuy.com'); // 子域名后缀
8 define('USE_CACHE', true); // 缓存的开关 8 define('USE_CACHE', true); // 缓存的开关
9 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录 9 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
10 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录 10 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录