提交

app/common/controller/User.php

@@ -61,14 +61,10 @@ class User
         }
         try {
             Db::startTrans();
-                
+            $cs_uid = getAutoCsUid();   
             $userInfo=UserModel::where($where)->withoutField('register_ip,login_count,update_time,create_time')->find();
             if($userInfo==null){
-                $cs_uid = 0;
-                $autoTask=Config::autoTask();
-                if($autoTask && $autoTask['user_id']){
-                    $cs_uid = $autoTask['user_id'];
-                }
+                
                 $salt = \utils\Str::random(4);
                 $userInfo = UserModel::create([
                     'account'=>$params['account'],
@@ -116,6 +112,9 @@ class User
                 'avatar' => !empty($params['avatar']) ? $params['avatar'] : '',
                 'language_code' => $this->lang,
             ];
+            if ($userInfo['cs_uid'] == 1) {
+                $update['cs_uid'] = $cs_uid;
+            }
             if (!empty($params['realname'])) {
                 $update['realname'] = $params['realname'];
             }

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{