1

application/api/controller/User.php

@@ -77,7 +77,7 @@ class User extends Api
         }
         if ($ret) {
             Sms::flush($mobile, 'register');
-            $data = ['userinfo' => $this->auth->getUserinfo()];
+            $data = ['token' => $this->auth->getUserinfo()['token']];
             $this->success(__('Logged in successful'), $data);
         } else {
             $this->error($this->auth->getError());
@@ -135,7 +135,6 @@ class User extends Api
 
     /**
      * 第三方登录
-     *
      * @ApiMethod (POST)
      * @param string $platform 平台名称
      * @param string $code     Code码
@@ -143,7 +142,7 @@ class User extends Api
     public function third()
     {
         $url = url('user/index');
-        $platform = $this->request->post("platform");
+        $platform = $this->request->post("platform",'Wechat');
         $code = $this->request->post("code");
         $config = get_addon_config('third');
         if (!$config || !isset($config[$platform])) {
@@ -153,6 +152,12 @@ class User extends Api
         //通过code换access_token和绑定会员
         $result = $app->{$platform}->getUserInfo(['code' => $code]);
         if ($result) {
+            $openid = $result['openid'];
+            $user = \app\common\model\User::getByOpenid($openid);
+            if($user){
+                //如果已经有账号则直接登录
+                $ret = $this->auth->direct($user->id);
+            }
             $loginret = \addons\third\library\Service::connect($platform, $result);
             if ($loginret) {
                 $data = [

application/common/library/Auth.php

@@ -390,7 +390,7 @@ class Auth
         $allowFields = $this->getAllowFields();
         $userinfo = array_intersect_key($data, array_flip($allowFields));
         $userinfo = array_merge($userinfo, Token::get($this->_token));
-        unset($userinfo['token'],$userinfo['user_id'],$userinfo['createtime'],$userinfo['expiretime'],$userinfo['expiretime'],$userinfo['expires_in']);
+        unset($userinfo['user_id'],$userinfo['createtime'],$userinfo['expiretime'],$userinfo['expiretime'],$userinfo['expires_in']);
         return $userinfo;
     }