add

server/apidoc.json

@@ -3,5 +3,5 @@
   "version": "0.1.0",
   "description": "喵喵App API接口文档",
   "title": "喵喵App API接口文档",
-  "url" : "http://q8.9026.com"
+  "url" : "http://www.miao.com"
 }

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

@@ -3,13 +3,10 @@
 namespace App\Http\Controllers\Api\V1;
 
 use App\Helper\SmsHelper;
-use App\Models\UserBanks;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use App\Models\UserInfoModel;
 use Illuminate\Http\Request;
 use App\Services\Base\ErrorCode;
-use App\User;
-use Illuminate\Support\Facades\Hash;
 use Validator, Auth, Cache;
 
 class AuthController extends Controller
@@ -103,7 +100,6 @@ class AuthController extends Controller
         }else{
             return $this->error(ErrorCode::INCORRECT_USER_OR_PASS);
         }
-
     }
 
     /**

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

@@ -20,7 +20,7 @@ class Controller extends BaseController
 
     public function getUser()
     {
-        $this->user = UserInfoModel::where('tel','13880642880')->first();
+        $this->user = UserInfoModel::where('phone','13880642880')->first();
         return $this->user;
     }
 

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

@@ -7,6 +7,7 @@ use App\Models\BaseSettingsModel;
 use App\Models\DreamImages;
 use App\Models\DreamInfoModel;
 use App\Models\InteractionInfo;
+use App\Models\SearchInfoModel;
 use App\Models\SupportDreamModel;
 use App\Models\SystemInfoModel;
 use App\Models\UserCareDream;
@@ -22,7 +23,7 @@ class DreamController extends Controller
      * @apiGroup Dream
      * @apiPermission Passport
      * @apiVersion 0.1.0
-     * @apiParam {int} type index interaction paihang  默认all
+     * @apiParam {int} type home interaction paihang  默认all
      * @apiParam {int} id 梦想ID
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
@@ -139,11 +140,11 @@ class DreamController extends Controller
         $id = $request->id;    //梦想ID
         if (empty($id)) return $this->error(ErrorCode::KEY_ERROR);
 
-        $info = SupportDreamModel::where('dream_id',$id)->get();
+        $support_dream = SupportDreamModel::where('dream_id',$id)->get();
         $top = [] ;
-        $topuser = [];
-        $top3user = [];
-        foreach ($info as $item) {
+        $topuser = [];    //所有支持用户排行
+        $top3user = [];   //  支持用户排行前三
+        foreach ($support_dream as $item) {
             if (!array_key_exists($item->user_id,$top)) {
                 $top[$item->user_id] = $item->score;
             }else{
@@ -155,14 +156,14 @@ class DreamController extends Controller
             $user = UserInfoModel::find($user_id);
             $user->score = $score;
             $topuser[] = $user;
-            if(count($top3user)<=2)$top3user[] = $user;
+            if(count($top3user)<=2) $top3user[] = $user;
         }
         if ($type == 'paihang') return $this->api($topuser);
 
         $interactios = InteractionInfo::where('dream_id',$id)->orderBy('id','desc')->get();
         foreach ($interactios as $item) {
             dd($item->comments);
-            $item->with(['comments']);
+//            $item->with(['comments']);
             foreach ($item->comments as $comment) {
                 $comment->pic = UserInfoModel::find($comment->user_id)->pic;
                 $comment->replay = $comment->replay;
@@ -416,4 +417,63 @@ class DreamController extends Controller
             return $this->error(ErrorCode::SAVE_USER_FAILED);
         }
     }
+    /**
+     * @api {get}  /api/dream/search 梦想搜索
+     * @apiDescription 梦想搜索)
+     * @apiGroup Dream
+     * @apiPermission none
+     * @apiVersion 0.1.0
+     * @apiParam {string}  keyword   关键字
+     * @apiSuccessExample {json} Success-Response:
+     * HTTP/1.1 200 OK
+     *{
+     *   "status": true,
+     *   "status_code": 0,
+     *   "message": "",
+     *   "data": {
+     *       "data": [
+     *           {
+     *              "dream": "haha",  梦想名
+     *               "user_pic": [
+     *               {
+     *                  "pic": "",   用户头像
+     *               }
+     *               ],
+     *              "dream_img": "",  梦想图片
+     *          }
+     *       ]
+     *   }
+     *}
+     * @apiErrorExample {json} Error-Response:
+     * HTTP/1.1 400 Bad Request
+     */
+    public function search(Request $request)
+    {
+        $user = $this->getUser();
+        if (empty($request->keyword)) {
+            return $this->api('');
+        }
+        $keyword ='%'.$request->keyword.'%';
+        $data = DreamInfoModel::where('dream','like',$keyword)->
+        orWhere('sign','like',$keyword)->get();
+        foreach ($data as $k => $value) {
+            $value->user_pic = $value->dreamFindUser;
+            $value->dream_img = $value->dreamImgsFirst->pic;
+        }
+        $this->insertSearchTable($user->id,$request->keyword);
+        return $this->api(compact('data'));
+    }
+
+    public function insertSearchTable($id,$keyword)
+    {
+        $info = SearchInfoModel::where('user_id',$id)->
+        where('search',trim($keyword))->first();
+        if (count($info) == 0) {
+            SearchInfoModel::create(['user_id'=>$id,'search'=>trim($keyword),'times'=>1]);
+        }else{
+            $info->times += 1;
+            $info->save();
+        }
+
+    }
 }

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

