Merge pull request #89 from nineaiyu/dev

Dev

Author: nineaiyu

Dockerfile

@@ -1,4 +1,4 @@
-FROM nineaiyu/xadmin-server-base:20250401_063806 AS stage-build
+FROM nineaiyu/xadmin-server-base:20250508_064151 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.2-slim
+FROM python:3.13.3-slim
 
 ENV LANG=en_US.UTF-8 \
     PATH=/data/py3/bin:$PATH

Dockerfile-base

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

Dockerfile-dev

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

docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - net
 
   postgresql:
-    image: registry.cn-beijing.aliyuncs.com/nineaiyu/postgres:16.7
+    image: registry.cn-beijing.aliyuncs.com/nineaiyu/postgres:16.8
     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.2
+    image: registry.cn-beijing.aliyuncs.com/nineaiyu/redis:7.4.3
     container_name: xadmin-redis
     hostname: xadmin-redis
     restart: always

loadjson/fieldpermission.json

@@ -1095,6 +1095,29 @@
       ]
     }
   },
+  {
+    "model": "system.fieldpermission",
+    "pk": "069ea080-66b5-4ce3-9047-e3044ee98f30-72a636d3-99f2-4abc-9689-e34ccaad4573",
+    "fields": {
+      "description": null,
+      "creator": 1,
+      "modifier": 1,
+      "dept_belong": null,
+      "role": "069ea080-66b5-4ce3-9047-e3044ee98f30",
+      "menu": "72a636d3-99f2-4abc-9689-e34ccaad4573",
+      "field": [
+        "d2126ef2-3876-416b-8b7b-fb6aa370c5d4",
+        "98ac03f2-18d9-4104-8189-853d4395fc64",
+        "d4e7f68c-42c5-4e52-9df7-788b70ada28c",
+        "6d7f40fe-265b-4375-94d9-fc7f3a659874",
+        "52dec320-69f6-4ffd-9d28-8b438cd54d2e",
+        "6d1cc67b-de72-4af9-8839-3feb477d24e9",
+        "21b85978-b7d4-4dab-a5f0-9d605617fed4",
+        "9d132e73-6e0f-407d-a198-0872108f6862",
+        "7e370824-a5d4-4d9a-94fb-bcbe2dac84e9"
+      ]
+    }
+  },
   {
     "model": "system.fieldpermission",
     "pk": "069ea080-66b5-4ce3-9047-e3044ee98f30-731d7005-46da-4e8f-a972-54069c174300",

loadjson/menu.json

@@ -2295,7 +2295,9 @@
       "is_active": true,
       "meta": "f6c4e5ba-5858-4484-a520-ee326f116dd1",
       "method": "POST",
-      "model": []
+      "model": [
+        "771d52ec-3633-41c4-89b4-2ca1f0ba4997"
+      ]
     }
   },
   {

notifications/serializers/message.py

@@ -91,7 +91,7 @@ def validate(self, attrs):
         if files is not None:
             del attrs['files']
             queryset = UploadFile.objects.filter(
-                filepath__in=[file.replace(os.path.join('/', settings.MEDIA_URL), '') for file in files])
+                filepath__in=[file.split(os.path.join('/', settings.MEDIA_URL))[-1] for file in files])
             attrs['file'] = get_filter_queryset(queryset, self.request.user).all()
         return attrs
 

requirements.txt

@@ -1,23 +1,23 @@
-django==5.1.7
-djangorestframework==3.15.2
+django==5.2.1
+djangorestframework==3.16.0
 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.22.0
 djangorestframework-simplejwt==5.5.0
-celery==5.4.0
-django-celery-beat==2.7.0
-django-celery-results==2.5.1
+celery==5.5.2
+django-celery-beat==2.8.0
+django-celery-results==2.6.0
 flower==2.0.1
 python-daemon==3.1.2
 gunicorn==23.0.0
 django-proxy==1.3.0
-psutil==6.1.1
-uvicorn==0.34.0
+psutil==7.0.0
+uvicorn==0.34.2
 daphne==4.1.2
-channels==4.2.0
+channels==4.2.2
 channels-redis==4.2.1
 django-ranged-response==0.2.0
 user-agents==2.2.0
@@ -26,18 +26,18 @@ websockets==15.0.1
 django-imagekit==5.0.0
 pilkit==3.0
 drf-spectacular==0.28.0
-drf-spectacular-sidecar==2025.3.1
+drf-spectacular-sidecar==2025.5.1
 openpyxl==3.2.0b1
 pyzipper==0.3.6
 unicodecsv==0.14.1
 chardet==5.2.0
-pyexcel==0.7.2
+pyexcel==0.7.3
 pyexcel-xlsx==0.6.1
-alibabacloud-dysmsapi20170525==3.1.1
-phonenumbers==8.13.55
+alibabacloud-dysmsapi20170525==4.1.0
+phonenumbers==9.0.5
 pycountry==24.6.1
-geoip2==4.8.1
+geoip2==5.1.0
 ipip-ipdb==1.6.1
 requests==2.32.3
-html2text==2024.2.26
+html2text==2025.4.15
 pyotp==2.9.0

system/utils/ctasks.py

@@ -29,7 +29,7 @@ def auto_clean_black_token(clean_day=1):
 def auto_clean_tmp_file(clean_day=1):
     clean_time = timezone.now() - datetime.timedelta(days=clean_day)
     _rows_count = 0
-    for instance in UploadFile.objects.filter(created_time__lte=clean_time):
+    for instance in UploadFile.objects.filter(created_time__lte=clean_time, is_tmp=True):
         if instance.delete():
             _rows_count += 1
     logger.info(f"clean {_rows_count} upload tmp file")

system/views/admin/online.py

@@ -18,7 +18,7 @@ class UserOnlineFilter(BaseFilterSet):
 
     class Meta:
         model = UserLoginLog
-        fields = ['creator_id', 'channel_name']
+        fields = ['creator_id']
 
 
 class UserOnlineViewSet(ListDeleteModelSet, OnlyExportDataAction):