github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-06 18:00:57 +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/users/api/profile.py
View File

@@ -5,7 +5,7 @@ from rest_framework import generics
from rest_framework.permissions import IsAuthenticated
from authentication.models import ConnectionToken
from common.permissions import IsValidUserOrConnectionToken
from authentication.permissions import IsValidUserOrConnectionToken
from common.utils import get_object_or_none
from orgs.utils import tmp_to_root_org
from users.notifications import (