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

@@ -4,7 +4,7 @@ application.directory = APPLICATION_PATH  "/application"
 ;;website library
 application.library = ROOT_PATH "/library"
 ;;默认模块
-application.modules = "Index,Category,Channel,Guang,Passport,Product,Cart"
+application.modules = "Index,Product,Passport,Order"
 ;;加载
 application.bootstrap = APPLICATION_PATH "/application/Bootstrap.php"
 ;;view文件的扩展名
@@ -41,16 +41,16 @@ application.dispatcher.throwException = False
 application.dispatcher.catchException = False
 
 ;模板预编译目录,该目录需要有读写权限
-application.template.compile = ROOT_PATH "/compile/m.yohobuy.com"
-application.template.path = ROOT_PATH "/template/m.yohobuy.com/actions"
-application.template.partials = ROOT_PATH "/template/m.yohobuy.com/partials"
+application.template.compile = ROOT_PATH "/compile/www.yohobuy.com"
+application.template.path = ROOT_PATH "/template/www.yohobuy.com/actions"
+application.template.partials = ROOT_PATH "/template/www.yohobuy.com/partials"
 application.template.ext = ".phtml"
 
 ;静态HTML页面的存放目录, 该目录需要有读写权限
 application.assets.path = ROOT_PATH "/assets"
 
 ; 应用的版本号
-application.version = "1.2.0"
+application.version = "0.0.1"
 
 ; 网站SEO信息
 application.seo.title = "YOHO!有货 | 年轻人潮流购物中心,中国潮流购物风向标,官方授权正品保证"

 <?php
 use Yaf\Application;
 
-define('SITE_MAIN', 'http://web.yohobuy.com'); // 网站主域名
-define('OLD_MAIN', 'http://web.yohobuy.com'); // 网站旧域名
+define('SITE_MAIN', 'http://www.yohobuy.com'); // 网站主域名
+define('OLD_MAIN', 'http://www.yohobuy.com'); // 网站旧域名
 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
-define('SUB_DOMAIN', '.web.yohobuy.com'); // 子域名后缀
+define('SUB_DOMAIN', '.yohobuy.com'); // 子域名后缀
 define('USE_CACHE', true); // 缓存的开关
 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录