From 7560b70c4dc8c49eb48ff7d1592213c2cc0f2ea4 Mon Sep 17 00:00:00 2001 From: xinwen Date: Wed, 15 Sep 2021 18:20:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=20=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E9=92=89=E9=92=89=EF=BC=8C=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=EF=BC=8C=E9=A3=9E=E4=B9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.po | 38 +++++++++---------- .../migrations/0034_auto_20210506_1448.py | 4 +- apps/users/migrations/0036_user_feishu_id.py | 2 +- apps/users/models/user.py | 6 +-- apps/users/serializers/user.py | 1 + 5 files changed, 26 insertions(+), 25 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 9cfbd7b76..dcba19f91 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-15 19:13+0800\n" +"POT-Creation-Date: 2021-09-15 19:29+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -1240,13 +1240,13 @@ msgstr "认证令牌" #: audits/signals_handler.py:68 #: authentication/templates/authentication/login.html:210 -#: notifications/backends/__init__.py:11 +#: notifications/backends/__init__.py:11 users/models/user.py:659 msgid "WeCom" msgstr "企业微信" #: audits/signals_handler.py:69 #: authentication/templates/authentication/login.html:215 -#: notifications/backends/__init__.py:12 +#: notifications/backends/__init__.py:12 users/models/user.py:660 msgid "DingTalk" msgstr "钉钉" @@ -1788,7 +1788,7 @@ msgid "CAS" msgstr "CAS" #: authentication/templates/authentication/login.html:220 -#: notifications/backends/__init__.py:14 +#: notifications/backends/__init__.py:14 users/models/user.py:661 msgid "FeiShu" msgstr "飞书" @@ -2487,7 +2487,7 @@ msgstr "来自工单" #: perms/serializers/application/permission.py:18 #: perms/serializers/application/permission.py:38 #: perms/serializers/asset/permission.py:42 -#: perms/serializers/asset/permission.py:68 users/serializers/user.py:76 +#: perms/serializers/asset/permission.py:68 users/serializers/user.py:77 msgid "Is valid" msgstr "账户是否有效" @@ -2495,7 +2495,7 @@ msgstr "账户是否有效" #: perms/serializers/application/permission.py:37 #: perms/serializers/asset/permission.py:43 #: perms/serializers/asset/permission.py:67 users/serializers/user.py:28 -#: users/serializers/user.py:77 +#: users/serializers/user.py:78 msgid "Is expired" msgstr "是否过期" @@ -5255,7 +5255,7 @@ msgstr "" msgid "The old password is incorrect" msgstr "旧密码错误" -#: users/serializers/profile.py:36 users/serializers/user.py:137 +#: users/serializers/profile.py:36 users/serializers/user.py:138 msgid "Password does not match security rules" msgstr "密码不满足安全规则" @@ -5267,7 +5267,7 @@ msgstr "新密码不能是最近 {} 次的密码" msgid "The newly set password is inconsistent" msgstr "两次密码不一致" -#: users/serializers/profile.py:121 users/serializers/user.py:75 +#: users/serializers/profile.py:121 users/serializers/user.py:76 msgid "Is first login" msgstr "首次登录" @@ -5305,47 +5305,47 @@ msgstr "是否可删除" msgid "Can public key authentication" msgstr "能否公钥认证" -#: users/serializers/user.py:33 users/serializers/user.py:82 +#: users/serializers/user.py:33 users/serializers/user.py:83 msgid "Organization role name" msgstr "组织角色名称" -#: users/serializers/user.py:78 +#: users/serializers/user.py:79 msgid "Avatar url" msgstr "头像路径" -#: users/serializers/user.py:80 +#: users/serializers/user.py:81 msgid "Groups name" msgstr "用户组名" -#: users/serializers/user.py:81 +#: users/serializers/user.py:82 msgid "Source name" msgstr "用户来源名" -#: users/serializers/user.py:83 +#: users/serializers/user.py:84 msgid "Super role name" msgstr "超级角色名称" -#: users/serializers/user.py:84 +#: users/serializers/user.py:85 msgid "Total role name" msgstr "汇总角色名称" -#: users/serializers/user.py:86 +#: users/serializers/user.py:87 msgid "Is wecom bound" msgstr "是否绑定了企业微信" -#: users/serializers/user.py:87 +#: users/serializers/user.py:88 msgid "Is dingtalk bound" msgstr "是否绑定了钉钉" -#: users/serializers/user.py:88 +#: users/serializers/user.py:89 msgid "Is feishu bound" msgstr "是否绑定了飞书" -#: users/serializers/user.py:111 +#: users/serializers/user.py:112 msgid "Role limit to {}" msgstr "角色只能为 {}" -#: users/serializers/user.py:231 +#: users/serializers/user.py:232 msgid "name not unique" msgstr "名称重复" diff --git a/apps/users/migrations/0034_auto_20210506_1448.py b/apps/users/migrations/0034_auto_20210506_1448.py index df6257064..f08b34b3e 100644 --- a/apps/users/migrations/0034_auto_20210506_1448.py +++ b/apps/users/migrations/0034_auto_20210506_1448.py @@ -13,11 +13,11 @@ class Migration(migrations.Migration): migrations.AddField( model_name='user', name='dingtalk_id', - field=models.CharField(default=None, max_length=128, null=True, unique=True), + field=models.CharField(default=None, max_length=128, null=True, unique=True, verbose_name='DingTalk'), ), migrations.AddField( model_name='user', name='wecom_id', - field=models.CharField(default=None, max_length=128, null=True, unique=True), + field=models.CharField(default=None, max_length=128, null=True, unique=True, verbose_name='WeCom'), ), ] diff --git a/apps/users/migrations/0036_user_feishu_id.py b/apps/users/migrations/0036_user_feishu_id.py index 3e5882c70..472bc0970 100644 --- a/apps/users/migrations/0036_user_feishu_id.py +++ b/apps/users/migrations/0036_user_feishu_id.py @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='user', name='feishu_id', - field=models.CharField(default=None, max_length=128, null=True, unique=True), + field=models.CharField(default=None, max_length=128, null=True, unique=True, verbose_name='FeiShu'), ), ] diff --git a/apps/users/models/user.py b/apps/users/models/user.py index 9911bf91b..3a369e808 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -656,9 +656,9 @@ class User(AuthMixin, TokenMixin, RoleMixin, MFAMixin, AbstractUser): need_update_password = models.BooleanField( default=False, verbose_name=_('Need update password') ) - wecom_id = models.CharField(null=True, default=None, unique=True, max_length=128) - dingtalk_id = models.CharField(null=True, default=None, unique=True, max_length=128) - feishu_id = models.CharField(null=True, default=None, unique=True, max_length=128) + wecom_id = models.CharField(null=True, default=None, unique=True, max_length=128, verbose_name=_('WeCom')) + dingtalk_id = models.CharField(null=True, default=None, unique=True, max_length=128, verbose_name=_('DingTalk')) + feishu_id = models.CharField(null=True, default=None, unique=True, max_length=128, verbose_name=_('FeiShu')) def __str__(self): return '{0.name}({0.username})'.format(self) diff --git a/apps/users/serializers/user.py b/apps/users/serializers/user.py index 10fa78100..a6da38a37 100644 --- a/apps/users/serializers/user.py +++ b/apps/users/serializers/user.py @@ -51,6 +51,7 @@ class UserSerializer(CommonBulkSerializerMixin, serializers.ModelSerializer): 'date_expired', 'date_joined', 'last_login', # 日期字段 'created_by', 'comment', # 通用字段 'is_wecom_bound', 'is_dingtalk_bound', 'is_feishu_bound', + 'wecom_id', 'dingtalk_id', 'feishu_id' ] # 包含不太常用的字段，可以没有 fields_verbose = fields_small + [