diff --git a/assets/views.py b/assets/views.py index d21c44f..790e193 100644 --- a/assets/views.py +++ b/assets/views.py @@ -50,7 +50,7 @@ class EcsCreateView(LoginRequiredMixin, PermissionRequiredMixin, CreateView): def get_success_url(self): return self.request.POST['__next__'] - def form_valid(self, form): # 保存结果 可以进行 手动 修改 再保存 + def form_valid(self, form): # 保存结果 可以进行 手动 修改 再保存 obj = form.save(commit=False) obj.save() return super().form_valid(form) @@ -147,7 +147,7 @@ class ApiEcsList(generics.ListCreateAPIView): queryset = Ecs.objects.get_queryset().order_by('id') serializer_class = EcsSerializer filter_backends = (DjangoFilterBackend, filters.SearchFilter, filters.OrderingFilter) - filter_fields = ('id', 'hostname', 'type', 'instance_id') + filter_fields = ('id', 'hostname','type','instance_id') search_fields = ('id', 'hostname',) permission_classes = (permissions.DjangoModelPermissions,) # 继承 django的权限 @@ -156,3 +156,4 @@ class ApiEcsDetail(generics.RetrieveUpdateDestroyAPIView): queryset = Ecs.objects.get_queryset().order_by('id') serializer_class = EcsSerializer permission_classes = (permissions.DjangoModelPermissions,) + diff --git a/system/urls.py b/system/urls.py index 83f28d9..a0279c6 100644 --- a/system/urls.py +++ b/system/urls.py @@ -1,5 +1,5 @@ from django.urls import path -from system.views import login_view, UserPasswordUpdateView, logout_view +from system.views import login_view, UserPasswordUpdateView, logout_view, GetInfo app_name = "system" @@ -7,4 +7,5 @@ urlpatterns = [ path('login', login_view, name="login"), path('password_update', UserPasswordUpdateView.as_view(), name="password_update"), path('logout', logout_view, name="logout"), + path('get_info', GetInfo.as_view()), ] diff --git a/system/views.py b/system/views.py index 24c347f..6d73789 100644 --- a/system/views.py +++ b/system/views.py @@ -1,5 +1,6 @@ import logging -from django.shortcuts import render +import json +from django.shortcuts import render, HttpResponse from django.contrib.auth import authenticate, login from django.shortcuts import redirect, render from system.models import Users @@ -15,8 +16,22 @@ from django.contrib.auth import logout logger = logging.getLogger('system') -class CustomBackend(ModelBackend): +class GetInfo(View): + """ + 为了 配合 seal-vue 项目 临时使用 + """ + def get(self, request): + admin = { + 'name': 'super_admin', + 'user_id': '1', + 'access': ['super_admin', 'admin'], + 'token': 'super_admin', + 'avator': 'https://file.iviewui.com/dist/a0e88e83800f138b94d2414621bd9704.png' + } + return HttpResponse(json.dumps(admin)) + +class CustomBackend(ModelBackend): """ 用户名字/邮箱名字 登录 :param request: @@ -61,7 +76,6 @@ def login_view(request): return render(request, 'system/login.html', {'error_msg': error_msg, }) - @login_required(login_url="/system/login") def index(request): """ @@ -72,8 +86,6 @@ def index(request): return render(request, 'system/index.html') - - class UserPasswordUpdateView(LoginRequiredMixin, UpdateView): """ 修改密码