@@ -327,52 +327,7 @@ class IndexController extends Controller
         return $this->api(compact('data1'));
     }
 
-    /**
-     * @api {get}  /api/index/dream_search 梦想搜索(search)
-     * @apiDescription 梦想搜索(search)
-     * @apiGroup Index
-     * @apiPermission none
-     * @apiVersion 0.1.0
-     * @apiParam {string}  keyword   关键字
-     * @apiSuccessExample {json} Success-Response:
-     * HTTP/1.1 200 OK
-     *{
-     *   "status": true,
-     *   "status_code": 0,
-     *   "message": "",
-     *   "data": {
-     *       "data": [
-     *           {
-     *              "dream": "haha",  梦想名
-     *               "user_pic": [
-     *               {
-     *                  "pic": "",   用户头像
-     *               }
-     *               ],
-     *              "dream_img": "",  梦想图片
-     *          }
-     *       ]
-     *   }
-     *}
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     */
-    public function dreamSearch(Request $request)
-    {
-        $user = $this->getUser();
-        if (empty($request->keyword)) {
-            return $this->api('');
-        }
-        $keyword ='%'.$request->keyword.'%';
-        $data = DreamInfoModel::where('dream','like',$keyword)->
-        orWhere('sign','like',$keyword)->get();
-        foreach ($data as $k => $value) {
-            $value->user_pic = $value->dreamFindUser;
-            $value->dream_img = $value->dreamImgsFirst->pic;
-        }
-        $this->insertSearchTable($user->id,$request->keyword);
-        return $this->api(compact('data'));
-    }
+
 
     //获取轮播图
     public function getBanner()
@@ -492,17 +447,4 @@ class IndexController extends Controller
         }
         return $this->api($data);
     }
-
-    public function insertSearchTable($id,$keyword)
-    {
-        $info = SearchInfoModel::where('user_id',$id)->
-        where('search',trim($keyword))->first();
-        if (count($info) == 0) {
-            SearchInfoModel::create(['user_id'=>$id,'search'=>trim($keyword),'times'=>1]);
-        }else{
-            $info->times += 1;
-            $info->save();
-        }
-
-    }
 }

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

@@ -452,13 +452,13 @@ class MyController extends Controller
     }
 
     /**
-     * @api {post} /api/my/add_dream 发布梦想(addDream)
-     * @apiDescription 发布梦想(addDream)
+     * @api {post} /api/my/store_dream 发布梦想
+     * @apiDescription 发布梦想
        * @apiParam {string}  pics   梦想图片 数组
        * @apiParam {string}  video   梦想视频
-       * @apiParam {string}  dream   梦想标题
+       * @apiParam {string}  name   梦想标题
        * @apiParam {string}  about   梦想介绍
-       * @apiParam {int}  money   梦想币
+       * @apiParam {int}  coin   梦想币
        * @apiParam {int}  time   实现时间默认21*3600
      * @apiGroup My
      * @apiPermission Passport
@@ -480,22 +480,22 @@ class MyController extends Controller
      * }
      * HTTP/1.1 400 Bad Request
      */
