github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-07 02:10:23 +00:00
Code Issues Projects Releases Wiki Activity

perf: 修改完冲突了

Browse Source
This commit is contained in:
ibuler
2022-12-05 18:54:12 +08:00
parent 2168610ffe
commit daf279304a
12 changed files with 49 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/common/db/fields.py
View File

@@ -7,8 +7,8 @@ from django.db import models
from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
from common.utils import signer, crypto
from common.local import add_encrypted_field_set
from common.utils import signer, crypto
__all__ = [
"JsonMixin",
@@ -131,7 +131,7 @@ class EncryptMixin:
return signer.unsign(value) or ""
def from_db_value(self, value, expression, connection, context=None):
if not value:
if value is None:
return value
value = force_text(value)
@@ -148,7 +148,7 @@ class EncryptMixin:
return plain_value
def get_prep_value(self, value):
if not value:
if value is None:
return value
# 先 json 再解密