diff --git a/module/sonarqube/control.php b/module/sonarqube/control.php index c9d480134f..47056fe28c 100644 --- a/module/sonarqube/control.php +++ b/module/sonarqube/control.php @@ -351,7 +351,19 @@ class sonarqube extends control $cacheFile = $this->sonarqube->getCacheFile($sonarqubeID, $projectKey); if(!$cacheFile or !file_exists($cacheFile) or (time() - filemtime($cacheFile)) / 60 > $this->config->sonarqube->cacheTime) { + ini_set('memory_limit', '256M'); + $sonarqubeIssueList = $this->sonarqube->apiGetIssues($sonarqubeID, $projectKey); + foreach($sonarqubeIssueList as $key => $sonarqubeIssue) + { + if(!isset($sonarqubeIssue->line)) $sonarqubeIssue->line = ''; + if(!isset($sonarqubeIssue->effort)) $sonarqubeIssue->effort = ''; + $sonarqubeIssue->message = htmlspecialchars($sonarqubeIssue->message); + $sonarqubeIssue->creationDate = date('Y-m-d H:i:s', strtotime($sonarqubeIssue->creationDate)); + + list($project, $file) = explode(':', $sonarqubeIssue->component); + $sonarqubeIssue->file = $file; + } if($cacheFile) { @@ -368,16 +380,6 @@ class sonarqube extends control $sonarqubeIssueList = unserialize(file_get_contents($cacheFile)); } - foreach($sonarqubeIssueList as $key => $sonarqubeIssue) - { - if(!isset($sonarqubeIssue->line)) $sonarqubeIssue->line = ''; - if(!isset($sonarqubeIssue->effort)) $sonarqubeIssue->effort = ''; - $sonarqubeIssue->message = htmlspecialchars($sonarqubeIssue->message); - - list($project, $file) = explode(':', $sonarqubeIssue->component); - $sonarqubeIssue->file = $file; - } - /* Data search. */ if($keyword) { diff --git a/module/sonarqube/css/browseissue.css b/module/sonarqube/css/browseissue.css index f32e286da6..8465817171 100644 --- a/module/sonarqube/css/browseissue.css +++ b/module/sonarqube/css/browseissue.css @@ -2,4 +2,6 @@ #mainMenu .pull-left {margin-right: 15px;} .c-message {width: 350px;} .c-file {width: 300px;} +.c-effort {width: 155px;} +.c-date {width: 130px;} #keyword {width: 240px;} diff --git a/module/sonarqube/lang/zh-cn.php b/module/sonarqube/lang/zh-cn.php index 791445b5a4..febe818c45 100644 --- a/module/sonarqube/lang/zh-cn.php +++ b/module/sonarqube/lang/zh-cn.php @@ -35,7 +35,7 @@ $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->placeholder->projectKey = "最多400个字符。 允许的字符为字母、数字,'-','_','. '和':',至少有一个非数字"; $lang->sonarqube->placeholder->searchIssue = "请输入问题名称或文件"; $lang->sonarqube->nameRepeatError = "服务器名称已存在!"; @@ -69,7 +69,7 @@ $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->apiErrorMap[2] = "/Could not create Project, key already exists: ([\s\S]+)/"; -$lang->sonarqube->errorLang[1] = "项目标识的格式不正确。允许的字符为字母数字、'-'、''、'.'和“:”,至少有一个非数字。"; +$lang->sonarqube->errorLang[1] = "项目标识的格式不正确。允许的字符为字母、数字、'-'、''、'.'和“:”,至少有一个非数字。"; $lang->sonarqube->errorLang[2] = "无法创建项目,项目标识已存在:%s"; $lang->sonarqube->issue = new stdclass(); diff --git a/module/sonarqube/view/browseissue.html.php b/module/sonarqube/view/browseissue.html.php index ceb2513ac0..c0ec6c2cf6 100644 --- a/module/sonarqube/view/browseissue.html.php +++ b/module/sonarqube/view/browseissue.html.php @@ -46,7 +46,8 @@