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

Merge branch 'devops21_48605' into 'devops21'

Browse Source 
zg:任务48605

See merge request easycorp/zentaopms!1728
This commit is contained in:
李玉春
2022-02-09 01:48:13 +00:00
parent 11f82e3db8 ca4bab2feb
commit f10948fa80
8 changed files with 184 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/resource.php
+2
View File
@@ -1401,6 +1401,7 @@ $lang->resource->sonarqube->create = 'create';
$lang->resource->sonarqube->edit = 'edit';
$lang->resource->sonarqube->delete = 'delete';
$lang->resource->sonarqube->browseProject = 'browseProject';
$lang->resource->sonarqube->createProject = 'createProject';
$lang->resource->sonarqube->deleteProject = 'deleteProject';
$lang->resource->sonarqube->execJob = 'execJob';
$lang->resource->sonarqube->reportView = 'reportView';
@@ -1411,6 +1412,7 @@ $lang->sonarqube->methodOrder[10] = 'create';
$lang->sonarqube->methodOrder[15] = 'edit';
$lang->sonarqube->methodOrder[20] = 'delete';
$lang->sonarqube->methodOrder[25] = 'browseProject';
$lang->sonarqube->methodOrder[30] = 'createProject';
$lang->sonarqube->methodOrder[35] = 'deleteProject';
$lang->sonarqube->methodOrder[40] = 'execJob';
$lang->sonarqube->methodOrder[45] = 'reportView';
module/sonarqube/config.php
+3
View File
@@ -11,3 +11,6 @@ $config->sonarqube->projectStatusClass = array();
$config->sonarqube->projectStatusClass['OK'] = 'success';
$config->sonarqube->projectStatusClass['WARN'] = 'warning';
$config->sonarqube->projectStatusClass['ERROR'] = 'danger';
$config->sonarqube->createproject = new stdclass();
$config->sonarqube->createproject->requiredFields = 'projectName,projectKey';
module/sonarqube/control.php
+22
View File
@@ -286,6 +286,28 @@ class sonarqube extends control
$this->display();
}
/**
* Creat a sonarqube project.
*
* @param int $sonarqubeID
* @access public
* @return void
*/
public function createProject($sonarqubeID)
{
if($_POST)
{
$this->sonarqube->createProject($sonarqubeID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browseProject', "sonarqubeID=$sonarqubeID")));
}
$this->view->title = $this->lang->sonarqube->common . $this->lang->colon . $this->lang->sonarqube->createProject;
$this->view->sonarqubeID = $sonarqubeID;
$this->display();
}
/**
* Delete project.
*
module/sonarqube/lang/en.php
+5 -3
View File
@@ -30,9 +30,11 @@ $lang->sonarqube->editServer = 'Edit SonarQube Server';
$lang->sonarqube->createSuccess = 'Create success';
$lang->sonarqube->placeholder = new stdclass;
$lang->sonarqube->placeholder->name = '';
$lang->sonarqube->placeholder->url = "Please fill in the access address of the SonarQube Server homepage, as: https://sonarqube.zentao.net.";
$lang->sonarqube->placeholder->account = "Please fill in the SonarQube user information with Administrator privileges";
$lang->sonarqube->placeholder->name = '';
$lang->sonarqube->placeholder->url = "Please fill in the access address of the SonarQube Server homepage, as: https://sonarqube.zentao.net.";
$lang->sonarqube->placeholder->account = "Please fill in the SonarQube user information with Administrator privileges";
$lang->sonarqube->placeholder->projectName = 'Up to 255 characters.';
$lang->sonarqube->placeholder->projectKey = "It may contain up to 400 characters. Allowed characters are alphanumeric, '-' (dash), '_' (underscore), '.' (period) and ':' (colon), with at least one non-digit.";
$lang->sonarqube->nameRepeatError = "Server name already exists!";
$lang->sonarqube->urlRepeatError = 'Server address already exists!';
module/sonarqube/lang/zh-cn.php
+9 -3
View File
@@ -30,9 +30,11 @@ $lang->sonarqube->editServer = '修改SonarQube服务器';
$lang->sonarqube->createSuccess = "创建成功";
$lang->sonarqube->placeholder = new stdclass;
$lang->sonarqube->placeholder->name = '';
$lang->sonarqube->placeholder->url = "请填写SonarQube Server首页的访问地址，如：https://sonarqube.zentao.net。";
$lang->sonarqube->placeholder->account = "请填写具有Administrator权限的SonarQube用户信息";
$lang->sonarqube->placeholder->name = '';
$lang->sonarqube->placeholder->url = "请填写SonarQube Server首页的访问地址，如：https://sonarqube.zentao.net。";
$lang->sonarqube->placeholder->account = "请填写具有Administrator权限的SonarQube用户信息";
$lang->sonarqube->placeholder->projectName = '最多255个字符';
$lang->sonarqube->placeholder->projectKey = "最多400个字符。 允许的字符为字母数字，'-'，'_'，'. '和':'，至少有一个非数字";
$lang->sonarqube->nameRepeatError = "服务器名称已存在！";
$lang->sonarqube->urlRepeatError = "服务器地址已存在！";
@@ -60,3 +62,7 @@ $lang->sonarqube->qualitygateList = array();
$lang->sonarqube->qualitygateList['OK'] = 'Passed';
$lang->sonarqube->qualitygateList['WARN'] = 'Warning';
$lang->sonarqube->qualitygateList['ERROR'] = 'Failed';
$lang->sonarqube->apiErrorMap[1] = "/Malformed key for Project: '([\s\S]+)'. Allowed characters are alphanumeric, '-', '_', '\.' and ':', with at least one non-digit\./";
$lang->sonarqube->errorLang[1] = "项目'%s'的格式不正确。允许的字符为字母数字、'-'、''、'.'和“：”，至少有一个非数字。";
module/sonarqube/model.php
+99 -1
View File
@@ -43,7 +43,7 @@ class sonarqubeModel extends model
$url = rtrim($host, '/') . "/api/authentication/validate";
$header = 'Authorization: Basic ' . $token;
$result = json_decode(commonModel::http($url, null, array(), $header));
if(!isset($result->valid) or !$result->valid) return array('password' => array($this->lang->sonarqube->validError));
if(!isset($result->valid) or !$result->valid) return array('password' => array($this->lang->sonarqube->validError));
$url = rtrim($host, '/') . "/api/user_groups/search";
$header = 'Authorization: Basic ' . $token;
@@ -120,6 +120,25 @@ class sonarqubeModel extends model
return $allResults;
}
/**
* Create a sonarqube project by api.
*
* @param int $sonarqubeID
* @param object $project
* @access public
* @return object
*/
public function apiCreateProject($sonarqubeID, $project)
{
list($apiRoot, $header) = $this->getApiBase($sonarqubeID);
if(!$apiRoot) return false;
$url = sprintf($apiRoot, "projects/create?name=" . urlencode($project->projectName) . "&project=" . urlencode($project->projectKey));
$result = json_decode(commonModel::http($url, null, array(CURLOPT_CUSTOMREQUEST => 'POST'), $header));
return $result;
}
/**
* Delete sonarqube project by api.
*
@@ -137,4 +156,83 @@ class sonarqubeModel extends model
$result = json_decode(commonModel::http($url, null, array(CURLOPT_CUSTOMREQUEST => 'POST'), $header));
return $result;
}
/**
* Create a sonarqube project.
*
* @param int $sonarqubeID
* @access public
* @return bool
*/
public function createProject($sonarqubeID)
{
$project = fixer::input('post')->get();
$this->dao->insert('sonarqube')->data($project)->batchCheck($this->config->sonarqube->createproject->requiredFields, 'notempty');
if(dao::isError()) return false;
$response = $this->apiCreateProject($sonarqubeID, $project);
if(!empty($response->project->key))
{
$this->loadModel('action')->create('sonarqubeproject', 0, 'created', '', $response->project->name);
return true;
}
return $this->apiErrorHandling($response);
}
/**
* Api error handling.
*
* @param object $response
* @access public
* @return bool
*/
public function apiErrorHandling($response)
{
if(!empty($response->errors))
{
foreach($response->errors as $error)
{
if(isset($error->msg))
{
dao::$errors[] = $this->convertApiError($error->msg);
}
}
return false;
}
if(!$response) dao::$errors[] = false;
return false;
}
/**
* Convert API error.
*
* @param array $message
* @access public
* @return string
*/
public function convertApiError($message)
{
if(is_array($message)) $message = $message[0];
if(!is_string($message)) return $message;
if(!isset($this->lang->sonarqube->apiErrorMap)) return $message;
foreach($this->lang->sonarqube->apiErrorMap as $key => $errorMsg)
{
if(strpos($errorMsg, '/') === 0)
{
$result = preg_match($errorMsg, $message, $matches);
if($result) $errorMessage = sprintf(zget($this->lang->sonarqube->errorLang, $key), $matches[1]);
}
elseif($message == $errorMsg)
{
$errorMessage = zget($this->lang->mr->errorLang, $key, $message);
}
if(isset($errorMessage)) break;
}
return isset($errorMessage) ? $errorMessage : $message;
}
}
module/sonarqube/view/browseproject.html.php
+2 -2
View File
@@ -26,7 +26,7 @@
</form>
</div>
</div>
<div class="btn-toolbar pull-right hide">
<div class="btn-toolbar pull-right">
<?php if(common::hasPriv('sonarqube', 'createProject')) common::printLink('sonarqube', 'createProject', "sonarqubeID=$sonarqubeID", "<i class='icon icon-plus'></i> " . $lang->sonarqube->createProject, '', "class='btn btn-primary'");?>
</div>
</div>
@@ -35,7 +35,7 @@
<p>
<span class="text-muted"><?php echo $lang->noData;?></span>
<?php if(empty($keyword) and common::hasPriv('sonarqube', 'createProject')):?>
<?php //echo html::a($this->createLink('sonarqube', 'createProject', "sonarqubeID=$sonarqubeID"), "<i class='icon icon-plus'></i> " . $lang->sonarqube->createProject, '', "class='btn btn-info'");?>
<?php echo html::a($this->createLink('sonarqube', 'createProject', "sonarqubeID=$sonarqubeID"), "<i class='icon icon-plus'></i> " . $lang->sonarqube->createProject, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
module/sonarqube/view/createproject.html.php
+42
View File
@@ -0,0 +1,42 @@
<?php
/**
* The create view file of protect tag of ZenTaoPMS.
*
* @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Gang Zeng <zenggang@easycorp.ltd>
* @package sonarqube
* @version $Id$
* @link https://www.zentao.net
*/
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainContent' class='main-row'>
<div class='main-col main-content'>
<div class='center-block'>
<div class='main-header'>
<h2><?php echo $lang->sonarqube->createProject;?></h2>
</div>
<form id='branchForm' method='post' class='form-ajax' enctype="multipart/form-data">
<table class='table table-form'>
<tr>
<th class='w-110px'><?php echo $lang->sonarqube->projectName;?></th>
<td><?php echo html::input('projectName', '', "class='form-control' placeholder='{$lang->sonarqube->placeholder->projectName}'");?></td>
</tr>
<tr>
<th><?php echo $lang->sonarqube->projectKey;?></th>
<td><?php echo html::input('projectKey', '', 'class="form-control" placeholder="' . $lang->sonarqube->placeholder->projectKey . '"');?></td>
</tr>
<tr>
<th></th>
<td class='text-center form-actions'>
<?php echo html::submitButton();?>
<?php if(!isonlybody()) echo html::a(inlink('browseProject', "sonarqubeID=$sonarqubeID"), $lang->goback, '', 'class="btn btn-wide"');?>
</td>
</tr>
</table>
</form>
</div>
</div>
</div>
<?php include '../../common/view/footer.html.php';?>