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

Merge branch 'bug_32024' into 'master'

Browse Source 
* Fix bug #32024

See merge request easycorp/zentaopms!6924
This commit is contained in:
王怡栋
2023-02-13 02:54:36 +00:00
parent c724e74778 317ddd5fbc
commit 780b9c26b7
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/scm/gitlab.class.php
+2 -1
View File
@@ -780,13 +780,14 @@ class gitlab
}
else
{
$response = commonModel::http($api);
list($response, $httpCode) = commonModel::http($api, null, array(), array(), 'data', 'Post', 30, true);
if(!empty(commonModel::$requestErrors))
{
commonModel::$requestErrors = array();
return array();
}
if($httpCode == 500) return array();
return json_decode($response);
}
}
module/common/model.php
+5 -2
View File
@@ -3203,11 +3203,13 @@ EOD;
* @param array $headers Set request headers.
* @param string $dataType
* @param string $method POST|PATCH|PUT
* @param int $timeout
* @param bool $httpCode
* @static
* @access public
* @return string
*/
public static function http($url, $data = null, $options = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30)
public static function http($url, $data = null, $options = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false)
{
global $lang, $app;
if(!extension_loaded('curl'))
@@ -3254,6 +3256,7 @@ EOD;
$response = curl_exec($curl);
$errors = curl_error($curl);
if($httpCode) $httpCode = curl_getinfo($curl,CURLINFO_HTTP_CODE);
curl_close($curl);
$logFile = $app->getLogRoot() . 'saas.'. date('Ymd') . '.log.php';
@@ -3272,7 +3275,7 @@ EOD;
if($errors) commonModel::$requestErrors[] = $errors;
return $response;
return $httpCode ? array($response, $httpCode) : $response;
}
/**