Merge branch 'gq' of http://git.9026.com/roobe/miao

server/app/Http/Controllers/Api/V1/AuthController.php

@@ -30,6 +30,7 @@ class AuthController extends Controller
      * @apiPermission none
      * @apiVersion 0.1.0
      * @apiParam {string}  phone    手机号码
+     * @apiParam {string}  [wechat]    微信openid
      * @apiParam {String}  verify_code  手机验证码
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
@@ -66,7 +67,7 @@ class AuthController extends Controller
      *    1610    SERVICE_CODE_FAILED          验证码错误
      *
      */
-    public function login(Request $request,$openid_webo=null,$type=null) {
+    public function login(Request $request) {
         $validator = Validator::make($request->all(),
             [
                 'phone'         => 'required|regex:/^1[34578]\d{9}$/',
@@ -83,6 +84,7 @@ class AuthController extends Controller
             return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
 
         $phone = $request->phone;
+        $wechat = $request->wechat;
         $key = $this->keySmsCode . $phone;
         $code = Cache::store('file')->get($key);
         $password = 123456;
@@ -96,13 +98,8 @@ class AuthController extends Controller
         if ($status == 0) return $this->error(ErrorCode::LOCK_USER);
         if (Auth::attempt(['phone'=>$phone,'password'=>$password])) {
             $user = Auth::user();
-            if (!empty($openid_webo)) {
-                if ($type == 'wechat') {
-                    $user->wechat =$openid_webo;
-                }
-                if ($type == 'webo') {
-                    $user->webo =$openid_webo;
-                }
+            if (!empty($wechat)) {
+                $user->wechat =$wechat;
                 $user->save();
             }
             \Log::info($user);
@@ -114,7 +111,7 @@ class AuthController extends Controller
     }
 
 
-//    第三方登录  微信、微博
+//    第三方登录  微信
     /**
      * @api {post} /api/auth/wechat_login 微信登陆（login）
      * @apiDescription 微信登陆(login)
@@ -160,65 +157,12 @@ class AuthController extends Controller
             return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
         $user = UserInfoModel::where('wechat',$request->wechat)->first();
         if (empty($user)) {
-           $this->login($request,$request->wechat,'wechat');
+           $this->login($request);
         }else{
             $token = $user->createToken($user->phone)->accessToken;
             return $this->api(compact( 'user', 'code','token'));
         }
     }
-
-    /**
-     * @api {post} /api/auth/webo_login 微博登录
-     * @apiDescription 微博登录
-     * @apiGroup Auth
-     * @apiPermission none
-     * @apiVersion 0.1.0
-     * @apiParam {string}  webo   微博id
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     * {
-     *     "state": true,
-     *     "code": 0,
-     *     "message": "",
-     *     "data": {
-     *         "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"
-     *         }
-     *     }
-     * }
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function weboLogin(Request $request) {
-        $validator = Validator::make($request->all(),
-            [
-                'webo'      => 'required',
-            ],
-            [
-                'webo.required'      => '微博id不存在',
-            ]
-        );
-
-        if ($validator->fails())
-            return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
-        $user = UserInfoModel::where('webo',$request->webo)->first();
-        if (empty($user)) {
-            $this->login($request,$request->webo,'webo');
-        }else{
-            $token = $user->createToken($user->phone)->accessToken;
-            return $this->api(compact( 'user', 'code','token'));
-        }
-    }
-
     /**
      * @api {get} /api/auth/logout 退出(logout)
      * @apiDescription 退出(logout)

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

@@ -42,7 +42,7 @@ class IndexController extends Controller
      *           "deleted_at": null
      *       }
      *   ],
-     *   "dtusers": [                 动态用户
+     *   "users": [                  动态用户
      *       {
      *           "id": 3,
      *           "user_id": 1,
@@ -50,13 +50,12 @@ class IndexController extends Controller
      *           "dream_number": 1,
      *           "created_at": null,
      *           "updated_at": null,
-     *            "other_user": {               动态用户   头像和id
+     *            "other_user": {
      *               "id": 2,
      *               "avatar": "http://www.miao.com/upload/user/20170630/08e235d7211944e9b6482965b4d7c42e.jpg",
      *           }
      *       }
      *  ],
-     *  "hdusers": [],                          互动用户
      *   "dreams": {
      *       "current_page": 1,
      *       "data": [
@@ -122,20 +121,27 @@ class IndexController extends Controller
         $hdusers = CommentInfoModel::where(function ($query) use ($id) {
             $query->where('user_id',$id)->orWhere('to_user_id',$id);
         })->where('is_read',0)->with('to_user')->orderBy('created_at')->get()->toArray();
+        $users = [] ;
+        foreach ($dtusers as $k => $v){
+            $users[] = $v['other_user'];
+        }
+        foreach ($hdusers as $k => $v){
+            $users[] = $v['to_user'];
+        }
         $type = $request->type;
         if ($type == 'trend') {
             $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->whereNotIn('id', $id_arr1)->limit(100)->paginate(20);
             $this->dreams($dreams);
-            return $this->api(compact('dtusers','hdusers','dreams'));
+            return $this->api(compact('users','dreams'));
         } elseif ($type == 'news') {
             $dreams = DreamInfoModel::orderBy('score','desc')->orderBy('created_at','desc')->with('user')->whereNotIn('id', $id_arr2)->limit(500)->paginate(20);
             $this->dreams($dreams);
-            return $this->api(compact('dtusers','hdusers','dreams'));
+            return $this->api(compact('users','dreams'));
         } else{
             $banners = $this->getBanner();
             $dreams = DreamInfoModel::orderBy('score','desc')->with('user')->limit(20)->paginate(20);
             $this->dreams($dreams);
-            return $this->api(compact('banners','dtusers','hdusers','dreams'));
+            return $this->api(compact('banners','users','dreams'));
         }
     }
 

server/app/Repositories/User/Criteria/MultiWhere.php

@@ -46,5 +46,4 @@ class MultiWhere extends Criteria {
           }
          return $model;
     }
-
 }

server/routes/api.php

@@ -60,10 +60,6 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'auth.wechat_login',
         'uses' => 'AuthController@wechatLogin',
     ]);
-    $api->post('auth/webo_login', [
-        'as' => 'auth.webo_login',
-        'uses' => 'AuthController@weboLogin',
-    ]);
     $api->get('auth/logout', [
         'as' => 'auth.logout',
         'uses' => 'AuthController@logout',