Merge pull request #1222 from hanshuaikang/feature/develop_by_han

minor: 文档链接允许通过环境变量配置
TencentBlueKing · Oct 26, 2023 · a8f6bf0 · a8f6bf0
2 parents e592408 + 3429b42
commit a8f6bf0
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 33 deletions.
diff --git a/adapter/core/__init__.py b/adapter/core/__init__.py
@@ -32,5 +32,4 @@
 
 TITLE = show_module.get_title
 FOOTER = show_module.get_footer
-DOC_URL = show_module.DOC_URL
 LOGIN_URL = show_module.LOGIN_URL
diff --git a/adapter/core/sites/ieod/show.py b/adapter/core/sites/ieod/show.py
@@ -25,8 +25,6 @@
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 
-DOC_URL = settings.BK_IEOD_DOC_URL
-
 
 def get_title():
     return "{} | {}".format(_("流程服务"), _("腾讯蓝鲸智云"))

diff --git a/adapter/core/sites/open/show.py b/adapter/core/sites/open/show.py
@@ -23,35 +23,10 @@
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 """
 
-import os
 from django.utils.translation import gettext_lazy as _
 from django.conf import settings
 
 
-def get_doc_url():
-    from itsm.component.esb.esbclient import client_backend
-
-    try:
-        res = client_backend.doc_center.get_doc_link_by_path(
-            {"md_path": "流程服务/产品白皮书/产品简介/README.md"}
-        )
-        return os.path.join(settings.BK_PAAS_HOST, "o/bk_docs_center/", res)
-    except Exception as err:
-        print(err)
-        return os.path.join(
-            settings.BK_PAAS_HOST, "o/bk_docs_center/markdown/流程服务/产品白皮书/产品简介/README.md"
-        )
-
-
-# if settings.OPEN_VER == "enterprise":
-#     TITLE = "{} | {}".format(_("流程服务"), _("腾讯蓝鲸智云"))
-#     DOC_URL = get_doc_url()
-# else:
-
-# 企业版非企业版，统一跳到蓝鲸官网去
-DOC_URL = "https://bk.tencent.com/docs/markdown/流程服务/产品白皮书/产品简介/README.md"
-
-
 def get_title():
     TITLE = "{} | {}".format(_("流程服务"), _("腾讯蓝鲸智云"))
     return TITLE

diff --git a/app.yml b/app.yml
@@ -5,7 +5,7 @@ author: 蓝鲸智云
 category: 办公应用
 introduction: 流程服务是蓝鲸推出的轻量级ITSM，通过可自定义设计的流程模块，覆盖IT服务中的不同管理活动或应用场景。帮助企业用户规范内部管理流程，提升沟通及管理效率。
 introduction_en: bk_itsm is a lightweight ITSM created by Blueking. It covers different application scenarios in IT services through customizable workflows and help enterprise users to implement standardize IT workflow, improve communication and management efficiency.
-version: 2.6.8-alpha.2
+version: 2.6.8-alpha.3
 language: python
 is_use_celery: True
 is_use_celery_with_gevent: False

diff --git a/app_desc.yaml b/app_desc.yaml
@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "2.6.8-alpha.2"
+app_version: "2.6.8-alpha.3"
 app:
     region: default
     bk_app_code: bk_itsm

diff --git a/config/default.py b/config/default.py
@@ -864,7 +864,9 @@ def my_before_proxy_func(request, json_data, request_headers):
 APIGW_PUBLIC_KEY = base64.b64decode(api_public_key)
 
 # show.py 敏感信息处理, 内部白皮书地址，内部登陆地址
-BK_IEOD_DOC_URL = os.environ.get("BK_IEOD_DOC_URL", "")
+BK_DOC_URL = os.environ.get(
+    "BK_DOC_URL", "https://bk.tencent.com/docs/markdown/流程服务/产品白皮书/产品简介/README.md"
+)
 BK_IEOD_LOGIN_URL = os.environ.get("BK_IEOD_LOGIN_URL", "")
 
 # itsm-tapd 网关API地址

diff --git a/itsm/sites/views.py b/itsm/sites/views.py
@@ -83,7 +83,7 @@ def init(request):
 @login_exempt
 def index(request):
     """首页"""
-    from adapter.core import TITLE, DOC_URL, LOGIN_URL
+    from adapter.core import TITLE, LOGIN_URL
 
     # 如果发现不是woa过来的域名
     if (
@@ -123,7 +123,7 @@ def index(request):
             "BK_USER_MANAGE_HOST": BK_USER_MANAGE_HOST,
             "BK_PAAS_ESB_HOST": settings.BK_PAAS_ESB_HOST,
             "TAM_PROJECT_ID": settings.TAM_PROJECT_ID,
-            "DOC_URL": DOC_URL,
+            "DOC_URL": settings.BK_DOC_URL,
             "SOPS_URL": settings.SOPS_SITE_URL,
         },
     )