Authored by Rock Zhang

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

@@ -14,7 +14,6 @@ use Index\UserModel as UserModel; @@ -14,7 +14,6 @@ use Index\UserModel as UserModel;
14 * @package 14 * @package
15 * @copyright yoho.inc 15 * @copyright yoho.inc
16 * @version 1.0 (2015-10-28 16:28:32) 16 * @version 1.0 (2015-10-28 16:28:32)
17 - * @author fei.hong <fei.hong@yoho.cn>  
18 */ 17 */
19 class HomeController extends AbstractAction 18 class HomeController extends AbstractAction
20 { 19 {
@@ -33,12 +33,12 @@ application.debug = False @@ -33,12 +33,12 @@ application.debug = False
33 application.servers.config = APPLICATION_PATH "/configs/core" 33 application.servers.config = APPLICATION_PATH "/configs/core"
34 34
35 ;出错的时候是否抛出异常 35 ;出错的时候是否抛出异常
36 -application.dispatcher.throwException = False 36 +application.dispatcher.throwException = True
37 37
38 ;是否使用默认的异常 捕获Controller, 如果开启, 在有未捕获的异常的时候, 38 ;是否使用默认的异常 捕获Controller, 如果开启, 在有未捕获的异常的时候,
39 ;控制权会交给ErrorController的errorAction 方法, 39 ;控制权会交给ErrorController的errorAction 方法,
40 ;可以通过$request->getException()获得此异常对象 40 ;可以通过$request->getException()获得此异常对象
41 -application.dispatcher.catchException = False 41 +application.dispatcher.catchException = True
42 42
43 ;模板预编译目录,该目录需要有读写权限 43 ;模板预编译目录,该目录需要有读写权限
44 application.template.compile = ROOT_PATH "/compile/m.yohobuy.com" 44 application.template.compile = ROOT_PATH "/compile/m.yohobuy.com"
@@ -126,10 +126,10 @@ routes.product.route.action = Index @@ -126,10 +126,10 @@ routes.product.route.action = Index
126 routes.product.map.1 = productId 126 routes.product.map.1 = productId
127 routes.product.map.2 = goodsId 127 routes.product.map.2 = goodsId
128 128
129 -routes.buy.type = "regex"  
130 -routes.buy.match = "#/product/intro_([0-9]+)/(.*).html#"  
131 -routes.buy.route.module = Product  
132 -routes.buy.route.controller = Detail  
133 -routes.buy.route.action = Intro  
134 -routes.buy.map.1 = productSkn 129 +routes.productintro.type = "regex"
  130 +routes.productintro.match = "#/product/intro_([0-9]+)/(.*).html#"
  131 +routes.productintro.route.module = Product
  132 +routes.productintro.route.controller = Detail
  133 +routes.productintro.route.action = Intro
  134 +routes.productintro.map.1 = productSkn
135 135