From 9152c5ec0cd98a2cada5ed7f7368077eebaf577e Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 18 Apr 2016 20:56:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E5=8A=A9=E6=89=8B=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E6=9B=B4=E5=90=8D=20=E6=9B=B4=E5=88=A9=E4=BA=8E?=
 =?UTF-8?q?=E7=90=86=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helper.php | 101 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 58 insertions(+), 43 deletions(-)

diff --git a/helper.php b/helper.php
index fc1ea49c..0e9adb60 100644
--- a/helper.php
+++ b/helper.php
@@ -17,6 +17,7 @@ use think\Debug;
 use think\Input;
 use think\Lang;
 use think\Loader;
+use think\Route;
 use think\Session;
 use think\Url;
 use think\View;
@@ -81,13 +82,50 @@ function G($start, $end = '', $dec = 6)
     }
 }
 
+/**
+ * 快速导入Traits PHP5.5以上无需调用
+ * @param string $class trait库
+ * @param string $ext 类库后缀
+ * @return boolean
+ */
+function T($class, $ext = EXT)
+{
+    return Loader::import($class, TRAIT_PATH, $ext);
+}
+
+/**
+ * 抛出异常处理
+ *
+ * @param string  $msg  异常消息
+ * @param integer $code 异常代码 默认为0
+ * @param string $exception 异常类
+ *
+ * @throws Exception
+ */
+function E($msg, $code = 0, $exception = '')
+{
+    $e = $exception ?: '\think\Exception';
+    throw new $e($msg, $code);
+}
+
+/**
+ * 渲染输出Widget
+ * @param string $name Widget名称
+ * @param array $data 传人的参数
+ * @return mixed
+ */
+function W($name, $data = [])
+{
+    return Loader::action($name, $data, 'widget');
+}
+
 /**
  * 实例化Model
  * @param string $name Model名称
  * @param string $layer 业务层名称
  * @return object
  */
-function D($name = '', $layer = MODEL_LAYER)
+function model($name = '', $layer = MODEL_LAYER)
 {
     return Loader::model($name, $layer);
 }
@@ -108,7 +146,7 @@ function db($config = [])
  * @param string $layer 控制层名称
  * @return object
  */
-function A($name, $layer = CONTROLLER_LAYER)
+function controller($name, $layer = CONTROLLER_LAYER)
 {
     return Loader::controller($name, $layer);
 }
@@ -120,7 +158,7 @@ function A($name, $layer = CONTROLLER_LAYER)
  * @param string $layer 要调用的控制层名称
  * @return mixed
  */
-function R($url, $vars = [], $layer = CONTROLLER_LAYER)
+function action($url, $vars = [], $layer = CONTROLLER_LAYER)
 {
     return Loader::action($url, $vars, $layer);
 }
@@ -148,32 +186,6 @@ function vendor($class, $ext = EXT)
     return Loader::import($class, VENDOR_PATH, $ext);
 }
 
-/**
- * 快速导入Traits
- * @param string $class trait库
- * @param string $ext 类库后缀
- * @return boolean
- */
-function T($class, $ext = EXT)
-{
-    return Loader::import($class, TRAIT_PATH, $ext);
-}
-
-/**
- * 抛出异常处理
- *
- * @param string  $msg  异常消息
- * @param integer $code 异常代码 默认为0
- * @param string $exception 异常类
- *
- * @throws Exception
- */
-function E($msg, $code = 0, $exception = '')
-{
-    $e = $exception ?: '\think\Exception';
-    throw new $e($msg, $code);
-}
-
 /**
  * 浏览器友好的变量输出
  * @param mixed $var 变量
@@ -186,18 +198,7 @@ function dump($var, $echo = true, $label = null)
     return Debug::dump($var, $echo, $label);
 }
 
-/**
- * 渲染输出Widget
- * @param string $name Widget名称
- * @param array $data 传人的参数
- * @return mixed
- */
-function W($name, $data = [])
-{
-    return Loader::action($name, $data, 'widget');
-}
-
-function U($url = '', $vars = '', $suffix = true, $domain = false)
+function url($url = '', $vars = '', $suffix = true, $domain = false)
 {
     return Url::build($url, $vars, $suffix, $domain);
 }
@@ -249,7 +250,7 @@ function cookie($name, $value = '', $option = null)
  * @param mixed $options 缓存参数
  * @return mixed
  */
-function S($name, $value = '', $options = null)
+function cache($name, $value = '', $options = null)
 {
     if (is_array($options)) {
         // 缓存操作的同时初始化
@@ -296,7 +297,21 @@ function trace($log = '[think]', $level = 'log')
  * @param array $vars 模板变量
  * @return string
  */
-function V($template = '', $vars = [])
+function view($template = '', $vars = [])
 {
     return View::instance(Config::get('view'))->fetch($template, $vars);
 }
+
+/**
+ * 路由注册
+ * @param string $rule 路由规则
+ * @param mixed $route 路由地址
+ * @param sting $type 请求类型
+ * @param array $option 路由参数
+ * @param array $pattern 变量规则
+ * @return void
+ */
+function route($rule = '', $route = [], $type = '*', $option = [], $pattern = [])
+{
+    Route::register($rule, $route, $type, $option, $pattern);
+}