Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

+<?php
+
+namespace App\Console\Commands\DayCount;
+
+use App\Helper\Common;
+use App\Helper\FormGlobalsoApi;
+use App\Models\Domain\DomainInfo;
+use App\Models\Inquiry\InquiryForm;
+use App\Models\Inquiry\InquiryFormData;
+use App\Models\Project\DeployBuild;
+use App\Models\Project\DeployOptimize;
+use App\Models\Project\Project;
+use App\Services\ProjectServer;
+use Carbon\Carbon;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+
+class CountDate extends Command
+{
+    const STATUS_ERROR = 400;
+    public $error = 0;
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'count_data {date}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '统计昨日数据';
+
+    /**
+     * @name   :(定时执行生成昨日数据统计)handle
+     * @author :lyh
+     * @method :post
+     * @time   :2023/5/12 14:48
+     */
+    public function handle()
+    {
+        $date = $this->argument('date');
+        $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
+            ->whereIn('gl_project.type',[1,2,3,4,6])
+            ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
+            ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
+            ->select($this->selectParam())->get();
+        try {
+            if(!empty($list)){
+                $list = $list->toArray();
+//                $yesterday = Carbon::yesterday()->toDateString();
+                $yesterday = $date;
+                $domainInfo = new DomainInfo();
+                foreach ($list as $v){
+                    $v = (array)$v;
+                    echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
+                    if($v['type'] == Project::TYPE_ZERO){
+                        continue;
+                    }
+                    if(!empty($v['domain'])){
+                        $info = $domainInfo->read(['id'=>$v['domain']]);
+                        if($info !== false){
+                            $v['test_domain'] = $info['domain'];
+                        }
+                    }
+                    $arr = [];
+                    //统计时间
+                    $arr['date'] = $yesterday;
+                    ProjectServer::useProject($v['id']);
+                    //pv统计
+                    $arr['pv_num'] = $this->pv_num($yesterday,$v['test_domain']);
+                    //ip统计
+                    $arr['ip_num'] = $this->ip_num($yesterday,$v['test_domain']);
+                    DB::disconnect('custom_mysql');
+                    //服务达标天数
+                    $arr['compliance_day'] = $v['finish_remain_day'];
+                    //剩余服务时常
+                    $arr['service_day'] = ($v['remain_day'] - 1) < 0 ? 0: $v['remain_day'] - 1;
+                    //项目id
+                    $arr['project_id'] = $v['project_id'];
+                    $arr['created_at'] = date('Y-m-d H:i:s');
+                    $arr['updated_at'] = date('Y-m-d H:i:s');
+                    //询盘统计
+                    $arr = $this->inquiry($arr,$v['test_domain'], $v['id']);
+                    if($arr === false){
+                        continue;
+                    }
+                    //查询当天数据是否存在  存在则更新
+                    $countModel = new \App\Models\HomeCount\Count();
+                    $info = $countModel->read(['date'=>$arr['date'],'project_id'=>$v['id']]);
+                    if($info === false){
+                        DB::table('gl_count')->insert($arr);
+                    }else{
+                        $countModel->edit($arr,['id'=>$info['id']]);
+                    }
+                    Log::channel('day_count')->error('日期：'.$arr['created_at'].'success: ' .$v['test_domain']);
+                }
+            }
+        }catch (\Exception $e){
+            Log::channel('day_count')->error('day_count：->error ' . $e->getMessage());
+        }
+        Log::channel('day_count')->error('success:end');
+        echo $this->error;
+    }
+
+    /**
+     * @name   :（统计pv）pv_num
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:40
+     */
+    public function pv_num($yesterday,$domain){
+        $pv = DB::connection('custom_mysql')->table('gl_customer_visit_item')->whereDate('updated_date', $yesterday)->count();
+        return $pv;
+    }
+
+    /**
+     * @name   :（统计ip）ip_num
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:40
+     */
+    public function ip_num($yesterday,$domain){
+        $ip = DB::connection('custom_mysql')->table('gl_customer_visit')->whereDate('updated_date', $yesterday)->count();
+        return $ip;
+    }
+
+    /**
+     * @param $arr
+     * @param $domain
+     * @name   :(询盘统计)inquiry
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:44
+     */
+    public function inquiry($arr,$domain,$project_id){
+        $inquiry_list = (new FormGlobalsoApi())->getInquiryAll($domain);
+        if($inquiry_list == false){
+            return false;
+        }
+        if($inquiry_list['status'] == self::STATUS_ERROR){
+            $arr['inquiry_num'] = 0;
+            $countryArr = [];
+        }else{
+            $arr['inquiry_num'] = $inquiry_list['data']['count'];
+            //询盘国家统计
+            $countryArr = $inquiry_list['data']['country'];
+        }
+        //加上其他询盘
+        ProjectServer::useProject($project_id);
+        $arr['inquiry_num'] += InquiryFormData::getCount();
+        $countryData = InquiryFormData::getCountryCount();
+        foreach ($countryData as $v1){
+            if(isset($countryArr[$v1['country']])){
+                $countryArr[$v1['country']] += $v1['count'];
+            }else{
+                $countryArr[$v1['country']] = $v1['count'];
+            }
+        }
+        arsort($countryArr);
+        $top20 = array_slice($countryArr, 0, 20, true);
+        $arr['country'] = json_encode($top20);
+        return $arr;
+    }
+
+    /**
+     * @name   :(查询参数设置)selectParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:00
+     */
+    public function selectParam(){
+        $select = [
+            'gl_project.id AS id',
+            'gl_project.type AS type',
+            'gl_project.extend_type AS extend_type',
+            'gl_project.remain_day AS remain_day',
+            'gl_project.finish_remain_day AS finish_remain_day',
+            'gl_project_deploy_build.test_domain AS test_domain',
+            'gl_project_deploy_optimize.domain AS domain',
+            'gl_project_deploy_build.project_id AS project_id',
+            'gl_project.cooperate_date AS cooperate_date',
+            'gl_project_deploy_build.service_duration AS service_duration',
+        ];
+        return $select;
+    }
+}

