登录返回信息简单化

application/api/controller/User.php

@@ -50,7 +50,7 @@ class User extends Api
 
         $ret = $this->auth->login($account, $password);
         if ($ret) {
-            $data = $this->userInfo('return');
+            $data = $this->auth->getUserinfo_simple();
             $this->success(__('Logged in successful'), $data);
         } else {
             $this->error($this->auth->getError());
@@ -103,7 +103,7 @@ class User extends Api
         }
         if ($ret) {
             Sms::flush($mobile, 'mobilelogin');
-            $data = $this->userInfo('return');
+            $data = $this->auth->getUserinfo_simple();
             $this->success(__('Logged in successful'), $data);
         } else {
             $this->error($this->auth->getError());
@@ -144,7 +144,7 @@ class User extends Api
             $ret = $this->auth->direct($user['id']);
 
             if ($ret) {
-                $userInfo = $this->auth->getUserinfo();
+                $userInfo = $this->auth->getUserinfo_simple();
                 $userInfo['is_register'] = 0;
                 $userInfo['code'] = $code;
                 $this->success(__('Logged in successful'), $userInfo);
@@ -243,7 +243,7 @@ class User extends Api
 
 
                 if ($ret) {
-                    $this->success(__('Logged in successful'), $this->auth->getUserinfo());
+                    $this->success(__('Logged in successful'), $this->auth->getUserinfo_simple());
                 } else {
                     $this->error($this->auth->getError());
                 }
@@ -274,7 +274,7 @@ class User extends Api
             $ret = $this->auth->direct($user['id']);
 
             if ($ret) {
-                $userInfo = $this->auth->getUserinfo();
+                $userInfo = $this->auth->getUserinfo_simple();
                 $userInfo['is_register'] = 0;
                 $userInfo['ios_user_id'] = $iosUserId;
                 $this->success(__('Logged in successful'), $userInfo);
@@ -293,11 +293,9 @@ class User extends Api
     }
 
     //用户详细资料
-    public function userInfo($type = 1){
+    public function userInfo(){
         $info = $this->auth->getUserinfo();
-        if($type == 'return'){
-            return $info;
-        }
+
         $this->success(__('success'),$info);
     }
 
@@ -606,7 +604,7 @@ class User extends Api
             //如果已经有账号则直接登录
 
             $ret = $this->auth->direct($user['id']);
-            $this->success('success',$this->userInfo('return'));
+            $this->success('success',$this->auth->getUserinfo_simple());
         }
 
         //新的ios用户
@@ -634,7 +632,7 @@ class User extends Api
         }
 
 
-        $this->success('success',$this->userInfo('return'));
+        $this->success('success',$this->auth->getUserinfo_simple());
 
     }
     /**
@@ -681,7 +679,7 @@ class User extends Api
             }
             //如果已经有账号则直接登录
             $ret = $this->auth->direct($user['id']);
-            $this->success('success',$this->userInfo('return'));
+            $this->success('success',$this->auth->getUserinfo_simple());
         }
 
         //新的openid用户
@@ -708,7 +706,7 @@ class User extends Api
             $this->error($this->auth->getError());
         }
 
-        $this->success('success',$this->userInfo('return'));
+        $this->success('success',$this->auth->getUserinfo_simple());
 
     }
 
@@ -739,7 +737,7 @@ class User extends Api
         $user->wechat_openid = $wechat_openid;
         $user->save();
 
-        $this->success('绑定成功',$this->userInfo('return'));
+        $this->success('绑定成功',$this->auth->getUserinfo_simple());
     }
 
 

application/common/library/Auth.php

@@ -488,6 +488,41 @@ class Auth
     /**
      * 获取会员基本信息
      */
+    public function getUserinfo_simple()
+    {
+        $data = $this->_user->toArray();
+        $allowFields = $this->getAllowFields();
+        $userinfo = array_intersect_key($data, array_flip($allowFields));
+        $userinfo = array_merge($userinfo, Token::get($this->_token));
+
+        //
+        $userinfo = info_domain_image($userinfo,['avatar','photo_images']);
+
+
+        $new_data = [
+            'setpassword'    => !empty($this->password) ? 1 : 0,
+            'age'            => birthtime_to_age($this->birthday),
+            'birthday'       => date('Y-m-d',$this->birthday),
+        ];
+
+        $userinfo = array_merge($userinfo,$new_data);
+
+
+        //是否绑定微信
+        $userinfo['is_openid'] = !empty($userinfo['wechat_openid']) ? 1 : 0;
+        unset($userinfo['wechat_openid']);
+
+        //
+        unset($userinfo['longitude']);
+        unset($userinfo['latitude']);
+        unset($userinfo['provincename']);
+        unset($userinfo['cityname']);
+        unset($userinfo['jinyantime']);
+        unset($userinfo['jinyantype']);
+        unset($userinfo['introcode']);
+
+        return $userinfo;
+    }
     public function getUserinfo()
     {
         $data = $this->_user->toArray();