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

* Fix jenkins exec。

Browse Source
This commit is contained in:
leiyong
2020-07-16 17:17:36 -07:00
parent 4cb09a3c0d
commit 054ee87fa8
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/ci/model.php
+1 -4
View File
@@ -84,9 +84,7 @@ class ciModel extends model
$queueInfo = json_decode($response);
if(!empty($queueInfo->executable))
{
$buildUrl = $queueInfo->executable->url . 'api/json?pretty=true';
$buildUrl = str_replace('://', $jenkinsAuth, $buildUrl);
$buildUrl = $queueInfo->executable->url . 'api/json?pretty=true';
$response = common::http($buildUrl, '', false, $userPwd);
$buildInfo = json_decode($response);
@@ -100,7 +98,6 @@ class ciModel extends model
$this->updateBuildStatus($compile, $result);
$logUrl = $buildInfo->url . 'logText/progressiveText/api/json';
$logUrl = str_replace('://', $jenkinsAuth, $logUrl);
$response = common::http($logUrl, '', false, $userPwd);
$this->dao->update(TABLE_COMPILE)->set('logs')->eq($response)->where('id')->eq($compile->id)->exec();
}