diff --git a/apps/develop/tasks.py b/apps/develop/tasks.py index 1e165106..89207be3 100755 --- a/apps/develop/tasks.py +++ b/apps/develop/tasks.py @@ -11,7 +11,7 @@ def backup_database(): """ import datetime name = datetime.datetime.now().strftime('%Y%m%d%H%M%S') - command = 'echo "{}" | sudo -S pg_dump "user={} password={} dbname={}" > {}/hberp_{}.sql'.format( + command = 'echo "{}" | sudo -S pg_dump "user={} password={} dbname={}" > {}/bak_{}.sql'.format( SD_PWD, DATABASES['default']['USER'], DATABASES['default']['PASSWORD'], @@ -30,15 +30,15 @@ def reload_server_git(): @shared_task -def reload_client_git(): - command = 'bash {}/git_client.sh'.format(SH_PATH) +def reload_web_git(): + command = 'bash {}/git_web.sh'.format(SH_PATH) completed = subprocess.run(command, shell=True, capture_output=True, text=True) return completed @shared_task def reload_server_only(): - command = 'echo "{}" | sudo -S service supervisor reload'.format(SD_PWD) + command = 'echo "{}" | sudo supervisorctl reload'.format(SD_PWD) completed = subprocess.run(command, shell=True, capture_output=True, text=True) return completed diff --git a/apps/develop/urls.py b/apps/develop/urls.py index 2c581f39..1e60ddab 100755 --- a/apps/develop/urls.py +++ b/apps/develop/urls.py @@ -6,7 +6,7 @@ HTML_BASE_URL = 'develop/' urlpatterns = [ path(API_BASE_URL + 'reload_server_git/', ReloadServerGit.as_view()), - path(API_BASE_URL + 'reload_client_git/', ReloadClientGit.as_view()), + path(API_BASE_URL + 'reload_web_git/', ReloadClientGit.as_view()), path(API_BASE_URL + 'reload_server_only/', ReloadServerOnly.as_view()), path(API_BASE_URL + 'backup_database/', BackupDatabase.as_view()), path(API_BASE_URL + 'backup_media/', BackupMedia.as_view()) diff --git a/apps/develop/views.py b/apps/develop/views.py index 74223bdd..f11a3521 100755 --- a/apps/develop/views.py +++ b/apps/develop/views.py @@ -1,7 +1,7 @@ from rest_framework.views import APIView from rest_framework.permissions import IsAdminUser from rest_framework.response import Response -from apps.develop.tasks import backup_database, backup_media, reload_client_git, reload_server_git, reload_server_only +from apps.develop.tasks import backup_database, backup_media, reload_web_git, reload_server_git, reload_server_only from rest_framework.exceptions import APIException # Create your views here. @@ -33,7 +33,7 @@ class ReloadClientGit(APIView): 拉取前端代码并打包 """ - completed = reload_client_git() + completed = reload_web_git() if completed.returncode == 0: return Response() else: diff --git a/apps/rpm/views.py b/apps/rpm/views.py index a2a403dc..2f7ebee4 100644 --- a/apps/rpm/views.py +++ b/apps/rpm/views.py @@ -67,9 +67,8 @@ class RemployeeViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Cus serializer_class = RemployeeSerializer def get_queryset(self): - user = self.request.user queryset = super().get_queryset() - if user.type == 'remployee': + if self.request.user.type == 'remployee': queryset = queryset.filter(rparty=self.request.user.belong_dept) return queryset @@ -103,10 +102,9 @@ class RcertificateViewSet(CustomModelViewSet): serializer_class = RcertificateSerializer def get_queryset(self): - user = self.request.user queryset = super().get_queryset() - if user.type == 'remployee': - queryset = queryset.filter(remployee__rparty=user.belong_dept) + if self.request.user.type == 'remployee': + queryset = queryset.filter(remployee__rparty=self.request.user.belong_dept) return queryset @@ -117,19 +115,17 @@ class RpjViewSet(CustomModelViewSet): serializer_class = RpjListSerializer def get_queryset(self): - user = self.request.user queryset = super().get_queryset() - if user.type == 'remployee': - queryset = queryset.filter(belong_dept=user.belong_dept) + if self.request.user.type == 'remployee': + queryset = queryset.filter(belong_dept=self.request.user.belong_dept) return queryset def create(self, request, *args, **kwargs): - user = self.request.user serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) vdata = serializer.validated_data - if user.type == 'remployee': - vdata['rparty'] = user.belong_dept.rparty + if self.request.user.type == 'remployee': + vdata['rparty'] = self.request.user.belong_dept.rparty if not vdata.get('rparty', None): raise ParseError('请指定相关方') if not vdata.get('belong_dept', None):