add

server/apidoc.json

@@ -1,7 +1,7 @@
 {
   "name": "MiaoMiao",
   "version": "0.1.0",
-  "description": "MiaoMiao",
+  "description": "喵喵App API接口文档",
   "title": "MiaoMiao",
   "url" : "http://w21.9026.com"
 }

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

@@ -31,7 +31,8 @@ class AuthController extends Controller
      * @apiGroup Auth
      * @apiPermission none
      * @apiVersion 0.1.0
-     * @apiParam {string}  phone   手机号码
+     * @apiParam {string}  phone    手机号码
+     * @apiParam {String}  verify_code  手机验证码
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
      * {
@@ -205,129 +206,129 @@ class AuthController extends Controller
         return $this->api(['verify_code' => $verify_code]);
     }
 
-    /**
-     * @api {post} /api/auth/register 注册(register)
-     * @apiDescription 注册(register)
-     * @apiGroup Auth
-     * @apiPermission none
-     * @apiVersion 0.1.0
-     * @apiParam {String}   phone               手机号码
-     * @apiParam {String}   verify_code          手机验证码
-     * @apiParam {int}      type                帐户类型：1.个人，2.商户
-     * @apiParam {String}   [name=手机号码]      用户帐号名称
-     * @apiParam {String}   [email]             邮件地址
-     * @apiParam {String}   [password=123456]   密码
-     * @apiParam {File}     [avatar]            用户头像
-     * @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": {
-     *             "type": "2",
-     *             "phone": "15881082737",
-     *             "name": "15881082737",
-     *             "updated_at": "2016-10-03 20:52:21",
-     *             "created_at": "2016-10-03 20:52:21",
-     *             "id": 6
-     *         }
-     *     }
-     * }
-     * @apiErrorExample {json} Error-Response:
-     * HTTP/1.1 400 Bad Request
-     * {
-     *     "state": false,
-     *     "code": 1000,
-     *     "message": "传入参数不正确",
-     *     "data": null or []
-     * }
-     * 可能出现的错误代码：
-     *    200     SAVE_USER_FAILED                保存用户数据失败
-     *    1000    CLIENT_WRONG_PARAMS             传入参数不正确
-     *    1101    INCORRECT_VERIFY_CODE           输入验证码错误
-     */
-    public function register(Request $request) {
-        $validator = Validator::make($request->input(),
-            [
-                'phone'         => 'required|regex:/^1[34578]\d{9}$/',
-                'verify_code'    => 'required',
-                'name'          => 'alpha_dash|between:2,50',
-                'email'         => 'email',
-                'password'      => 'between:6,16',
-                'avatar'        => 'image',
-            ],
-            [
-                'phone.required'        => '手机号码必填',
-                'phone.regex'           => '手机号码格式不正确',
-                'verify_code.required'   => '请输入校验码',
-                'name.alpha_dash'       => '用户名称只能字母数字中下划线',
-                'name.between'          => '用户名称只能为2~50字符',
-                'email.email'           => '邮件格式不正确',
-                'password.between'      => '密码必须在6~16字符之内',
-                'avatar.image'          => '用户头像必须为有效的图片',
-            ]
-        );
-
-        if ($validator->fails()) {
-            return $this->error($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS, '');
-        }
-
-        $phone = $request->get('phone');
-        $type = $request->get('type');
-        $verify_code = $request->get('verify_code');
-        $name = $request->get('name');
-
-        //先绑定会员 ，后绑定商户
-//        if (User::where('phone', '=', $phone)->where('type', '=', $type)->exists()) {
-//            return $this->error(ErrorCode::PHONE_NUMBER_ALREADY_REGISTERED);
+//    /**
+//     * @api {post} /api/auth/register 注册(register)
+//     * @apiDescription 注册(register)
+//     * @apiGroup Auth
+//     * @apiPermission none
+//     * @apiVersion 0.1.0
+//     * @apiParam {String}   phone               手机号码
+//     * @apiParam {String}   verify_code          手机验证码
+//     * @apiParam {int}      type                帐户类型：1.个人，2.商户
+//     * @apiParam {String}   [name=手机号码]      用户帐号名称
+//     * @apiParam {String}   [email]             邮件地址
+//     * @apiParam {String}   [password=123456]   密码
+//     * @apiParam {File}     [avatar]            用户头像
+//     * @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": {
+//     *             "type": "2",
+//     *             "phone": "15881082737",
+//     *             "name": "15881082737",
+//     *             "updated_at": "2016-10-03 20:52:21",
+//     *             "created_at": "2016-10-03 20:52:21",
+//     *             "id": 6
+//     *         }
+//     *     }
+//     * }
+//     * @apiErrorExample {json} Error-Response:
+//     * HTTP/1.1 400 Bad Request
+//     * {
+//     *     "state": false,
+//     *     "code": 1000,
+//     *     "message": "传入参数不正确",
+//     *     "data": null or []
+//     * }
+//     * 可能出现的错误代码：
+//     *    200     SAVE_USER_FAILED                保存用户数据失败
+//     *    1000    CLIENT_WRONG_PARAMS             传入参数不正确
+//     *    1101    INCORRECT_VERIFY_CODE           输入验证码错误
+//     */
+//    public function register(Request $request) {
+//        $validator = Validator::make($request->input(),
+//            [
+//                'phone'         => 'required|regex:/^1[34578]\d{9}$/',
+//                'verify_code'    => 'required',
+//                'name'          => 'alpha_dash|between:2,50',
+//                'email'         => 'email',
+//                'password'      => 'between:6,16',
+//                'avatar'        => 'image',
+//            ],
+//            [
+//                'phone.required'        => '手机号码必填',
+//                'phone.regex'           => '手机号码格式不正确',
+//                'verify_code.required'   => '请输入校验码',
+//                'name.alpha_dash'       => '用户名称只能字母数字中下划线',
+//                'name.between'          => '用户名称只能为2~50字符',
+//                'email.email'           => '邮件格式不正确',
+//                'password.between'      => '密码必须在6~16字符之内',
+//                'avatar.image'          => '用户头像必须为有效的图片',
+//            ]
+//        );
+//
+//        if ($validator->fails()) {
+//            return $this->error($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS, '');
 //        }
-
-        $email = $request->get('email');
-        $password = $request->get('password');
-        //如果有头像，上传
-        if ($request->hasFile('avatar')) {
-            $md5 = $this->uploadAttachment($request, 'avatar', 'avatar');
-        }
-
-        $key = $this->keySmsCode . $phone;
-//        if (Redis::exists($key)) {
-        if (Cache::store('file')->has($key)) {
-//            $code = Redis::get($key);
-            $code = Cache::store('file')->get($key);
-            if ($code == $verify_code) {
-                if(!$user = User::where('phone', '=', $phone)->first()){
-                    $user = new User();
-                }
-                $user->type = $type;
-                $user->phone = $phone;
-                $user->name = $name;
-                $user->email = $email;
-                if (!empty($password)) {
-                    $user->password = bcrypt($password);
-                }
-                if (isset($md5) && is_string($md5) && !empty($md5)) {
-                    $user->avatar = $md5;
-                }
-                if ($user->save()) {
-//                    Redis::del($key);
-                    Cache::store('file')->forget($key);
-
-                    //发token
-                    $token = $user->createToken($phone . '-' . $type);
-                    return $this->api([
-                        'token'     => $token->accessToken,
-                        'user'      => $user->toArray(),
-                    ]);
-                } else {
-                    return $this->error(ErrorCode::SAVE_USER_FAILED);
-                }
-            }
-        }
-        return $this->error(ErrorCode::INCORRECT_VERIFY_CODE);
-    }
+//
+//        $phone = $request->get('phone');
+//        $type = $request->get('type');
+//        $verify_code = $request->get('verify_code');
+//        $name = $request->get('name');
+//
+//        //先绑定会员 ，后绑定商户
+////        if (User::where('phone', '=', $phone)->where('type', '=', $type)->exists()) {
+////            return $this->error(ErrorCode::PHONE_NUMBER_ALREADY_REGISTERED);
+////        }
+//
+//        $email = $request->get('email');
+//        $password = $request->get('password');
+//        //如果有头像，上传
+//        if ($request->hasFile('avatar')) {
+//            $md5 = $this->uploadAttachment($request, 'avatar', 'avatar');
+//        }
+//
+//        $key = $this->keySmsCode . $phone;
+////        if (Redis::exists($key)) {
+//        if (Cache::store('file')->has($key)) {
+////            $code = Redis::get($key);
+//            $code = Cache::store('file')->get($key);
+//            if ($code == $verify_code) {
+//                if(!$user = User::where('phone', '=', $phone)->first()){
+//                    $user = new User();
+//                }
+//                $user->type = $type;
+//                $user->phone = $phone;
+//                $user->name = $name;
+//                $user->email = $email;
+//                if (!empty($password)) {
+//                    $user->password = bcrypt($password);
+//                }
+//                if (isset($md5) && is_string($md5) && !empty($md5)) {
+//                    $user->avatar = $md5;
+//                }
+//                if ($user->save()) {
+////                    Redis::del($key);
+//                    Cache::store('file')->forget($key);
+//
+//                    //发token
+//                    $token = $user->createToken($phone . '-' . $type);
+//                    return $this->api([
+//                        'token'     => $token->accessToken,
+//                        'user'      => $user->toArray(),
+//                    ]);
+//                } else {
+//                    return $this->error(ErrorCode::SAVE_USER_FAILED);
+//                }
+//            }
+//        }
+//        return $this->error(ErrorCode::INCORRECT_VERIFY_CODE);
+//    }
 
     public function refreshToken() {
         $token = '';//TODO

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

@@ -88,17 +88,17 @@ class MyController extends Controller
      *"message": "",
      *"data": {
      *"user": {
-     *"id": 1,
-     * "tel": "13880642880",手机
-     *"nickname": "",昵称
-     *"sex": 1,性别
-     *"job": "", 职业
-     *"emotion": 1,情感状态
-     *"address": "",
-     *"detail_address": "",
-     *"status": 1,
-     *"tall": 1,   身高
-     *}
+     *  "id": 1,
+     *  "tel": "13880642880",手机
+     *  "nickname": "",昵称
+     *  "sex": 1,性别
+     *  "job": "", 职业
+     *  "emotion": 1,情感状态
+     *  "address": "",
+     *  "detail_address": "",
+     *  "status": 1,
+     *  "tall": 1,   身高
+     *  }
      * }
      *}
      * @apiErrorExample {json} Error-Response:

server/database/migrations/2017_06_01_091444_create_user_info_table.php

@@ -33,6 +33,8 @@ class CreateUserInfoTable extends Migration
             $table->string('address')->default('')->comment('省市区地址');
             $table->string('detail_address')->default('')->comment('详细地址');
             $table->tinyInteger('status')->default(1)->comment('状态');
+            $table->string('wechat')->default('')->comment('微信id');
+            $table->string('weibo')->default('')->comment('微博id');
             $table->string('remember_token')->default('')->comment('token');
             $table->timestamps();
             $table->softDeletes();