From b58cbe0c60b904eb8cdd8d1145ec4f958603bf60 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Mon, 21 Feb 2022 16:49:35 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20ji?= =?UTF-8?q?ra=E6=A0=A1=E9=AA=8C=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96=20--bu?= =?UTF-8?q?g=3D1010309=20--user=3D=E9=99=88=E5=BB=BA=E6=98=9F=20=E3=80=90?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E3=80=91=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=B9=B3=E5=8F=B0=E8=B4=A6=E6=88=B7=EF=BC=8Cjira?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BC=98=E5=8C=96=20https://www.tapd.cn/55049933/s/11?= =?UTF-8?q?06747?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/track/issue/client/JiraAbstractClient.java | 7 +++++++ backend/src/main/resources/i18n/messages.properties | 3 ++- backend/src/main/resources/i18n/messages_en_US.properties | 3 ++- backend/src/main/resources/i18n/messages_zh_CN.properties | 1 + backend/src/main/resources/i18n/messages_zh_TW.properties | 3 ++- 5 files changed, 14 insertions(+), 3 deletions(-) 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 3a38b79cf4..2f8067f827 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 @@ -173,6 +173,13 @@ public abstract class JiraAbstractClient extends BaseClient { public void auth() { try { restTemplate.exchange(getBaseUrl() + "/myself", HttpMethod.GET, getAuthHttpEntity(), String.class); + } catch (HttpClientErrorException e) { + if (e.getRawStatusCode() == 401) { + MSException.throwException(Translator.get("jira_auth_error")); + } else { + LogUtil.error(e.getMessage(), e); + MSException.throwException(e.getMessage()); + } } catch (Exception e) { LogUtil.error(e.getMessage(), e); MSException.throwException(e.getMessage()); diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index 4d8d8bf2f6..8e90b4cd06 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -74,4 +74,5 @@ invalid_parameter= workspace_template_settings_issue= zentao_test_type_error= issue_jira_info_error= -case_status_not_exist= \ No newline at end of file +case_status_not_exist= +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 0e75e151a9..3e5194965a 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -305,4 +305,5 @@ error_report_library=Error report issue_jira_info_error=Check the service integration information or Jira project ID error_code_is_unique=Error code is not unique -no_version_exists=version not exists \ No newline at end of file +no_version_exists=version not exists +jira_auth_error=Account name or password (Token) is wrong diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 595a9c1308..c4b64bf5e2 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -304,3 +304,4 @@ error_report_library=误报库 issue_jira_info_error=请检查服务集成信息或Jira项目ID error_code_is_unique=错误代码不可重复 no_version_exists=不存在版本！请先创建项目的版本 +jira_auth_error=账号名或密码(Token)错误 diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 6c3924bb09..8fd5bcea91 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -304,4 +304,5 @@ error_report_library=誤報庫 issue_jira_info_error=請檢查服務集成信息或Jira項目ID error_code_is_unique=錯誤代碼不可重複 -no_version_exists=不存在版本！請先創建項目的版本 \ No newline at end of file +no_version_exists=不存在版本！請先創建項目的版本 +jira_auth_error=賬號名或密碼(Token)錯誤