修改用户表相关联的茶轩

app/admin/command/UserQueue.php

@@ -91,7 +91,7 @@ class UserQueue extends Command
             wsSendMsg(0,'handleChat',['user_id'=>$user_id]);
 
             //自动回复-人工客服接线成功
-            Message::sendAutoReply('transfer_to_human_success', $user_id, $cs_uid, $user['language_code']);
+            Message::sendAutoReply('transfer_to_human_success', $user_id, $cs_uid, $user['language']);
         } catch (\Exception $e) {
             Db::rollback();
         }

app/admin/controller/Complaint.php

@@ -26,7 +26,8 @@ class Complaint extends BaseController
             $language_code = $params['language_code'] ?? $this->lang;
             
             $query = ComplaintModel::alias('complaint')
-                                    ->join('user', 'user.user_id=complaint.cs_uid','left');
+                                    ->join(env('database.DATABASE').'.bot_users user', 'complaint.cs_uid = user.user_id', 'left');
+                                    // ->join('user', 'user.user_id=complaint.cs_uid','left');
                                     //->where('complaint.language_code', $language_code);
             if (!empty($params['keyword'])) {
                 $query = $query->where('user.realname', 'like', '%'.$params['keyword'].'%')

app/admin/controller/Kefu.php

@@ -43,8 +43,9 @@ class Kefu extends BaseController
             $params = $this->request->param();
             $page = $params['page'] ?? 1;
             $limit = $params['limit'] ?? 15;
-            $query = KefuWork::alias('kefu_work')
-                        ->join('user', 'kefu_work.admin_id = user.uid', 'left')
+            $query = Db::table('la_kefu_work')->alias('kefu_work')
+                        // 关键：写完整的 库名.bot_users，彻底避免加 la_ 前缀
+                        ->join(env('database.DATABASE').'.bot_users user', 'kefu_work.admin_id = user.uid', 'left')
                         ->where('kefu_work.created_at', '>=', date('Y-m-d 00:00:00'))
                         ->where('user.role', 3);
 
@@ -53,7 +54,7 @@ class Kefu extends BaseController
             }
 
             $count = $query->count();
-            $list = $query->field([' kefu_work.id', 'user.realname as nickname','user.is_online', 'user.chat_num','kefu_work.transfer_num','kefu_work.intervention_num','kefu_work.completed_num','kefu_work.created_at'])
+            $list = $query->field(['kefu_work.id', 'user.realname as nickname','user.is_online', 'user.chat_num','kefu_work.transfer_num','kefu_work.intervention_num','kefu_work.completed_num','kefu_work.created_at'])
                         ->order('user.is_online', 'desc')  
                         ->limit($limit)
                         ->page($page)
@@ -91,7 +92,7 @@ class Kefu extends BaseController
             $order = $params['order'] ?? 'desc';
             $query = KefuWork::alias('kefu_work')
                         ->join('admin', 'kefu_work.admin_id = admin.id', 'left')
