Merge branch 'devops21_19388' into 'devops21'

zg:修复bug19388

See merge request easycorp/zentaopms!1751

module/sonarqube/lang/en.php

@@ -42,6 +42,7 @@ $lang->sonarqube->nameRepeatError      = "Server name  already exists!";
 $lang->sonarqube->urlRepeatError       = 'Server address already exists!';
 $lang->sonarqube->validError           = 'SonarQube user authority authentication failed!';
 $lang->sonarqube->hostError            = "Invalid SonarQube service address.";
+$lang->sonarqube->lengthError          = "『%s』length should be <=『%d』";
 $lang->sonarqube->confirmDelete        = 'Do you want to delete this SonarQube server?';
 $lang->sonarqube->confirmDeleteProject = 'Do you want to delete this SonarQube project?';
 $lang->sonarqube->noReport             = "No Reprot";

module/sonarqube/lang/zh-cn.php

@@ -42,6 +42,7 @@ $lang->sonarqube->nameRepeatError      = "服务器名称已存在！";
 $lang->sonarqube->urlRepeatError       = "服务器地址已存在！";
 $lang->sonarqube->validError           = "SonarQube 用户权限认证失败！";
 $lang->sonarqube->hostError            = "无效的SonarQube服务地址。";
+$lang->sonarqube->lengthError          = "『%s』长度应当不超过『%d』";
 $lang->sonarqube->confirmDelete        = '确认删除该SonarQube吗？';
 $lang->sonarqube->confirmDeleteProject = '确认删除该SonarQube项目吗？';
 $lang->sonarqube->noReport             = "暂无报告";

module/sonarqube/model.php

@@ -197,9 +197,11 @@ class sonarqubeModel extends model
         $project = fixer::input('post')->get();
 
         $this->dao->insert('sonarqube')->data($project)
-            ->batchCheck($this->config->sonarqube->createproject->requiredFields, 'notempty')
-            ->check('projectName', 'length', 255, 1)
-            ->check('projectKey', 'length', 400, 1);
+            ->batchCheck($this->config->sonarqube->createproject->requiredFields, 'notempty');
+        if(dao::isError()) return false;
+
+        if(mb_strlen($project->projectName) > 255) dao::$errors['projectName'][] = sprintf($this->lang->sonarqube->lengthError, $this->lang->sonarqube->projectName, 255);
+        if(mb_strlen($project->projectKey) > 400) dao::$errors['projectKey'][] = sprintf($this->lang->sonarqube->lengthError, $this->lang->sonarqube->projectKey, 400);
         if(dao::isError()) return false;
 
         $response = $this->apiCreateProject($sonarqubeID, $project);