diff --git a/common/templates/base.html b/common/templates/base.html
index f3bfa63a9c..f0ea044d7c 100644
--- a/common/templates/base.html
+++ b/common/templates/base.html
@@ -379,6 +379,9 @@ <h4 class="modal-title" id="myModalLabel2">扫码绑定</h4>
     <div id="page-wrapper">
         <div class="clearfix">
             <br>
+            {% if announcement_content_enabled %}
+            <div class="alert alert-info h4"  role="alert">{{announcement_content}}</div>
+            {% endif %}
             {% block content %}
             {% endblock content %}
             <!--底部部分 -->
diff --git a/common/templates/config.html b/common/templates/config.html
index 2ab40afc60..38cd6d8d93 100755
--- a/common/templates/config.html
+++ b/common/templates/config.html
@@ -1076,6 +1076,31 @@ <h4 style="color: darkgrey"><b>其他配置</b></h4>
                                     </div>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label for="announcement_content_enabled"
+                                       class="col-sm-4 control-label">ANNOUNCEMENT_CONTENT_ENABLED</label>
+                                <div class="col-sm-8">
+                                    <div class="switch switch-small">
+                                        <label>
+                                            <input id="announcement_content_enabled" key="announcement_content_enabled"
+                                                   value="{{ config.announcement_content_enabled }}"
+                                                   type="checkbox"> 是否开启公告
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label for="announcement_content"
+                                       class="col-sm-4 control-label">ANNOUNCEMENT_CONTENT</label>
+                                <div class="col-sm-5">
+                                    <input type="text" class="form-control"
+                                           id="announcement_content"
+                                           key="announcement_content"
+                                           value="{{ config.announcement_content }}"
+                                           placeholder="公告内容">
+                                            
+                                </div>
+                            </div>
                         </div>
                         <hr />
                         <div class="form-group">
diff --git a/common/utils/global_info.py b/common/utils/global_info.py
index e3a7a5c7bf..ce2ded0ef7 100644
--- a/common/utils/global_info.py
+++ b/common/utils/global_info.py
@@ -20,11 +20,17 @@ def global_info(request):
     except Exception:
         todo = 0
 
-    watermark_enabled = SysConfig().get("watermark_enabled", False)
+    sys_config = SysConfig()
+    watermark_enabled = sys_config.get("watermark_enabled", False)
+    # 添加公告
+    announcement_content_enabled = sys_config.get("announcement_content_enabled", False)
+    announcement_content = sys_config.get("announcement_content", "")
 
     return {
         "todo": todo,
         "archery_version": display_version,
         "watermark_enabled": watermark_enabled,
+        "announcement_content_enabled": announcement_content_enabled,
+        "announcement_content": announcement_content,
         "twofa_type": twofa_type,
     }