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

lyh
app/Console/Commands/Domain/DomainInfo.php
app/Console/Commands/WorkOrder/FetchTicketProjects.php
app/Helper/helper.php
app/Http/Controllers/Aside/WorkOrder/TicketProjectController.php
app/Models/WorkOrder/TicketProject.php
routes/aside.php
--- a/app/Console/Commands/Domain/DomainInfo.php
查看文件 @f93c3cc
+++ b/app/Console/Commands/Domain/DomainInfo.php
查看文件 @f93c3cc
@@ -109,6 +109,16 @@ class DomainInfo extends Command
                 $v->save();
             }
+            if (empty($v['domain_end_time']) || $v['domain_end_time'] < date('Y-m-d H:i:s')) {
+                //获取主站域名有效期并更新
+                $valid_time = $this->getDomainValidTime($v['domain']);
+                if ($valid_time['start'] && $valid_time['end']) {
+                    $v->domain_start_time = $valid_time['start'];
+                    $v->domain_end_time = $valid_time['end'];
+                    $v->save();
+                }
+            }
+
             if ($v['amp_status'] == 1) {
                 $domain_array = parse_url($v['domain']);
                 $host = $domain_array['host'] ?? $domain_array['path'];
@@ -332,4 +342,24 @@ class DomainInfo extends Command
         }
         return ['from' => $valid_from, 'to' => $valid_to];
     }
+
+    /**
+     * 获取域名有效时间
+     * @param $domain
+     * @return array
+     * @author Akun
+     * @date 2024/08/29 9:43
+     */
+    public function getDomainValidTime($domain)
+    {
+        $url = 'http://openai.waimaoq.com/v1/whois_api?domain=' . $domain;
+        $response = curlGet($url);
+        $start = '';
+        $end = '';
+        if (isset($response['code']) && $response['code'] == 200) {
+            $start = $response['text']['creation_date'] != 'None' ? $response['text']['creation_date'] : '';
+            $end = $response['text']['expiration_date'] != 'None' ? $response['text']['expiration_date'] : '';
+        }
+        return ['start' => $start, 'end' => $end];
+    }
 }
--- a/app/Console/Commands/WorkOrder/FetchTicketProjects.php
查看文件 @f93c3cc
+++ b/app/Console/Commands/WorkOrder/FetchTicketProjects.php
查看文件 @f93c3cc
@@ -82,9 +82,9 @@ class FetchTicketProjects extends Command
                     elseif ($item['cate'] == "建站中")
                         $status=1; // 建站中
