登录

app/Http/Controllers/Api/V1/IndexController.php

@@ -208,21 +208,22 @@ class IndexController extends Controller
         if ($validator->fails()) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '传入参数不正确!', $validator->messages());
         }
-        $user = Auth('api')->user();
-        echo 111;
-        dd($user);
+        $userAuth = Auth('api')->user();
+        if(!$userAuth){
+            $msg = 'token已过期，请重新登录';
+            return $this->api($msg);
+        }
+        //echo 111;
         $id = $request->input('id');
 
         $message = MessagesInfoModel::where([['state',0],['id',$id]])->first();
         if(!$message){
-            $data = [
-                'msg' => '该信息不存在或者已完成'
-            ];
-            return $this->api($data);
+            $msg = '该信息不存在或者已完成';
+            return $this->api($msg);
         }
 
         if($message->type ==0) {
-            $user = UserInfoModel::find($this->getUserId());
+            $user = UserInfoModel::find($userAuth->id);
             $followers['messages_id'] = $message->id;
             $followers['user_id'] = $user->id;
             $followers['username'] = $user->nickname;
@@ -233,7 +234,7 @@ class IndexController extends Controller
 
         if($message->type == 2){
             if($message->user_id != $this->getUserId()) {
-                $check_message = MessagesFollowerModel::where([['message_id',$message->id],['user_id',$this->getUserId()],['type',1]])->first();
+                $check_message = MessagesFollowerModel::where([['message_id',$message->id],['user_id',$userAuth->id],['type',1]])->first();
                 if(!$check_message){
                     $message->is_pay = 0;
                 } else {
@@ -289,6 +290,11 @@ class IndexController extends Controller
         if ($validator->fails()) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '传入参数不正确!', $validator->messages());
         }
+        $userAuth = Auth('api')->user();
+        if(!$userAuth){
+            $msg = 'token已过期，请重新登录';
+            return $this->api($msg);
+        }
         $id = $request->input('id');
         $type = $request->input('type');
         $message = MessagesInfoModel::where([['id',$id],['type',$type],['state',0]])->first();
@@ -297,12 +303,12 @@ class IndexController extends Controller
             return $this->api($msg);
         }
 
-        $check_is_buy = MessagesFollowerModel::where([['user_id',$this->getUserId()],['messages_id',$message->id]])->first();
+        $check_is_buy = MessagesFollowerModel::where([['user_id',$userAuth->id],['messages_id',$message->id]])->first();
         if($check_is_buy){
             $msg = '您已获取该知识，请勿重复操作';
             return $this->api($msg);
         }
-        $user = UserInfoModel::find($this->getUserId());
+        $user = UserInfoModel::find($userAuth->id);
         if($type == 2) {
             DB::beginTransaction();
             $out_trade_no = 'We'.date('YmdHis').rand(1000,9999);
@@ -319,7 +325,7 @@ class IndexController extends Controller
             //dd(111);
             $save['openid'] = $user->openid;
             $save['out_trade_no'] = $out_trade_no;
-            $save['user_id'] = $this->getUserId();
+            $save['user_id'] = $userAuth->id;
             $save['to_user'] = $message->user_id;
             $save['price'] = $message->price;
             $save['type'] = 2;

app/Http/Controllers/Api/V1/LoginController.php

@@ -43,20 +43,9 @@ class LoginController extends Controller
      * {
      *     "state": true,
      *     "code": 0,
-     *     "message": "",
-     *     "data": {
+     *     "message": {
      *         "token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjdjYWUyYzFmYTUwMTIyZDI0ZTRiYTZhZGZhNmQxYmZlOWNiMzIxMTBmYWJlZjNjYzIyNmViZjRmNGExNWM3NjllNmU2ZTNiYWE5OGNhOWUzIn0.eyJhdWQiOiIxIiwianRpIjoiN2NhZTJjMWZhNTAxMjJkMjRlNGJhNmFkZmE2ZDFiZmU5Y2IzMjExMGZhYmVmM2NjMjI2ZWJmNGY0YTE1Yzc2OWU2ZTZlM2JhYTk4Y2E5ZTMiLCJpYXQiOjE0NzU0MTE1NTgsIm5iZiI6MTQ3NTQxMTU1OCwiZXhwIjo0NjMxMDg1MTU4LCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.E9YGEzuRUOk02aV1EiWLJ_pD0hKoCyW0k_sGy63hM3u5X8K_HI1kVhaU6JNLqLZeszIAroTEDB8XMgZKAqTLlwtL8PLCJcuDoxfk1BRHbfjhDheTsahBysKGalvNEpzRCrGlao0mS0Cg9qDpEsndtypPFS8sfaflToOzbJjiSK2DvQiHSH8xZI3zHJTezgZMz-pB_hPTxp8ajdv0ve1gWtWjs3vERr0Y91X4hngO8X7LuXtAYtfxGZRIye12YE7TuLBMYzj8CCfiRt7Smhyf4palNW5mzKlZpa2l87n6NQ14Iy4oMzQ2PON1j_swrosuE2yZohGOn6fDdSCBRdJ6dLD_emjBdQCQOoB63R7BbhFZgvFX25TjzFJ7r9AdVMiGmebuRKEVSZV_JCGu1C71OIbQk-UK35s00gSr2fmJGBbN2cZTXBRTJpfuMZ_ihFYEZrvVq_Ih2X0xkd36JUuxaUld1BXRgPZvH-9jBuhe0YW2OOlgwpdm6ZB8BMcuS4ftLoi6FipgzFqfIuy-0ZqPMDnJaG7Gycrdpxza00mgOFxYxJtqwZNsUWFRZEVU881l6VC_cy294YXSPQxUwEoyKg-G5Pm8AEB9bqv5z4EU4B8-XTd3zKNqtNba_snHbc711i4EytCiZfYSjNB1hwenq45YYOAhPTwOpFI0kxyRazc",
-     *         "user": {
-     *             "id": 1,
-     *             "name": "15888888888",
-     *             "email": "abcdefg@gmail.com",
-     *             "type": 2,
-     *             "phone": "15888888888",
-     *             "avatar": null,
-     *             "last_ip": null,
-     *             "created_at": "2016-09-30 00:45:13",
-     *             "updated_at": "2016-09-29 16:43:36"
-     *         }
+     *         "msg": '登录成功'
      *     }
      * }
      * @apiErrorExample {json} Error-Response:
@@ -74,27 +63,26 @@ class LoginController extends Controller
     public function login(Request $request)
     {
         $data = $request->input();
-       /* $app = Factory::miniProgram($this->config);
+        $app = Factory::miniProgram($this->config);
         $res = $app->auth->session($data['code']);
         if (!$res || empty($res['openid'])) {
-            $user= [
+            $message= [
                 'code' => 1,
                 'msg' => '获取用户OpenId失败',
                 'data' => $res,
             ];
-            return $this->api($user);
-        }*/
+            return $this->api($message);
+        }
         $check_user = UserInfoModel::where('openid',$data['openid'])->first();
         //dd($check_user);
         if($check_user && Auth::loginUsingId($check_user->id)) {
             $user = Auth::user();
             $success['token'] =  $user->createToken($user->id . '-' . $user->openid)->accessToken;
-            $save['nickname'] = preg_replace('/[\xf0-\xf7].{3}/', '', $data['nickname']);
+            $save['nickname'] = preg_replace('/[\xf0-\xf7].{3}/', '', $res['nickname']);
             $save['avatar'] = $data['avatar'];
-            $save['remember_token'] = $success['token'];
-            $res = UserInfoModel::where('openid',$data['openid'])->update($save);
+            $query = UserInfoModel::where('openid',$res['openid'])->update($save);
             //echo 111;die;
-            if($res){
+            if($query){
                 $message = [
                     'msg'=>'登录成功',
                     'token'=>$success['token'],
@@ -104,12 +92,11 @@ class LoginController extends Controller
             }
         }else {
             $add['nickname'] = preg_replace('/[\xf0-\xf7].{3}/', '', $data['nickname']);
-            $add['wechat_open_id'] = $data['openid'];
+            $add['wechat_open_id'] = $res['openid'];
             $add['avatar'] = $data['avatar'];
-            //$add['remember_token'] = $success['token'];
             $res_add = UserInfoModel::create($add);
             if($res_add){
-                $data_user = UserInfoModel::where('openid',$data['openid'])->first();
+                $data_user = UserInfoModel::where('openid',$res['openid'])->first();
                 if(Auth::loginUsingId($data_user->id)){
                     $user = Auth::user();
                     $success['token'] =  $user->createToken($user->id . '-' . $user->openid)->accessToken;

app/Http/Controllers/Api/V1/UserController.php

@@ -72,6 +72,11 @@ class UserController extends Controller
         if ($validator->fails()) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '传入参数不正确!', $validator->messages());
         }
+        $userAuth = Auth('api')->user();
+        if(!$userAuth){
+            $msg = 'token已过期，请重新登录';
+            return $this->api($msg);
+        }
         DB::beginTransaction();
         $data = $request->input();
         $tag = $data['tag'];
@@ -86,7 +91,7 @@ class UserController extends Controller
         $content['pic_url']  = $data['pic_url'];
         $content['sort'] = 1;
         $content['state'] = 0;
-        $user = UserInfoModel::find($this->getUserId());
+        $user = UserInfoModel::find($userAuth->id);
         $content['phone'] = $user->mobile;
         $content['user_id'] = $user->id;
         $create_res = MessagesInfoModel::create($content);
@@ -107,7 +112,7 @@ class UserController extends Controller
             $save['out_trade_no'] = $out_trade_no;
             $save['to_user'] = 0;
             $save['msg_id'] = $create_res->id;
-            $save['user_id'] = $this->getUserId();
+            $save['user_id'] = $userAuth->id;
             $save['price'] = $data['price'];
             $save['type'] = 3;
             $res = PaymentInfoModel::create($save);
@@ -178,15 +183,20 @@ class UserController extends Controller
         if ($validator->fails()) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '传入参数不正确!', $validator->messages());
         }
+        $userAuth = Auth('api')->user();
+        if(!$userAuth){
+            $msg = 'token已过期，请重新登录';
+            return $this->api($msg);
+        }
         $data = $request->input();
         //dd($data);
-        $check = FavoriteModel::where([['user_id',$this->getUserId()],['messages_id',$data['messages_id']]])->first();
+        $check = FavoriteModel::where([['user_id',$userAuth->id],['messages_id',$data['messages_id']]])->first();
         if($data['type'] == 1) {
             if($check){
                 $msg = '已添加收藏，请勿重复操作';
                 return $this->api(compact('msg'));
             }
-            $save['user_id'] = $this->getUserId();
+            $save['user_id'] = $userAuth->id;
             $save['messages_id'] = $data['messages_id'];
             $res = FavoriteModel::create($save);
             if($res){
@@ -245,7 +255,12 @@ class UserController extends Controller
 
     public function userFavorite(Request $request)
     {
-        $data = FavoriteModel::where('user_id',$this->getUserId())->paginate(5);
+        $userAuth = Auth('api')->user();
+        if(!$userAuth){
+            $msg = 'token已过期，请重新登录';
+            return $this->api($msg);
+        }
+        $data = FavoriteModel::where('user_id',$userAuth->id)->paginate(5);
         $messages = array();
         foreach ($data as $key=>$val){
             $messages[] = MessagesInfoModel::where('id',$val['messages_id'])->select('id','title','type')->first();
@@ -297,11 +312,16 @@ class UserController extends Controller
         if ($validator->fails()) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '传入参数不正确!', $validator->messages());
         }
+        $userAuth = Auth('api')->user();
+        if(!$userAuth){
+            $msg = 'token已过期，请重新登录';
+            return $this->api($msg);
+        }
         $state = $request->input('state');
         if(!empty($state)){
-            $messages = MessagesInfoModel::where([['user_id',$this->getUserId()],['type',$state]])->select('id','title','type')->paginate(5);
+            $messages = MessagesInfoModel::where([['user_id',$userAuth->id],['type',$state]])->select('id','title','type')->paginate(5);
         } else {
-            $messages = MessagesInfoModel::where([['user_id',$this->getUserId()]])->select('id','title','type')->paginate(5);
+            $messages = MessagesInfoModel::where([['user_id',$userAuth->id]])->select('id','title','type')->paginate(5);
         }
         return $this->api(compact('messages'));
     }
@@ -350,11 +370,16 @@ class UserController extends Controller
         if ($validator->fails()) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '传入参数不正确!', $validator->messages());
         }
+        $userAuth = Auth('api')->user();
+        if(!$userAuth){
+            $msg = 'token已过期，请重新登录';
+            return $this->api($msg);
+        }
         $state = $request->input('state');
         if(!empty($state)){
-            $messages = MessagesFollowerModel::where([['user_id',$this->getUserId()]])->infos()->where('type',$state)->paginate(5);
+            $messages = MessagesFollowerModel::where([['user_id',$userAuth->id]])->infos()->where('type',$state)->paginate(5);
         } else {
-            $messages = MessagesFollowerModel::where([['user_id',$this->getUserId()]])->infos()->paginate(5);
+            $messages = MessagesFollowerModel::where([['user_id',$userAuth->id]])->infos()->paginate(5);
         }
         return $this->api(compact('messages'));
     }
@@ -482,10 +507,15 @@ class UserController extends Controller
         if ($validator->fails()) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '传入参数不正确!', $validator->messages());
         }
