作者 赵彬吉

update

@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 3
4 namespace App\Helper; 4 namespace App\Helper;
5 5
  6 +use App\Models\Project\Project;
6 use App\Utils\HttpUtils; 7 use App\Utils\HttpUtils;
7 use GuzzleHttp\Exception\GuzzleException; 8 use GuzzleHttp\Exception\GuzzleException;
8 9
@@ -51,6 +52,8 @@ class FormGlobalsoApi @@ -51,6 +52,8 @@ class FormGlobalsoApi
51 */ 52 */
52 public function getInquiryList($domain, $search = '', $page = 1, $page_size = 20) 53 public function getInquiryList($domain, $search = '', $page = 1, $page_size = 20)
53 { 54 {
  55 + $project = Project::getProjectByDomain($domain);
  56 + $is_upgrade = $project['is_upgrade'] ??0;
54 $api_url = $this->url . '/api/external-interface/6a1bd159b1fd60af'; 57 $api_url = $this->url . '/api/external-interface/6a1bd159b1fd60af';
55 58
56 $params = [ 59 $params = [
@@ -58,7 +61,7 @@ class FormGlobalsoApi @@ -58,7 +61,7 @@ class FormGlobalsoApi
58 'domain' => $domain, 61 'domain' => $domain,
59 'limit' => $page_size, 62 'limit' => $page_size,
60 'page' => $page, 63 'page' => $page,
61 - 'source' => '1,3' //来源类型 新项目用1,3 64 + 'source' => $is_upgrade ? '1,2,3,4' : '1,3' //来源类型 新项目用1,3
62 ]; 65 ];
63 if($search){ 66 if($search){
64 $params['name'] = $search; 67 $params['name'] = $search;
@@ -284,24 +284,15 @@ class Project extends Base @@ -284,24 +284,15 @@ class Project extends Base
284 */ 284 */
285 public static function getProjectByDomain($domain) 285 public static function getProjectByDomain($domain)
286 { 286 {
287 - $cache_key = 'project_' . $domain;  
288 - $data = Cache::get($cache_key);  
289 - if (!$data) {  
290 - //是否测试域名  
291 - $project_id = DeployBuild::where('test_domain', $domain)->value('project_id');  
292 - //是否正式域名  
293 - if (!$project_id) {  
294 - $project_id = DeployOptimize::where('domain', $domain)->value('project_id');  
295 - }  
296 - if (!$project_id) {  
297 - return [];  
298 - }  
299 - $data = self::find($project_id);  
300 - if ($data) {  
301 - Cache::put($cache_key, $data);  
302 - } 287 + $domain = parse_url($domain);
  288 + $domain = $domain['host'] ?? $domain;
  289 + //是否测试域名
  290 + $project_id = DeployBuild::where('test_domain', $domain)->value('project_id');
  291 + //是否正式域名
  292 + if (!$project_id) {
  293 + $project_id = \App\Models\Domain\DomainInfo::where('domain', $domain)->value('project_id');
303 } 294 }
304 - return $data; 295 + return self::find($project_id ?: 0);
305 } 296 }
306 297
307 /** 298 /**