github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-10 20:00:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into pr@dev@change_import (#11815)

Browse Source 
* perf: 修改获取 ip

* perf: 修改导入

---------

Co-authored-by: ibuler <ibuler@qq.com>
This commit is contained in:
fit2bot
2023-10-12 16:17:32 +08:00
committed by GitHub
parent ce63ea7528
commit 9f042cfa04
16 changed files with 85 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/authentication/api/confirm.py
View File

@@ -7,7 +7,8 @@ from rest_framework import status
from rest_framework.generics import RetrieveAPIView, CreateAPIView
from rest_framework.response import Response
from common.permissions import IsValidUser, UserConfirmation
from authentication.permissions import UserConfirmation
from common.permissions import IsValidUser
from ..const import ConfirmType
from ..serializers import ConfirmSerializer