diff --git a/application/admin/library/traits/Backend.php b/application/admin/library/traits/Backend.php
index f81f62fee840c33d300fd432d4af641b5e5e9094..b91a5629adca30819679a38e2d64d4ce2fbcd617 100755
--- a/application/admin/library/traits/Backend.php
+++ b/application/admin/library/traits/Backend.php
@@ -9,12 +9,16 @@ use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
 use PhpOffice\PhpSpreadsheet\Reader\Xls;
 use PhpOffice\PhpSpreadsheet\Reader\Csv;
 use think\Db;
+use think\db\exception\BindParamException;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\ModelNotFoundException;
+use think\exception\DbException;
 use think\exception\PDOException;
 use think\exception\ValidateException;
+use think\response\Json;
 
 trait Backend
 {
-
     /**
      * 排除前台提交过来的字段
      * @param $params
@@ -24,115 +28,114 @@ trait Backend
     {
         if (is_array($this->excludeFields)) {
             foreach ($this->excludeFields as $field) {
-                if (key_exists($field, $params)) {
+                if (array_key_exists($field, $params)) {
                     unset($params[$field]);
                 }
             }
-        } else {
-            if (key_exists($this->excludeFields, $params)) {
-                unset($params[$this->excludeFields]);
-            }
+        } else if (array_key_exists($this->excludeFields, $params)) {
+            unset($params[$this->excludeFields]);
         }
         return $params;
     }
 
-
     /**
      * 查看
+     *
+     * @return string|Json
+     * @throws \think\Exception
+     * @throws DbException
      */
     public function index()
     {
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
-        if ($this->request->isAjax()) {
-            //如果发送的来源是Selectpage，则转发到Selectpage
-            if ($this->request->request('keyField')) {
-                return $this->selectpage();
-            }
-            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
-            $list = $this->model
-                ->where($where)
-                ->order($sort, $order)
-                ->paginate($limit);
-
-            $result = array("total" => $list->total(), "rows" => $list->items());
-
-            return json($result);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
+        }
+        //如果发送的来源是 Selectpage，则转发到 Selectpage
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
         }
-        return $this->view->fetch();
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $list = $this->model
+            ->where($where)
+            ->order($sort, $order)
+            ->paginate($limit);
+        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        return json($result);
     }
 
     /**
      * 回收站
+     *
+     * @return string|Json
+     * @throws \think\Exception
      */
     public function recyclebin()
     {
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
-        if ($this->request->isAjax()) {
-            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
-            $list = $this->model
-                ->onlyTrashed()
-                ->where($where)
-                ->order($sort, $order)
-                ->paginate($limit);
-
-            $result = array("total" => $list->total(), "rows" => $list->items());
-
-            return json($result);
+        if (false === $this->request->isAjax()) {
+            return $this->view->fetch();
         }
-        return $this->view->fetch();
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
+        $list = $this->model
+            ->onlyTrashed()
+            ->where($where)
+            ->order($sort, $order)
+            ->paginate($limit);
+        $result = ['total' => $list->total(), 'rows' => $list->items()];
+        return json($result);
     }
 
     /**
      * 添加
+     *
+     * @return string
+     * @throws \think\Exception
      */
     public function add()
     {
-        if ($this->request->isPost()) {
-            $params = $this->request->post("row/a");
-            if ($params) {
-                $params = $this->preExcludeFields($params);
+        if (false === $this->request->isPost()) {
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a');
+        if (empty($params)) {
+            $this->error(__('Parameter %s can not be empty', ''));
+        }
+        $params = $this->preExcludeFields($params);
 
-                if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
-                    $params[$this->dataLimitField] = $this->auth->id;
-                }
-                $result = false;
-                Db::startTrans();
-                try {
-                    //是否采用模型验证
-                    if ($this->modelValidate) {
-                        $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
-                        $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
-                        $this->model->validateFailException(true)->validate($validate);
-                    }
-                    $result = $this->model->allowField(true)->save($params);
-                    Db::commit();
-                } catch (ValidateException $e) {
-                    Db::rollback();
-                    $this->error($e->getMessage());
-                } catch (PDOException $e) {
-                    Db::rollback();
-                    $this->error($e->getMessage());
-                } catch (Exception $e) {
-                    Db::rollback();
-                    $this->error($e->getMessage());
-                }
-                if ($result !== false) {
-                    $this->success();
-                } else {
-                    $this->error(__('No rows were inserted'));
-                }
+        if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
+            $params[$this->dataLimitField] = $this->auth->id;
+        }
+        $result = false;
+        Db::startTrans();
+        try {
+            //是否采用模型验证
+            if ($this->modelValidate) {
+                $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.add' : $name) : $this->modelValidate;
+                $this->model->validateFailException()->validate($validate);
             }
-            $this->error(__('Parameter %s can not be empty', ''));
+            $result = $this->model->allowField(true)->save($params);
+            Db::commit();
+        } catch (ValidateException|PDOException|Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
         }
-        return $this->view->fetch();
+        if ($result === false) {
+            $this->error(__('No rows were inserted'));
+        }
+        $this->success();
     }
 
     /**
      * 编辑
+     *
+     * @param $ids
+     * @return string
+     * @throws DbException
+     * @throws \think\Exception
      */
     public function edit($ids = null)
     {
@@ -141,137 +144,132 @@ trait Backend
             $this->error(__('No Results were found'));
         }
         $adminIds = $this->getDataLimitAdminIds();
-        if (is_array($adminIds)) {
-            if (!in_array($row[$this->dataLimitField], $adminIds)) {
-                $this->error(__('You have no permission'));
-            }
+        if (is_array($adminIds) && !in_array($row[$this->dataLimitField], $adminIds)) {
+            $this->error(__('You have no permission'));
         }
-        if ($this->request->isPost()) {
-            $params = $this->request->post("row/a");
-            if ($params) {
-                $params = $this->preExcludeFields($params);
-                $result = false;
-                Db::startTrans();
-                try {
-                    //是否采用模型验证
-                    if ($this->modelValidate) {
-                        $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
-                        $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
-                        $row->validateFailException(true)->validate($validate);
-                    }
-                    $result = $row->allowField(true)->save($params);
-                    Db::commit();
-                } catch (ValidateException $e) {
-                    Db::rollback();
-                    $this->error($e->getMessage());
-                } catch (PDOException $e) {
-                    Db::rollback();
-                    $this->error($e->getMessage());
-                } catch (Exception $e) {
-                    Db::rollback();
-                    $this->error($e->getMessage());
-                }
-                if ($result !== false) {
-                    $this->success();
-                } else {
-                    $this->error(__('No rows were updated'));
-                }
-            }
+        if (false === $this->request->isPost()) {
+            $this->view->assign('row', $row);
+            return $this->view->fetch();
+        }
+        $params = $this->request->post('row/a');
+        if (empty($params)) {
             $this->error(__('Parameter %s can not be empty', ''));
         }
-        $this->view->assign("row", $row);
-        return $this->view->fetch();
+        $params = $this->preExcludeFields($params);
+        $result = false;
+        Db::startTrans();
+        try {
+            //是否采用模型验证
+            if ($this->modelValidate) {
+                $name = str_replace("\\model\\", "\\validate\\", get_class($this->model));
+                $validate = is_bool($this->modelValidate) ? ($this->modelSceneValidate ? $name . '.edit' : $name) : $this->modelValidate;
+                $row->validateFailException()->validate($validate);
+            }
+            $result = $row->allowField(true)->save($params);
+            Db::commit();
+        } catch (ValidateException|PDOException|Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if (false === $result) {
+            $this->error(__('No rows were updated'));
+        }
+        $this->success();
     }
 
     /**
      * 删除
+     *
+     * @param $ids
+     * @return void
+     * @throws DbException
+     * @throws DataNotFoundException
+     * @throws ModelNotFoundException
      */
-    public function del($ids = "")
+    public function del($ids = null)
     {
-        if (!$this->request->isPost()) {
+        if (false === $this->request->isPost()) {
             $this->error(__("Invalid parameters"));
         }
-        $ids = $ids ? $ids : $this->request->post("ids");
-        if ($ids) {
-            $pk = $this->model->getPk();
-            $adminIds = $this->getDataLimitAdminIds();
-            if (is_array($adminIds)) {
-                $this->model->where($this->dataLimitField, 'in', $adminIds);
-            }
-            $list = $this->model->where($pk, 'in', $ids)->select();
+        $ids = $ids ?: $this->request->post("ids");
+        if (empty($ids)) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+        $pk = $this->model->getPk();
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds)) {
+            $this->model->where($this->dataLimitField, 'in', $adminIds);
+        }
+        $list = $this->model->where($pk, 'in', $ids)->select();
 
-            $count = 0;
-            Db::startTrans();
-            try {
-                foreach ($list as $k => $v) {
-                    $count += $v->delete();
-                }
-                Db::commit();
-            } catch (PDOException $e) {
-                Db::rollback();
-                $this->error($e->getMessage());
-            } catch (Exception $e) {
-                Db::rollback();
-                $this->error($e->getMessage());
-            }
-            if ($count) {
-                $this->success();
-            } else {
-                $this->error(__('No rows were deleted'));
+        $count = 0;
+        Db::startTrans();
+        try {
+            foreach ($list as $item) {
+                $count += $item->delete();
             }
+            Db::commit();
+        } catch (PDOException|Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if ($count) {
+            $this->success();
         }
-        $this->error(__('Parameter %s can not be empty', 'ids'));
+        $this->error(__('No rows were deleted'));
     }
 
     /**
      * 真实删除
+     *
+     * @param $ids
+     * @return void
      */
-    public function destroy($ids = "")
+    public function destroy($ids = null)
     {
-        if (!$this->request->isPost()) {
+        if (false === $this->request->isPost()) {
             $this->error(__("Invalid parameters"));
         }
-        $ids = $ids ? $ids : $this->request->post("ids");
+        $ids = $ids ?: $this->request->post('ids');
+        if (empty($ids)) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
         $pk = $this->model->getPk();
         $adminIds = $this->getDataLimitAdminIds();
         if (is_array($adminIds)) {
             $this->model->where($this->dataLimitField, 'in', $adminIds);
         }
-        if ($ids) {
-            $this->model->where($pk, 'in', $ids);
-        }
+        $this->model->where($pk, 'in', $ids);
         $count = 0;
         Db::startTrans();
         try {
             $list = $this->model->onlyTrashed()->select();
-            foreach ($list as $k => $v) {
-                $count += $v->delete(true);
+            foreach ($list as $item) {
+                $count += $item->delete(true);
             }
             Db::commit();
-        } catch (PDOException $e) {
-            Db::rollback();
-            $this->error($e->getMessage());
-        } catch (Exception $e) {
+        } catch (PDOException|Exception $e) {
             Db::rollback();
             $this->error($e->getMessage());
         }
         if ($count) {
             $this->success();
-        } else {
-            $this->error(__('No rows were deleted'));
         }
-        $this->error(__('Parameter %s can not be empty', 'ids'));
+        $this->error(__('No rows were deleted'));
     }
 
     /**
      * 还原
+     *
+     * @param $ids
+     * @return void
      */
-    public function restore($ids = "")
+    public function restore($ids = null)
     {
-        if (!$this->request->isPost()) {
-            $this->error(__("Invalid parameters"));
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
         }
-        $ids = $ids ? $ids : $this->request->post("ids");
+        $ids = $ids ?: $this->request->post('ids');
         $pk = $this->model->getPk();
         $adminIds = $this->getDataLimitAdminIds();
         if (is_array($adminIds)) {
@@ -284,14 +282,11 @@ trait Backend
         Db::startTrans();
         try {
             $list = $this->model->onlyTrashed()->select();
-            foreach ($list as $index => $item) {
+            foreach ($list as $item) {
                 $count += $item->restore();
             }
             Db::commit();
-        } catch (PDOException $e) {
-            Db::rollback();
-            $this->error($e->getMessage());
-        } catch (Exception $e) {
+        } catch (PDOException|Exception $e) {
             Db::rollback();
             $this->error($e->getMessage());
         }
@@ -303,52 +298,56 @@ trait Backend
 
     /**
      * 批量更新
+     *
+     * @param $ids
+     * @return void
      */
-    public function multi($ids = "")
+    public function multi($ids = null)
     {
-        if (!$this->request->isPost()) {
-            $this->error(__("Invalid parameters"));
+        if (false === $this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
         }
-        $ids = $ids ? $ids : $this->request->post("ids");
-        if ($ids) {
-            if ($this->request->has('params')) {
-                parse_str($this->request->post("params"), $values);
-                $values = $this->auth->isSuperAdmin() ? $values : array_intersect_key($values, array_flip(is_array($this->multiFields) ? $this->multiFields : explode(',', $this->multiFields)));
-                if ($values) {
-                    $adminIds = $this->getDataLimitAdminIds();
-                    if (is_array($adminIds)) {
-                        $this->model->where($this->dataLimitField, 'in', $adminIds);
-                    }
-                    $count = 0;
-                    Db::startTrans();
-                    try {
-                        $list = $this->model->where($this->model->getPk(), 'in', $ids)->select();
-                        foreach ($list as $index => $item) {
-                            $count += $item->allowField(true)->isUpdate(true)->save($values);
-                        }
-                        Db::commit();
-                    } catch (PDOException $e) {
-                        Db::rollback();
-                        $this->error($e->getMessage());
-                    } catch (Exception $e) {
-                        Db::rollback();
-                        $this->error($e->getMessage());
-                    }
-                    if ($count) {
-                        $this->success();
-                    } else {
-                        $this->error(__('No rows were updated'));
-                    }
-                } else {
-                    $this->error(__('You have no permission'));
-                }
+        $ids = $ids ?: $this->request->post('ids');
+        if (empty($ids)) {
+            $this->error(__('Parameter %s can not be empty', 'ids'));
+        }
+
+        if (false === $this->request->has('params')) {
+            $this->error(__('No rows were updated'));
+        }
+        parse_str($this->request->post('params'), $values);
+        $values = $this->auth->isSuperAdmin() ? $values : array_intersect_key($values, array_flip(is_array($this->multiFields) ? $this->multiFields : explode(',', $this->multiFields)));
+        if (empty($values)) {
+            $this->error(__('You have no permission'));
+        }
+        $adminIds = $this->getDataLimitAdminIds();
+        if (is_array($adminIds)) {
+            $this->model->where($this->dataLimitField, 'in', $adminIds);
+        }
+        $count = 0;
+        Db::startTrans();
+        try {
+            $list = $this->model->where($this->model->getPk(), 'in', $ids)->select();
+            foreach ($list as $item) {
+                $count += $item->allowField(true)->isUpdate(true)->save($values);
             }
+            Db::commit();
+        } catch (PDOException|Exception $e) {
+            Db::rollback();
+            $this->error($e->getMessage());
+        }
+        if ($count) {
+            $this->success();
         }
-        $this->error(__('Parameter %s can not be empty', 'ids'));
+        $this->error(__('No rows were updated'));
     }
 
     /**
      * 导入
+     *
+     * @return void
+     * @throws PDOException
+     * @throws BindParamException
      */
     protected function import()
     {
@@ -368,12 +367,12 @@ trait Backend
         if ($ext === 'csv') {
             $file = fopen($filePath, 'r');
             $filePath = tempnam(sys_get_temp_dir(), 'import_csv');
-            $fp = fopen($filePath, "w");
+            $fp = fopen($filePath, 'w');
             $n = 0;
             while ($line = fgets($file)) {
                 $line = rtrim($line, "\n\r\0");
                 $encoding = mb_detect_encoding($line, ['utf-8', 'gbk', 'latin1', 'big5']);
-                if ($encoding != 'utf-8') {
+                if ($encoding !== 'utf-8') {
                     $line = mb_convert_encoding($line, 'utf-8', $encoding);
                 }
                 if ($n == 0 || preg_match('/^".*"$/', $line)) {
diff --git a/application/api/lang/zh-cn/user.php b/application/api/lang/zh-cn/user.php
index eb40897fd690de4e212c091fad3546ae49b5f716..e98e4cd050ecd766c783a4b3d96b8a06d7b25b53 100644
--- a/application/api/lang/zh-cn/user.php
+++ b/application/api/lang/zh-cn/user.php
@@ -7,7 +7,7 @@ return [
     'Sign up successful'                    => '注册成功',
     'Username can not be empty'             => '用户名不能为空',
     'Username must be 3 to 30 characters'   => '用户名必须3-30个字符',
-    'Username must be 6 to 30 characters'   => '用户名必须3-30个字符',
+    'Username must be 6 to 30 characters'   => '用户名必须6-30个字符',
     'Password can not be empty'             => '密码不能为空',
     'Password must be 6 to 30 characters'   => '密码必须6-30个字符',
     'Mobile is incorrect'                   => '手机格式不正确',
diff --git a/application/index/view/common/captcha.html b/application/index/view/common/captcha.html
index 8db2df91337abdc670244509b98477d047df0026..d424e70fc29506116993e67ac655bc6a15356338 100644
--- a/application/index/view/common/captcha.html
+++ b/application/index/view/common/captcha.html
@@ -1,11 +1,11 @@
 <!--@formatter:off-->
 {if "[type]" == 'email'}
-    <input type="text" name="captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});integer[+];remote({:url('api/validate/check_ems_correct')}, event=[event], email:#email)" />
+    <input type="text" name="captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});digits;remote({:url('api/validate/check_ems_correct')}, event=[event], email:#email)" />
     <span class="input-group-btn" style="padding:0;border:none;">
         <a href="javascript:;" class="btn btn-info btn-captcha" data-url="{:url('api/ems/send')}" data-type="email" data-event="[event]">发送验证码</a>
     </span>
 {elseif "[type]" == 'mobile'/}
-    <input type="text" name="captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});integer[+];remote({:url('api/validate/check_sms_correct')}, event=[event], mobile:#mobile)" />
+    <input type="text" name="captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});digits;remote({:url('api/validate/check_sms_correct')}, event=[event], mobile:#mobile)" />
     <span class="input-group-btn" style="padding:0;border:none;">
         <a href="javascript:;" class="btn btn-info btn-captcha" data-url="{:url('api/sms/send')}" data-type="mobile" data-event="[event]">发送验证码</a>
     </span>
diff --git a/application/index/view/user/login.html b/application/index/view/user/login.html
index eb3ecfb7dc5563077aeb28a26e0d5f9a735f08bd..f75237b83e75f83f21bae4f50998d168952d8574 100755
--- a/application/index/view/user/login.html
+++ b/application/index/view/user/login.html
@@ -69,7 +69,7 @@
                 <label for="captcha" class="control-label col-xs-12 col-sm-3">{:__('Captcha')}:</label>
                 <div class="col-xs-12 col-sm-8">
                     <div class="input-group">
-                        <input type="text" name="captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});integer[+];remote({:url('api/validate/check_ems_correct')}, event=resetpwd, email:#email)"/>
+                        <input type="text" name="captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});digits;remote({:url('api/validate/check_ems_correct')}, event=resetpwd, email:#email)"/>
                         <span class="input-group-btn" style="padding:0;border:none;">
                             <a href="javascript:;" class="btn btn-primary btn-captcha" data-url="{:url('api/ems/send')}" data-type="email" data-event="resetpwd">{:__('Send verification code')}</a>
                         </span>
diff --git a/application/index/view/user/profile.html b/application/index/view/user/profile.html
index 62e6b05ba7f93393c17eece419182f64c635907d..e0b57b3702c356ce20a4d733881ad817d2ac2548 100644
--- a/application/index/view/user/profile.html
+++ b/application/index/view/user/profile.html
@@ -121,7 +121,7 @@
                 <label class="control-label col-xs-12 col-sm-3">{:__('Captcha')}:</label>
                 <div class="col-xs-12 col-sm-8">
                     <div class="input-group">
-                        <input type="text" name="captcha" id="email-captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});integer[+];remote({:url('api/validate/check_ems_correct')}, event=changeemail, email:#email)" />
+                        <input type="text" name="captcha" id="email-captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});digits;remote({:url('api/validate/check_ems_correct')}, event=changeemail, email:#email)" />
                         <span class="input-group-btn" style="padding:0;border:none;">
                             <a href="javascript:;" class="btn btn-info btn-captcha" data-url="{:url('api/ems/send')}" data-type="email" data-event="changeemail">获取验证码</a>
                         </span>
@@ -155,7 +155,7 @@
                 <label for="mobile-captcha" class="control-label col-xs-12 col-sm-3">{:__('Captcha')}:</label>
                 <div class="col-xs-12 col-sm-8">
                     <div class="input-group">
-                        <input type="text" name="captcha" id="mobile-captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});integer[+];remote({:url('api/validate/check_sms_correct')}, event=changemobile, mobile:#mobile)" />
+                        <input type="text" name="captcha" id="mobile-captcha" class="form-control" data-rule="required;length({$Think.config.captcha.length});digits;remote({:url('api/validate/check_sms_correct')}, event=changemobile, mobile:#mobile)" />
                         <span class="input-group-btn" style="padding:0;border:none;">
                             <a href="javascript:;" class="btn btn-info btn-captcha" data-url="{:url('api/sms/send')}" data-type="mobile" data-event="changemobile">获取验证码</a>
                         </span>
diff --git a/composer.json b/composer.json
index bacfc9d4ca6c5a366d32784bc0cd4184e564ce79..fa0375cc8b8d337739b9c567c1a9d68f60a4983a 100755
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
     "repositories": [
         {
             "type": "git",
-            "url": "https://gitee.com/karson/framework"
+            "url": "https://gitee.com/fastadminnet/framework.git"
         }
     ]
 }
diff --git a/extend/fast/Form.php b/extend/fast/Form.php
index faf7d1dbff526a731428bb658f6619b4dcba153f..92f343dc37c1ab1f9c3d315844d721d57a8d6191 100644
--- a/extend/fast/Form.php
+++ b/extend/fast/Form.php
@@ -8,45 +8,45 @@ use ArrayAccess;
  * 表单元素生成
  * @class   Form
  * @package fast
- * @method string token() static 生成Token
- * @method string label(string $name, string $value = null, array $options = []) static label标签
- * @method string input($type, $name, string $value = null, array $options = []) static 按类型生成文本框
- * @method string text(string $name, string $value = null, array $options = []) static 普通文本框
- * @method string password(string $name, array $options = []) static 密码文本框
- * @method string hidden(string $name, string $value = null, array $options = []) static 隐藏文本框
- * @method string email(string $name, string $value = null, array $options = []) static Email文本框
- * @method string url(string $name, string $value = null, array $options = []) static URL文本框
- * @method string file(string $name, array $options = []) static 文件上传组件
- * @method string textarea(string $name, string $value = null, array $options = []) static 多行文本框
- * @method string editor(string $name, string $value = null, array $options = []) static 富文本编辑器
- * @method string select(string $name, array $list = [], string $selected = null, array $options = []) static 下拉列表组件
- * @method string selects(string $name, array $list = [], string $selected = null, array $options = []) static 下拉列表组件(多选)
- * @method string selectpicker(string $name, array $list = [], string $selected = null, array $options = []) static 下拉列表组件(友好)
- * @method string selectpickers(string $name, array $list = [], string $selected = null, array $options = []) static 下拉列表组件(友好)(多选)
- * @method string selectpage(string $name, string $value, string $url, string $field = null, string $primaryKey = null, array $options = []) static 动态下拉列表组件
- * @method string selectpages(string $name, string $value, string $url, string $field = null, string $primaryKey = null, array $options = []) static 动态下拉列表组件(多选)
- * @method string citypicker(string $name, string $value, array $options = []) static 城市选择组件
- * @method string switcher(string $name, string $value, array $options = []) static 切换组件
- * @method string datepicker(string $name, string $value, array $options = []) static 日期选择组件
- * @method string timepicker(string $name, string $value, array $options = []) static 时间选择组件
- * @method string datetimepicker(string $name, string $value, array $options = []) static 日期时间选择组件
- * @method string daterange(string $name, string $value, array $options = []) static 日期区间组件
- * @method string timerange(string $name, string $value, array $options = []) static 时间区间组件
- * @method string datetimerange(string $name, string $value, array $options = []) static 日期时间区间组件
- * @method string fieldlist(string $name, string $value, string $title = null, string $template = null, array $options = []) static 字段列表组件
- * @method string cxselect(string $url, array $names = [], array $values = [], array $options = []) static 联动组件
- * @method string selectRange(string $name, string $begin, string $end, string $selected = null, array $options = []) static 选择数字区间
- * @method string selectYear(string $name, string $begin, string $end, string $selected = null, array $options = []) static 选择年
- * @method string selectMonth(string $name, string $selected = null, array $options = [], string $format = '%m') static 选择月
- * @method string checkbox(string $name, string $value = '1', string $checked = null, array $options = []) static 单个复选框
- * @method string checkboxs(string $name, array $list = [], string $checked = null, array $options = []) static 一组复选框
- * @method string radio(string $name, string $value = null, string $checked = null, array $options = [])) static 单个单选框
- * @method string radios(string $name, array $list = [], string $checked = null, array $options = [])) static 一组单选框
- * @method string image(string $name = null, string $value, array $inputAttr = [], array $uploadAttr = [], array $chooseAttr = [], array $previewAttr = []) static 上传图片组件
- * @method string images(string $name = null, string $value, array $inputAttr = [], array $uploadAttr = [], array $chooseAttr = [], array $previewAttr = []) static 上传图片组件(多图)）
- * @method string upload(string $name = null, string $value, array $inputAttr = [], array $uploadAttr = [], array $chooseAttr = [], array $previewAttr = []) static 上传文件组件
- * @method string uploads(string $name = null, string $value, array $inputAttr = [], array $uploadAttr = [], array $chooseAttr = [], array $previewAttr = []) static 上传文件组件(多文件)）
- * @method string button(string $value = null, array $options = []) static 表单button
+ * @method static string token() 生成Token
+ * @method static string label(string $name, string $value = null, array $options = []) label标签
+ * @method static string input($type, $name, string $value = null, array $options = []) 按类型生成文本框
+ * @method static string text(string $name, string $value = null, array $options = []) 普通文本框
+ * @method static string password(string $name, array $options = []) 密码文本框
+ * @method static string hidden(string $name, string $value = null, array $options = []) 隐藏文本框
+ * @method static string email(string $name, string $value = null, array $options = []) Email文本框
+ * @method static string url(string $name, string $value = null, array $options = []) URL文本框
+ * @method static string file(string $name, array $options = []) 文件上传组件
+ * @method static string textarea(string $name, string $value = null, array $options = []) 多行文本框
+ * @method static string editor(string $name, string $value = null, array $options = []) 富文本编辑器
+ * @method static string select(string $name, array $list = [], string $selected = null, array $options = []) 下拉列表组件
+ * @method static string selects(string $name, array $list = [], string $selected = null, array $options = []) 下拉列表组件(多选)
+ * @method static string selectpicker(string $name, array $list = [], string $selected = null, array $options = []) 下拉列表组件(友好)
+ * @method static string selectpickers(string $name, array $list = [], string $selected = null, array $options = []) 下拉列表组件(友好)(多选)
+ * @method static string selectpage(string $name, string $value, string $url, string $field = null, string $primaryKey = null, array $options = []) 动态下拉列表组件
+ * @method static string selectpages(string $name, string $value, string $url, string $field = null, string $primaryKey = null, array $options = []) 动态下拉列表组件(多选)
+ * @method static string citypicker(string $name, string $value, array $options = []) 城市选择组件
+ * @method static string switcher(string $name, string $value, array $options = []) 切换组件
+ * @method static string datepicker(string $name, string $value, array $options = []) 日期选择组件
+ * @method static string timepicker(string $name, string $value, array $options = []) 时间选择组件
+ * @method static string datetimepicker(string $name, string $value, array $options = []) 日期时间选择组件
+ * @method static string daterange(string $name, string $value, array $options = []) 日期区间组件
+ * @method static string timerange(string $name, string $value, array $options = []) 时间区间组件
+ * @method static string datetimerange(string $name, string $value, array $options = []) 日期时间区间组件
+ * @method static string fieldlist(string $name, string $value, string $title = null, string $template = null, array $options = []) 字段列表组件
+ * @method static string cxselect(string $url, array $names = [], array $values = [], array $options = []) 联动组件
+ * @method static string selectRange(string $name, string $begin, string $end, string $selected = null, array $options = []) 选择数字区间
+ * @method static string selectYear(string $name, string $begin, string $end, string $selected = null, array $options = []) 选择年
+ * @method static string selectMonth(string $name, string $selected = null, array $options = [], string $format = '%m') 选择月
+ * @method static string checkbox(string $name, string $value = '1', string $checked = null, array $options = []) 单个复选框
+ * @method static string checkboxs(string $name, array $list = [], string $checked = null, array $options = []) 一组复选框
+ * @method static string radio(string $name, string $value = null, string $checked = null, array $options = [])) 单个单选框
+ * @method static string radios(string $name, array $list = [], string $checked = null, array $options = [])) 一组单选框
+ * @method static string image(string $name = null, string $value, array $inputAttr = [], array $uploadAttr = [], array $chooseAttr = [], array $previewAttr = []) 上传图片组件
+ * @method static string images(string $name = null, string $value, array $inputAttr = [], array $uploadAttr = [], array $chooseAttr = [], array $previewAttr = []) 上传图片组件(多图)）
+ * @method static string upload(string $name = null, string $value, array $inputAttr = [], array $uploadAttr = [], array $chooseAttr = [], array $previewAttr = []) 上传文件组件
+ * @method static string uploads(string $name = null, string $value, array $inputAttr = [], array $uploadAttr = [], array $chooseAttr = [], array $previewAttr = []) 上传文件组件(多文件)）
+ * @method static string button(string $value = null, array $options = []) 表单button
  */
 class Form
 {
diff --git a/think b/think
index 8afa938affcc48dc7171fe9ab78d5e32ea25e9c6..8eeb81b5747cae9c76e74562de3789494596d3e1 100755
--- a/think
+++ b/think
@@ -14,4 +14,4 @@
 define('APP_PATH', __DIR__ . '/application/');
 
 // 加载框架引导文件
-require './thinkphp/console.php';
\ No newline at end of file
+require __DIR__ . '/thinkphp/console.php';
\ No newline at end of file