Merge pull request #84 from nineaiyu/dev

优化代码

Author: nineaiyu

Dockerfile

@@ -1,4 +1,4 @@
-FROM nineaiyu/xadmin-server-base:20241225_013140 AS stage-build
+FROM nineaiyu/xadmin-server-base:20250224_065028 AS stage-build
 ARG VERSION
 
 WORKDIR /data/xadmin-server
@@ -11,7 +11,7 @@ RUN echo > config.yml \
         sed -i "s@VERSION = .*@VERSION = '${VERSION}'@g" server/const.py; \
     fi
 
-FROM python:3.13.1-slim
+FROM python:3.13.2-slim
 
 ENV LANG=en_US.UTF-8 \
     PATH=/data/py3/bin:$PATH

Dockerfile-base

@@ -1,4 +1,4 @@
-FROM python:3.13.1-slim
+FROM python:3.13.2-slim
 
 # Install APT dependencies
 ARG DEPENDENCIES="                    \

Dockerfile-dev

@@ -1,4 +1,4 @@
-FROM registry.cn-beijing.aliyuncs.com/nineaiyu/python:3.13.1-slim
+FROM registry.cn-beijing.aliyuncs.com/nineaiyu/python:3.13.2-slim
 
 # add pip cn mirrors
 ARG PIP_MIRROR=https://pypi.tuna.tsinghua.edu.cn/simple

common/core/db/utils.py

@@ -8,7 +8,7 @@
 import re
 from contextlib import contextmanager
 
-from django.db import connections, transaction
+from django.db import connections, transaction, connection
 from django.db.models import Q
 
 
@@ -114,13 +114,25 @@ def close_old_connections():
 
 @contextmanager
 def safe_db_connection():
-    close_old_connections()
-    yield
-    close_old_connections()
+    in_atomic_block = connection.in_atomic_block  # 当前是否处于事务中
+    autocommit = transaction.get_autocommit()  # 是否启用了自动提交
+    created = False
+
+    try:
+        if not connection.is_usable():
+            connection.close()
+            connection.connect()
+            created = True
+        yield
+    finally:
+        # 如果不是事务中（API 请求中可能需要提交事务），则关闭连接
+        if created and not in_atomic_block and autocommit:
+            print("close connection in safe_db_connection")
+            close_old_connections()
 
 
 @contextmanager
-def open_db_connection(alias='default'):
+def open_db_connection(alias="default"):
     connection = transaction.get_connection(alias)
     try:
         connection.connect()

common/core/models.py

@@ -102,4 +102,8 @@ def upload_directory_path(instance, filename):
     tmp_name = f"{filename}_{time.time()}"
     new_filename = f"{uuid.uuid5(uuid.NAMESPACE_DNS, tmp_name).__str__().replace('-', '')}.{prefix}"
     labels = instance._meta.label_lower.split('.')
-    return os.path.join(labels[0], labels[1], str(instance.pk), new_filename)
+    if creator := getattr(instance, "creator", None):
+        creator_pk = creator.pk
+    else:
+        creator_pk = 0
+    return os.path.join(labels[0], labels[1], str(creator_pk), new_filename)

common/fields/char.py

@@ -12,7 +12,7 @@
 from common.base.utils import AESCipher
 
 
-class AESCharField(models.CharField):
+class AESField(models.Field):
 
     def __init__(self, *args, **kwargs):
         if 'prefix' in kwargs:
@@ -21,10 +21,10 @@ def __init__(self, *args, **kwargs):
         else:
             self.prefix = "aes:::"
         self.cipher = AESCipher(settings.SECRET_KEY)
-        super(AESCharField, self).__init__(*args, **kwargs)
+        super(AESField, self).__init__(*args, **kwargs)
 
     def deconstruct(self):
-        name, path, args, kwargs = super(AESCharField, self).deconstruct()
+        name, path, args, kwargs = super(AESField, self).deconstruct()
         if self.prefix != "aes:::":
             kwargs['prefix'] = self.prefix
         return name, path, args, kwargs
@@ -58,3 +58,11 @@ def get_prep_value(self, value):
         elif value is not None:
             raise TypeError(_("{} is not a valid value for AESCharField").format(value))
         return value
+
+
+class AESCharField(AESField, models.CharField):
+    pass
+
+
+class AESTextField(AESField, models.TextField):
+    pass

common/fields/image.py

@@ -6,6 +6,7 @@
 # date : 1/17/2024
 import os
 
+from django.core.files.storage import default_storage, FileSystemStorage
 from django.db import models
 from django.db.models.fields.files import ImageFieldFile
 from imagekit.cachefiles import ImageCacheFile
@@ -38,7 +39,10 @@ def get_thumbnail(source, index, force=False):
     return file.name
 
 
