refactor: cr 调整

TencentBlueKing · Nov 3, 2023 · 4fc127a · 4fc127a
1 parent 2ca445d
commit 4fc127a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/bk-user/bkuser/apps/sync/syncers.py b/src/bk-user/bkuser/apps/sync/syncers.py
@@ -538,7 +538,6 @@ def sync(self):
         self.ctx.recorder.add(SyncOperation.CREATE, TenantSyncObjectType.USER, waiting_create_tenant_users)
 
     def _get_user_account_expired_at(self) -> datetime.datetime:
-        """FIXME (su) 支持读取账号有效期配置，然后累加到 timezone.now() 上，目前是直接返回 PERMANENT_TIME"""
         # 根据配置初始化账号有效期
         valid_time = PERMANENT_TIME
         validity_period_config = TenantUserValidityPeriodConfig.objects.get(tenant_id=self.tenant.id)

diff --git a/src/bk-user/bkuser/biz/tenant_setting.py b/src/bk-user/bkuser/biz/tenant_setting.py
@@ -104,9 +104,9 @@ class TenantUserValidityPeriodConfigHandler:
                 "title": "蓝鲸智云 - 账号到期提醒!",
                 "sender": "蓝鲸智云",
                 "content": (
-                    "{{ username }}，您好：\n"
-                    + " 您的蓝鲸智云平台账号已过期。如需继续使用，请尽快联系平台管理员进行续期。\n"
-                    + " 此邮件为系统自动发送，请勿回复。"
+                    "{{ username }}，您好：\n" 
+                    + "您的蓝鲸智云平台账号已过期。为避免影响使用，请尽快联系平台管理员进行续期。\n"
+                    + " 该短信为系统自动发送，请勿回复。"
                 ),
                 "content_html": (
                     "<p>{{ username }}，您好：</p>"
@@ -138,8 +138,8 @@ class TenantUserValidityPeriodConfigHandler:
                 "title": None,
                 "sender": "蓝鲸智云",
                 "content": (
-                    "{{ username }}，您好：\n "
-                    + "您的蓝鲸智云平台账号已过期。如需继续使用，请尽快联系平台管理员进行续期。\n "
+                    "{{ username }}您好：\n"
+                    + "您的蓝鲸智云平台账号已过期，如需继续使用，请尽快联系平台管理员进行续期。\n"
                     + "该短信为系统自动发送，请勿回复。"
                 ),
                 "content_html": (