Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -178,6 +178,43 @@ class WebTraffic extends Command
                 }
                 }
                 //随机访问ip
                 //随机访问ip
                 $ips = $this->getIpAreas(count($need_project));
                 $ips = $this->getIpAreas(count($need_project));
+
+                //特殊日期 降访问率
+                foreach ($need_project as $project_key => $project){
+                    $diff = $ips[$project_key]['diff'];
+                    //当地时间
+                    $w = date('w', strtotime($diff . 'hour'));
+                    $date = date('m-d', strtotime($diff . 'hour'));
+                    //元旦节和圣诞节按照周六的比例处理
+                    if(in_array($date, ['01-01', '12-25'])){
+                        $w = 6;
+                    }
+                    switch ($w){
+                        case 0:
+                            //周日降70-80%
+                            $rate = rand(70, 80) * 10;
+                            $res = $this->get_rand([1000-$rate, $rate]);
+                            break;
+                        case 5:
+                            //周5降30-40%
+                            $rate = rand(30, 40) * 10;
+                            $res = $this->get_rand([1000-$rate, $rate]);
+                            break;
+                        case 6:
+                            //周6降60-70%
+                            $rate = rand(60, 70) * 10;
+                            $res = $this->get_rand([1000-$rate, $rate]);
+                            break;
+                        default:
+                            $res = 0;
+                    }
+                    //不访问
+                    if($res == 1){
+                        unset($need_project[$project_key]);
+                        unset($ips[$project_key]);
+                    }
+                }
+
                 //最多10层深度
                 //最多10层深度
                 $client = new Client(['verify' => false]);
                 $client = new Client(['verify' => false]);
                 for ($j = 0; $j < 10; $j++) {
                 for ($j = 0; $j < 10; $j++) {
@@ -314,6 +351,7 @@ class WebTraffic extends Command
         $h = date('H');
         $h = date('H');
         $areas = [];
         $areas = [];
         $list = DB::table('gl_area_timezone')->get();
         $list = DB::table('gl_area_timezone')->get();
+        $time_zones = [];
         foreach ($list as $v) {
         foreach ($list as $v) {
             $v = (array)$v;
             $v = (array)$v;
             $country_hour = $h + $v['diff'];
             $country_hour = $h + $v['diff'];
@@ -322,11 +360,16 @@ class WebTraffic extends Command
             }
             }
             if ($country_hour >= 7 && $country_hour < 23) {
             if ($country_hour >= 7 && $country_hour < 23) {
                 $areas[] = $v['name'];
                 $areas[] = $v['name'];
+                $time_zones[$v['name']] = $v['diff'];
             }
             }
         }
         }
         //根据地区随机取该地区的IP
         //根据地区随机取该地区的IP
         $data = DB::table('gl_xunpan_ipdata')->whereIn('ip_area', $areas)->inRandomOrder()->limit($num)->get();
         $data = DB::table('gl_xunpan_ipdata')->whereIn('ip_area', $areas)->inRandomOrder()->limit($num)->get();
-        return Arr::s2a(Arr::a2s($data));
+        $data = Arr::s2a(Arr::a2s($data));
+        foreach ($data as &$item){
+            $item['diff'] = $time_zones[$item['ip_area']];
+        }
+        return $data;
     }
     }
 
 
     /**
     /**

@@ -75,7 +75,6 @@ class AyrReleaseController extends BaseController
             'post'=>$this->param['content'],
             'post'=>$this->param['content'],
             'platforms'=>$this->param['platforms'],
             'platforms'=>$this->param['platforms'],
             'mediaUrls'=>$this->param['mediaUrls'],//参数处理
             'mediaUrls'=>$this->param['mediaUrls'],//参数处理
-
         ];
         ];
         if(isset($this->param['schedule_date']) && !empty($this->param['schedule_date'])){
         if(isset($this->param['schedule_date']) && !empty($this->param['schedule_date'])){
             $datetime = new \DateTime($this->param['schedule_date'] ?? date('Y-m-d H:i:s'));
             $datetime = new \DateTime($this->param['schedule_date'] ?? date('Y-m-d H:i:s'));
@@ -85,7 +84,8 @@ class AyrReleaseController extends BaseController
         //发送请求发布社交文章
         //发送请求发布社交文章
         $res = $ayrShare->post_send_msg($param,$share_info['profile_key']);
         $res = $ayrShare->post_send_msg($param,$share_info['profile_key']);
         //保存数据库
         //保存数据库
-        $ayrReleaseLogic->release_add();
+        $ayrReleaseLogic->release_add($res);
+        //保存返回的内容
         $this->response('success',Code::SUCCESS,json_decode($res));
         $this->response('success',Code::SUCCESS,json_decode($res));
     }
     }
 
 

@@ -37,12 +37,13 @@ class AyrReleaseLogic extends BaseLogic
      * @method :post
      * @method :post
      * @time   :2023/5/9 9:38
      * @time   :2023/5/9 9:38
      */
      */
-    public function release_add(){
+    public function release_add($res){
         $this->param['project_id'] = $this->user['project_id'];
         $this->param['project_id'] = $this->user['project_id'];
         $this->param['operator_id'] = $this->user['id'];
         $this->param['operator_id'] = $this->user['id'];
         if(isset($this->param['images']) && !empty($this->param['images'])){
         if(isset($this->param['images']) && !empty($this->param['images'])){
             $this->param['images'] = implode(',',$this->param['images']);
             $this->param['images'] = implode(',',$this->param['images']);
         }
         }
+        $this->param['result_data'] = $res;
         $this->param['platforms'] = json_encode($this->param['platforms']);
         $this->param['platforms'] = json_encode($this->param['platforms']);
         $rs = $this->model->add($this->param);
         $rs = $this->model->add($this->param);
         if($rs === false){
         if($rs === false){