1

application/api/controller/User.php

@@ -41,17 +41,16 @@ class User extends Api
      * @ApiReturnParams (name=data.birthday,type="string",description=出生年月)
      * @ApiReturnParams (name=data.rights,type="integer",description=是否有权益:0=没有1=有)
      */
-    public function index()
+    public function get_user_info()
     {
         $user = $this->auth->getUserinfo();
         $this->success('用户信息', $user);
     }
     /**
      * 手机验证码登录
-     *
      * @ApiMethod (POST)
-     * @param string $mobile  手机号
-     * @param string $captcha 验证码
+     * @ApiParams (name="mobile", type="string", required=true, description="手机号")
+     * @ApiParams (name="captcha", type="string", required=true, description="验证码")
      */
     public function mobile_login()
     {
@@ -84,38 +83,21 @@ class User extends Api
             $this->error($this->auth->getError());
         }
     }
-
     /**
-     * 退出登录
+     * 修改用户信息
      * @ApiMethod (POST)
+     * @ApiParams (name="avatar", type="string", required=false, description="头像地址")
+     * @ApiParams (name="username", type="string", required=false, description="姓名")
+     * @ApiParams (name="gender", type="string", required=false, description="性别")
+     * @ApiParams (name="birthday", type="string", required=false, description="出生年月")
+     * @ApiParams (name="email", type="string", required=false, description="邮箱地址")
      */
-    public function logout()
-    {
-        if (!$this->request->isPost()) {
-            $this->error(__('Invalid parameters'));
-        }
-        $this->auth->logout();
-        $this->success(__('Logout successful'));
-    }
-
-    /**
-     * 修改会员个人信息
-     *
-     * @ApiMethod (POST)
-     * @param string $avatar   头像地址
-     * @param string $username 用户名
-     * @param string $gender   性别
-     * @param string $mobile   手机号
-     * @param string $birthday   出生年月
-     * @param string $email   邮箱
-     */
-    public function profile()
+    public function edit_user_info()
     {
         $user = $this->auth->getUser();
         $email = $this->request->post('email');
         $username = $this->request->post('username');
         $gender = $this->request->post('gender');
-        $mobile = $this->request->post('mobile');
         $birthday = $this->request->post('birthday');
         $avatar = $this->request->post('avatar', '', 'trim,strip_tags,htmlspecialchars');
         if ($username) {
@@ -125,87 +107,15 @@ class User extends Api
             }
             $user->username = $username;
         }
-
-        $user->bio = $email;
+        $user->email = $email;
         $user->avatar = $avatar;
         $user->gender = $gender;
-        $user->mobile = $mobile;
         $user->birthday = $birthday;
         $user->save();
         $this->success();
     }
 
     /**
-     * 修改邮箱
-     *
-     * @ApiMethod (POST)
-     * @param string $email   邮箱
-     * @param string $captcha 验证码
-     */
-    public function changeemail()
-    {
-        $user = $this->auth->getUser();
-        $email = $this->request->post('email');
-        $captcha = $this->request->post('captcha');
-        if (!$email || !$captcha) {
-            $this->error(__('Invalid parameters'));
-        }
-        if (!Validate::is($email, "email")) {
-            $this->error(__('Email is incorrect'));
-        }
-        if (\app\common\model\User::where('email', $email)->where('id', '<>', $user->id)->find()) {
-            $this->error(__('Email already exists'));
-        }
-        $result = Ems::check($email, $captcha, 'changeemail');
-        if (!$result) {
-            $this->error(__('Captcha is incorrect'));
-        }
-        $verification = $user->verification;
-        $verification->email = 1;
-        $user->verification = $verification;
-        $user->email = $email;
-        $user->save();
-
-        Ems::flush($email, 'changeemail');
-        $this->success();
-    }
-
-    /**
-     * 修改手机号
-     *
-     * @ApiMethod (POST)
-     * @param string $mobile  手机号
-     * @param string $captcha 验证码
-     */
-    public function changemobile()
-    {
-        $user = $this->auth->getUser();
-        $mobile = $this->request->post('mobile');
-        $captcha = $this->request->post('captcha');
-        if (!$mobile || !$captcha) {
-            $this->error(__('Invalid parameters'));
-        }
-        if (!Validate::regex($mobile, "^1\d{10}$")) {
-            $this->error(__('Mobile is incorrect'));
-        }
-        if (\app\common\model\User::where('mobile', $mobile)->where('id', '<>', $user->id)->find()) {
-            $this->error(__('Mobile already exists'));
-        }
-        $result = Sms::check($mobile, $captcha, 'changemobile');
-        if (!$result) {
-            $this->error(__('Captcha is incorrect'));
-        }
-        $verification = $user->verification;
-        $verification->mobile = 1;
-        $user->verification = $verification;
-        $user->mobile = $mobile;
-        $user->save();
-
-        Sms::flush($mobile, 'changemobile');
-        $this->success();
-    }
-
-    /**
      * 第三方登录
      *
      * @ApiMethod (POST)
@@ -264,4 +174,16 @@ class User extends Api
             $this->error('留言失败');
         }
     }
+    /**
+     * 退出登录
+     * @ApiMethod (POST)
+     */
+    public function logout()
+    {
+        if (!$this->request->isPost()) {
+            $this->error(__('Invalid parameters'));
+        }
+        $this->auth->logout();
+        $this->success(__('Logout successful'));
+    }
 }