-                        ->join('user', 'kefu_work.admin_id = user.uid', 'left')
+                        ->join(env('database.DATABASE').'.bot_users user', 'kefu_work.admin_id = user.uid', 'left')
                         ->where('user.from', 0);
 
             if (isset($params['is_online'])) {
@@ -245,7 +246,7 @@ class Kefu extends BaseController
             wsSendMsg(0,'handleChat',['user_id'=>$user_id]);
 
             //自动回复-人工客服接线成功
-            Message::sendAutoReply('transfer_to_human_success', $user_id, $cs_uid,$user->language_code);
+            Message::sendAutoReply('transfer_to_human_success', $user_id, $cs_uid,$user->language);
         } catch (\Exception $e) {
             Db::rollback();
             return $this->error($e->getMessage());
@@ -302,7 +303,7 @@ class Kefu extends BaseController
             wsSendMsg(0,'handleChat',['user_id'=>$user_id]);
 
             //自动回复-人工客服接线成功
-            Message::sendAutoReply('transfer_to_human_success', $user_id, $cs_uid, $user->language_code);
+            Message::sendAutoReply('transfer_to_human_success', $user_id, $cs_uid, $user->language);
         } catch (\Exception $e) {
             Db::rollback();
             return $this->error($e->getMessage());
@@ -396,7 +397,7 @@ class Kefu extends BaseController
                         'status' => 'going',
                         'sendTime' => time() * 1000,
                         'toContactId' => $user_id,
-                        'content' => Config::getFieldValue('kefu_finished_chat', $user->language_code),
+                        'content' => Config::getFieldValue('kefu_finished_chat', $user->language),
                         'file_id' => 0,
                         'is_group' => 0,
                         'user_id' => $cs_uid,
@@ -428,7 +429,8 @@ class Kefu extends BaseController
             
             $cs_uid = $params['user_id'] ?? User::getCsId($this->admin_id);
             $query = Score::alias('score')
-                        ->join('user', 'score.user_id = user.user_id', 'left')
+                        ->join(env('database.DATABASE').'.bot_users user', 'score.user_id = user.user_id', 'left')
+                        // ->join('user', 'score.user_id = user.user_id', 'left')
                         ->where('score.cs_uid', $cs_uid);
 
             $count = $query->count();
@@ -459,8 +461,10 @@ class Kefu extends BaseController
             $is_online = $params['is_online'] ?? '';
             
             $query = KefuLog::alias('log')
-                        ->join('user', 'log.user_id = user.user_id', 'left')
-                        ->join('user kefu', 'log.cs_uid = kefu.user_id', 'left');
+                        ->join(env('database.DATABASE').'.bot_users user', 'log.user_id = user.user_id', 'left')
+                        ->join(env('database.DATABASE').'.bot_users kefu', 'log.cs_uid = kefu.user_id', 'left');
+                        // ->join('user', 'log.user_id = user.user_id', 'left')
+                        // ->join('user kefu', 'log.cs_uid = kefu.user_id', 'left');
             if ($keyword) {
                 $query = $query->where('user.realname|user.user_id', 'like', "%{$keyword}%");
             }

app/admin/controller/Wallet.php

@@ -108,7 +108,9 @@ class Wallet extends BaseController
             $page = isset($params['page']) ? intval($params['page']) : 1;
             $limit = isset($params['limit']) ? intval($params['limit']) : 15;
             
-            $query = Recharge::alias('recharge')->join('user', 'recharge.user_id=user.user_id','left');
+            $query = Recharge::alias('recharge')
+                        ->join(env('database.DATABASE').'.bot_users user', 'recharge.user_id = user.user_id', 'left');
+                        // ->join('user', 'recharge.user_id=user.user_id','left');
            
             if (isset($params['start_time'])) {
                 $start_time = strtotime($params['start_time'].' 00:00:00');
@@ -289,7 +291,9 @@ class Wallet extends BaseController
             $params = $this->request->param();
             $page = isset($params['page']) ? intval($params['page']) : 1;
             $limit = isset($params['limit']) ? intval($params['limit']) : 15;
-            $query = Withdraw::alias('withdraw')->join('user', 'withdraw.user_id=user.user_id','left');
+            $query = Withdraw::alias('withdraw')
+                        ->join(env('database.DATABASE').'.bot_users user', 'withdraw.user_id = user.user_id', 'left');
+                        // ->join('user', 'withdraw.user_id=user.user_id','left');
            
             if (isset($params['start_time'])) {
                 $start_time = strtotime($params['start_time'].' 00:00:00');

app/admin/model/Department.php

@@ -40,10 +40,12 @@ class Department extends BaseModel
         $tree = self::getChildrenTree($parent_department_id);
         $department_ids = self::getChildrenIds($tree);
 
-        $cs_uids = Admin::alias('admin')->join('user', 'admin.id=user.uid','left')
-            ->whereIn('admin.department_id', $department_ids)
-            ->where('user.role', '>', 0)
-            ->column('user.user_id');
+        $cs_uids = Admin::alias('admin')
+                    ->join(env('database.DATABASE').'.bot_users user', 'admin.id = user.uid', 'left')
+                    // ->join('user', 'admin.id=user.uid','left')
+                    ->whereIn('admin.department_id', $department_ids)
+                    ->where('user.role', '>', 0)
+                    ->column('user.user_id');
         return $cs_uids;
     }
 

app/admin/model/FundsRecord.php

@@ -35,7 +35,8 @@ class FundsRecord extends BaseModel
 
     public static function getList($params, $user_code = '') {
         $query = FundsRecord::alias('funds_record')
-            ->join('user', 'funds_record.user_id=user.user_id','left');
+                    ->join(env('database.DATABASE').'.bot_users user', 'funds_record.user_id = user.user_id', 'left');
+                    // ->join('user', 'funds_record.user_id=user.user_id','left');
         if ($user_code != '') {
             $query = $query->where('user.user_code', $user_code);
         } 

app/admin/model/User.php

@@ -12,7 +12,11 @@ class User extends BaseModel
     use softDelete;
     protected $deleteTime = 'delete_time';
     protected $defaultSoftDelete = null;
-
+    protected $table = 'bot_users';
+    protected $createTime = 'created_at';
+    protected $updateTime = 'updated_at';
+    //时间是日期格式
+    protected $autoWriteTimestamp = true;
    protected $pk = "id";
    
    public static $defaultField = 'user_id,realname,realname as displayName,account,avatar,name_py,email,last_login_ip';
@@ -36,7 +40,7 @@ class User extends BaseModel
         }
         return $user_id;
     }
-    
+
    public static function getCsId($admin_id) {
       return self::where('from', 0)->where('uid', $admin_id)->value('user_id');
    }

app/common/controller/Pub.php

@@ -11,6 +11,8 @@ use GatewayClient\Gateway;
 use app\manage\model\Config;
 use thans\jwt\facade\JWTAuth;
 
+use function AlibabaCloud\Client\json;
+
 /**
  * 控制器基础类
  */
@@ -320,8 +322,11 @@ class Pub
 
     // 获取系统配置信息
     public function getSystemInfo(){
-        $systemInfo=Config::getSystemInfo();
-        $systemInfo['demon_mode']=env('app.demon_mode',false);
+        try {
+            $systemInfo=Config::getSystemInfo();
+            $systemInfo['demon_mode']=env('app.demon_mode',false);
+        } catch (\Exception $e) {
+        }
         return success('',$systemInfo);
     }
 

app/common/controller/User.php

@@ -45,15 +45,16 @@ class User
      public function login(){
 
         $token = $this->request->param('token');
+        
         if (!$token) {
-            return error(lang('user.token_error'));
+            return json(['code' => 400, 'msg' => 'user.token_error']);
         }
         
         try {
             Db::startTrans();
             $user_id = UserSession::where('token',$token)->where('expire_time','>', time())->value('user_id');
             if(!$user_id){
-                return error(lang('user.token_error'));
+                return json(['code' => 400, 'msg' => 'user.token_error']);
             }
 
             $cs_uid = getAutoCsUid();   
@@ -76,10 +77,9 @@ class User
             
             $update=[
                 'last_login_time'=>time(),
-                'last_login_ip'=>$this->request->ip(),
                 'login_count'=>Db::raw('login_count+1'),
                 'avatar' => !empty($params['avatar']) ? $params['avatar'] : '',
-                'language_code' => $this->lang,
+                'language' => $this->lang,
             ];
             if ($userInfo['cs_uid'] == 1) {
                 $update['cs_uid'] = $cs_uid;
@@ -95,7 +95,7 @@ class User
             Db::commit();
         } catch (\Exception $e) {
             Db::rollback();
-            return error($e->getMessage());
+            return json(['code' => 400, 'msg' => $e->getMessage()]);
         }
         
         //如果登录信息中含有client——id则自动进行绑定
@@ -187,7 +187,7 @@ class User
                 'last_login_ip'=>$this->request->ip(),
                 'login_count'=>Db::raw('login_count+1'),
                 'avatar' => !empty($params['avatar']) ? $params['avatar'] : '',
-                'language_code' => $this->lang,
+                'language' => $this->lang,
             ];
             if ($userInfo['cs_uid'] == 1) {
                 $update['cs_uid'] = $cs_uid;
@@ -204,7 +204,7 @@ class User
             Db::commit();
         } catch (\Exception $e) {
             Db::rollback();
-            return error($e->getMessage());
+            return json(['code' => 400, 'msg' => $e->getMessage()]);
         }
         
         //如果登录信息中含有client——id则自动进行绑定

app/enterprise/model/User.php

@@ -23,6 +23,15 @@ class User extends BaseModel
    use SoftDelete;
    protected $deleteTime = 'delete_time';
    protected $defaultSoftDelete  = null;
+    
+    // 指定使用 other_db 连接
+   //  protected $connection = 'bot_db';
+    protected $table = 'bot_users';
+    protected $createTime = 'created_at';
+    protected $updateTime = 'updated_at';
+    //时间是日期格式
+    protected $autoWriteTimestamp = true;
+
    
    public static $defaultField = 'id,user_id,realname,realname as displayName,account,avatar,name_py,email,last_login_ip,service_status,cs_uid,timeout_type,remark';