Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'roadrunner-zhangrunyu' into 'master'

Browse Source 
Add roadrunner cron

See merge request easycorp/zentaopms!1359
This commit is contained in:
朱金勇
2022-01-13 05:01:47 +00:00
parent ee2fc5b7c6 0230675445
commit 91e9aeaf20
7 changed files with 128 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/router.class.php
+26 -12
View File
@@ -1891,23 +1891,37 @@ class baseRouter
$defaultParams[$name] = $default;
}
/**
* 根据PATH_INFO或者GET方式设置请求的参数。
* Set params according PATH_INFO or GET.
*/
if($this->config->requestType != 'GET')
if ('cli' === PHP_SAPI)
{
$this->setParamsByPathInfo($defaultParams);
if ($this->params)
{
$this->params = array_merge($defaultParams, $this->params);
}
else
{
$this->params = $defaultParams;
}
}
else
{
$this->setParamsByGET($defaultParams);
}
/**
* 根据PATH_INFO或者GET方式设置请求的参数。
* Set params according PATH_INFO or GET.
*/
if($this->config->requestType != 'GET')
{
$this->setParamsByPathInfo($defaultParams);
}
else
{
$this->setParamsByGET($defaultParams);
}
if($this->config->framework->filterParam == 2)
{
$_GET = validater::filterParam($_GET, 'get');
$_COOKIE = validater::filterParam($_COOKIE, 'cookie');
if($this->config->framework->filterParam == 2)
{
$_GET = validater::filterParam($_GET, 'get');
$_COOKIE = validater::filterParam($_COOKIE, 'cookie');
}
}
/* 调用该方法 Call the method. */