diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php
index c0f9b098e0528487ea6d7516e9fcb1021a563f96..67fd3f6f3663473b8c3991dc968cb191c3612b8b 100644
--- a/application/admin/controller/Login.php
+++ b/application/admin/controller/Login.php
@@ -152,7 +152,7 @@ class Login extends Controller
         //存储到redis
         Cache::store('redis')->set($encryptKey,json_encode($user),3600);
 
-        return $data;
+        return json($data);
     }
 
     private function getRandomStr($length = 10){
diff --git a/thinkphp/library/think/Response.php b/thinkphp/library/think/Response.php
index 5fa5402abe9bcee213ccb98ee5be2a47888c392a..3c1bbb04d26bd8f7fbd15e5ecb5356f148e1aa08 100644
--- a/thinkphp/library/think/Response.php
+++ b/thinkphp/library/think/Response.php
@@ -399,7 +399,8 @@ class Response
                 $content,
                 '__toString',
             ])
-            ) {
+            )
+            {
                 throw new \InvalidArgumentException(sprintf('variable type error： %s', gettype($content)));
             }