diff --git a/apps/common/db/fields.py b/apps/common/db/fields.py index 8d46c9174..0757bc068 100644 --- a/apps/common/db/fields.py +++ b/apps/common/db/fields.py @@ -143,6 +143,7 @@ class EncryptMixin: value = sp.get_prep_value(value) value = force_text(value) # 替换新的加密方式 + return crypto.encrypt(value) class EncryptTextField(EncryptMixin, models.TextField): diff --git a/apps/jumpserver/settings/_xpack.py b/apps/jumpserver/settings/_xpack.py index 322740201..7a2f34c8d 100644 --- a/apps/jumpserver/settings/_xpack.py +++ b/apps/jumpserver/settings/_xpack.py @@ -6,8 +6,8 @@ from .. import const from .base import INSTALLED_APPS, TEMPLATES XPACK_DIR = os.path.join(const.BASE_DIR, 'xpack') -# XPACK_ENABLED = False -XPACK_ENABLED = os.path.isdir(XPACK_DIR) +XPACK_ENABLED = False +# XPACK_ENABLED = os.path.isdir(XPACK_DIR) XPACK_TEMPLATES_DIR = [] XPACK_CONTEXT_PROCESSOR = []