Merge pull request #872 from wklken/fix_footer_header_0414

fix(footer): 2.14.8, fix login/paas footer
TencentBlueKing · Apr 14, 2022 · 90a1ad4 · 90a1ad4
2 parents 4ddad51 + 282f5f7
commit 90a1ad4
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 17 deletions.
diff --git a/paas2/VERSION b/paas2/VERSION
@@ -1 +1 @@
-2.14.7
+2.14.8
diff --git a/paas2/login/components/http.py b/paas2/login/components/http.py
@@ -14,14 +14,13 @@
 
 import logging
 import time
-import traceback
-from functools import partial
 from urllib.parse import urlparse
 
 import requests
 from django.conf import settings
 
 from common.log import logger
+from components.esb import _remove_sensitive_info
 
 logger = logging.getLogger("component")
 
@@ -71,7 +70,8 @@ def _http_request(method, url, headers=None, data=None, timeout=None, verify=Fal
         else:
             return False, {"error": "method not supported"}
     except requests.exceptions.RequestException as e:
-        logger.exception("http request error! %s %s, data: %s, request_id: %s", method, url, data, request_id)
+        logger.exception("http request error! %s %s, data: %s, request_id: %s",
+                        method, url, _remove_sensitive_info(data), request_id)
         return False, {"error": str(e)}
     else:
         # record for /metrics
@@ -86,7 +86,7 @@ def _http_request(method, url, headers=None, data=None, timeout=None, verify=Fal
             error_msg = (
                 "http request fail! %s %s, data: %s, request_id: %s, response.status_code: %s, response.body: %s"
             )
-            logger.error(error_msg, method, url, str(data), request_id, resp.status_code, content)
+            logger.error(error_msg, method, url, str(_remove_sensitive_info(data)), request_id, resp.status_code, content)
 
             return False, {
                 "error": (

diff --git a/paas2/login/templates/account/login_ce.html b/paas2/login/templates/account/login_ce.html
@@ -109,7 +109,7 @@
                         <span class="qr-box" style="right: -20px;"><img class="qr" src="{{STATIC_URL}}img/logo_ce/qr.png" alt=""></span>
                     </a>
                 </p>
-                <p>Copyright © 2012-{{NOW.year}} Tencent BlueKing. All Rights Reserved. </p>
+                <p>Copyright © 2012-{{NOW.year}} Tencent BlueKing. All Rights Reserved. V6</p>
                 <p>{% trans '蓝鲸智云 版权所有' %}</p>
             </footer>
         </div>

diff --git a/paas2/paas/common/context_processors.py b/paas2/paas/common/context_processors.py
@@ -44,4 +44,6 @@ def site_settings(request):
         "BK_APIGW_URL": settings.BK_APIGW_URL,
         # API 网关文档中心地址
         "BK_APIGW_DOC_URL": settings.BK_APIGW_DOC_URL,
+        # paas版本号
+        "PLATFORM_VERSION": settings.PLATFORM_VERSION,
     }
diff --git a/paas2/paas/conf/default.py b/paas2/paas/conf/default.py
@@ -156,7 +156,8 @@
 
 STATIC_VERSION = "0.2.1"
 
-PLATFORM_VERSION = "2.0.0"
+# NOTE: SHOULD NOT CHANGE THIS LINE, WILL BE REPLACED WITH THE VERSION in pipeline
+PLATFORM_VERSION = '2.0.0'
 
 MEDIA_ROOT = os.path.join(PROJECT_ROOT, "media")
 MEDIA_URL = "/media/"

diff --git a/paas2/paas/templates/base.html b/paas2/paas/templates/base.html
@@ -174,12 +174,8 @@
                 <a href="https://wpa1.qq.com/KziXGWJs?_type=wpa&qidian=true" class="link">${_(u'技术支持')}</a>
                     | <a href="https://bk.tencent.com/s-mart/community/" target="_blank" hotrep="hp.footer.feedback" class="link">${_(u'社区论坛')}</a>
                     | <a href="http://bk.tencent.com/" target="_blank" hotrep="hp.footer.feedback" class="link">${_(u'产品官网')}</a>
-                    | <a href="###" hotrep="hp.footer.feedback" class="link follow-us" style="z-index:101;">
-                      ${_(u'关注我们')}
-                        <span class="qr-box"><img class="qr" src="../../../static/img/qr.png" alt=""></span>
-                      </a>
 
-                    <p>Copyright © 2012-${NOW.year} Tencent BlueKing. All Rights Reserved.</p>
+                    <p>Copyright © 2012-${NOW.year} Tencent BlueKing. All Rights Reserved. ${PLATFORM_VERSION}</p>
                     <p class="copyright">${_(u'蓝鲸智云 版权所有')}</p>
             </li>
         </ul>

diff --git a/paas2/paas/templates/home/index.html b/paas2/paas/templates/home/index.html
@@ -319,11 +319,7 @@
                 <a href="https://wpa1.qq.com/KziXGWJs?_type=wpa&qidian=true" class="link">${_(u'技术支持')}</a>
                     | <a href="https://bk.tencent.com/s-mart/community/" target="_blank" hotrep="hp.footer.feedback" class="link">${_(u'社区论坛')}</a>
                     | <a href="http://bk.tencent.com/" target="_blank" hotrep="hp.footer.feedback" class="link">${_(u'产品官网')}</a>
-                    | <a href="###" hotrep="hp.footer.feedback" class="link follow-us" style="z-index:101;">
-                      ${_(u'关注我们')}
-                        <span class="qr-box"><img class="qr" src="../../../static/img/qr.png" alt=""></span>
-                      </a>
-		<p>Copyright © 2012-${NOW.year}</p>
+		<p>Copyright © 2012-${NOW.year} Tencent BlueKing. All Rights Reserved. ${PLATFORM_VERSION}</p>
 		<p>${_(u'蓝鲸智云 版权所有')}</p>
 	</footer>
   <script src="${STATIC_URL}assets/jquery-1.10.2.min.js"></script>

diff --git a/paas2/release.md b/paas2/release.md
@@ -1,5 +1,9 @@
 Release Log
 ===============================
+# 2.14.8
+    - update: login remove sensitive info from log
+    - update: login/paas footer
+
 # 2.14.7
     - update: header and footer of pages