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.

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

fix: 🐛 fix django_celery_beat migrate error #898

Merged
merged 1 commit into from
Jun 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1/views/approve_action.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ class Config:
tags=['审批动作'],
auth=None,
)
def list_approve_system_extensions(request, status: str = None):
def list_approve_system_extensions(request, tenant_id: str):
"""获取审批系统插件列表"""
qs = Extension.active_objects.filter(type='approve_system').all()
return qs
2 changes: 1 addition & 1 deletion api/v1/views/scim_sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class Config:
tags=['用户数据同步配置'],
auth=None,
)
def list_scim_servers(request, status: str = None):
def list_scim_servers(request, tenant_id: str):
"""获取Scim同步server列表"""
qs = TenantExtensionConfig.active_objects.filter(
extension__type='scim_sync', config__mode='server'
Expand Down
5 changes: 4 additions & 1 deletion arkid/common/check_arstore.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django_celery_beat.models import PeriodicTask, CrontabSchedule
from arkid.common.logger import logger
import json
from django.db.utils import OperationalError


def check_extensions_expired():
Expand All @@ -24,5 +25,7 @@ def check_extensions_expired():
'kwargs': json.dumps({}),
},
)
except OperationalError:
pass
except Exception as e:
logger.exception('add celery task failed %s' % e)
logger.error('add celery task failed %s' % e)