From 20355b24bf1c9a45fb27b3f78119f218fea9e45b Mon Sep 17 00:00:00 2001
From: lxb <1580622474@qq.com>
Date: Thu, 26 Jun 2025 18:31:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E8=BF=9E=E6=8E=A5=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=A2=9E=E5=8A=A0=E5=85=AC=E5=91=8A=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=AE=A2=E6=88=B7=E7=AB=AF=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E7=9A=84=E5=85=AC=E5=91=8A=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E4=B8=8D=E5=88=B0=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E4=B9=9F=E5=8F=AF=E4=BB=A5=E6=98=BE=E7=A4=BA=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 active_connector.py | 7 +++++--
 server.py           | 8 ++++++--
 server_config.json  | 2 ++
 version.py          | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/active_connector.py b/active_connector.py
index f5477d2..cf04722 100644
--- a/active_connector.py
+++ b/active_connector.py
@@ -6,10 +6,11 @@ import json
 import re
 
 class Connector:
-    def __init__(self, data_dict : dict, server_cfg : dict, lock : threading.Lock, connect_check_interval : float, reconnect_interval : float, multiple_of_timeout : float = 2):
+    def __init__(self, data_dict : dict, server_cfg : dict, note_dict : dict, lock : threading.Lock, connect_check_interval : float, reconnect_interval : float, multiple_of_timeout : float = 2):
         self.data_dict = data_dict
         self.tmp_data_dict = dict()
         self.server_cfg = server_cfg
+        self.note_dict = note_dict
         self.lock = lock
         self.tmp_lock = threading.Lock()
         self.connect_check_interval = connect_check_interval
@@ -70,8 +71,10 @@ class Connector:
 
                         # 记录信息
                         with self.tmp_lock:
+                            # 添加公告
+                            if server_title in self.note_dict:
+                                shared_data_list[server_title]['note'] = self.note_dict[server_title]
                             shared_data_list[server_title]['interval'] = interval
-                            shared_data_list[server_title]['note'] = "" # TODO 暂不支持公告，后续增加
                             shared_data_list[server_title]['title'] = server_title
                             shared_data_list[server_title]['version'] = version
                             shared_data_list[server_title]['update_time_stamp'] = int(time.time())
diff --git a/server.py b/server.py
index 23ebbd6..aa633d6 100644
--- a/server.py
+++ b/server.py
@@ -61,14 +61,18 @@ def init():
         data_dict['server_dict'] = dict()
         data_dict['version'] = version
         for server_name in server_cfg['server_list']:
-            data_dict['server_dict'][server_name] = None
+            if server_name in server_cfg['note_dict']:
+                data_dict['server_dict'][server_name] = dict()
+                data_dict['server_dict'][server_name]['note'] = server_cfg['note_dict'][server_name]
+            else:
+                data_dict['server_dict'][server_name] = None
 
 def main():
     init()
 
     # 主动连接
     if 'connect_server' in server_cfg and len(server_cfg['connect_server']) > 0:
-        connector = Connector(data_dict['server_dict'], server_cfg['connect_server'], data_lock, server_cfg['connect_check_interval'], server_cfg['reconnect_interval'])
+        connector = Connector(data_dict['server_dict'], server_cfg['connect_server'], server_cfg['note_dict'], data_lock, server_cfg['connect_check_interval'], server_cfg['reconnect_interval'])
         connector.run()
         print('开启主动服务器主动连接 : ' + '、'.join([s['title'] for s in server_cfg['connect_server']]))
     else:
diff --git a/server_config.json b/server_config.json
index 6564b86..f52ccb0 100644
--- a/server_config.json
+++ b/server_config.json
@@ -3,6 +3,8 @@
     "port": 15002,
     "server_list":["76", "174", "233", "222"],
     "note_dict":{
+        "76" : "test1",
+        "SERVER_76" : "test2"
     },
     "api_name": "api",
 
diff --git a/version.py b/version.py
index 4e5e697..c6c9fa0 100644
--- a/version.py
+++ b/version.py
@@ -1 +1 @@
-version = "0.2.1.20250626_beta"
\ No newline at end of file
+version = "0.2.2.20250626_beta"
\ No newline at end of file