github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-09 03:09:34 +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

2
apps/authentication/api/access_key.py
View File

@@ -5,8 +5,8 @@ from django.utils.translation import gettext as _
from rest_framework import serializers
from rest_framework.response import Response
from authentication.permissions import UserConfirmation
from common.api import JMSModelViewSet
from common.permissions import UserConfirmation
from rbac.permissions import RBACPermission
from ..const import ConfirmType
from ..serializers import AccessKeySerializer

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

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

@@ -4,8 +4,9 @@ from rest_framework.views import APIView
from authentication import errors
from authentication.const import ConfirmType
from authentication.permissions import UserConfirmation
from common.api import RoleUserMixin, RoleAdminMixin
from common.permissions import UserConfirmation, IsValidUser
from common.permissions import IsValidUser
from common.utils import get_logger
from users.models import User

5
apps/authentication/api/feishu.py
View File

@@ -4,12 +4,13 @@ from rest_framework.views import APIView
from authentication import errors
from authentication.const import ConfirmType
from authentication.permissions import UserConfirmation
from common.api import RoleUserMixin, RoleAdminMixin
from common.permissions import UserConfirmation, IsValidUser
from common.permissions import IsValidUser
from common.utils import get_logger
from users.models import User
logger = get_logger(__file__)
logger = get_logger(__name__)
class FeiShuQRUnBindBase(APIView):

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

@@ -4,8 +4,9 @@ from rest_framework.views import APIView
from authentication import errors
from authentication.const import ConfirmType
from authentication.permissions import UserConfirmation
from common.api import RoleUserMixin, RoleAdminMixin
from common.permissions import UserConfirmation, IsValidUser
from common.permissions import IsValidUser
from common.utils import get_logger
from users.models import User