保持代码最新版。

application/api/controller/Ceshi.php

@@ -8,8 +8,10 @@ use think\Log;
 
 class Ceshi extends Controller
 {
-    //测试 发送各种消息
+    //设置白名单ip访问本类接口
-
+    protected $allowIp = [
+        '113.201.181.82'
+    ];
 
     //发送群组系统消息
     public function send_group_system_notification()
@@ -150,6 +152,13 @@ class Ceshi extends Controller
     //清空数据  禁用 慎用 ！！！！！！
     public function clear_data()
     {
+        //ip
+        $ip = request()->ip();
+        //白名单
+        $white_list = $this -> allowIp;
+        if (!in_array($ip, $white_list)) {
+            return V(301, '非法访问！');
+        }
         $i = 0;
         $res = [];
         //开启事务

application/api/controller/Search.php

@@ -84,7 +84,7 @@ class Search extends BaseCom
                     $lists[$k]['picture'] = $v['room_cover'];
                     $lists[$k]['code'] = $v['room_number'];
                     $lists[$k]['label_icon'] = db::name('vs_room_label')->where('id', $v['label_id'])->value('label_icon');
-                    $lists[$k]['hot_value'] = $v['hot_value'];
+                    $lists[$k]['hot_value'] = $v['today_hot_value'];
                 }elseif($type == 3){
                     $lists[$k]['id'] = $v['id'];
                     $lists[$k]['name'] = $v['guild_name'];

application/api/model/GiveGift.php

@@ -505,6 +505,7 @@ class GiveGift extends Model
         //增加房间火热值hot_value
         $gift_totalaa = $gift_total * get_system_config_value('coin_charm_exp');
         Db::name('vs_room')->where(['id'=>$from_id,'apply_status'=>2])->setInc('hot_value',$gift_totalaa);
+        Db::name('vs_room')->where(['id'=>$from_id,'apply_status'=>2])->setInc('today_hot_value',$gift_totalaa);
 
         Db::commit();
         return ['code' => 1, 'msg' => '送礼成功', 'data' => null];

application/api/model/Room.php

@@ -181,7 +181,7 @@ class Room extends Model
             $map['is_top'] = $is_top;
         }
 
-        $list = db::name('vs_room')->field('id as room_id,room_number,user_id,room_name,room_cover,room_password,hot_value,label_id,is_show_room')
+        $list = db::name('vs_room')->field('id as room_id,room_number,user_id,room_name,room_cover,room_password,today_hot_value as hot_value,label_id,is_show_room')
                         ->where($map)->order('hot_value desc')->page($page, $page_limit)->select();
 //        var_dump($list);
         foreach ($list as $k => &$v){
@@ -231,7 +231,7 @@ class Room extends Model
             }
         }
         if(!empty($user_room_list)){
-            $list = db::name('vs_room')->field('id as room_id,room_number,user_id,room_name,room_cover,room_password,hot_value')
+            $list = db::name('vs_room')->field('id as room_id,room_number,user_id,room_name,room_cover,room_password,today_hot_value as hot_value')
                 ->where('id', 'in', $user_room_list)->order('hot_value desc')->page($page, $page_limit)->select();
             foreach ($list as $k => &$v){
 //                $v['hot_value'] = $v['hot_value'] * 10;
@@ -822,7 +822,7 @@ class Room extends Model
             'label_id' => $label_id,
             'label_icon' => db::name('vs_room_label')->where('id', $room['label_id'])->value('label_icon_room'),
             'room_background' => $room['room_background'],
-            'hot_value' => $room['hot_value'],
+            'hot_value' => $room['today_hot_value'],
             'chatrooms' => 'room'.$room['id'],
             'pit_list'  => $pit_list,
             'room_up_pit_type'=>$room['room_up_pit_type'],
@@ -1963,7 +1963,7 @@ class Room extends Model
             'label_id' => $label_id,
             'label_icon' => db::name('vs_room_label')->where('id', $room['label_id'])->value('label_icon_room'),
             'room_background' => $room['room_background'],
-            'hot_value' => $room['hot_value'],
+            'hot_value' => $room['today_hot_value'],
             'chatrooms' => 'room'.$room['id'],
             'pit_list'  => $pit_list,
             'room_up_pit_type'=>$room['room_up_pit_type'],

application/api/model/UserData.php

@@ -393,7 +393,7 @@ class UserData extends Model
     //房间历史足迹
     public function user_room_history_list($uid,$page,$page_limit){
         $list = db::name('user_visit_log')->alias('a')->join('fa_vs_room b','a.to_id = b.id')
-            ->field('b.id as room_id,b.room_number,b.room_name,b.room_cover,b.room_intro,b.label_id,b.room_password,b.is_show_room,b.hot_value')
+            ->field('b.id as room_id,b.room_number,b.room_name,b.room_cover,b.room_intro,b.label_id,b.room_password,b.is_show_room,b.today_hot_value as hot_value')
             ->where('a.from_uid',$uid)
             ->where('a.type',2)
             ->where('b.type_id','<>',6)

application/api/model/UserToken.php

@@ -10,14 +10,14 @@ class UserToken extends Model
     public function check_login_token($token)
     {
         if (empty($token)) {
-            return ['code' => 301, 'msg' => '登录失效',  'data' =>null];
+            return ['code' => 301, 'msg' => '登录失效!',  'data' =>null];
         }
         $user_token = $this->where('token', $token)->find();
         if (empty($user_token)) {
-            return ['code' => 301, 'msg' => '登录失效',  'data' => null];
+            return ['code' => 301, 'msg' => '登录失效!!',  'data' => null];
         }
         if ($user_token['expiretime'] < time()) {
-            return ['code' => 301, 'msg'=> '登录失效',  'data' => null];
+            return ['code' => 301, 'msg'=> '登录失效!!!',  'data' => null];
         }
 
         $block1 = db::name('block')->where(['type' => 1,'type_text' => $user_token['user_id']])->find();

application/api/model/UserZone.php

@@ -122,7 +122,7 @@ class UserZone extends Model
                 //查询房主此时是否在聊天室
                 $room_id = db::name('vs_room_visitor')->where(['user_id' => $v['user_id'], 'is_delete' => 1])->value('room_id');
                 if ($room_id) {
-                    $room = db::name('vs_room')->where(['id' => $room_id, 'room_status' => 1])->field('id,room_name,room_number,room_cover,room_intro,hot_value,type_id')->find();
+                    $room = db::name('vs_room')->where(['id' => $room_id, 'room_status' => 1])->field('id,room_name,room_number,room_cover,room_intro,today_hot_value as hot_value,type_id')->find();
                     $v['room_id'] = $room['id'];
                     $v['room_cover'] = $room['room_cover'];
                     $v['room_type'] = db::name('vs_room_type')->where(['id' => $room['type_id'], 'status' => 1])->field('type_name');

application/common/controller/BaseCom.php

@@ -20,7 +20,6 @@ class BaseCom extends Controller
         header("Access-Control-Max-Age: 3600");
 
         //检测系统是否维护中
-//        $config = get_system_config();
         $is_maintenance = get_system_config_value('is_maintenance');
         if($is_maintenance == 2){
             return V(203, '系统维护中');
@@ -37,14 +36,37 @@ class BaseCom extends Controller
         }
         $zhenshi_version = db::name('version')->where('type', 2)->value('oldversion');
         $result = version_compare($version,$zhenshi_version);
+        //请求的接口
+        $api = request()->controller().'/'.request()->action();
         if($system == 'iOS' && $result > 0){
+            if($api == 'Index/index_banner' || $api == 'Index/room_type_list' || $api == 'Index/room_list' || $api == 'UserZone/expand_zone' || $api == 'UserZone/zone_list' || $api == 'UserZone/topic_list' || $api == 'UserZone/get_zone_topic'){
                 $this->uid = 0;
                 //定义一个常量
                 define('UID', $this->uid);
             }else{
-            $token = input('token', '');
-            if (empty($token)) {
                 $token = request()->header('token');
+                if (empty($token)) {
+                    $token = input('token', '');
+                    if(empty($token)){
+                        return V(301, '登录失效');
+                    }
+                }
+
+                $reslut = model('UserToken')->check_login_token($token);
+                if($reslut['code'] != 1) {
+                    model('UserToken')->where('token', $token)->update(['token' => 1]);
+                    return V($reslut['code'], $reslut['msg'],$reslut['data']);
+                } else {
+                    $this->uid = $reslut['data'];
+                    //定义一个常量
+                    define('UID', $this->uid);
+                }
+            }
+
+        }else{
+            $token = request()->header('token');
+            if (empty($token)) {
+                $token = input('token', '');
                 if(empty($token)){
                     return V(301, '登录失效');
                 }

application/cron/controller/DaySeconds.php

@@ -35,7 +35,7 @@ class DaySeconds
             $data = [
                 'today_hot_value' => 0,
             ];
-            db::name('vs_room')->where(['id' => $value['id']])->save($data);
+            db::name('vs_room')->where(['id' => $value['id']])->update($data);
         }
         echo date('Y-m-d H:i:s').' 完成'."\n";
         die;

application/cron/controller/PerformPerSecond.php

@@ -30,9 +30,9 @@ class PerformPerSecond
         echo "pk发起10秒后无应答拒绝：\n";
         $this->pk_start_refuse();
         echo "\n";
-        echo "提现云账号订单状态查询：\n";
+//        echo "提现云账号订单状态查询：\n";
-        $this->withdraw_order_status();
+//        $this->withdraw_order_status();
-        echo "\n";
+//        echo "\n";
     }
 
 
@@ -144,6 +144,7 @@ class PerformPerSecond
                     db::name('vs_user_withdrawal')->where('order_sn',$value['order_sn'])->update([
                         'status' => 6,
                         'pay_time' => time(),
+                        'pay_message' => $result['data']['msg'],
                         'updatetime' => time()
                     ]);
                 }else{