From b1435253f6e448881b843760367e43d473579040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E9=A3=9E?= <feiazifeiazi@hotmail.com>
Date: Fri, 10 May 2024 11:56:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=A0=87=E9=A2=98=E5=8A=9F=E8=83=BD-custom?=
 =?UTF-8?q?=5Ftitle=5Fsuffix=20(#2631)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 添加favicon图片

* 修改favicon

* 修改favicon.ico

* 添加自定义环境标题

* update

* update 自定义环境标题

* update custom_environment_title

* update custom_environment_title

* 添加favicon图片

* 修改favicon

* 修改favicon.ico

* 添加自定义环境标题

* update

* update 自定义环境标题

* update custom_environment_title

* update custom_environment_title

* 修改字段名称，添加环境变量

* Update __init__.py

* Update settings.py

* update CUSTOM_TITLE_SUFFIX

* 从env读写。env("CUSTOM_TITLE_SUFFIX", default="")

* docker的环境变量加上此配置

---------

Co-authored-by: 王飞 <fei.wang@xgo.one>
---
 archery/settings.py                  |  3 +++
 common/templates/base.html           |  4 ++--
 common/templates/config.html         | 11 +++++++++++
 common/templates/login.html          |  4 ++--
 common/utils/global_info.py          |  6 +++++-
 sql/templates/legacy_login_form.html |  2 +-
 src/docker-compose/.env              |  3 +++
 7 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/archery/settings.py b/archery/settings.py
index d9ce6f6b1b..de45f1dd41 100644
--- a/archery/settings.py
+++ b/archery/settings.py
@@ -486,6 +486,9 @@
     },
 }
 
+# 在网站标题及登录页面追加此内容, 可用于多archery实例的区分。Archery后台也有相同配置，如都做了配置，以后台配置为准
+CUSTOM_TITLE_SUFFIX = env("CUSTOM_TITLE_SUFFIX", default="")
+
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")
 if not os.path.exists(MEDIA_ROOT):
     os.mkdir(MEDIA_ROOT)
diff --git a/common/templates/base.html b/common/templates/base.html
index f0ea044d7c..0f5a4dc6b1 100644
--- a/common/templates/base.html
+++ b/common/templates/base.html
@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
     <meta name="author" content="">
-    <title>Archery-SQL审核查询平台</title>
+    <title>{% block title %}Archery-SQL审核查询平台{{ custom_title_suffix }}{% endblock %}</title>
     <link rel="shortcut icon" href="{% static 'img/favicon.ico' %}"/>
 
     <!-- 引入 Bootstrap -->
@@ -35,7 +35,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="/index/"><strong>Archery</strong></a>
+            <a class="navbar-brand" href="/index/"><strong>Archery{{ custom_title_suffix }}</strong></a>
         </div>
 
         <!-- /.navbar-header -->
diff --git a/common/templates/config.html b/common/templates/config.html
index c9732458b6..93af8eeb1f 100755
--- a/common/templates/config.html
+++ b/common/templates/config.html
@@ -1099,6 +1099,17 @@ <h4 style="color: darkgrey"><b>其他配置</b></h4>
                                             
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label for="custom_title_suffix"
+                                       class="col-sm-4 control-label">CUSTOM_TITLE_SUFFIX</label>
+                                <div class="col-sm-5">
+                                    <input type="text" class="form-control"
+                                           id="custom_title_suffix"
+                                           key="custom_title_suffix"
+                                           value="{{ config.custom_title_suffix }}"
+                                           placeholder="在网站标题及登录页面追加此内容, 可用于多archery实例的区分">
+                                </div>
+                            </div>
                         </div>
                         <hr />
                         <div class="form-group">
diff --git a/common/templates/login.html b/common/templates/login.html
index 817a0d71bf..064ce07926 100644
--- a/common/templates/login.html
+++ b/common/templates/login.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>Login To Archery</title>
+    <title>Login To Archery{{ custom_title_suffix }}</title>
     {% load static %}
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!-- 引入 Bootstrap -->
@@ -18,7 +18,7 @@
 <body style="background-color:#edeff1;">
 <div class="row lsb-login">
     <div class="col-sm-4 login-form-wrapper">
-        <h3 class="text-center">Login To Archery</h3>
+        <h3 class="text-center">Login To Archery{{ custom_title_suffix }}</h3>
         <form class="login-form fade-in-effect" id="login" method="post" role="form">
             {% csrf_token %}
             {% if dingding_enabled %}
diff --git a/common/utils/global_info.py b/common/utils/global_info.py
index ce2ded0ef7..8bcdd47c94 100644
--- a/common/utils/global_info.py
+++ b/common/utils/global_info.py
@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 from sql.utils.workflow_audit import Audit
-from archery import display_version
+from archery import display_version, settings
 from common.config import SysConfig
 from sql.models import TwoFactorAuthConfig
 
@@ -25,12 +25,16 @@ def global_info(request):
     # 添加公告
     announcement_content_enabled = sys_config.get("announcement_content_enabled", False)
     announcement_content = sys_config.get("announcement_content", "")
+    custom_title_suffix = sys_config.get("custom_title_suffix", "")
+    if not custom_title_suffix:
+        custom_title_suffix = settings.CUSTOM_TITLE_SUFFIX
 
     return {
         "todo": todo,
         "archery_version": display_version,
         "watermark_enabled": watermark_enabled,
         "announcement_content_enabled": announcement_content_enabled,
+        "custom_title_suffix": custom_title_suffix,
         "announcement_content": announcement_content,
         "twofa_type": twofa_type,
     }
diff --git a/sql/templates/legacy_login_form.html b/sql/templates/legacy_login_form.html
index f2b05f76ce..2eb863e4fa 100644
--- a/sql/templates/legacy_login_form.html
+++ b/sql/templates/legacy_login_form.html
@@ -10,5 +10,5 @@
 </div>
 <br/>
 <div class="form-group">
-    <button class="btn btn-primary btn-block" id="btnLogin" type="button"><i class="fa-lock"></i>登录</button>
+    <button class="btn btn-primary btn-block" id="btnLogin" type="button"><i class="fa-lock"></i>登录{{ custom_title_suffix  }}</button>
 </div>
\ No newline at end of file
diff --git a/src/docker-compose/.env b/src/docker-compose/.env
index 64f589f090..18a3f709d5 100644
--- a/src/docker-compose/.env
+++ b/src/docker-compose/.env
@@ -19,3 +19,6 @@ Q_CLUISTER_WORKERS=4
 Q_CLUISTER_TIMEOUT=60
 Q_CLUISTER_SYNC=false
 
+# 在网站标题及登录页面追加此内容, 可用于多archery实例的区分。Archery后台也有相同配置，如都做了配置，以后台配置为准
+CUSTOM_TITLE_SUFFIX = ""
+