作者 李宇航

合并分支 'lyh-server' 到 'master'

gxai



查看合并请求 !1833
... ... @@ -42,15 +42,15 @@ class RequestUrlLog extends Command
//获取需要请求的接口
$requestUrlModel = new RequestUrl();
$urlList = $requestUrlModel->list(['status'=>0]);
//随机获取一个项目,需要验证的其他方法
$projectModel = new Project();
$projectInfo = $projectModel->formatQuery(['type'=>2,'delete_status'=>0])->inRandomOrder()->first();
//获取对应项目的域名
$domainModel = new DomainInfo();
$domainInfo = $domainModel->read(['project_id'=>$projectInfo['id']]);
foreach ($urlList as $v){
//需要单独验证的方法
if($v['url'] == 'getMonthInquiry'){
//随机获取一个项目,需要验证的其他方法
$projectModel = new Project();
$projectInfo = $projectModel->formatQuery(['type'=>2,'delete_status'=>0])->inRandomOrder()->first();
//获取对应项目的域名
$domainModel = new DomainInfo();
$domainInfo = $domainModel->read(['project_id'=>$projectInfo['id']]);
$result = $this->getMonthInquiry($domainInfo['domain'],date('Y-m'), 0);
$requestUrlModel->edit(['text'=>json_encode($result,true),'time'=>$result['$requestTime'],'http_code'=>$result['http_code']],['id'=>$v['id']]);
continue;
... ... @@ -60,13 +60,13 @@ class RequestUrlLog extends Command
$result = $this->postRequest($v['url'],$v['param']);
echo '执行的url:' . $v['url'] . PHP_EOL . '返回的结果:'.json_encode($result,true) . date('Y-m-d H:i:s').PHP_EOL;
//更新请求结果
$requestUrlModel->edit(['text'=>json_encode($result,true),'time'=>$result['$requestTime'],'http_code'=>$result['http_code']],['id'=>$v['id']]);
$requestUrlModel->edit(['text'=>json_encode($result,true),'time'=>$result['requestTime'],'http_code'=>$result['http_code']],['id'=>$v['id']]);
continue;
}else if($v['method'] == 'get'){
$result = $this->getRequest($v['url']);
echo '执行的url:' . $v['url'] . PHP_EOL . '返回的结果:'.json_encode($result,true) . date('Y-m-d H:i:s').PHP_EOL;
//更新请求结果
$requestUrlModel->edit(['text'=>json_encode($result,true),'time'=>$result['$requestTime'],'http_code'=>$result['http_code']],['id'=>$v['id']]);
$requestUrlModel->edit(['text'=>json_encode($result,true),'time'=>$result['requestTime'],'http_code'=>$result['http_code']],['id'=>$v['id']]);
continue;
}else{
//todo::其他方式的验证
... ...