lip 3 月之前
父節點
當前提交
0952231bbb
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 1 0
      app/common.php
  2. 5 6
      app/common/controller/User.php

+ 1 - 0
app/common.php

@@ -141,6 +141,7 @@ function getEnvValue($key) {
  * 获取机器人客服ID
  * 获取机器人客服ID
  */
  */
 function getAutoCsUid(){
 function getAutoCsUid(){
+    return 2;
     $autoTask = \app\manage\model\Config::autoTask();
     $autoTask = \app\manage\model\Config::autoTask();
     return isset($autoTask['user_id']) ? $autoTask['user_id'] : 0;
     return isset($autoTask['user_id']) ? $autoTask['user_id'] : 0;
 }
 }

+ 5 - 6
app/common/controller/User.php

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