+<?php
+/**
+ * @remark :
+ * @name   :CountProject.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/1/8 9:03
+ */
+
+namespace App\Console\Commands\MonthlyCount;
+
+use App\Helper\FormGlobalsoApi;
+use App\Models\Com\UpdateOldInfo;
+use App\Models\Domain\DomainInfo;
+use App\Models\Inquiry\InquiryFormData;
+use App\Models\Project\Project;
+use App\Services\ProjectServer;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\DB;
+use App\Models\HomeCount\MonthCount AS MonthCountModel;
+
+class MonthCountDate extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'month_counts_date {date}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '每天生成月统计记录';
+
+    public function handle(){
+        $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
+            ->whereIn('gl_project.type',[1,2,3,4,6])
+            ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
+            ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
+            ->select($this->selectParam())->get()->toArray();
+        foreach ($list as $v) {
+            $v = (array)$v;
+            if($v['type'] == Project::TYPE_ZERO){
+                continue;
+            }
+            if($v['is_upgrade'] == 1){
+                $oldModel = new UpdateOldInfo();
+                $info = $oldModel->read(['project_id' => $v['id']]);
+                if ($info !== false) {
+                    $url = $info['old_domain_online'];
+                }else{
+                    continue;
+                }
+            }else{
+                $domainInfo = new DomainInfo();
+                if(!empty($v['domain'])){
+                    $info = $domainInfo->read(['id'=>$v['domain']]);
+                    if($info !== false){
+                        $url = $info['domain'];
+                    }
+                }else{
+                    $url = $v['test_domain'];
+                }
+            }
+            ProjectServer::useProject($v['id']);
+            echo date('Y-m-d H:i:s') . '项目id：'.$v['id'] . PHP_EOL;
+            $this->count($v['id'], $url);
+            DB::disconnect('custom_mysql');
+        }
+    }
+
+    /**
+     * @name   :(查询参数设置)selectParam
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/14 15:00
+     */
+    public function selectParam(){
+        $select = [
+            'gl_project.id AS id',
+            'gl_project.type AS type',
+            'gl_project.extend_type AS extend_type',
+            'gl_project_deploy_build.test_domain AS test_domain',
+            'gl_project.is_upgrade AS is_upgrade',
+            'gl_project_deploy_optimize.domain AS domain',
+            'gl_project_deploy_build.project_id AS project_id',
+            'gl_project.cooperate_date AS cooperate_date',
+            'gl_project_deploy_build.service_duration AS service_duration',
+        ];
+        return $select;
+    }
+    /**
+     * @remark :日统计记录
+     * @name   :count
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/8 9:05
+     */
+    public function count($project_id,$url){
+        $arr = [];
+        $date = $this->argument('date');
+        $v = ['month'=>$date];
+        $monthCountModel = new MonthCountModel();
+        $info = $monthCountModel->read(['month'=>$v['month'],'project_id'=>$project_id]);
+        // 获取当月开始时间
+        $start = date('Y-m-01', strtotime($v['month']));
+        // 获取当月结束时间
+        $end = date('Y-m-t', strtotime($v['month']));
+        $arr['project_id'] = $project_id;
+        $res = (new FormGlobalsoApi())->getMonthInquiry($url,$v['month']);
+        $arr['total'] = $arr['month_total'] = 0;
+        if(isset($res['data']['count'])){
+            echo date('Y-m-d H:i:s') . '数据：'.$res['data']['count'] . PHP_EOL;
+            $arr['month_total'] = $res['data']['count'] + InquiryFormData::getCount([$start.' 00:00:00',$end.' 00:00:00']);
+        }
+        //获取上一个的count
+        $previousMonth = date('Y-m', strtotime($v['month'] . ' -1 month'));
+        $previousInfo = $monthCountModel->read(['month'=>$previousMonth,'project_id'=>$project_id]);
+        if($previousInfo === false){
+            $arr['total'] = $arr['month_total'];
+        }else{
+            $arr['total'] = $arr['month_total'] + ($previousInfo['total'] ?? 0);
+        }
+        $country = [];
+        if(isset($res['data']['data'])){
+            $country = $res['data']['data'];
+        }
+        $countryData = InquiryFormData::getCountryCount([$start.' 00:00:00',$end.' 00:00:00']);
+        foreach ($countryData as $v1){
+            if(isset($country[$v1['country']])){
+                $country[$v1['country']] += $v1['count'];
+            }else{
+                $country[$v1['country']] = $v1['count'];
+            }
+        }
+        $arr['country'] = json_encode($country);
+        $arr['month'] = $v['month'];
+        $arr = $this->pv_ip($arr,$start,$end,$project_id);
+        $arr = $this->sourceCount($arr,$start,$end);
+        if($info === false){
+            $selectedDate = $start;
+            $firstDayOfNextMonth = date('Y-m-01 01:00:00', strtotime("$selectedDate +1 month"));
+            $arr['created_at'] = $firstDayOfNextMonth;
+            $arr['updated_at'] = $firstDayOfNextMonth;
+            $monthCountModel->insert($arr);
+        }else{
+            $monthCountModel->edit($arr,['id'=>$info['id']]);
+        }
+        echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
+    }
+
+    /**
+     * @remark :本月询盘总量
+     * @name   :month_total
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/8 11:02
+     */
+    public function pv_ip(&$arr,$start,$end,$project_id){
+        $pv_ip = DB::table('gl_count')
+            ->where(['project_id'=>$project_id])
+            ->where('date','>=',$start.' 00:00:00')
+            ->where('date','<=',$end.' 23:59:59')
+            ->select(DB::raw('SUM(pv_num) as pv_num'), DB::raw('SUM(ip_num) as ip_num'),DB::raw('SUM(inquiry_num) as inquiry_num'))
+            ->first();
+        $arr['pv'] = $pv_ip->pv_num;
+        $arr['ip'] = $pv_ip->ip_num;
+        if($arr['ip'] != 0){
+            $arr['rate'] = round((($arr['month_total'] ?? 0) / $arr['ip']) * 10,2);
+        }
+        return $arr;
+    }
+    /**
+     * @remark :来源访问前8
+     * @name   :sourceCount
+     * @author :lyh
+     * @method :post
+     * @time   :2023/6/30 16:14
+     */
+    public function sourceCount(&$arr,$startTime,$endTime){
+        //访问来源前10
+        $source = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select('referrer_url', DB::raw('COUNT(*) as count'))
+            ->groupBy('referrer_url')
+            ->whereBetween('updated_date', [$startTime,$endTime])
+            ->orderByDesc('count')->limit(10)->get()->toArray();
+        $arr['source'] = json_encode($source);
+        //访问国家前15
+        $source_country = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select('country',DB::raw('COUNT(*) as ip'),DB::raw('SUM(depth) as pv'))
+            ->groupBy('country')
+            ->whereBetween('updated_date', [$startTime,$endTime])
+            ->orderBy('ip','desc')->limit(15)->get()->toArray();
+        $arr['source_country'] = json_encode($source_country);
+        //受访界面前15
+        $referrer_url = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select('url',DB::raw('COUNT(*) as num'))
+            ->orderBy('num','desc')
+            ->whereBetween('updated_date', [$startTime,$endTime])
+            ->groupBy('url')
+            ->limit(15)->get()->toArray();
+        $arr['referrer_url'] = json_encode($referrer_url);
+        //访问端口
+        $referrer_port = DB::connection('custom_mysql')->table('gl_customer_visit')
+            ->select('device_port',DB::raw('COUNT(*) as num'))
+            ->orderBy('num','desc')
+            ->whereBetween('updated_date', [$startTime,$endTime])
+            ->groupBy('device_port')
+            ->limit(15)->get()->toArray();
+        $arr['referrer_port'] = json_encode($referrer_port);
+        return $arr;
+    }
+
+}

