diff --git a/update/consumers.py b/update/consumers.py index 08c9413..1b17e1e 100644 --- a/update/consumers.py +++ b/update/consumers.py @@ -1,5 +1,5 @@ import json -from update.views import cinema_update_status +from update.views import get_cinema_update_status from channels.generic.websocket import WebsocketConsumer @@ -13,6 +13,7 @@ class UpdateConsumer(WebsocketConsumer): self.send('你发了啥') else: data = json.loads(text_data) + cinema_update_status = get_cinema_update_status() if data.get('msg', False): if data['msg'] == 'ping': self.send(json.dumps({'msg': 'pong'})) diff --git a/update/views.py b/update/views.py index 3d7a79e..fee6a01 100644 --- a/update/views.py +++ b/update/views.py @@ -22,9 +22,13 @@ from update.utils.git_util import GitUtil, GitDbUtil from update.utils.cmd_extcute import UpdateCommandUtil, UpdateConfigUtil from update.utils.db_compare import DbCompare from update.utils.client_util import ClientUtil + # from consumers import UpdateConsumer +cinema_update_status = dict() + + # CacheResponseMixin 一定要放第一位 class CinemaViewSet(CacheResponseMixin, viewsets.ModelViewSet): # 接口文档的中文注释 @@ -63,6 +67,7 @@ class UpdateAlterViewSet(CacheResponseMixin, viewsets.ModelViewSet): queryset = UpdateAlter.objects.all() serializer_class = UpdateAlterSerializer + # class CinemaSearchAPIView(APIView, CacheResponseMixin): # @method_decorator(cache_page(60 * 5)) # def get(self, request, *args, **kwargs): @@ -96,9 +101,6 @@ def get_git_version(request): return JsonResponse(serializer.data, safe=False) -cinema_update_status = dict() - - def update_cine(request): req = request.GET.dict() cinema_ip = req.get('ip') @@ -252,6 +254,11 @@ def write_git_version_to_db(request): git_util = GitDbUtil() git_util.set_release_to_db() return JsonResponse({'result': 'success'}) + + +def get_cinema_update_status(): + return cinema_update_status + # # # def write_cine_sql(request):