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

Merge branch 'jihu' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihu

Browse Source
This commit is contained in:
dingguodong
2021-07-05 10:28:01 +08:00
parent eca1930586 b840895478
commit 9f05faa716
1 changed files with 57 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+57 -15
View File
@@ -256,6 +256,44 @@ class gitlabModel extends model
return $this->loadModel('pipeline')->update($id);
}
/**
* Send an api get request.
*
* @param int|string $host gitlab server ID | gitlab host url.
* @param int $api
* @param int $data
* @param int $options
* @access public
* @return object
*/
public function apiGet($host, $api, $data = array(), $options = array())
{
if(is_numeric($host)) $host = $this->getApiRoot($host);
if(strpos($host, 'http://') !== 0 and strpos($host, 'https://') !== 0) return false;
$url = sprintf($apiRoot, $api);
return json_decode(commonModel::http($url, $data, $options));
}
/**
* Send an api post request.
*
* @param int|string $host gitlab server ID | gitlab host url.
* @param int $api
* @param int $data
* @param int $options
* @access public
* @return object
*/
public function apiGet($host, $api, $data = array(), $options = array())
{
if(is_numeric($host)) $host = $this->getApiRoot($host);
if(strpos($host, 'http://') !== 0 and strpos($host, 'https://') !== 0) return false;
$url = sprintf($apiRoot, $api);
return json_decode(commonModel::http($url, $data, $options));
}
/**
* Get current user.
*
@@ -266,8 +304,8 @@ class gitlabModel extends model
*/
public function apiGetCurrentUser($host, $token)
{
$api = rtrim($host, '/') . "/api/v4/user?private_token=$token";
return json_decode(commonModel::http($api));
$host = rtrim($host, '/') . "/api/v4%s?private_token=$token";
return $this->apiGet($host, '/user');
}
/**
@@ -280,9 +318,7 @@ class gitlabModel extends model
*/
public function apiGetUsers($gitlab)
{
$apiRoot = $this->getApiRoot($gitlab->id);
$url = sprintf($apiRoot, '/users');
$response = json_decode(commonModel::http($url));
$response = $this->apiGet($gitlab->id, '/users');
if (!$response) return array();
@@ -520,18 +556,22 @@ class gitlabModel extends model
/**
* Create issue by api.
*
* @param int $gitlabID
* @param int $projectID
* @param object $issue
* @param int $gitlabID
* @param int $projectID
* @param string $objectType
* @param int $objectID
* @param object $object
* @access public
* @return object
*/
public function apiCreateIssue($gitlabID, $projectID, $issue, $objectType, $objectID, $object)
public function apiCreateIssue($gitlabID, $projectID, $objectType, $objectID, $object)
{
$label = $this->createZentaoObjectLabel($gitlabID, $projectID, $objectType, $objectID);
$issue->labels = isset($label->name) ? $label->name : '';
foreach($this->config->gitlab->skippedFields->issueCreate as $field)
$issue = $this->loadModel('gitlab')->parseObjectToIssue($gitlabID, $projectID, $objectType, $object);
if(isset($label->name)) $issue->labels = $label->name;
foreach($this->config->gitlab->skippedFields->issueCreate[$objectType] as $field)
{
if(isset($issue->$field)) unset($issue->$field);
}
@@ -540,7 +580,9 @@ class gitlabModel extends model
$url = sprintf($apiRoot, "/projects/{$projectID}/issues/");
$response = json_decode(commonModel::http($url, $issue));
$this->saveSyncedIssue($objectType, $object, $gitlabID, $response);
if(!$response) return false;
return $this->saveSyncedIssue($objectType, $object, $gitlabID, $response);
}
/**
@@ -555,10 +597,10 @@ class gitlabModel extends model
*/
public function apiUpdateIssue($gitlabID, $projectID, $issueID, $objectType, $object)
{
$attribute = $this->parseObjectToIssue($gitlabID, $projectID, $objectType, $object);
$issue = $this->parseObjectToIssue($gitlabID, $projectID, $objectType, $object);
$apiRoot = $this->getApiRoot($gitlabID);
$url = sprintf($apiRoot, "/projects/{$projectID}/issues/{$issueID}");
return json_decode(commonModel::http($url, $attribute, $options = array(CURLOPT_CUSTOMREQUEST => 'PUT')));
return json_decode(commonModel::http($url, $issue, $options = array(CURLOPT_CUSTOMREQUEST => 'PUT')));
}
/**
@@ -1004,8 +1046,8 @@ class gitlabModel extends model
*
* @param int $gitlabID
* @param int $projectID
* @param object $object
* @param string $objectType
* @param object $object
* @access public
* @return object
*/