From a486848639c0c75f2b9043e3417b4d5e6d45e53b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Mon, 28 Feb 2022 22:23:32 +0800 Subject: [PATCH] =?UTF-8?q?coding=20git=20push=E8=87=AA=E5=8A=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hb_server/apps/develop/views.py | 6 ++++-- hb_server/server/urls.py | 3 +-- hb_server/utils/view.py | 27 --------------------------- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/hb_server/apps/develop/views.py b/hb_server/apps/develop/views.py index bdd9b07..0ece46c 100644 --- a/hb_server/apps/develop/views.py +++ b/hb_server/apps/develop/views.py @@ -2,7 +2,7 @@ from django.db import transaction from django.shortcuts import render from rest_framework.decorators import permission_classes from rest_framework.views import APIView -from rest_framework.permissions import IsAdminUser +from rest_framework.permissions import IsAdminUser, AllowAny from rest_framework.response import Response from apps.develop.tasks import backup_database, backup_media, reload_server, reload_server_only from apps.inm.models import FIFO, FIFOItem, Inventory, MaterialBatch @@ -121,8 +121,10 @@ class UpdateFIFONumber(APIView): i.save() return Response() + + class ReloadServer(APIView): - permission_classes = [IsAdminUser] + permission_classes = [AllowAny] def post(self, request): """ 拉取代码并重启服务 diff --git a/hb_server/server/urls.py b/hb_server/server/urls.py index 0ed07c3..50bc49f 100644 --- a/hb_server/server/urls.py +++ b/hb_server/server/urls.py @@ -24,7 +24,7 @@ from drf_yasg.views import get_schema_view from rest_framework import routers from rest_framework.documentation import include_docs_urls from django.views.generic import TemplateView -from utils.view import GenSignature, UpdateDevelop +from utils.view import GenSignature import os router = routers.DefaultRouter() router.register('', FileViewSet, basename="file") @@ -75,7 +75,6 @@ urlpatterns = [ # 工具 path('api/utils/signature/', GenSignature.as_view()), - path('api/utils/develop/', UpdateDevelop.as_view()), # 前端页面入口 path('',TemplateView.as_view(template_name="index.html")) diff --git a/hb_server/utils/view.py b/hb_server/utils/view.py index be860d6..3d489a3 100644 --- a/hb_server/utils/view.py +++ b/hb_server/utils/view.py @@ -65,30 +65,3 @@ class GenSignature(APIView): except: return Response('签名照处理失败,请重新上传', status=status.HTTP_400_BAD_REQUEST) - - -import time -class UpdateDevelop(APIView): - """ - 更新开发服务器 - """ - authentication_classes = () - permission_classes = () - - def post(self, request, *args, **kwargs): - import os - # 更新后端 - os.chdir('/home/lighthouse/hberp') - ret = os.popen('sudo git pull && sudo service supervisor reload') - # 奇怪的处理 - # os.chdir('/home/hberp/hb_server/vuedist') - # os.popen('cp index.html indexbak') - # time.sleep(1000) - # os.popen('rm -rf index.html') - # time.sleep(1000) - # os.popen('mv -f indexbak index.html') - # 打包前端 - # os.chdir('/home/hberp/hb_client') - # os.system('npm run build:prod') - # os.system('\cp -rf /home/hberp/hb_client/dist/* /home/hberp/hb_server/vuedist') - return Response(ret.read())