|
|
@@ -7,7 +7,6 @@ use app\enterprise\model\User as UserModel;
|
|
|
use app\enterprise\model\Group;
|
|
|
use app\admin\model\UserView;
|
|
|
use app\manage\model\Config;
|
|
|
-use app\enterprise\model\Message;
|
|
|
use think\facade\Session;
|
|
|
use think\facade\Db;
|
|
|
use GatewayClient\Gateway;
|
|
|
@@ -113,10 +112,6 @@ class User
|
|
|
'avatar' => !empty($params['avatar']) ? $params['avatar'] : '',
|
|
|
'language_code' => $this->lang,
|
|
|
];
|
|
|
- if (empty($userInfo['service_status']) || $userInfo['service_status'] == -1) {
|
|
|
- $update['service_status'] = 0;//登录后如果没有服务中,则直接进入排队状态
|
|
|
- }
|
|
|
-
|
|
|
if ($userInfo['cs_uid'] == 1) {
|
|
|
$update['cs_uid'] = $cs_uid;
|
|
|
}
|
|
|
@@ -154,28 +149,6 @@ class User
|
|
|
'userInfo'=>$userInfo
|
|
|
];
|
|
|
|
|
|
- // 如果设置了欢迎语则发送欢迎语
|
|
|
- $first_auto_reply = Config::getFieldValue('first_auto_reply', $this->lang);
|
|
|
- if(!empty($first_auto_reply)){
|
|
|
- if($userInfo){
|
|
|
- $userInfo['dispalayName']=$userInfo['realname'];
|
|
|
- $userInfo['id']=$userInfo['user_id'];
|
|
|
- $userInfo['avatar']=avatarUrl($userInfo['avatar'],$userInfo['realname'],$userInfo['user_id']);
|
|
|
- $msg=[
|
|
|
- 'id'=>\utils\Str::getUuid(),
|
|
|
- 'user_id'=>$cs_uid,
|
|
|
- 'content'=>$first_auto_reply,
|
|
|
- 'toContactId'=>$userInfo['user_id'],
|
|
|
- 'sendTime'=>time()*1000,
|
|
|
- 'type'=>'html',
|
|
|
- 'is_group'=>0,
|
|
|
- 'status'=>'succeed',
|
|
|
- 'fromUser'=>$userInfo,
|
|
|
- 'at'=>[]
|
|
|
- ];
|
|
|
- Message::sendMsg($msg,0,1);
|
|
|
- }
|
|
|
- }
|
|
|
return success(lang('user.loginOk'),$data);
|
|
|
}
|
|
|
|