Browse Source

微调整

lizhen_gitee 1 year ago
parent
commit
df072b7cb4

+ 4 - 0
application/api/controller/Topicdongtai.php

@@ -477,6 +477,10 @@ class Topicdongtai extends Api
 
     //评论
     public function answer(){
+        if($this->apiLimit(1,5000) == false){
+            $this->error('抱歉,您在5秒内只能进行一次回复');
+        }
+
         $id = input('id',0);
         $content = input('content','');
         $to_user_id = input('to_user_id',0);

+ 11 - 6
application/api/controller/Usercenter.php

@@ -74,6 +74,7 @@ class Usercenter extends Api
 
         $field = $this->allowFields;
         $field[] = 'longitude';
+        $field[] = 'latitude';
         $field[] = '(st_distance(point (' . $this->auth->longitude . ', ' . $this->auth->latitude . '),point(longitude,latitude))*111195) as distance';
         $userinfo = Db::name('user')->field($field)->where('id',$uid)->find();
 
@@ -83,11 +84,10 @@ class Usercenter extends Api
 
         //用户数据
         $userinfo = info_domain_image($userinfo,['avatar','photo_images']);
-        $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$uid)->find();
 
         $new_data = [
             'age'            => birthtime_to_age($userinfo['birthday']),
-            'truename'       => ($userinfo['idcard_status'] == 1 && isset($idcard_confirm['truename'])) ? $idcard_confirm['truename'] : '',
+            'truename'       => '',
         ];
 
         //合并
@@ -102,7 +102,7 @@ class Usercenter extends Api
         //是否喜欢和关注
         $userinfo['is_follow'] = $this->is_follow($this->auth->id,$uid);
         $userinfo['is_fans'] = $this->is_follow($uid,$this->auth->id);
-        $userinfo['is_friend'] = $this->is_friend($this->auth->id,$uid);
+        $userinfo['is_friend'] = ($userinfo['is_follow'] && $userinfo['is_fans']) ? 1 : 0;
 
 //        $is_like   = Db::name('user_like')->where(['uid'=>$this->auth->id,'like_uid'=>$uid])->find();
 //        $userinfo['is_like'] = $is_like ? 1 : 0;
@@ -167,6 +167,7 @@ class Usercenter extends Api
 
         $field = $this->allowFields;
         $field[] = 'longitude';
+        $field[] = 'latitude';
         $field[] = '(st_distance(point (' . $this->auth->longitude . ', ' . $this->auth->latitude . '),point(longitude,latitude))*111195) as distance';
         $userinfo = Db::name('user')->field($field)->where('id',$uid)->find();
 
@@ -176,11 +177,12 @@ class Usercenter extends Api
 
         //用户数据
         $userinfo = info_domain_image($userinfo,['avatar','photo_images']);
-        $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$uid)->find();
+//        $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$uid)->find();
 
         $new_data = [
             'age'            => birthtime_to_age($userinfo['birthday']),
-            'truename'       => ($userinfo['idcard_status'] == 1 && isset($idcard_confirm['truename'])) ? $idcard_confirm['truename'] : '',
+//            'truename'       => ($userinfo['idcard_status'] == 1 && isset($idcard_confirm['truename'])) ? $idcard_confirm['truename'] : '',
+            'truename'       => '',
         ];
 
         //合并
@@ -195,7 +197,10 @@ class Usercenter extends Api
         //是否喜欢和关注
         $userinfo['is_follow'] = $this->is_follow($this->auth->id,$uid);
         $userinfo['is_fans'] = $this->is_follow($uid,$this->auth->id);
-        $userinfo['is_friend'] = $this->is_friend($this->auth->id,$uid);
+        $userinfo['is_friend'] = ($userinfo['is_follow'] && $userinfo['is_fans']) ? 1 : 0;
+
+
+
 
 //        $is_like   = Db::name('user_like')->where(['uid'=>$this->auth->id,'like_uid'=>$uid])->find();
 //        $userinfo['is_like'] = $is_like ? 1 : 0;

+ 2 - 1
application/api/controller/Userintro.php

@@ -16,7 +16,8 @@ class Userintro extends Api
     //生成我的视频海报
     //生成邀请码二维码图片
     public function inviteimage() {
-        $params['text'] = config('app_download_url') . '/index/index/appdownload';
+//        $params['text'] = config('app_download_url') . '/index/index/appdownload';
+        $params['text'] = 'https://www.tken.com.cn';
         $qrcode_service = \addons\qrcode\library\Service::qrcode($params);
 //        $mimetype = 'image/png';
 //        $response = Response::create()->header("Content-Type", $mimetype);

+ 2 - 2
application/common/controller/Api.php

@@ -443,7 +443,7 @@ class Api
         return true;
     }
 
-    //获取用户是否活跃,7200秒,2小时
+    //获取用户是否活跃,172800秒,48小时
     //1活跃,0不活跃
     protected function user_activeinfo($user_id,$requesttime = 0){
 
@@ -456,7 +456,7 @@ class Api
             'active_text' => get_last_time($requesttime).'在线',
         ];
 
-        if(time() - $requesttime > 7200){
+        if(time() - $requesttime > 172800){
             $result = [
                 'is_active' => 0,
                 'active_text' => '离线',

+ 1 - 1
application/index/controller/Plantask.php

@@ -57,7 +57,7 @@ class Plantask extends Controller
 
     //定时跑用户活跃,改成离线
     public function auto_user_active(){
-        $actitime = time() - 7200;
+        $actitime = time() - 172800;
 
         $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);