Skip to content

Commit 2072d23

Browse files
committed
feat: 支持获取 footer 信息 #7495
1 parent 89aafea commit 2072d23

File tree

6 files changed

+41
-14
lines changed

6 files changed

+41
-14
lines changed

env.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@
113113
# 获取 PaaS 注入的蓝鲸域名
114114
BKPAAS_BK_DOMAIN = os.getenv("BKPAAS_BK_DOMAIN", "") or os.getenv("BK_DOMAIN", "")
115115

116+
# PaaS 注入的蓝鲸共享资源域名
117+
BKPAAS_SHARED_RES_URL = os.getenv("BKPAAS_SHARED_RES_URL", "")
116118

117119
# 获取加密类型
118120
BKPAAS_BK_CRYPTO_TYPE = (

gcloud/core/api.py

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,23 @@
1515
import re
1616
from datetime import datetime
1717

18-
from django.http import JsonResponse
18+
from blueapps.account.decorators import login_exempt
1919
from django.contrib.auth.models import Group
20-
from django.views.decorators.http import require_POST, require_GET
20+
from django.http import JsonResponse
2121
from django.utils.translation import ugettext_lazy as _
22+
from django.views.decorators.http import require_GET, require_POST
2223
from drf_yasg.utils import swagger_auto_schema
23-
2424
from mako.template import Template
2525
from rest_framework.decorators import api_view
2626

27-
from blueapps.account.decorators import login_exempt
28-
from gcloud.core import roles
27+
import env
2928
from gcloud.conf import settings
30-
from gcloud.core.footer import FOOTER
31-
from gcloud.constants import TASK_CATEGORY, TASK_FLOW_TYPE, NOTIFY_TYPE
32-
from gcloud.core.models import (
33-
UserDefaultProject,
34-
ProjectCounter,
35-
)
36-
from gcloud.core.utils import convert_group_name
29+
from gcloud.constants import NOTIFY_TYPE, TASK_CATEGORY, TASK_FLOW_TYPE
30+
from gcloud.core import roles
3731
from gcloud.core.api_adapter import get_all_users
32+
from gcloud.core.footer import FOOTER, FOOTER_INFO
33+
from gcloud.core.models import ProjectCounter, UserDefaultProject
34+
from gcloud.core.utils import convert_group_name
3835
from gcloud.openapi.schema import AnnotationAutoSchema
3936

4037
logger = logging.getLogger("root")
@@ -141,6 +138,24 @@ def get_footer(request):
141138
)
142139

143140

141+
@require_GET
142+
def get_footer_info(request):
143+
"""
144+
@summary: 获取当前环境的页面 footer 信息
145+
"""
146+
return JsonResponse(
147+
{
148+
"result": True,
149+
"data": {
150+
"env": env.RUN_VER,
151+
"sops_version": settings.STATIC_VERSION,
152+
"year": datetime.now().year,
153+
**FOOTER_INFO,
154+
},
155+
}
156+
)
157+
158+
144159
@require_GET
145160
def get_msg_types(request):
146161
client = get_client_by_user(request.user.username)

gcloud/core/context_processors.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ def mysetting(request):
125125
"BK_DOMAIN": env.BKPAAS_BK_DOMAIN,
126126
# 是否开启通知中心
127127
"ENABLE_NOTICE_CENTER": enable_notice_center,
128+
"BK_PAAS_SHARED_RES_URL": env.BKPAAS_SHARED_RES_URL,
128129
"TASK_LIST_STATUS_FILTER_DAYS": settings.TASK_LIST_STATUS_FILTER_DAYS,
129130
}
130131

gcloud/core/footer/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@
1818
footer_module = importlib.import_module("gcloud.core.footer.sites.{}.footer".format(settings.RUN_VER))
1919

2020
FOOTER = footer_module.FOOTER # noqa
21+
22+
FOOTER_INFO = footer_module.FOOTER_INFO # noqa

gcloud/core/footer/sites/open/footer.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,10 @@ def i18n_footer(language):
3737
return EnvironmentVariables.objects.get_var(footer_key, default)
3838

3939

40+
FOOTER_INFO = {
41+
"tech_support_url": "https://wpa1.qq.com/KziXGWJs?_type=wpa&qidian=true",
42+
"smart_url": "http://bk.tencent.com/s-mart/community/",
43+
"bk_tencent_url": "http://bk.tencent.com/index",
44+
}
45+
4046
FOOTER = i18n_footer

gcloud/core/urls.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
1111
specific language governing permissions and limitations under the License.
1212
"""
13+
from blueapps.account.decorators import login_exempt
1314
from django.apps import apps
1415
from django.conf.urls import include, url
1516
from django.views.i18n import JavaScriptCatalog
17+
from version_log import config as version_log_config
1618

17-
from blueapps.account.decorators import login_exempt
1819
from gcloud.core import api, views
1920
from gcloud.iam_auth.resource_api import dispatcher
20-
from version_log import config as version_log_config
2121

2222
javascript_catalog = JavaScriptCatalog.as_view(
2323
packages=[app_config.name for app_config in apps.get_app_configs() if app_config.name.startswith("gcloud")]
@@ -31,6 +31,7 @@
3131
url(r"^core/api/get_roles_and_personnel/(?P<biz_cc_id>\d+)/$", api.get_roles_and_personnel),
3232
url(r"^core/api/get_basic_info/$", api.get_basic_info),
3333
url(r"^core/footer/$", api.get_footer),
34+
url(r"^core/footer_info/$", api.get_footer_info),
3435
url(r"^core/api/get_user_list/$", api.get_user_list),
3536
url(r"^core/api/get_msg_types/$", api.get_msg_types),
3637
url(r"^core/healthz", api.healthz),

0 commit comments

Comments
 (0)