Merge pull request #88 from nineaiyu/dev

Dev

Author: nineaiyu

Dockerfile

@@ -1,4 +1,4 @@
-FROM nineaiyu/xadmin-server-base:20250224_065028 AS stage-build
+FROM nineaiyu/xadmin-server-base:20250326_075546 AS stage-build
 ARG VERSION
 
 WORKDIR /data/xadmin-server

common/base/magic.py

@@ -210,6 +210,7 @@ def invalid_caches(keys):
         logger.warning(
             f"invalid_cache_data cache_key:{delete_keys[0]}... {len(delete_keys)} count. delete count:{count}")
 
+
 class MagicCacheResponse(object):
     def __init__(self, timeout=60 * 10, invalid_time=0, key_func=None):
         self.timeout = timeout

common/cache/channel.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+# -*- coding:utf-8 -*-
+# project : xadmin-server
+# filename : channel
+# author : ly_13
+# date : 3/29/2025
+import time
+
+from channels_redis.core import RedisChannelLayer as _RedisChannelLayer
+
+
+class RedisChannelLayer(_RedisChannelLayer):
+    layer_expire = 30  # 需要心跳方式发送在线状态，否则将channel移除
+
+    async def group_discard(self, group, channel):
+        """
+        Removes the channel from the named group if it is in the group;
+        does nothing otherwise (does not error)
+        """
+        assert self.valid_channel_name(channel), "Channel name not valid"
+        connection, key = await self.auto_expire_layers(group)
+        await connection.zrem(key, channel)
+
+    async def auto_expire_layers(self, group):
+        assert self.valid_group_name(group), "Group name not valid"
+        key = self._group_key(group)
+        connection = self.connection(self.consistent_hash(group))
+
+        # Discard old channels based on group_expiry
+        await connection.zremrangebyscore(
+            key, min=0, max=int(time.time()) - self.layer_expire
+        )
+
+        return connection, key
+
+    async def get_layers(self, group):
+        connection, key = await self.auto_expire_layers(group)
+        return [x.decode("utf8") for x in await connection.zrange(key, 0, -1)]
+
+    async def update_active_layers(self, group, channel):
+        connection, key = await self.auto_expire_layers(group)
+        await connection.zadd(key, {channel: time.time()})
+        await connection.expire(key, self.group_expiry)
+
+    async def get_groups(self):
+        groups = []
+        group = self._group_key("*")
+        for index in range(self.ring_size):
+            connection = self.connection(index)
+            cursor = 0
+            while True:
+                cursor, keys = await connection.scan(cursor, match=group)
+                for key in keys:
+                    groups.append(key.decode("utf8").split(":")[-1])
+                if cursor == 0:
+                    break
+        return groups

common/cache/redis.py

@@ -39,6 +39,9 @@ def __init__(self, key):
     def lock(self, *args, **kwargs):
         return self.connect.lock(f"{self.key}_locker", *args, **kwargs)
 
+    def expire(self, timeout=None):
+        return self.connect.expire(self.key, timeout)
+
 
 class CacheList(CacheRedis):
 

common/cache/storage.py

@@ -103,3 +103,9 @@ class CommonResourceIDsCache(RedisCacheBase):
     def __init__(self, prefix_key):
         self.cache_key = f"{settings.CACHE_KEY_TEMPLATE.get('common_resource_ids_key')}_{prefix_key}"
         super().__init__(self.cache_key)
+
+
+class WebSocketMsgResultCache(RedisCacheBase):
+    def __init__(self, prefix_key):
+        self.cache_key = f"{settings.CACHE_KEY_TEMPLATE.get('websocket_message_result_key')}_{prefix_key}"
+        super().__init__(self.cache_key)

common/core/fields.py

@@ -128,7 +128,11 @@ def get_choices(self, cutoff=None):
             result = []
             for item in queryset:
                 data = self.to_representation(item)
-                data['value'] = data.get("pk")
+                if isinstance(data, dict):
+                    if "pk" in data:
+                        data['value'] = data.get("pk")
+                else:
+                    data = {"value": data, "label": data}
                 result.append(data)
         else:
             result = {}

common/core/modelset.py

@@ -6,11 +6,11 @@
 # date : 6/2/2023
 import itertools
 import json
+import math
 import uuid
 from hashlib import md5
 from typing import Callable
 
-import math
 from django.conf import settings
 from django.db import transaction
 from django.forms.widgets import SelectMultiple, DateTimeInput
@@ -41,6 +41,7 @@
 
 logger = get_logger(__name__)
 
+
 def run_view_by_celery_task(view, request, kwargs, data, batch_length=100):
     task = kwargs.get("task", request.query_params.get('task', 'true').lower() in ['true', '1', 'yes'])  # 默认为任务异步导入
     if task:

common/core/response.py

@@ -4,6 +4,7 @@
 # filename : response
 # author : ly_13
 # date : 6/2/2023
+import datetime
 
 from django.utils.translation import gettext_lazy as _
 from rest_framework.response import Response
@@ -16,7 +17,8 @@ def __init__(self, code=1000, detail=None, data=None, status=None, headers=None,
         dic = {
             'code': code,
             'detail': detail if detail else (_("Operation successful") if code == 1000 else _("Operation failed")),
-            'requestId': str(getattr(get_current_request(), 'request_uuid', ""))
+            'requestId': str(getattr(get_current_request(), 'request_uuid', "")),
+            'timestamp': str(datetime.datetime.now()),
         }
         if data is not None:
             dic['data'] = data

common/core/serializers.py

@@ -85,4 +85,3 @@ def build_standard_field(self, field_name, model_field):
                 default = default()
             field_kwargs.setdefault("default", default)
         return field_class, field_kwargs
-

common/fields/image.py

@@ -39,7 +39,6 @@ def get_thumbnail(source, index, force=False):
     return file.name
 
 
-
 class ProcessedImageFieldFile(ImageFieldFile):
     is_local_storage = isinstance(default_storage, FileSystemStorage)