Merge branch 'dev'

orvice · Mar 28, 2016 · 0170756 · 0170756
2 parents cd14fc4 + 82e929c
commit 0170756
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/app/Controllers/AuthController.php b/app/Controllers/AuthController.php
@@ -32,14 +32,14 @@ public function loginHandle($request, $response, $args)
         $user = User::where('email', '=', $email)->first();
 
         if ($user == null) {
-            $rs['ret'] = 0;
-            $rs['msg'] = "401 邮箱或者密码错误";
+            $res['ret'] = 0;
+            $res['msg'] = "401 邮箱或者密码错误";
             return $this->echoJson($response, $res);
         }
 
         if (!Hash::checkPassword($user->pass, $passwd)) {
-            $rs['ret'] = 0;
-            $rs['msg'] = "402 邮箱或者密码错误";
+            $res['ret'] = 0;
+            $res['msg'] = "402 邮箱或者密码错误";
             return $this->echoJson($response, $res);
         }
         // @todo
@@ -48,8 +48,8 @@ public function loginHandle($request, $response, $args)
             $time = 3600 * 24 * 7;
         }
         Auth::login($user->id, $time);
-        $rs['ret'] = 1;
-        $rs['msg'] = "欢迎回来";
+        $res['ret'] = 1;
+        $res['msg'] = "欢迎回来";
         return $this->echoJson($response, $res);
     }
 

diff --git a/bootstrap.php b/bootstrap.php
@@ -11,7 +11,7 @@
 
 //  BASE_PATH
 define('BASE_PATH', __DIR__);
-define('VERSION', '3.3.5');
+define('VERSION', '3.3.6');
 
 // Vendor Autoload
 require BASE_PATH . '/vendor/autoload.php';