提交

app/common/listener/UserRegister.php

@@ -42,7 +42,7 @@ class UserRegister
                             $msg=[
                                 'id'=>\utils\Str::getUuid(),
                                 'user_id'=>$cs_uid,
-                                'content'=>$first_auto_reply ? $first_auto_reply : $autoAdduser['welcome'],
+                                'content'=>$first_auto_reply,
                                 'toContactId'=>$data['user_id'],
                                 'sendTime'=>time()*1000,
                                 'type'=>'html',

app/enterprise/controller/Im.php

@@ -240,8 +240,7 @@ class Im extends BaseController
             if($user->service_status == -1) {
                 
                 //机器人客服
-                $autoTask = Config::autoTask();
-                $auto_cs_uid = !empty($autoTask['user_id']) ? $autoTask['user_id'] : 1;
+                $auto_cs_uid = getAutoCsUid();
                 $user->service_status = 0;
                 $user->service_start = time();
                 $user->timeout_type = 0;

app/enterprise/model/Message.php

@@ -141,8 +141,8 @@ class Message extends BaseModel
                 }
 
                 //判断是否给机器人客服发送消息
-                $autoTask = Config::autoTask();
-                if (!empty($autoTask['user_id']) && $param['toContactId'] == $autoTask['user_id']) { 
+                $autoCsUid = getAutoCsUid();
+                if ($autoCsUid && $param['toContactId'] == $autoCsUid) { 
                     $is_robot = true;
                 }
             }else{

app/enterprise/model/User.php

@@ -24,7 +24,7 @@ class User extends BaseModel
 
    protected $pk = "user_id";
    
-   public static $defaultField = 'user_id,realname,realname as displayName,account,avatar,name_py,email,last_login_ip,service_status,cs_uid,timeout_type';
+   public static $defaultField = 'user_id,realname,realname as displayName,account,avatar,name_py,email,last_login_ip,service_status,cs_uid,timeout_type,remark';
 
    protected $json = ['setting'];
    protected $jsonAssoc = true;