提交

app/common/controller/User.php

@@ -47,19 +47,12 @@ class User
     public function login(){
         $params=request()->param();
         $where['role'] = 0;
-        $where['cs_uid'] = 0;
         if (empty($params['account']) || empty($params['uid']) || empty($params['from'])) {
             return json(['code' => 400, 'msg' => '参数错误']);
         }
         if (!empty($params['account'])) {
             $where[] = ['account', '=', $params['account']];
         } 
-        if (!empty($params['phone'])) {
-            $where[] = ['phone', '=', $params['phone']];
-        }
-        if (!empty($params['email'])) {
-            $where[] = ['email', '=', $params['email']];
-        }
         if (!empty($params['from'])) {
             $where[] = ['from', '=', $params['from']];
         }
@@ -71,10 +64,10 @@ class User
             $salt = \utils\Str::random(4);
             $userInfo = UserModel::create([
                 'account'=>$params['account'],
-                'realname'=>$params['realname'],
-                'name_py' => pinyin_sentence($params['realname']),
-                'phone'=>$params['phone'],
-                'email'=>$params['email'],
+                'realname'=> !empty($params['realname'])  ? $params['realname'] : '',
+                'name_py' => !empty($params['realname']) ? pinyin_sentence($params['realname']) : '',
+                'phone'=>!empty($params['phone']) ? $params['phone'] : '',
+                'email'=>!empty($params['email']) ? $params['email'] : '',
                 'from'=>$params['from'],
                 'uid'=>$params['uid'],
                 'salt' => $salt,
@@ -87,30 +80,34 @@ class User
                 'last_login_time' => time(),
                 'login_count' => 1
             ]);
+            // 监听用户注册后的操作
+            event('UserRegister',['user_id' => $userInfo['user_id'], 'realname' => $userInfo['realname']]);
 
-            $content=lang('friend.newChat');
-            //把机器人添加到我的联系人中
-            $userM = new UserModel;
-            $user=$userM->setContact(1, 0,'event',$content);//机器人客服
-            if($user){
-                wsSendMsg($userInfo->user_id,'appendContact',$user);
+            
+            // $content=lang('friend.newChat');
+            // //把机器人添加到我的联系人中
+            // $userM = new UserModel;
+            // $user=$userM->setContact(1, 0,'event',$content);//机器人客服
+            // if($user){
+            //     wsSendMsg($userInfo->user_id,'appendContact',$user);
+            // }
+        } else {
+            $userInfo['avatar']=avatarUrl($userInfo['avatar'],$userInfo['realname'],$userInfo['user_id']);
+            //    如果用户已经有设置
+            $setting=$userInfo['setting'] ?: '';
+            if($setting){
+                $setting['hideMessageName']= $setting['hideMessageName']=='true' ? true : false;
+                $setting['hideMessageTime']= $setting['hideMessageTime']=='true' ? true : false;
+                $setting['avatarCricle']= $setting['avatarCricle']=='true' ? true : false;
+                $setting['isVoice']= $setting['isVoice']=='true' ? true : false;
+                $setting['sendKey']=(int)$setting['sendKey'];
+                $userInfo['setting']=$setting;
             }
         }
         if($userInfo['status']==0){
             return warning(lang('user.forbid'));
         }  
         
-        $userInfo['avatar']=avatarUrl($userInfo['avatar'],$userInfo['realname'],$userInfo['user_id']);
-        //    如果用户已经有设置
-        $setting=$userInfo['setting'] ?: '';
-        if($setting){
-            $setting['hideMessageName']= $setting['hideMessageName']=='true' ? true : false;
-            $setting['hideMessageTime']= $setting['hideMessageTime']=='true' ? true : false;
-            $setting['avatarCricle']= $setting['avatarCricle']=='true' ? true : false;
-            $setting['isVoice']= $setting['isVoice']=='true' ? true : false;
-            $setting['sendKey']=(int)$setting['sendKey'];
-            $userInfo['setting']=$setting;
-        }
         //如果登录信息中含有client——id则自动进行绑定
         $client_id=$this->request->param('client_id');
         if($client_id){
@@ -128,11 +125,13 @@ class User
         $userInfo['displayName']=$userInfo['realname'];
         $userInfo['id']=$userInfo['user_id'];
         $authToken=UserModel::refreshToken($userInfo,$param['terminal'] ?? 'web');
+        
         $data=[
             'sessionId'=>Session::getId(),
             'authToken'=>$authToken,
             'userInfo'=>$userInfo
         ];
+           
         return success(lang('user.loginOk'),$data);
    }
 

app/enterprise/model/User.php

@@ -491,6 +491,9 @@ class User extends BaseModel
 
    // 获取机器人聊天消息
    public static function otherChat($uid){
+      return [];
+
+
       $staticList=self::staticUser();
       $adminNotice=$staticList['adminNotice'];
       $fileTransfer=$staticList['fileTransfer'];