-                    $assm_id = Manage::where('name', $item['assm'])->value('id') ?? Manage::where('name', '张鸿飞')->value('id') ?? 0;  //售后服务经理
-                    $seom_id = Manage::where('name', $item['yhs'])->value('id') ?? Manage::where('name', '陶婵')->value('id') ?? 0;  //优化师
-                    $pm_id = Manage::where('name', $item['pm'])->value('id') ?? Manage::where('name', '李洁玉')->value('id') ?? 0; // 项目经理
+                    $assm_id = ManageHr::where('name', $item['assm'])->where('status', 1)->value('manage_id') ?? ManageHr::where('name', '张鸿飞')->where('status', 1)->value('manage_id') ?? 0;  //售后服务经理
+                    $seom_id = ManageHr::where('name', $item['yhs'])->where('status', 1)->value('manage_id') ?? ManageHr::where('name', '陶婵')->where('status', 1)->value('manage_id') ?? 0;  //优化师
+                    $pm_id = ManageHr::where('name', $item['pm'])->where('status', 1)->value('manage_id') ?? ManageHr::where('name', '李洁玉')->where('status', 1)->value('manage_id') ?? 0; // 项目经理
                     /**
                      * 第一负责人逻即说明：
@@ -100,6 +100,22 @@ class FetchTicketProjects extends Command
                     elseif ($status == 1)
                         $engineer_id = $pm_id; // 建站中找项目经理
+                    $team_names = [
+                        $item['pm'],
+                        $item['assm'],
+                        $item['yhs'],
+                        $item['team_leader'],
+                        $item['technology'],
+                        $item['designer'],
+                        $item['yhszl'],
+                    ];
+                    // 过滤掉空值,去掉重复
+                    $team_ids = ManageHr::whereIn('name', $team_names)->where('status', 1)->pluck('manage_id')
+                        ->unique()
+                        ->filter(fn($v) => !is_null($v) && $v !== 0)
+                        ->values()
+                        ->toArray();
+
                     $fields = [
                         'post_id' => $item['postid'],
                         'company_name' => $item['company'],
@@ -114,7 +130,8 @@ class FetchTicketProjects extends Command
                         'project_cate' => 1,
                         'pm_id' => $pm_id,
                         'status' => $status, // 项目状态
-                        'wechat_group_id' => $item['wx_id']
+                        'wechat_group_id' => $item['wx_id'],
+                        'team' => $team_ids ? json_encode($team_ids) : null,
                     ];
                     if (!$project) {
                         $new = new TicketProject();
@@ -186,22 +203,22 @@ class FetchTicketProjects extends Command
                     // 售后服务经理
                     $assm_id = collect([
-                        ManageHr::find($item->deploy_optimize->manager_mid)->manage_id ?? 0,
-                        ManageHr::find($item->deploy_optimize->tech_leader)->manage_id ?? 0,
+                        ManageHr::where('status', 1)->find($item->deploy_optimize->manager_mid)->manage_id ?? 0,
+                        ManageHr::where('status', 1)->find($item->deploy_optimize->tech_leader)->manage_id ?? 0,
                         8,  //张鸿飞
                     ])->first(fn($v) => $v !== null && $v !== 0, 0);
                     // 优化师
-                    $seom_id = ManageHr::find($item->deploy_optimize->optimist_mid) ? ManageHr::find($item->deploy_optimize->optimist_mid)->manage_id : 0;
+                    $seom_id = ManageHr::where('status', 1)->find($item->deploy_optimize->optimist_mid) ? ManageHr::where('status', 1)->find($item->deploy_optimize->optimist_mid)->manage_id : 0;
                     // 项目经理
-                    $pm_id = ManageHr::find($item->deploy_build->manager_mid)->manage_id ?? ManageHr::where('name', '李洁玉')->value('manage_id') ?? 0;
+                    $pm_id = ManageHr::where('status', 1)->find($item->deploy_build->manager_mid)->manage_id ?? ManageHr::where('status', 1)->where('name', '李洁玉')->value('manage_id') ?? 0;
                     // 第一负责人
                     if ($status == 1)
                         $engineer_id = $pm_id; // 建站中找项目经理
                     elseif ($status == 2)
-                        $engineer_id = Manage::where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
+                        $engineer_id = Manage::where('status', 1)->where('name', '杨长远')->value('id') ?? 0; // 建站完成找杨长远
                     else
                         $engineer_id = $assm_id; // 推广找售后服务经理
@@ -212,6 +229,30 @@ class FetchTicketProjects extends Command
                         || $item->site_status == 1
                     ) ? 1 : 0;
+                    $team_ids_in = [
+                        $item->deploy_build->leader_mid,
+                        $item->deploy_build->manager_mid,
+                        $item->deploy_build->designer_mid,
+                        $item->deploy_build->tech_mid,
+                        $item->deploy_optimize->manager_mid,
+                        $item->deploy_optimize->optimist_mid,
+                        $item->deploy_optimize->assist_mid,
+                        $item->deploy_optimize->tech_mid,
+                        $item->deploy_optimize->tech_leader,
+                    ];
+
+                    // $team_ids 去重复
+                    $team_ids_in = array_unique($team_ids_in);
+                    $team_ids_in = array_filter($team_ids_in);
+                    // $team_ids 去掉下标
+                    $team_ids_in = array_values($team_ids_in);
+
+                    $team_ids = ManageHr::whereIn('manage_id', $team_ids_in)->where('status', 1)->pluck('manage_id')
+                        ->unique()
+                        ->filter(fn($v) => !is_null($v) && $v !== 0)
+                        ->values()
+                        ->toArray();
+
                     $fields = [
                         'company_name' => $item->company,
                         'title' => $item->title . " - V6",
@@ -230,6 +271,7 @@ class FetchTicketProjects extends Command
                             ->value('friend_id'),
                         'pm_id' => $pm_id,
                         'status' => $status, // 项目状态
+                        'team' => $team_ids ? json_encode($team_ids) : null,
                     ];
                     if (!$project) {
                         $project = new TicketProject();
@@ -289,14 +331,14 @@ class FetchTicketProjects extends Command
                         {
                             // 售后服务经理
                             $assm_id = collect([
-                                ManageHr::where('name', $item['cj_assm']['real_name'] ?? '')->first()->manage_id ?? 0,
+                                ManageHr::where('status', 1)->where('name', $item['cj_assm']['real_name'] ?? '')->first()->manage_id ?? 0,
                                 20,  //徐莹
                             ])->first(fn($v) => $v !== null && $v !== 0, 0);
                         }else
                         {
                             // 域途
                             $assm_id = collect([
-                                ManageHr::where('name', $item['yutu_assm']['real_name'] ?? '')->first()->manage_id ?? 0,
+                                ManageHr::where('status', 1)->where('name', $item['yutu_assm']['real_name'] ?? '')->first()->manage_id ?? 0,
                                 85,  //黄小玉
                             ])->first(fn($v) => $v !== null && $v !== 0, 0);
                         }
--- a/app/Helper/helper.php
查看文件 @f93c3cc
+++ b/app/Helper/helper.php
查看文件 @f93c3cc
@@ -822,7 +822,7 @@ if(!function_exists('curlGet')){
      */
     function curlGet($url){
         $ch1     = curl_init();
-        $timeout = 0;
+        $timeout = 60;
         curl_setopt($ch1, CURLOPT_URL, $url);
         curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch1, CURLOPT_ENCODING, '');