-    public function addDream(Request $request)
+    public function storeDream(Request $request)
     {
         $user = $this->getUser();
         $validator = \Validator::make($request->all(),
             [
-                'dream'  => 'required',
+                'name'  => 'required',
                 'about'  => 'required',
-                'money'  => 'required|integer',
+                'coin'  => 'required|integer',
                 'time'  => 'required|integer',
             ],
             [
-                'dream.required'  => '梦想标题必填',
+                'name.required'  => '梦想标题必填',
                 'about.required'  => '梦想介绍必填',
-                'money.required'  => '梦想币必填',
+                'coin.required'  => '梦想币必填',
+                'coin.integer'  => '梦想币必须是正整数',
                 'time.required'  => '实现时间必填',
-                'money.integer'  => '梦想币必须是正整数',
                 'time.integer'  => '实现时间必须是正整数',
             ]
         );
@@ -509,6 +509,7 @@ class MyController extends Controller
         $t = 21*3600 / 60;
 
         $data = $request->except('_token','pics');
+        $data['user_id'] = $user->id;
         \Log::debug(' care_num:'.$care_num.' a:'.$a.' b:'.$b.' t:'.$t);
         if ($care_num == 0) {
             $data['score'] = (($a/$t) + $b)*100000000 ;
@@ -521,42 +522,32 @@ class MyController extends Controller
 
         if ($dream_id) {
 //            梦想创建成功 关联关系中最新动态+1
-            $info = UserCareUser::where('other_user_id',$user->id)->paginate(20);
+   /*         $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');
                 $item->save();
-            }
-
-            $data1['dream_id'] = $dream_id;
-            $data1['user_id'] = $user->id;
-            $data1['created_at'] = date('Y-m-d H:i:s');
-            $data1['updated_at'] = date('Y-m-d H:i:s');
-            $arr = $request->pics;
+            }*/
+            $pics = $request->pics;
             $video = $request->video;
-            if (empty($arr) && empty($video))   return $this->error(ErrorCode::ATTACHMENT_NOT_EXIST);
-            $ok = UserDream::create($data1);
-            $arr1 = [];
-            if ($ok) {
-                if (is_array($arr)) {
-                    foreach ($arr as $k => $v){
-                        $arr1[] = [
+            if (empty($pics) && empty($video)) {
+                DreamInfoModel::destroy($dream_id);
+                return $this->error(ErrorCode::ATTACHMENT_NOT_EXIST);
+            }
+            $data = [];
+                if (is_array($pics)) {
+                    foreach ($pics as $v){
+                        $data[] = [
                             'dream_id'=>$dream_id,
                             'pic' => $v,
                             'created_at' =>date('Y-m-d H:i:s'),
                             'updated_at' =>date('Y-m-d H:i:s'),
                         ];
                     }
-                    DreamImages::insert($arr1);
+                    DreamImages::insert($data);
                 }
                 return $this->api('');
-            }else{
-                DreamInfoModel::destroy($dream_id);
-                return $this->error(ErrorCode::SAVE_USER_FAILED);
             }
-        }else{
-            return $this->error(ErrorCode::SAVE_USER_FAILED);
-        }
     }
 
 }

server/app/Models/DreamInfoModel.php

@@ -31,11 +31,11 @@ class DreamInfoModel extends BaseModel
      * @var string
      */
     protected $fillable = [
-                           'dream',
+                           'name',
                            'about',
-                           'money',
+                           'coin',
                            'time',
-                           'get_money',
+                           'get_coin',
                            'mark',
                            'status'
                           ];
@@ -43,22 +43,22 @@ class DreamInfoModel extends BaseModel
     protected $hidden = ['score','deleted_at','mark'];
 
 
-    public function dreamUser()
+    public function user()
     {
         return $this->hasOne('App\Models\UserInfoModel','id','user_id');
     }
 
-    public function Imgs()
+    public function imgs()
     {
         return $this->hasMany('App\Models\DreamImages','dream_id');
     }
 
-    public function dreamImgsFirst()
+    public function img()
     {
         return $this->hasOne('App\Models\DreamImages','dream_id','id');
     }
 
-//    支持过的梦想
+//    系统消息
     public function systemInfo()
     {
         return $this->hasMany('App\Models\SystemInfoModel','other_id','id');

server/app/Models/UserInfoModel.php

@@ -35,17 +35,17 @@ class UserInfoModel extends Authenticatable
      * @var string
      */
     protected $fillable = [
-                           'tel',
+                           'phone',
                            'password',
                            'nickname',
                            'sign',
-                           'pic',
+                           'avatar',
                            'money',
-        'sex',
-        'city',
+                            'sex',
+                            'city',
                            'signture',
-                           'tall',
-                           'job',
+                           'height',
+                           'work',
                            'emotion',
                            'address',
                            'detail_address',

server/app/Services/Base/ErrorCode.php

@@ -32,6 +32,7 @@ final class ErrorCode {
     const MERCHANT_ADD_MEMBER_FAILED = 1301;
     const MERCHANT_STATUS_NOT_OK = 1302;
     const BALANCE_NOT_ENOUGH = 1303;
+    const MERCHANT_BALANCE_NOT_ENOUGH = 1311;
     const PAY_TYPE_UNSUPPORTED = 2000;
     const MEMBER_NOT_EXIST = 1500;
     const COIN_NOT_ENOUGH = 1501;
@@ -87,7 +88,7 @@ final class ErrorCode {
         self::FAVORITE_NOT_EXIST => '收藏不存在',
         self::MERCHANT_ADD_MEMBER_FAILED => '添加会员失败',
         self::MERCHANT_STATUS_NOT_OK => '申请成功,客服会在3个工作日内与您取得联系！',
-        self::MERCHANT_BALANCE_NOT_ENOUGH => '商户余额不足',
+        self::MERCHANT_BALANCE_NOT_ENOUGH => '余额不足',
         self::PAY_TYPE_UNSUPPORTED => '不支持的支付方式',
         self::MEMBER_NOT_EXIST => '会员不存在',
         self::COIN_NOT_ENOUGH => '梦想币不足',

server/routes/api.php

@@ -152,9 +152,9 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'my.setting',
         'uses' => 'MyController@setting',
     ]);
-    $api->post('my/add_dream', [
-        'as' => 'my.add_dream',
-        'uses' => 'MyController@addDream',
+    $api->post('my/store_dream', [
+        'as' => 'my.store_dream',
+        'uses' => 'MyController@storeDream',
     ]);
 
 //    用户信息
@@ -186,6 +186,10 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'dream.show',
         'uses' => 'DreamController@show',
     ]);
+    $api->get('dream/search', [
+        'as' => 'dream.search',
+        'uses' => 'DreamController@search',
+    ]);
     $api->get('dream/collection', [
         'as' => 'dream.collection',
         'uses' => 'DreamController@collection',