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

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

@@ -61,8 +61,8 @@ class HomeController extends Controller
     public function index(Request $request)
     {
         $user_id = $request->user_id;
-        $care = UserCareUser::where('user_id',$user_id)->get();
-        $fens = UserCareUser::where('other_user_id',$user_id)->get();
+        $care = UserCareUser::where('user_id',$user_id)->paginate(20);
+        $fens = UserCareUser::where('other_user_id',$user_id)->paginate(20);
         $user = UserInfoModel::find($user_id);
         if (count($user == 0)) return $this->error(ErrorCode::USER_DOES_NOT_EXIST);
         $job = BaseSettingsModel::where(['category' => 'job'])->where(['key' => $user->job])->first();
@@ -73,7 +73,7 @@ class HomeController extends Controller
         $near_dream_id = UserDream::where('user_id',$user_id)->orderBy('id','desc')->first()->dream_id;
         $near_dream =DreamInfoModel::find($near_dream_id);
 //         封面图片
-        $near_dream_pic = DreamImages::where('dream_id',$near_dream_id)->select('pic')->get();
+        $near_dream_pic = DreamImages::where('dream_id',$near_dream_id)->select('pic')->paginate(20);
 //        曾经的梦想
         $dreams = $user->UserDream;
 

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

@@ -67,7 +67,7 @@ class IndexController extends Controller
             }
         }
 //        获取其他用户信息 及梦想
-        $dreams = DreamInfoModel::orderBy('score','desc')->limit(20)->get();
+        $dreams = DreamInfoModel::orderBy('score','desc')->limit(20)->paginate(20);
         $this->dreams($dreams);
         return $this->api(compact('banner','other_user','dreams'));
     }
@@ -117,6 +117,7 @@ class IndexController extends Controller
 //        关注的用户
         $arr =  $user->UserCareUser;
         $other_user = [] ;
+
         foreach ($arr as $k => $v){
             if ($v->pivot->dream_num > 0) {
                 $v->news_num = $v->pivot->dream_num;
@@ -124,7 +125,7 @@ class IndexController extends Controller
             }
         }
 //        获取其他用户信息 及梦想
-        $dreams = DreamInfoModel::orderBy('score','desc')->offset(20)->limit(100)->get();
+        $dreams = DreamInfoModel::orderBy('score','desc')->offset(20)->limit(100)->paginate(20);
         $this->dreams($dreams);
         return $this->api(compact('other_user','dreams'));
     }
@@ -181,7 +182,7 @@ class IndexController extends Controller
             }
         }
 //        获取其他用户信息 及梦想
-        $dreams = DreamInfoModel::orderBy('score','desc')->offset(100)->limit(500)->get();
+        $dreams = DreamInfoModel::orderBy('score','desc')->offset(100)->limit(500)->paginate(20);
         $this->dreams($dreams);
         return $this->api(compact('other_user','dreams'));
     }