@@ -1077,17 +1077,37 @@ if (!function_exists('check_domain_record')) {
     function check_domain_record($domain, $server_info)
     {
         try {
+            $is_record = false;
+
+            //获取域名解析记录
             $records = dns_get_record($domain,DNS_A);
-            if(count($records) != 1){
-                return false;
+            if(count($records) == 1 && ($records[0]['host'] == $server_info['domain'] || $records[0]['ip'] == $server_info['ip'])){
+                $is_record = true;
             }
-            $record = $records[0];
-            if($record['host'] == $server_info['domain'] || $record['ip'] == $server_info['ip']){
-                return $domain;
-            }else{
-                return false;
+            if(!$is_record){
+                //解析不正确，再判断是否开启cnd
+                $top_domain = getTopDomain($domain);
+                $cnd = curlGet('http://sitebak.globalso.com/get_records?domain=' . $top_domain);
+                if (isset($cnd['data']) && $cnd['data']) {
+                    if($domain == $top_domain || substr($domain,0,4) == 'www.'){
+                        $check_domain = $domain;
+                    }else{
+                        $check_domain = '*.'.$top_domain;
+                    }
+                    foreach ($cnd['data'] as $vc) {
+                        if ($vc['name'] == $check_domain && $vc['type'] == 'A' && $vc['content'] == $server_info['ip']) {
+                            $is_record = true;
+                            break;
+                        }elseif ($vc['name'] == $check_domain && $vc['type'] == 'CNAME' && $vc['content'] == $server_info['domain']){
+                            $is_record = true;
+                            break;
+                        }
+                    }
+                }
             }
+
+            return $is_record;
         }catch (\Exception $e){
             errorLog('dns_get_record',['domain'=>$domain],$e);
             return false;
@@ -1373,3 +1393,31 @@ function analysisRoute($pathInfo)
     }
     return $router;
 }
+
+function getTopDomain ($url) {
+    $url = strtolower($url);  //首先转成小写
+    $url = mb_ereg_replace('^(　| )+', '', trim($url));
+    $url = mb_ereg_replace('(　| )+$', '', $url);
+    if (!preg_match('/^(http:\/\/|https)/', $url)) {
+        $url = "https://".$url;
+    }
+    $hosts = parse_url($url);
+    $host = $hosts['host'] ?? '';
+    //查看是几级域名
+    $data = explode('.', $host);
+    $n = count($data);
+    if ($n < 2) {
+        return $host;
+    }
+    //判断是否是双后缀
+    $preg = '/[\w].+\.(com|net|org|gov|edu|co|ne)\.[\w]/';
+    if (($n > 2) && preg_match($preg, $host)) {
+        //双后缀取后3位
+        $host = $data[$n - 3].'.'.$data[$n - 2].'.'.$data[$n - 1];
+    } else {
+        //非双后缀取后两位
+        $host = $data[$n - 2].'.'.$data[$n - 1];
+    }
+    return $host;
+}
+
--- a/app/Http/Controllers/Aside/WorkOrder/TicketProjectController.php
查看文件 @f93c3cc
+++ b/app/Http/Controllers/Aside/WorkOrder/TicketProjectController.php
查看文件 @f93c3cc
@@ -93,4 +93,24 @@ class TicketProjectController extends BaseController
     {
         //
     }
+
+    /**
+     * 获取项目团队信息
+     *
+     * @param string $id 项目UUID
+     * @return mixed 返回项目团队信息或错误响应
+     */
+    public function team($id)
+    {
+        // 根据UUID查找项目
+        $project = TicketProject::where('uuid', $id)->first();
+
+        // 如果项目不存在，返回错误响应
+        if (!$project) $this->response('Project not found', Code::USER_MODEL_NOTFOUND_ERROE);
+
+        // 返回项目团队信息
+        // 修改: 使用 getTeam() 方法而不是 getTeam 属性
+        return $this->response('Project team', Code::SUCCESS, $project->getTeam());
+    }
+
 }
--- a/app/Models/WorkOrder/TicketProject.php
查看文件 @f93c3cc
+++ b/app/Models/WorkOrder/TicketProject.php
查看文件 @f93c3cc
@@ -93,4 +93,11 @@ class TicketProject extends Base
             $message_push->save();
         }
     }
