Merge pull request #42 from jiayuan929/fix-dependency

fix: delete the hardcoded http protocol

Author: jiayuan929

backend/account/accounts.py

@@ -52,9 +52,11 @@ class Account(AccountSingleton):
     提供通用的账号功能
     """
 
+    # 本地开发时会配置 LOGIN_DOMAIN
     if settings.LOGIN_DOMAIN:
-        BK_LOGIN_URL = "http://%s/login/" % settings.LOGIN_DOMAIN
+        BK_LOGIN_URL = f"{settings.HTTP_SCHEMA}://{settings.LOGIN_DOMAIN}/login/"
     else:
+        # 线上 LOGIN_DOMAIN 为空
         BK_LOGIN_URL = "/login/"
 
     # 蓝鲸统一登录约定的错误码, 表示用户认证成功，但用户无应用访问权限

backend/app/utils.py

@@ -17,40 +17,11 @@
 
 to the current version of the project delivered to anyone in the future.
 """
-from django.conf import settings
 from django.contrib.auth import get_user_model
 
-from common.http import http_get
-from common.log import logger
-
-
-def _get_users_from_login_service(bk_token):
-    """
-    获取所有用户的信息
-    """
-    param = {"bk_token": bk_token}
-    if settings.LOGIN_DOMAIN:
-        get_user_url = "http://%s/login/accounts/get_all_user/" % settings.LOGIN_DOMAIN
-    else:
-        get_user_url = "%s/login/accounts/get_all_user/" % settings.LOGIN_HOST
-
-    result, resp = http_get(get_user_url, param)
-    resp = resp if result and resp else {}
-    ret = resp.get("result", False) if result and resp else False
-    # 获取用户信息失败
-    if not ret:
-        logger.error(u"Get user information from the request platform interface failed：%s" % resp.get("message", ""))
-        return False, []
-    return True, resp.get("data", [])
-
 
 def get_users(request):
-    # 用户信息从统一登录接口获取
-    bk_token = request.COOKIES.get(settings.BK_COOKIE_NAME, None)
-    res, users = _get_users_from_login_service(bk_token)
-    # 接口返回出错则直接从数据库获取
-    if not res:
-        # 获取所有的用户信息
-        user_model = get_user_model()
-        users = user_model.objects.all().values("username")
+    # 获取所有的用户信息
+    user_model = get_user_model()
+    users = user_model.objects.all().values("username")
     return users

backend/blueking/component/conf.py

@@ -17,7 +17,7 @@
 
     APP_CODE = settings.APP_ID
     SECRET_KEY = settings.ESB_TOKEN
-    COMPONENT_SYSTEM_HOST = "http://%s" % settings.PAAS_INNER_DOMAIN
+    COMPONENT_SYSTEM_HOST = settings.BK_COMPONENT_API_URL
 except Exception:
     APP_CODE = ""
     SECRET_KEY = ""

backend/common/bk_iam.py

@@ -76,8 +76,8 @@
 }
 
 # 线上环境走内网，开发环境配置host
-BK_IAM_HOST = "%s://%s" % ("http", settings.HOST_IAM_NEW)
-BK_PAAS_HOST = "%s://%s" % ("http", settings.PAAS_INNER_DOMAIN)
+BK_IAM_HOST = settings.BK_IAM_API_URL
+BK_PAAS_HOST = settings.BK_PAAS3_URL
 # bk_paas
 SYSTEM_ID = settings.PAAS_APP_ID
 

backend/components/esb.py

@@ -44,7 +44,7 @@ def _call_esb_api(http_func, url_path, data, timeout=30):
         "X-Bkapi-Authorization": json.dumps(common_params),
     }
 
-    url = "http://{}{}".format(settings.PAAS_INNER_DOMAIN, url_path)
+    url = f"{settings.BK_COMPONENT_API_URL}{url_path}"
 
     ok, resp_data = http_func(url, data, headers=headers)
 

backend/conf/settings_env.py

@@ -21,7 +21,6 @@
 """
 
 import environ
-import urllib3
 
 from conf.default import APP_ID, LANGUAGE_COOKIE_NAME
 
@@ -83,8 +82,6 @@
 BK_PAAS3_URL = env.str("BK_PAAS3_URL", "")
 
 # 兼容二进制版本的变量
-PAAS_INNER_DOMAIN = urllib3.util.parse_url(BK_COMPONENT_API_URL).host
-HOST_IAM_NEW = urllib3.util.parse_url(BK_IAM_API_URL).host
 BK_USER_APP_CODE = "bk_usermgr"
 # 用户管理访问地址
 BK_USER_URL = env.str("BK_USER_URL", "")

backend/poetry.lock

@@ -6,7 +6,7 @@ authors = ["blueking <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = ">=3.11,<3.12"
-django = "4.2.16"
+django = "4.2.17"
 whitenoise = "5.3.0"
 requests = "2.32.3"
 gunicorn = "22.0.0"