+
 class ProcessedImageFieldFile(ImageFieldFile):
+    is_local_storage = isinstance(default_storage, FileSystemStorage)
+
     def save(self, name, content, save=True):
         filename, ext = os.path.splitext(name)
         spec = self.field.get_spec(source=content)
@@ -52,19 +56,20 @@ def delete(self, save=True):
         if hasattr(self, "_dimensions_cache"):
             del self._dimensions_cache
         name = self.name
-        try:
-            for i in self.field.scales:
-                self.name = f"{name.split('.')[0]}_{i}.jpg"
-                super().delete(False)
-        except Exception as e:
-            pass
+        if self.is_local_storage:
+            try:
+                for i in self.field.scales:
+                    self.name = f"{name.split('.')[0]}_{i}.jpg"
+                    super().delete(False)
+            except Exception as e:
+                pass
         self.name = name
         super().delete(save)
 
     @property
     def url(self):
         url: str = super().url
-        if url.endswith('.png'):
+        if self.is_local_storage and url.endswith('.png'):
             return url.replace('.png', '_1.jpg')
         return url
 

config_example.yml

@@ -4,7 +4,7 @@
 SECRET_KEY:
 
 # Development env open this, when error occur display the full process track, Production disable it
-# DEBUG 模式 开启DEBUG后遇到错误时可以看到更多日志，正式服要禁用
+# DEBUG 模式 开启DEBUG后遇到错误时可以看到更多日志，正式服要禁用，开发阶段，需要取消该注释，否则会导致前端ws连接失败
 # DEBUG: true
 
 # DEBUG, INFO, WARNING, ERROR, CRITICAL can set. See https://docs.djangoproject.com/zh-hans/5.0/topics/logging/
@@ -24,7 +24,7 @@ SECRET_KEY:
 # SQLite setting:
 # 使用单文件sqlite数据库
 # DB_ENGINE: sqlite3
-# DB_NAME:
+# DB_DATABASE:
 # MySQL or postgres setting like:
 # DB_ENGINE can set mysql, oracle, postgresql, sqlite3
 

docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - net
 
   postgresql:
-    image: registry.cn-beijing.aliyuncs.com/nineaiyu/postgres:16.5
+    image: registry.cn-beijing.aliyuncs.com/nineaiyu/postgres:16.7
     container_name: xadmin-postgresql
     restart: always
     command: [ "postgres","-c","max_connections=8000" ]
@@ -41,7 +41,7 @@ services:
       - net
 
   redis:
-    image: registry.cn-beijing.aliyuncs.com/nineaiyu/redis:7.4.1
+    image: registry.cn-beijing.aliyuncs.com/nineaiyu/redis:7.4.2
     container_name: xadmin-redis
     hostname: xadmin-redis
     restart: always

requirements.txt

@@ -1,42 +1,43 @@
-django==5.1.4
+django==5.1.6
 djangorestframework==3.15.2
-django-cors-headers==4.6.0
-django-filter==24.3
-mysqlclient==2.2.6
+django-cors-headers==4.7.0
+django-filter==25.1
+mysqlclient==2.2.7
 psycopg2-binary==2.9.10
 django-redis==5.4.0
 pycryptodomex==3.21.0
-djangorestframework-simplejwt==5.3.1
+djangorestframework-simplejwt==5.4.0
 celery==5.4.0
 django-celery-beat==2.7.0
 django-celery-results==2.5.1
 flower==2.0.1
 python-daemon==3.1.2
 gunicorn==23.0.0
 django-proxy==1.3.0
-psutil==6.1.0
-uvicorn==0.32.1
+psutil==6.1.1
+uvicorn==0.34.0
 daphne==4.1.2
 channels==4.2.0
 channels-redis==4.2.1
 django-ranged-response==0.2.0
 user-agents==2.2.0
 aiofiles==24.1.0
-websockets==14.1
+websockets==15.0
 django-imagekit==5.0.0
 pilkit==3.0
 drf-spectacular==0.28.0
-drf-spectacular-sidecar==2024.12.1
+drf-spectacular-sidecar==2025.2.1
 openpyxl==3.2.0b1
 pyzipper==0.3.6
 unicodecsv==0.14.1
 chardet==5.2.0
 pyexcel==0.7.1
 pyexcel-xlsx==0.6.0
-alibabacloud-dysmsapi20170525==3.1.0
-phonenumbers==8.13.51
+alibabacloud-dysmsapi20170525==3.1.1
+phonenumbers==8.13.55
 pycountry==24.6.1
 geoip2==4.8.1
 ipip-ipdb==1.6.1
 requests==2.32.3
-html2text==2024.2.26
+html2text==2024.2.26
+pyotp==2.9.0