From 3eba92548b2b5c862eb5ce50dda98a2883dae2f8 Mon Sep 17 00:00:00 2001 From: xinwen Date: Wed, 19 May 2021 15:51:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1&=E9=92=89=E9=92=89=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98=E5=92=8C=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/authentication/views/dingtalk.py | 2 +- apps/authentication/views/wecom.py | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 75305 -> 75231 bytes apps/locale/zh/LC_MESSAGES/django.po | 24 +++++++++++------------- apps/settings/api/dingtalk.py | 15 ++++++++++----- apps/settings/api/wecom.py | 15 ++++++++++----- 6 files changed, 33 insertions(+), 25 deletions(-) diff --git a/apps/authentication/views/dingtalk.py b/apps/authentication/views/dingtalk.py index 24861b979..6243b80b7 100644 --- a/apps/authentication/views/dingtalk.py +++ b/apps/authentication/views/dingtalk.py @@ -2,7 +2,7 @@ import urllib from django.http.response import HttpResponseRedirect from django.utils.decorators import method_decorator -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from django.views.decorators.cache import never_cache from django.views.generic import TemplateView from django.views import View diff --git a/apps/authentication/views/wecom.py b/apps/authentication/views/wecom.py index 981c12508..b7b2a707b 100644 --- a/apps/authentication/views/wecom.py +++ b/apps/authentication/views/wecom.py @@ -2,7 +2,7 @@ import urllib from django.http.response import HttpResponseRedirect from django.utils.decorators import method_decorator -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from django.views.decorators.cache import never_cache from django.views.generic import TemplateView from django.views import View diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index a43fbc6ce7dc58e810a82659d1b7331fa7378b4a..4056fe77cd908f585530467c6701dc86d5e84f7d 100644 GIT binary patch delta 21947 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 a)i`@II@SMC5tBbbK+nLKAA$m+)BQgaGRd|8 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 2f6862ff8..c456368c8 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-05-19 14:48+0800\n" +"POT-Creation-Date: 2021-05-19 16:27+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -2146,13 +2146,9 @@ msgstr "邮件已经发送{}, 请检查" msgid "Welcome to the JumpServer open source Bastion Host" msgstr "欢迎使用JumpServer开源堡垒机" -#: settings/api/dingtalk.py:29 -msgid "AppSecret is required" -msgstr "AppSecret 是必须的" - -#: settings/api/dingtalk.py:35 settings/api/wecom.py:35 -msgid "OK" -msgstr "" +#: settings/api/dingtalk.py:36 settings/api/wecom.py:36 +msgid "Test success" +msgstr "测试成功" #: settings/api/ldap.py:189 msgid "Get ldap users is None" @@ -2162,10 +2158,6 @@ msgstr "获取 LDAP 用户为 None" msgid "Imported {} users successfully" msgstr "导入 {} 个用户成功" -#: settings/api/wecom.py:29 -msgid "Secret is required" -msgstr "Secret 是必须的" - #: settings/models.py:123 users/templates/users/reset_password.html:29 msgid "Setting" msgstr "设置" @@ -3096,7 +3088,7 @@ msgstr "测试成功" msgid "Test failure: Account invalid" msgstr "测试失败: 账户无效" -#: terminal/api/terminal.py:38 terminal/api/terminal.py:43 +#: terminal/api/terminal.py:39 msgid "Have online sessions" msgstr "有在线会话" @@ -5049,6 +5041,12 @@ msgstr "旗舰版" msgid "Community edition" msgstr "社区版" +#~ msgid "AppSecret is required" +#~ msgstr "AppSecret 是必须的" + +#~ msgid "Secret is required" +#~ msgstr "Secret 是必须的" + #~ msgid "Corporation ID(corpid)" #~ msgstr "企业 ID(CorpId)" diff --git a/apps/settings/api/dingtalk.py b/apps/settings/api/dingtalk.py index 4e4a73bf7..bbbfc28a8 100644 --- a/apps/settings/api/dingtalk.py +++ b/apps/settings/api/dingtalk.py @@ -25,13 +25,18 @@ class DingTalkTestingAPI(GenericAPIView): if not dingtalk_appsecret: secret = Setting.objects.filter(name='DINGTALK_APPSECRET').first() - if not secret: - return Response(status=status.HTTP_400_BAD_REQUEST, data={'error': _('AppSecret is required')}) - dingtalk_appsecret = secret.cleaned_value + if secret: + dingtalk_appsecret = secret.cleaned_value + + dingtalk_appsecret = dingtalk_appsecret or '' try: dingtalk = DingTalk(appid=dingtalk_appkey, appsecret=dingtalk_appsecret, agentid=dingtalk_agentid) dingtalk.send_text(['test'], 'test') - return Response(status=status.HTTP_200_OK, data={'msg': _('OK')}) + return Response(status=status.HTTP_200_OK, data={'msg': _('Test success')}) except APIException as e: - return Response(status=status.HTTP_400_BAD_REQUEST, data={'error': e.detail}) + try: + error = e.detail['errmsg'] + except: + error = e.detail + return Response(status=status.HTTP_400_BAD_REQUEST, data={'error': error}) diff --git a/apps/settings/api/wecom.py b/apps/settings/api/wecom.py index 5059b7647..39d1576b5 100644 --- a/apps/settings/api/wecom.py +++ b/apps/settings/api/wecom.py @@ -25,13 +25,18 @@ class WeComTestingAPI(GenericAPIView): if not wecom_corpsecret: secret = Setting.objects.filter(name='WECOM_SECRET').first() - if not secret: - return Response(status=status.HTTP_400_BAD_REQUEST, data={'error': _('Secret is required')}) - wecom_corpsecret = secret.cleaned_value + if secret: + wecom_corpsecret = secret.cleaned_value + + wecom_corpsecret = wecom_corpsecret or '' try: wecom = WeCom(corpid=wecom_corpid, corpsecret=wecom_corpsecret, agentid=wecom_agentid) wecom.send_text(['test'], 'test') - return Response(status=status.HTTP_200_OK, data={'msg': _('OK')}) + return Response(status=status.HTTP_200_OK, data={'msg': _('Test success')}) except APIException as e: - return Response(status=status.HTTP_400_BAD_REQUEST, data={'error': e.detail}) + try: + error = e.detail['errmsg'] + except: + error = e.detail + return Response(status=status.HTTP_400_BAD_REQUEST, data={'error': error})