+
+    public function getTeam()
+    {
+        return ManageHr::whereIn('manage_id', json_decode($this->team, true))
+            ->where('manage_id', '>', 0)
+            ->select(['manage_id', 'name', 'nickname', 'mobile'])->get()->toArray();
+    }
 }
--- a/routes/aside.php
查看文件 @f93c3cc
+++ b/routes/aside.php
查看文件 @f93c3cc
@@ -258,6 +258,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::get('/pushNotify/{id}', [Aside\WorkOrder\AsideTicketController::class, 'pushNotify'])->name('admin.tickets.pushNotify')->summary('A端工单推送企微群');
         Route::get('/projects/{search}', [Aside\WorkOrder\AsideTicketController::class, 'getProjects'])->name('admin.tickets.projects')->summary('A端V5V6项目列表');
         Route::patch('/projects/{id}', [Aside\WorkOrder\TicketProjectController::class, 'update'])->name('admin.tickets.projects.update')->summary('A端修改工单项目');
+        Route::get('/projects_team/{id}', [Aside\WorkOrder\TicketProjectController::class, 'team'])->name('admin.tickets.projects_team')->summary('A端工单项目团队');
         Route::get('/v56_projects/list', [Aside\WorkOrder\AsideTicketController::class, 'projectList'])->name('admin.tickets.projectList')->summary('A端V5V6项目列表')
             ->description("project_cate[项目分类1]: 1 V5, 2 V6, 3 超迹, 4 域途");
         Route::post('/log/{id}', [Aside\WorkOrder\AsideTicketLogController::class, 'update'])->name('admin.tickets.log.update')->summary('A端工单操作日志更新,完成工单');