Merge pull request #343 from alex-smile/update_esb_bk_log_apis

paas2/esb get config from settings
TencentBlueKing · May 26, 2021 · a73dd2b · a73dd2b
2 parents df9e66c + 602dfb4
commit a73dd2b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/paas2/paas/conf/settings_env.py b/paas2/paas/conf/settings_env.py
@@ -79,6 +79,8 @@
 BK_APIGW_URL = env.str("BK_APIGW_URL", "")
 # API 网关文档中心地址
 BK_APIGW_DOC_URL = env.str("BK_APIGW_DOC_URL", "")
+# 是否隐藏菜单项：ESB 管理中的自助接入
+BK_ESB_MENU_ITEM_BUFFET_HIDDEN = env.bool("BK_ESB_MENU_ITEM_BUFFET_HIDDEN", False)
 
 # third-party hosts
 # host for cc

diff --git a/paas2/paas/esb/configs/default.py b/paas2/paas/esb/configs/default.py
@@ -10,16 +10,13 @@
 specific language governing permissions and limitations under the License.
 """
 
-import environ
 from django.conf import settings
 from django.utils.translation import pgettext, ugettext
 
-env = environ.Env()
 
-
-BK_APIGW_URL = env.str("BK_APIGW_URL", "")
+BK_APIGW_URL = getattr(settings, "BK_APIGW_URL", "")
 APIGATEWAY_ENABLED = bool(BK_APIGW_URL)
-BK_ESB_MENU_ITEM_BUFFET_HIDDEN = env.bool("BK_ESB_MENU_ITEM_BUFFET_HIDDEN", False)
+BK_ESB_MENU_ITEM_BUFFET_HIDDEN = getattr(settings, "BK_ESB_MENU_ITEM_BUFFET_HIDDEN", False)
 
 
 menu_items = [