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

@@ -3,6 +3,7 @@
 
 
 namespace App\Helper;
 namespace App\Helper;
 
 
+use App\Models\Project\Project;
 use App\Utils\HttpUtils;
 use App\Utils\HttpUtils;
 use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Exception\GuzzleException;
 
 
@@ -51,6 +52,8 @@ class FormGlobalsoApi
      */
      */
     public function getInquiryList($domain, $search = '', $page = 1, $page_size = 20)
     public function getInquiryList($domain, $search = '', $page = 1, $page_size = 20)
     {
     {
+        $project = Project::getProjectByDomain($domain);
+        $is_upgrade = $project['is_upgrade'] ??0;
         $api_url = $this->url . '/api/external-interface/6a1bd159b1fd60af';
         $api_url = $this->url . '/api/external-interface/6a1bd159b1fd60af';
 
 
         $params = [
         $params = [
@@ -58,7 +61,7 @@ class FormGlobalsoApi
             'domain' => $domain,
             'domain' => $domain,
             'limit' => $page_size,
             'limit' => $page_size,
             'page' => $page,
             'page' => $page,
-            'source' => '1,3' //来源类型 新项目用1,3
+            'source' => $is_upgrade ? '1,2,3,4' : '1,3' //来源类型 新项目用1,3
         ];
         ];
         if($search){
         if($search){
             $params['name'] = $search;
             $params['name'] = $search;

@@ -284,24 +284,15 @@ class Project extends Base
      */
      */
     public static function getProjectByDomain($domain)
     public static function getProjectByDomain($domain)
     {
     {
-        $cache_key = 'project_' . $domain;
-        $data = Cache::get($cache_key);
-        if (!$data) {
-            //是否测试域名
-            $project_id = DeployBuild::where('test_domain', $domain)->value('project_id');
-            //是否正式域名
-            if (!$project_id) {
-                $project_id = DeployOptimize::where('domain', $domain)->value('project_id');
-            }
-            if (!$project_id) {
-                return [];
-            }
-            $data = self::find($project_id);
-            if ($data) {
-                Cache::put($cache_key, $data);
-            }
+        $domain = parse_url($domain);
+        $domain = $domain['host'] ?? $domain;
+        //是否测试域名
+        $project_id = DeployBuild::where('test_domain', $domain)->value('project_id');
+        //是否正式域名
+        if (!$project_id) {
+            $project_id = \App\Models\Domain\DomainInfo::where('domain', $domain)->value('project_id');
         }
         }
-        return $data;
+        return self::find($project_id ?: 0);
     }
     }
 
 
     /**
     /**