15308555518/ MaxKB
1
0
Fork 0
mirror of https://github.com/1Panel-dev/MaxKB.git synced 2025-12-26 01:33:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: 修复license校验问题

This commit is contained in:
wxg0103 2024-10-22 17:53:08 +08:00 committed by wxg0103
parent f5fcc01113
commit 5973957037
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/common/util/common.py
View File

@ -77,11 +77,13 @@ def valid_license(model=None, count=None, message=None):
def inner(func):
def run(*args, **kwargs):
xpack_cache = DBModelManage.get_model('xpack_cache')
if ((not False if xpack_cache is None else xpack_cache.get('XPACK_LICENSE_IS_VALID', False))
and QuerySet(
model).count() >= count):
error = message or f'超出限制{count},请联系我们（https://fit2cloud.com/）。'
raise AppApiException(400, error)
is_license_valid = xpack_cache.get('XPACK_LICENSE_IS_VALID', False) if xpack_cache is not None else False
record_count = QuerySet(model).count()
if not is_license_valid and record_count >= count:
error_message = message or f'超出限制{count}, 请联系我们（https://fit2cloud.com/）。'
raise AppApiException(400, error_message)
return func(*args, **kwargs)
return run

3
apps/setting/serializers/valid_serializers.py
View File

@ -41,7 +41,8 @@ class ValidSerializer(serializers.Serializer):
self.is_valid(raise_exception=True)
model_value = model_message_dict.get(self.data.get('valid_type'))
xpack_cache = DBModelManage.get_model('xpack_cache')
if not False if xpack_cache is None else xpack_cache.get('XPACK_LICENSE_IS_VALID', False):
is_license_valid = xpack_cache.get('XPACK_LICENSE_IS_VALID', False) if xpack_cache is not None else False
if not is_license_valid:
if self.data.get('valid_count') != model_value.get('count'):
raise AppApiException(400, model_value.get('message'))
if QuerySet(