Hotfix 4.3.1 modify paas api host#401

Hotfix 4.3.1 modify paas api host
TencentBlueKing · Nov 4, 2021 · fb9d16e · fb9d16e
2 parents c481192 + d7a3376
commit fb9d16e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 14 deletions.
diff --git a/apps/utils/context_processors.py b/apps/utils/context_processors.py
@@ -77,7 +77,7 @@ def mysetting(request):
         "DEMO_BIZ_ID": settings.DEMO_BIZ_ID,
         "ES_STORAGE_CAPACITY": settings.ES_STORAGE_CAPACITY,
         "TAM_AEGIS_KEY": settings.TAM_AEGIS_KEY,
-        "BK_LOGIN_URL": f"{settings.PAAS_API_HOST}/api/c/compapi/v2/usermanage/fs_list_users/",
+        "BK_LOGIN_URL": f"{settings.BK_PAAS_HOST}/api/c/compapi/v2/usermanage/fs_list_users/",
         "MENU_LOGO_URL": f"{settings.STATIC_URL}{settings.MENU_LOGO_URL}",
         "BK_DOC_DATA_URL": settings.BK_DOC_DATA_URL,
     }
diff --git a/config/default.py b/config/default.py
@@ -259,8 +259,8 @@
 # ===============================================================================
 BK_PAAS_HOST = os.environ.get("BK_PAAS_HOST", "")
 # ESB API调用前辍
-PAAS_API_HOST = BK_PAAS_HOST
 BK_PAAS_INNER_HOST = os.environ.get("BK_PAAS_INNER_HOST", BK_PAAS_HOST)
+PAAS_API_HOST = BK_PAAS_INNER_HOST
 BK_CC_HOST = BK_PAAS_HOST.replace("paas", "cmdb")
 BKDATA_URL = BK_PAAS_HOST
 MONITOR_URL = ""

diff --git a/dev.env.yml b/dev.env.yml
@@ -66,10 +66,6 @@ settings:
     value: "{env.BK_PAAS_HOST}/t/bk_dataweb"
     env:
       BK_PAAS_HOST: ""
-  BK_PAAS_HOST:
-    value: "{env.BK_PAAS_INNER_HOST}"
-    env:
-      BK_PAAS_INNER_HOST: ""
   APIGW_ENABLED: true
 domains:
   ITSM_APIGATEWAY_ROOT_V2: "{settings.PAAS_API_HOST}/api/c/compapi/v2/itsm/"

diff --git a/prod.env.yml b/prod.env.yml
@@ -66,10 +66,6 @@ settings:
     value: "{env.BK_PAAS_HOST}/o/bk_dataweb"
     env:
       BK_PAAS_HOST: ""
-  BK_PAAS_HOST:
-    value: "{env.BK_PAAS_INNER_HOST}"
-    env:
-      BK_PAAS_INNER_HOST: ""
   APIGW_ENABLED: true
 domains:
   ITSM_APIGATEWAY_ROOT_V2: "{settings.PAAS_API_HOST}/api/c/compapi/v2/itsm/"

diff --git a/stag.env.yml b/stag.env.yml
@@ -66,10 +66,6 @@ settings:
     value: "{env.BK_PAAS_HOST}/o/bk_dataweb"
     env:
       BK_PAAS_HOST: ""
-  BK_PAAS_HOST:
-    value: "{env.BK_PAAS_INNER_HOST}"
-    env:
-      BK_PAAS_INNER_HOST: ""
   APIGW_ENABLED: true
 domains:
   ITSM_APIGATEWAY_ROOT_V2: "{settings.PAAS_API_HOST}/api/c/compapi/v2/itsm/"