From 9001418238281c2f44b285e9f3a919b94fb4583f Mon Sep 17 00:00:00 2001
From: alex-smile <443677891@qq.com>
Date: Wed, 26 May 2021 15:20:12 +0800
Subject: [PATCH 1/2] paas2/esb get config from settings

---
 paas2/paas/conf/settings_env.py   | 2 ++
 paas2/paas/esb/configs/default.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/paas2/paas/conf/settings_env.py b/paas2/paas/conf/settings_env.py
index 65c069179..52852f939 100644
--- 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
index 7b6b3fd3a..37cdab060 100644
--- a/paas2/paas/esb/configs/default.py
+++ b/paas2/paas/esb/configs/default.py
@@ -17,9 +17,9 @@
 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 = env.parse_value(getattr(settings, "BK_ESB_MENU_ITEM_BUFFET_HIDDEN", False), bool)
 
 
 menu_items = [

From 602dfb4cc104aa867e93dc5df72bde97be15eaaa Mon Sep 17 00:00:00 2001
From: alex-smile <443677891@qq.com>
Date: Wed, 26 May 2021 15:44:18 +0800
Subject: [PATCH 2/2] fix

---
 paas2/paas/esb/configs/default.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/paas2/paas/esb/configs/default.py b/paas2/paas/esb/configs/default.py
index 37cdab060..95e778b90 100644
--- 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 = getattr(settings, "BK_APIGW_URL", "")
 APIGATEWAY_ENABLED = bool(BK_APIGW_URL)
-BK_ESB_MENU_ITEM_BUFFET_HIDDEN = env.parse_value(getattr(settings, "BK_ESB_MENU_ITEM_BUFFET_HIDDEN", False), bool)
+BK_ESB_MENU_ITEM_BUFFET_HIDDEN = getattr(settings, "BK_ESB_MENU_ITEM_BUFFET_HIDDEN", False)
 
 
 menu_items = [