From 3744035281549a8bdec4e75095daaa50a7df4718 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Mon, 16 May 2022 11:37:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?= =?UTF-8?q?=20=E5=9C=A8Jira=E9=87=8C=E9=9D=A2=E5=A1=AB=E5=86=99=E7=A6=85?= =?UTF-8?q?=E9=81=93=E4=BF=A1=E6=81=AF=E6=B5=8B=E8=AF=95=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1013182 --user=李玉号 [系统设置]gihtub#13565在Jira里面填写禅道信息，测试成功 https://www.tapd.cn/55049933/s/1158316 Closes #13565 --- .../metersphere/track/issue/client/JiraAbstractClient.java | 6 +++++- backend/src/main/resources/i18n/messages_en_US.properties | 1 + backend/src/main/resources/i18n/messages_zh_CN.properties | 1 + backend/src/main/resources/i18n/messages_zh_TW.properties | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/metersphere/track/issue/client/JiraAbstractClient.java b/backend/src/main/java/io/metersphere/track/issue/client/JiraAbstractClient.java index 9e0d408b90..f959de72b8 100644 --- a/backend/src/main/java/io/metersphere/track/issue/client/JiraAbstractClient.java +++ b/backend/src/main/java/io/metersphere/track/issue/client/JiraAbstractClient.java @@ -182,8 +182,12 @@ public abstract class JiraAbstractClient extends BaseClient { } public void auth() { + ResponseEntity response = null; try { - restTemplate.exchange(getBaseUrl() + "/myself", HttpMethod.GET, getAuthHttpEntity(), String.class); + response = restTemplate.exchange(getBaseUrl() + "/myself", HttpMethod.GET, getAuthHttpEntity(), String.class); + if (StringUtils.isNotBlank(response.getBody()) && !response.getBody().startsWith("{\"self\"")) { + MSException.throwException(Translator.get("jira_auth_url_error")); + } } catch (HttpClientErrorException e) { if (e.getRawStatusCode() == 401) { MSException.throwException(Translator.get("jira_auth_error")); diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 5e233ef985..2361c9d14d 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -321,3 +321,4 @@ error_code_is_unique=Error code is not unique no_version_exists=version not exists jira_auth_error=Account name or password (Token) is wrong +jira_auth_url_error=The test connection failed, please check whether the Jira address is correct \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 8bf9aa85ab..8831c26a76 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -319,3 +319,4 @@ issue_jira_info_error=请检查服务集成信息或Jira项目ID error_code_is_unique=错误代码不可重复 no_version_exists=不存在版本！请先创建项目的版本 jira_auth_error=账号名或密码(Token)错误 +jira_auth_url_error=测试连接失败，请检查Jira地址是否正确 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 883f4291e3..4ef4deb1c3 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -319,3 +319,4 @@ error_code_is_unique=錯誤代碼不可重複 no_version_exists=不存在版本！請先創建項目的版本 jira_auth_error=賬號名或密碼(Token)錯誤 +jira_auth_url_error=測試連接失敗，請檢查Jira地址是否正確 \ No newline at end of file