Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: 新增配置- 账户有效期 #1361

Merged
merged 28 commits into from
Nov 13, 2023
Merged

feat: 新增配置- 账户有效期 #1361

merged 28 commits into from
Nov 13, 2023

Conversation

neronkl
Copy link
Contributor

@neronkl neronkl commented Nov 2, 2023

@neronkl neronkl added the tenant 多租户版本功能 label Nov 7, 2023
narasux
narasux reviewed Nov 7, 2023
View reviewed changes
src/bk-user/bkuser/apps/tenant/migrations/0008_add_tenant_user_expire_nitification_tasks.py Outdated
from django_celery_beat.models import CrontabSchedule, PeriodicTask


def generate_periodic_tasks(apps, schema_editor):
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/TencentBlueKing/bk-iam-saas/blob/c444e13a20ca4055c46539060513f32a9273a378/saas/config/default.py#L212

通过 settings 配置的方式初始化定时任务

nannan00
nannan00 reviewed Nov 11, 2023
View reviewed changes
src/bk-user/bkuser/apis/web/tenant_setting/serializers.py Outdated Show resolved Hide resolved
src/bk-user/bkuser/apis/web/tenant_setting/serializers.py Outdated Show resolved Hide resolved
src/bk-user/bkuser/apis/web/tenant_setting/views.py Outdated Show resolved Hide resolved
src/bk-user/bkuser/apis/web/tenant_setting/views.py Outdated Show resolved Hide resolved
src/bk-user/bkuser/apis/web/tenant_setting/views.py Outdated Show resolved Hide resolved
src/bk-user/bkuser/apps/tenant/periodic_tasks.py Outdated Show resolved Hide resolved
src/bk-user/bkuser/apps/tenant/periodic_tasks.py Outdated Show resolved Hide resolved
src/bk-user/bkuser/apps/tenant/tasks.py Show resolved Hide resolved
src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved
src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved
@neronkl neronkl requested a review from nannan00 November 13, 2023 10:03
@nannan00 nannan00 merged commit a852eb7 into TencentBlueKing:ft_tenant Nov 13, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@narasux narasux narasux left review comments

@nannan00 nannan00 nannan00 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@neronkl @nannan00 @narasux