@@ -235,15 +236,15 @@ class IndexController extends Controller
     {
         $user = $this->getUser();
         $keyword ='%'.$request->keyword.'%';
-        $data1 = UserInfoModel::where('nickname','like',$keyword)->get();
+        $data1 = UserInfoModel::where('nickname','like',$keyword)->paginate(20);
         $data2 = DreamInfoModel::where('dream','like',$keyword)->
-            orWhere('dream','like',$keyword)->get();
-        $data3  = BaseSettingsModel::where('category','sign')->where('value','like',$keyword)->get();
+            orWhere('dream','like',$keyword)->paginate(20);
+        $data3  = BaseSettingsModel::where('category','sign')->where('value','like',$keyword)->paginate(20);
         if (empty($request->keyword)) {
 //            历史搜索
-                $data1  = $user->search()->orderBy('id','desc')->limit(10)->get();
+                $data1  = $user->search()->orderBy('id','desc')->limit(10)->paginate(20);
 //            热门搜索
-                $data2 = SearchInfoModel::get();
+                $data2 = SearchInfoModel::paginate(20);
                 $arr = [];
                 foreach ($data2 as $k => $v) {
                     if (count($arr) == 8) {
@@ -292,7 +293,7 @@ class IndexController extends Controller
             return $this->api('');
         }
         $keyword ='%'.$request->keyword.'%';
-        $data1 = UserInfoModel::where('nickname','like',$keyword)->get();
+        $data1 = UserInfoModel::where('nickname','like',$keyword)->paginate(20);
           return $this->api(compact('data1'));
     }
 
@@ -333,7 +334,7 @@ class IndexController extends Controller
         }
         $keyword ='%'.$request->keyword.'%';
         $data = DreamInfoModel::where('dream','like',$keyword)->
-        orWhere('dream','like',$keyword)->get();
+        orWhere('dream','like',$keyword)->paginate(20);
         foreach ($data as $k => $value) {
             $value->user_pic = $value->dreamFindUser;
             $value->dream_img = $value->dreamImgsFirst->pic;
@@ -345,7 +346,7 @@ class IndexController extends Controller
     public function getBanner()
     {
         $banner =  BaseSettingsModel::where(['category' => 'banner'])->where(['status' => '1'])
-            ->orderBy('sort')->limit('3')->get()->toArray();
+            ->orderBy('sort')->limit('3')->paginate(20)->toArray();
         return $banner;
     }
 
@@ -356,7 +357,7 @@ class IndexController extends Controller
             $dream->dream_find_user =  $dream->dreamFindUser;
 //            计算被关注总人数
             $user_id = UserDream::where('dream_id',$dream->id)->first()->user_id;
-            $data = UserCareUser::where('other_user_id',$user_id)->get();
+            $data = UserCareUser::where('other_user_id',$user_id)->paginate(20);
             $dream->care_num = count($data);
             $dream->dream_first_pic =  $dream->dreamImgsFirst;
         }

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

@@ -132,22 +132,32 @@ class MyController extends Controller
      *  "status": true,
      *   "status_code": 0,
      *   "message": "",
-     *   "data": {
-     *       "emotion": [
-     *          {
-     *              "value": "1",
-     *              "name": "未婚"
-     *          },
-     *          ...
-     *      ],
-     *      "sex": [
-     *          {
-     *              "value": "0",
-     *              "name": "男"
-     *           },
-     *          ...
-     *      ]
-     *   }
+        "data": {
+            "emotion": [
+                {
+                    "value": "1",
+                    "name": "未婚"
+                },
+                {
+                    "value": "2",
+                    "name": "已婚"
+                },
+                {
+                    "value": "3",
+                    "name": "离异"
+                }
+            ],
+            "sex": [
+                {
+                    "value": "0",
+                    "name": "男"
+                },
+                {
+                    "value": "1",
+                    "name": "女"
+                }
+            ]
+        }
      * }
      * @apiErrorExample {json} Error-Response:
      * HTTP/1.1 400 Bad Request
@@ -161,9 +171,9 @@ class MyController extends Controller
     public function  editUserInfo (Request $request)
     {
         $sex = BaseDictionaryOptionModel::where('dictionary_table_code','user_info')->
-             where('dictionary_code','sex')->get();
+             where('dictionary_code','sex')->paginate(20);
         $emotion = BaseDictionaryOptionModel::where('dictionary_table_code','user_info')->
-             where('dictionary_code','emotion')->get();
+             where('dictionary_code','emotion')->paginate(20);
 
         return $this->api(compact('emotion','sex'));
 
@@ -203,7 +213,7 @@ class MyController extends Controller
         $user = $this->getUser();
         $data = $request->except('_token');
         $ok =  $user->update($data);
-        if ($ok) {
+        if ($ok == true) {
             return $this->api('');
         }else{
             return $this->error(ErrorCode::SAVE_USER_FAILED);
@@ -394,7 +404,7 @@ class MyController extends Controller
      *           "id": 2,
      *            "dream": "去旅游去旅游2",
      *           "about": "欧冠胡234",
-     *            "dream_pic": "aaaaa",
+     *            "dream_pic": "aaaaa",      封面图片
      *            "progress": 0,  进度
      *        ]
      *     }
@@ -525,7 +535,7 @@ class MyController extends Controller
 
         if ($dream_id) {
 //            梦想创建成功 关联关系中最新动态+1
-            $info = UserCareUser::where('other_user_id',$user->id)->get();
+            $info = UserCareUser::where('other_user_id',$user->id)->paginate(20);
             foreach ($info as $item) {
                 $item->dream_num += 1;
                 $item->updated_at = date('Y-m-d H:i:s');
@@ -563,20 +573,4 @@ class MyController extends Controller
         }
     }
 
-    /**
-     * @api {get} /api/my/dream_about 梦想介绍(dreamAbout)
-     * @apiDescription 梦想介绍(dreamAbout)
-     * @apiGroup My
-     * @apiPermission Passport
-     * @apiVersion 0.1.0
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function dreamAbout()
-    {
-        $user = $this->getUser();
-        return $this->api(compact('user'));
-    }
 }

server/routes/api.php

@@ -164,10 +164,6 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'my.add_dream',
         'uses' => 'MyController@addDream',
     ]);
-    $api->get('my/dream_about', [
-        'as' => 'my.dream_about',
-        'uses' => 'MyController@dreamAbout',
-    ]);
 
 //    用户信息
     $api->get('user/index', [