+        $userAuth = Auth('api')->user();
+        if(!$userAuth){
+            $msg = 'token已过期，请重新登录';
+            return $this->api($msg);
+        }
         $followers_id = $request->input('follower_id');
         $message_id = $request->input('message_id');
         $messages_followers = MessagesFollowerModel::find($followers_id);
-        $messages = MessagesInfoModel::where([['id'=>$messages_followers->messages_id],['type',1],['state',0]])->first();
+        $messages = MessagesInfoModel::where([['id'=>$messages_followers->messages_id],['type',1],['state',0],['user_id',$userAuth->id]])->first();
         if(!$messages||$message_id!=$messages->id){
             $data['msg'] = '该知识不存在，或者已完成';
             $data['code'] = 0;

public/apidoc/api_data.js

@@ -147,67 +147,6 @@ define({ "api": [
     "groupTitle": "Attachment",
     "name": "PostApiAttachmentUpload"
   },
-  {
-    "type": "post",
-    "url": "/api//login",
-    "title": "登陆（login）",
-    "description": "<p>登陆(login)login</p>",
-    "group": "Auth",
-    "permission": [
-      {
-        "name": "none"
-      }
-    ],
-    "version": "0.1.0",
-    "parameter": {
-      "fields": {
-        "Parameter": [
-          {
-            "group": "Parameter",
-            "type": "string",
-            "optional": false,
-            "field": "nickname",
-            "description": "<p>手机号码</p>"
-          },
-          {
-            "group": "Parameter",
-            "type": "string",
-            "optional": false,
-            "field": "avatar",
-            "description": ""
-          },
-          {
-            "group": "Parameter",
-            "type": "string",
-            "optional": false,
-            "field": "password",
-            "description": "<p>password</p>"
-          }
-        ]
-      }
-    },
-    "success": {
-      "examples": [
-        {
-          "title": "Success-Response:",
-          "content": "HTTP/1.1 200 OK\n{\n    \"state\": true,\n    \"code\": 0,\n    \"message\": \"\",\n    \"data\": {\n        \"token\": \"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjdjYWUyYzFmYTUwMTIyZDI0ZTRiYTZhZGZhNmQxYmZlOWNiMzIxMTBmYWJlZjNjYzIyNmViZjRmNGExNWM3NjllNmU2ZTNiYWE5OGNhOWUzIn0.eyJhdWQiOiIxIiwianRpIjoiN2NhZTJjMWZhNTAxMjJkMjRlNGJhNmFkZmE2ZDFiZmU5Y2IzMjExMGZhYmVmM2NjMjI2ZWJmNGY0YTE1Yzc2OWU2ZTZlM2JhYTk4Y2E5ZTMiLCJpYXQiOjE0NzU0MTE1NTgsIm5iZiI6MTQ3NTQxMTU1OCwiZXhwIjo0NjMxMDg1MTU4LCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.E9YGEzuRUOk02aV1EiWLJ_pD0hKoCyW0k_sGy63hM3u5X8K_HI1kVhaU6JNLqLZeszIAroTEDB8XMgZKAqTLlwtL8PLCJcuDoxfk1BRHbfjhDheTsahBysKGalvNEpzRCrGlao0mS0Cg9qDpEsndtypPFS8sfaflToOzbJjiSK2DvQiHSH8xZI3zHJTezgZMz-pB_hPTxp8ajdv0ve1gWtWjs3vERr0Y91X4hngO8X7LuXtAYtfxGZRIye12YE7TuLBMYzj8CCfiRt7Smhyf4palNW5mzKlZpa2l87n6NQ14Iy4oMzQ2PON1j_swrosuE2yZohGOn6fDdSCBRdJ6dLD_emjBdQCQOoB63R7BbhFZgvFX25TjzFJ7r9AdVMiGmebuRKEVSZV_JCGu1C71OIbQk-UK35s00gSr2fmJGBbN2cZTXBRTJpfuMZ_ihFYEZrvVq_Ih2X0xkd36JUuxaUld1BXRgPZvH-9jBuhe0YW2OOlgwpdm6ZB8BMcuS4ftLoi6FipgzFqfIuy-0ZqPMDnJaG7Gycrdpxza00mgOFxYxJtqwZNsUWFRZEVU881l6VC_cy294YXSPQxUwEoyKg-G5Pm8AEB9bqv5z4EU4B8-XTd3zKNqtNba_snHbc711i4EytCiZfYSjNB1hwenq45YYOAhPTwOpFI0kxyRazc\",\n        \"user\": {\n            \"id\": 1,\n            \"name\": \"15888888888\",\n            \"email\": \"abcdefg@gmail.com\",\n            \"type\": 2,\n            \"phone\": \"15888888888\",\n            \"avatar\": null,\n            \"last_ip\": null,\n            \"created_at\": \"2016-09-30 00:45:13\",\n            \"updated_at\": \"2016-09-29 16:43:36\"\n        }\n    }\n}",
-          "type": "json"
-        }
-      ]
-    },
-    "error": {
-      "examples": [
-        {
-          "title": "Error-Response:",
-          "content": "HTTP/1.1 400 Bad Request\n{\n    \"state\": false,\n    \"code\": 1000,\n    \"message\": \"传入参数不正确\",\n    \"data\": null or []\n}\n可能出现的错误代码：\n   1000    CLIENT_WRONG_PARAMS             传入参数不正确\n   1102    INCORRECT_USER_OR_PASS          用户名或密码不正确",
-          "type": "json"
-        }
-      ]
-    },
-    "filename": "app/Http/Controllers/Api/V1/LoginController.php",
-    "groupTitle": "Auth",
-    "name": "PostApiLogin"
-  },
   {
     "type": "get",
     "url": "/api/index/get_message",
@@ -403,6 +342,67 @@ define({ "api": [
     "groupTitle": "Index",
     "name": "GetApiIndexTag"
   },
+  {
+    "type": "post",
+    "url": "/api/login",
+    "title": "登陆（login）",
+    "description": "<p>登陆(login)login</p>",
+    "group": "Login",
+    "permission": [
+      {
+        "name": "none"
+      }
+    ],
+    "version": "0.1.0",
+    "parameter": {
+      "fields": {
+        "Parameter": [
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": false,
+            "field": "nickname",
+            "description": "<p>手机号码</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": false,
+            "field": "avatar",
+            "description": ""
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": false,
+            "field": "password",
+            "description": "<p>password</p>"
+          }
+        ]
+      }
+    },
+    "success": {
+      "examples": [
+        {
+          "title": "Success-Response:",
+          "content": "HTTP/1.1 200 OK\n{\n    \"state\": true,\n    \"code\": 0,\n    \"message\": {\n        \"token\": \"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjdjYWUyYzFmYTUwMTIyZDI0ZTRiYTZhZGZhNmQxYmZlOWNiMzIxMTBmYWJlZjNjYzIyNmViZjRmNGExNWM3NjllNmU2ZTNiYWE5OGNhOWUzIn0.eyJhdWQiOiIxIiwianRpIjoiN2NhZTJjMWZhNTAxMjJkMjRlNGJhNmFkZmE2ZDFiZmU5Y2IzMjExMGZhYmVmM2NjMjI2ZWJmNGY0YTE1Yzc2OWU2ZTZlM2JhYTk4Y2E5ZTMiLCJpYXQiOjE0NzU0MTE1NTgsIm5iZiI6MTQ3NTQxMTU1OCwiZXhwIjo0NjMxMDg1MTU4LCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.E9YGEzuRUOk02aV1EiWLJ_pD0hKoCyW0k_sGy63hM3u5X8K_HI1kVhaU6JNLqLZeszIAroTEDB8XMgZKAqTLlwtL8PLCJcuDoxfk1BRHbfjhDheTsahBysKGalvNEpzRCrGlao0mS0Cg9qDpEsndtypPFS8sfaflToOzbJjiSK2DvQiHSH8xZI3zHJTezgZMz-pB_hPTxp8ajdv0ve1gWtWjs3vERr0Y91X4hngO8X7LuXtAYtfxGZRIye12YE7TuLBMYzj8CCfiRt7Smhyf4palNW5mzKlZpa2l87n6NQ14Iy4oMzQ2PON1j_swrosuE2yZohGOn6fDdSCBRdJ6dLD_emjBdQCQOoB63R7BbhFZgvFX25TjzFJ7r9AdVMiGmebuRKEVSZV_JCGu1C71OIbQk-UK35s00gSr2fmJGBbN2cZTXBRTJpfuMZ_ihFYEZrvVq_Ih2X0xkd36JUuxaUld1BXRgPZvH-9jBuhe0YW2OOlgwpdm6ZB8BMcuS4ftLoi6FipgzFqfIuy-0ZqPMDnJaG7Gycrdpxza00mgOFxYxJtqwZNsUWFRZEVU881l6VC_cy294YXSPQxUwEoyKg-G5Pm8AEB9bqv5z4EU4B8-XTd3zKNqtNba_snHbc711i4EytCiZfYSjNB1hwenq45YYOAhPTwOpFI0kxyRazc\",\n        \"msg\": '登录成功'\n    }\n}",
+          "type": "json"
+        }
+      ]
+    },
+    "error": {
+      "examples": [
+        {
+          "title": "Error-Response:",
+          "content": "HTTP/1.1 400 Bad Request\n{\n    \"state\": false,\n    \"code\": 1000,\n    \"message\": \"传入参数不正确\",\n    \"data\": null or []\n}\n可能出现的错误代码：\n   1000    CLIENT_WRONG_PARAMS             传入参数不正确\n   1102    INCORRECT_USER_OR_PASS          用户名或密码不正确",
+          "type": "json"
+        }
+      ]
+    },
+    "filename": "app/Http/Controllers/Api/V1/LoginController.php",
+    "groupTitle": "Login",
+    "name": "PostApiLogin"
+  },
   {
     "type": "get",
     "url": "/api/user/complete_message",

public/apidoc/api_data.json

@@ -147,67 +147,6 @@
     "groupTitle": "Attachment",
     "name": "PostApiAttachmentUpload"
   },
-  {
-    "type": "post",
-    "url": "/api//login",
-    "title": "登陆（login）",
-    "description": "<p>登陆(login)login</p>",
-    "group": "Auth",
-    "permission": [
-      {
-        "name": "none"
-      }
-    ],
-    "version": "0.1.0",
-    "parameter": {
-      "fields": {
-        "Parameter": [
-          {
-            "group": "Parameter",
-            "type": "string",
-            "optional": false,
-            "field": "nickname",
-            "description": "<p>手机号码</p>"
-          },
-          {
-            "group": "Parameter",
-            "type": "string",
-            "optional": false,
-            "field": "avatar",
-            "description": ""
-          },
-          {
-            "group": "Parameter",
-            "type": "string",
-            "optional": false,
-            "field": "password",
-            "description": "<p>password</p>"
-          }
-        ]
-      }
-    },
-    "success": {
-      "examples": [
-        {
-          "title": "Success-Response:",
-          "content": "HTTP/1.1 200 OK\n{\n    \"state\": true,\n    \"code\": 0,\n    \"message\": \"\",\n    \"data\": {\n        \"token\": \"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjdjYWUyYzFmYTUwMTIyZDI0ZTRiYTZhZGZhNmQxYmZlOWNiMzIxMTBmYWJlZjNjYzIyNmViZjRmNGExNWM3NjllNmU2ZTNiYWE5OGNhOWUzIn0.eyJhdWQiOiIxIiwianRpIjoiN2NhZTJjMWZhNTAxMjJkMjRlNGJhNmFkZmE2ZDFiZmU5Y2IzMjExMGZhYmVmM2NjMjI2ZWJmNGY0YTE1Yzc2OWU2ZTZlM2JhYTk4Y2E5ZTMiLCJpYXQiOjE0NzU0MTE1NTgsIm5iZiI6MTQ3NTQxMTU1OCwiZXhwIjo0NjMxMDg1MTU4LCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.E9YGEzuRUOk02aV1EiWLJ_pD0hKoCyW0k_sGy63hM3u5X8K_HI1kVhaU6JNLqLZeszIAroTEDB8XMgZKAqTLlwtL8PLCJcuDoxfk1BRHbfjhDheTsahBysKGalvNEpzRCrGlao0mS0Cg9qDpEsndtypPFS8sfaflToOzbJjiSK2DvQiHSH8xZI3zHJTezgZMz-pB_hPTxp8ajdv0ve1gWtWjs3vERr0Y91X4hngO8X7LuXtAYtfxGZRIye12YE7TuLBMYzj8CCfiRt7Smhyf4palNW5mzKlZpa2l87n6NQ14Iy4oMzQ2PON1j_swrosuE2yZohGOn6fDdSCBRdJ6dLD_emjBdQCQOoB63R7BbhFZgvFX25TjzFJ7r9AdVMiGmebuRKEVSZV_JCGu1C71OIbQk-UK35s00gSr2fmJGBbN2cZTXBRTJpfuMZ_ihFYEZrvVq_Ih2X0xkd36JUuxaUld1BXRgPZvH-9jBuhe0YW2OOlgwpdm6ZB8BMcuS4ftLoi6FipgzFqfIuy-0ZqPMDnJaG7Gycrdpxza00mgOFxYxJtqwZNsUWFRZEVU881l6VC_cy294YXSPQxUwEoyKg-G5Pm8AEB9bqv5z4EU4B8-XTd3zKNqtNba_snHbc711i4EytCiZfYSjNB1hwenq45YYOAhPTwOpFI0kxyRazc\",\n        \"user\": {\n            \"id\": 1,\n            \"name\": \"15888888888\",\n            \"email\": \"abcdefg@gmail.com\",\n            \"type\": 2,\n            \"phone\": \"15888888888\",\n            \"avatar\": null,\n            \"last_ip\": null,\n            \"created_at\": \"2016-09-30 00:45:13\",\n            \"updated_at\": \"2016-09-29 16:43:36\"\n        }\n    }\n}",
-          "type": "json"
-        }
-      ]
-    },
-    "error": {
-      "examples": [
-        {
-          "title": "Error-Response:",
-          "content": "HTTP/1.1 400 Bad Request\n{\n    \"state\": false,\n    \"code\": 1000,\n    \"message\": \"传入参数不正确\",\n    \"data\": null or []\n}\n可能出现的错误代码：\n   1000    CLIENT_WRONG_PARAMS             传入参数不正确\n   1102    INCORRECT_USER_OR_PASS          用户名或密码不正确",
-          "type": "json"
-        }
-      ]
-    },
-    "filename": "app/Http/Controllers/Api/V1/LoginController.php",
-    "groupTitle": "Auth",
-    "name": "PostApiLogin"
-  },
   {
     "type": "get",
     "url": "/api/index/get_message",
@@ -403,6 +342,67 @@
     "groupTitle": "Index",
     "name": "GetApiIndexTag"
   },
+  {
+    "type": "post",
+    "url": "/api/login",
+    "title": "登陆（login）",
+    "description": "<p>登陆(login)login</p>",
+    "group": "Login",
+    "permission": [
+      {
+        "name": "none"
+      }
+    ],
+    "version": "0.1.0",
+    "parameter": {
+      "fields": {
+        "Parameter": [
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": false,
+            "field": "nickname",
+            "description": "<p>手机号码</p>"
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": false,
+            "field": "avatar",
+            "description": ""
+          },
+          {
+            "group": "Parameter",
+            "type": "string",
+            "optional": false,
+            "field": "password",
+            "description": "<p>password</p>"
+          }
+        ]
+      }
+    },
+    "success": {
+      "examples": [
+        {
+          "title": "Success-Response:",
+          "content": "HTTP/1.1 200 OK\n{\n    \"state\": true,\n    \"code\": 0,\n    \"message\": {\n        \"token\": \"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImp0aSI6IjdjYWUyYzFmYTUwMTIyZDI0ZTRiYTZhZGZhNmQxYmZlOWNiMzIxMTBmYWJlZjNjYzIyNmViZjRmNGExNWM3NjllNmU2ZTNiYWE5OGNhOWUzIn0.eyJhdWQiOiIxIiwianRpIjoiN2NhZTJjMWZhNTAxMjJkMjRlNGJhNmFkZmE2ZDFiZmU5Y2IzMjExMGZhYmVmM2NjMjI2ZWJmNGY0YTE1Yzc2OWU2ZTZlM2JhYTk4Y2E5ZTMiLCJpYXQiOjE0NzU0MTE1NTgsIm5iZiI6MTQ3NTQxMTU1OCwiZXhwIjo0NjMxMDg1MTU4LCJzdWIiOiIxIiwic2NvcGVzIjpbXX0.E9YGEzuRUOk02aV1EiWLJ_pD0hKoCyW0k_sGy63hM3u5X8K_HI1kVhaU6JNLqLZeszIAroTEDB8XMgZKAqTLlwtL8PLCJcuDoxfk1BRHbfjhDheTsahBysKGalvNEpzRCrGlao0mS0Cg9qDpEsndtypPFS8sfaflToOzbJjiSK2DvQiHSH8xZI3zHJTezgZMz-pB_hPTxp8ajdv0ve1gWtWjs3vERr0Y91X4hngO8X7LuXtAYtfxGZRIye12YE7TuLBMYzj8CCfiRt7Smhyf4palNW5mzKlZpa2l87n6NQ14Iy4oMzQ2PON1j_swrosuE2yZohGOn6fDdSCBRdJ6dLD_emjBdQCQOoB63R7BbhFZgvFX25TjzFJ7r9AdVMiGmebuRKEVSZV_JCGu1C71OIbQk-UK35s00gSr2fmJGBbN2cZTXBRTJpfuMZ_ihFYEZrvVq_Ih2X0xkd36JUuxaUld1BXRgPZvH-9jBuhe0YW2OOlgwpdm6ZB8BMcuS4ftLoi6FipgzFqfIuy-0ZqPMDnJaG7Gycrdpxza00mgOFxYxJtqwZNsUWFRZEVU881l6VC_cy294YXSPQxUwEoyKg-G5Pm8AEB9bqv5z4EU4B8-XTd3zKNqtNba_snHbc711i4EytCiZfYSjNB1hwenq45YYOAhPTwOpFI0kxyRazc\",\n        \"msg\": '登录成功'\n    }\n}",
+          "type": "json"
+        }
+      ]
+    },
+    "error": {
+      "examples": [
+        {
+          "title": "Error-Response:",
+          "content": "HTTP/1.1 400 Bad Request\n{\n    \"state\": false,\n    \"code\": 1000,\n    \"message\": \"传入参数不正确\",\n    \"data\": null or []\n}\n可能出现的错误代码：\n   1000    CLIENT_WRONG_PARAMS             传入参数不正确\n   1102    INCORRECT_USER_OR_PASS          用户名或密码不正确",
+          "type": "json"
+        }
+      ]
+    },
+    "filename": "app/Http/Controllers/Api/V1/LoginController.php",
+    "groupTitle": "Login",
+    "name": "PostApiLogin"
+  },
   {
     "type": "get",
     "url": "/api/user/complete_message",

public/apidoc/api_project.js

@@ -9,7 +9,7 @@ define({
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2018-07-20T02:31:16.691Z",
+    "time": "2018-07-25T09:17:05.790Z",
     "url": "http://apidocjs.com",
     "version": "0.17.6"
   }

public/apidoc/api_project.json

@@ -9,7 +9,7 @@
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2018-07-20T02:31:16.691Z",
+    "time": "2018-07-25T09:17:05.790Z",
     "url": "http://apidocjs.com",
     "version": "0.17.6"
   }