From ca6989aec5654d80c64104a4a42692ad707cd26c Mon Sep 17 00:00:00 2001
From: pwf0112 <pwf0112@163.com>
Date: Sat, 19 Dec 2015 15:54:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?patchQuery=E6=96=B9=E6=B3=95BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 发生异常回滚缺少返回值
---
 library/traits/model/query.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/traits/model/query.php b/library/traits/model/query.php
index fe589d94..52702d93 100644
--- a/library/traits/model/query.php
+++ b/library/traits/model/query.php
@@ -73,6 +73,7 @@ trait Query
             $this->commit();
         } catch (\think\exception $e) {
             $this->rollback();
+            return false;
         }
         return true;
     }

From 4dc7130dec5dd61ea28710f5b1e09b267d5ec7e1 Mon Sep 17 00:00:00 2001
From: pwf0112 <pwf0112@163.com>
Date: Sat, 19 Dec 2015 18:09:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?Rest=E7=B1=BB=E5=90=8D=E4=B9=A6=E5=86=99?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

类名称书写不符合规范
---
 library/think/controller/rest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/controller/rest.php b/library/think/controller/rest.php
index 028be28c..64bed282 100644
--- a/library/think/controller/rest.php
+++ b/library/think/controller/rest.php
@@ -13,7 +13,7 @@ namespace think\controller;
 
 use think\Response;
 
-abstract class rest
+abstract class Rest
 {
 
     protected $_method = ''; // 当前请求类型