在线离线改成五分钟，还有列表只显示在线

application/api/controller/Userfollow.php

@@ -82,12 +82,12 @@ class Userfollow extends Api
         //亲密度列表
         $intimacy = Db::name('user_intimacy')->alias('ui')
             ->field(['ui.id','ui.uid','ui.other_uid','ui.value','ui.level',
-                'u.nickname as u_nickname','u.avatar as u_avatar','u.is_active as u_is_active',/*'ua.requesttime as ua_requesttime',*/
-                'ou.nickname as ou_nickname','ou.avatar as ou_avatar','ou.is_active as ou_is_active '/*,'oua.requesttime as oua_requesttime'*/])
+                'u.nickname as u_nickname','u.avatar as u_avatar','u.is_active as u_is_active','ua.requesttime as ua_requesttime',
+                'ou.nickname as ou_nickname','ou.avatar as ou_avatar','ou.is_active as ou_is_active ','oua.requesttime as oua_requesttime'])
             ->join('user u'         ,'ui.uid = u.id','LEFT')
-//            ->join('user_active ua' ,'ui.uid = ua.user_id','LEFT')
+            ->join('user_active ua' ,'ui.uid = ua.user_id','LEFT')
             ->join('user ou'        ,'ui.other_uid = ou.id','LEFT')
-//            ->join('user_active oua','ui.other_uid = oua.user_id','LEFT')
+            ->join('user_active oua','ui.other_uid = oua.user_id','LEFT')
             ->where('(ui.uid = '.$this->auth->id.') or (ui.other_uid = '.$this->auth->id.')')
             ->where('ui.value','gt','0.1')
             ->order('ui.value desc, ui.id desc')->autopage()->select();
@@ -105,7 +105,7 @@ class Userfollow extends Api
 //                        'requesttime'      => $val['oua_requesttime'],
                         'is_active'         => $val['ou_is_active'],
                         'intimacy'         => $val['value'],
-//                        'requesttime_text' => get_last_time($val['oua_requesttime']),
+                        'requesttime_text' => get_last_time($val['oua_requesttime']).'在线',
                     ];
                 }else{
                     $newval = [
@@ -115,7 +115,7 @@ class Userfollow extends Api
 //                        'requesttime'      => $val['ua_requesttime'],
                         'is_active'         => $val['u_is_active'],
                         'intimacy'         => $val['value'],
-//                        'requesttime_text' => get_last_time($val['ua_requesttime']),
+                        'requesttime_text' => get_last_time($val['ua_requesttime']).'在线',
                     ];
                 }
                 $result[] = $newval;

application/common/controller/Api.php

@@ -503,7 +503,7 @@ class Api
             'active_text' => get_last_time($requesttime).'在线',
         ];
 
-        if(time() - $requesttime > 7200){
+        if(time() - $requesttime > 300){
             $result = [
                 'is_active' => 0,
                 'active_text' => '离线',

application/index/controller/Plantask.php

@@ -13,7 +13,7 @@ class Plantask extends Controller
 
     //定时跑用户活跃，改成离线
     public function auto_user_active(){
-        $actitime = time() - 7200;
+        $actitime = time() - 300;
 
         $sql = 'update `mt_user` set is_active = 0 where is_active = 1 and id in (select user_id from mt_user_active where requesttime < '.$actitime.')';
         db()->query($sql);