用户端小程序登录大改动

application/api/controller/User.php

@@ -11,7 +11,7 @@ use think\Db;
  */
 class User extends Api
 {
-    protected $noNeedLogin = ['getUserOpenid','mobilelogin','wxMiniProgramLogin'];
+    protected $noNeedLogin = ['mobilelogin'];
     protected $noNeedRight = '*';
 
     public function _initialize()
@@ -22,59 +22,6 @@ class User extends Api
 
 
 
-    //code获取openid
-    public function getUserOpenid() {
-        // code值
-        $code = $this->request->param('code');
-        if (!$code) {
-            $this->error(__('Invalid parameters'));
-        }
-
-        $config = config('wxMiniProgram');
-        $getopenid = 'https://api.weixin.qq.com/sns/jscode2session?appid='.$config['appid'].'&secret='.$config['secret'].'&js_code='.$code.'&grant_type=authorization_code';
-        $openidInfo = $this->getJson($getopenid);
-        if(!isset($openidInfo['openid'])) {
-            $this->error('用户openid获取失败',$openidInfo);
-        }
-
-        //  获取的结果存入数据库
-        $find = Db::name('user_sessionkey')->where(['openid'=>$openidInfo['openid']])->find();
-        if($find) {
-            $update = [];
-            $update['openid'] = $openidInfo['openid'];
-            $update['sessionkey'] = $openidInfo['session_key'];
-            $update['createtime'] = time();
-            $res = Db::name('user_sessionkey')->where(['openid'=>$openidInfo['openid']])->update($update);
-        } else {
-            $insert = [];
-            $insert['openid'] = $openidInfo['openid'];
-            $insert['sessionkey'] = $openidInfo['session_key'];
-            $insert['createtime'] = time();
-            $res = Db::name('user_sessionkey')->insertGetId($insert);
-        }
-
-        if($res !== false) {
-            $this->success('获取成功',$openidInfo);
-        } else {
-            $this->error('获取失败');
-        }
-
-    }
-    /**
-     * json 请求
-     * @param $url
-     * @return mixed
-     */
-    private function getJson($url){
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, FALSE);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        $output = curl_exec($ch);
-        curl_close($ch);
-        return json_decode($output, true);
-    }
     /**
      * 手机验证码登录
      *
@@ -86,9 +33,8 @@ class User extends Api
     {
         $mobile = $this->request->post('mobile');
         $captcha = $this->request->post('captcha');
-        $openid = $this->request->post('openid');
 
-        if (!$mobile || !$captcha || !$openid) {
+        if (!$mobile || !$captcha) {
             $this->error(__('Invalid parameters'));
         }
         if (!Validate::regex($mobile, "^1\d{10}$")) {
@@ -98,34 +44,16 @@ class User extends Api
             $this->error(__('Captcha is incorrect'));
         }
 
-        // 获取openid和sessionkey
-        $openidInfo = Db::name('user_sessionkey')->where(['openid'=>$openid])->find();
-        if(!$openidInfo){
-            $this->error('openid获取失败');
-        }
-
-        //
-        $check_user = Db::name('user')->where('mini_openid',$openidInfo['openid'])->where('mobile','neq',$mobile)->find();
-        if($check_user){
-            $this->error('该微信已经绑定手机号'.$check_user['mobile'].',请使用该手机号登录');
-        }
-
         $user = \app\common\model\User::getByMobile($mobile);
         if ($user) {
             if ($user->status != 1) {
                 $this->error(__('Account is locked'));
             }
-            //修改最新的sessionkey和openid。其他渠道注册，本渠道第一次来就赋值
-            $user->mini_openid = $openid;
-            $user->save();
+
             //如果已经有账号则直接登录
             $ret = $this->auth->direct($user->id);
         } else {
-            // 用户信息不存在时使用
-            $extend = [
-                'mini_openid'    => $openid,
-            ];
-            $ret = $this->auth->register('', '', '', $mobile, $extend);
+            $this->error('不存在的用户');
         }
         if ($ret) {
             Sms::flush($mobile, 'mobilelogin');
@@ -135,52 +63,6 @@ class User extends Api
         }
     }
 
-
-
-
-
-    /**
-     * 微信小程序授权登录
-     */
-    public function wxMiniProgramLogin() {
-        $openid        = $this->request->request('openid');// openid值
-
-        if (!$openid) {
-            $this->error(__('Invalid parameters'));
-        }
-
-        // 用户登录逻辑 === 开始
-        $user_sessionkey = Db::name('user_sessionkey')->where('openid',$openid)->find();
-        if(empty($user_sessionkey)){
-            $this->error('登录失败,请先使用手机号注册','',-1);
-        }
-        $userInfo = Db::name('user')->where(['mini_openid'=>$user_sessionkey['openid']])->find();
-
-        // 判断用户是否已经存在
-        if($userInfo) { // 登录
-            if ($userInfo['status'] != 1) {
-                $this->error(__('Account is locked'));
-            }
-
-            $res = $this->auth->direct($userInfo['id']);
-        } else {
-            //这里不在给注册，而是只能mobilelogin来注册
-            $this->error('登录失败,请先使用手机号注册','',-1);
-        }
-
-        if($res) {
-            $userInfo = $this->auth->getUserinfo();
-            if(empty($userInfo['mobile'])){
-                $this->success("登录成功！",$userInfo,-1);
-            }
-            $this->success("登录成功！",$userInfo);
-        } else {
-            $this->error($this->auth->getError());
-        }
-
-    }
-
-
     /**
      * 退出登录
      * @ApiMethod (POST)
@@ -252,37 +134,6 @@ class User extends Api
 
 
 
-    /**
-     * 修改手机号
-     *
-     * @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'));
-        }
-        $user->mobile = $mobile;
-        $user->save();
-
-        Sms::flush($mobile, 'changemobile');
-        $this->success();
-    }
 
 
 }