正在显示
3 个修改的文件
包含
8 行增加
和
8 行删除
| @@ -67,7 +67,7 @@ class InquiryMonthlyCount extends Command | @@ -67,7 +67,7 @@ class InquiryMonthlyCount extends Command | ||
| 67 | */ | 67 | */ |
| 68 | public function inquiryCount(&$arr,&$startTime,&$endTime,$domain){ | 68 | public function inquiryCount(&$arr,&$startTime,&$endTime,$domain){ |
| 69 | //TODO::上线后注释 | 69 | //TODO::上线后注释 |
| 70 | - $domain = 'https://demomark.globalso.com/'; | 70 | +// $domain = 'https://demomark.globalso.com/'; |
| 71 | $inquiry_list = (new FormGlobalsoApi())->getInquiryList($domain,'',1,100000000); | 71 | $inquiry_list = (new FormGlobalsoApi())->getInquiryList($domain,'',1,100000000); |
| 72 | //总数 | 72 | //总数 |
| 73 | $arr['total'] = $inquiry_list['data']['total']; | 73 | $arr['total'] = $inquiry_list['data']['total']; |
| @@ -29,7 +29,7 @@ class InquiryLogic extends BaseLogic | @@ -29,7 +29,7 @@ class InquiryLogic extends BaseLogic | ||
| 29 | $page_size = $export ? 1000 : 20; | 29 | $page_size = $export ? 1000 : 20; |
| 30 | $search = $this->request['search'] ?: ''; | 30 | $search = $this->request['search'] ?: ''; |
| 31 | $page = $this->request['page'] ?: 1; | 31 | $page = $this->request['page'] ?: 1; |
| 32 | - $project = (new ProjectLogic())->getInfo($this->user['project_id']); | 32 | + $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']); |
| 33 | $domain = $project['deploy_optimize']['domain'] ?? ''; | 33 | $domain = $project['deploy_optimize']['domain'] ?? ''; |
| 34 | $list = $this->form_globalso_api->getInquiryList($domain, $search, $page, $page_size); | 34 | $list = $this->form_globalso_api->getInquiryList($domain, $search, $page, $page_size); |
| 35 | //处理格式 免得前端又改 | 35 | //处理格式 免得前端又改 |
| @@ -22,12 +22,12 @@ class DeployBuild extends Base | @@ -22,12 +22,12 @@ class DeployBuild extends Base | ||
| 22 | return Arr::setToArr($value, 'trim'); | 22 | return Arr::setToArr($value, 'trim'); |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | - public function getTestDomainAttribute(): string | ||
| 26 | - { | ||
| 27 | - $hashids = new Hashids('test_domain', 5, 'abcdefghjkmnpqrstuvwxyz1234567890'); | ||
| 28 | - $code = $hashids->encode($this->project_id); | ||
| 29 | - return 'https://v6-' . $code . '.globalso.site'; | ||
| 30 | - } | 25 | +// public function getTestDomainAttribute(): string |
| 26 | +// { | ||
| 27 | +// $hashids = new Hashids('test_domain', 5, 'abcdefghjkmnpqrstuvwxyz1234567890'); | ||
| 28 | +// $code = $hashids->encode($this->project_id); | ||
| 29 | +// return 'https://v6-' . $code . '.globalso.site'; | ||
| 30 | +// } | ||
| 31 | 31 | ||
| 32 | public static function clearCache($row){ | 32 | public static function clearCache($row){ |
| 33 | $cache_key = 'project_' . $row->original['test_domain']; | 33 | $cache_key = 'project_' . $row->original['test_domain']; |
-
请 注册 或 登录 后发表评论