@@ -198,6 +198,17 @@ class DomainInfoLogic extends BaseLogic
             }
             }
         }
         }
 
 
+        $not_allow_ip = array_filter($this->param['not_allow_ip'] ?? []);
+        if($not_allow_ip){
+            //判断禁止访问IP是否填写正确
+            foreach ($not_allow_ip as $vn){
+                $vn_count = count(explode('.',$vn));
+                if($vn_count != 4){
+                    $this->fail('禁止访问IP填写有误');
+                }
+            }
+        }
+
         //保存301跳转数据+其他域名
         //保存301跳转数据+其他域名
         $data = [
         $data = [
             'other_domain'=>json_encode(array_filter($this->param['other_domain'] ?? [])),
             'other_domain'=>json_encode(array_filter($this->param['other_domain'] ?? [])),
@@ -211,7 +222,7 @@ class DomainInfoLogic extends BaseLogic
             'amp_private_key' => $this->param['amp_key'] ?? '',
             'amp_private_key' => $this->param['amp_key'] ?? '',
             'amp_private_cert' => $this->param['amp_cert'] ?? '',
             'amp_private_cert' => $this->param['amp_cert'] ?? '',
             'not_allow_country'=>json_encode(array_filter($this->param['not_allow_country'] ?? [])),
             'not_allow_country'=>json_encode(array_filter($this->param['not_allow_country'] ?? [])),
-            'not_allow_ip'=>json_encode(array_filter($this->param['not_allow_ip'] ?? [])),
+            'not_allow_ip'=>json_encode($not_allow_ip),
             'is_redirect' => $this->param['is_redirect'] ?? 0,
             'is_redirect' => $this->param['is_redirect'] ?? 0,
         ];
         ];
         $this->model->edit($data,['id'=>$this->param['id']]);
         $this->model->edit($data,['id'=>$this->param['id']]);