github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-19 01:45:27 +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/views/dingtalk.py
View File

@@ -13,7 +13,7 @@ from authentication import errors
from authentication.const import ConfirmType
from authentication.mixins import AuthMixin
from authentication.notifications import OAuthBindMessage
from common.permissions import UserConfirmation
from authentication.permissions import UserConfirmation
from common.sdk.im.dingtalk import URL, DingTalk
from common.utils import get_logger
from common.utils.common import get_request_ip

2
apps/authentication/views/feishu.py
View File

@@ -11,7 +11,7 @@ from rest_framework.permissions import AllowAny, IsAuthenticated
from authentication.const import ConfirmType
from authentication.notifications import OAuthBindMessage
from common.permissions import UserConfirmation
from authentication.permissions import UserConfirmation
from common.sdk.im.feishu import URL, FeiShu
from common.utils import get_logger
from common.utils.common import get_request_ip

2
apps/authentication/views/wecom.py
View File

@@ -13,7 +13,7 @@ from authentication import errors
from authentication.const import ConfirmType
from authentication.mixins import AuthMixin
from authentication.notifications import OAuthBindMessage
from common.permissions import UserConfirmation
from authentication.permissions import UserConfirmation
from common.sdk.im.wecom import URL
from common.sdk.im.wecom import WeCom
from common.utils import get_logger