Merge branch 'jxxghp:main' into main

This commit is contained in:
s0mE
2024-03-16 19:24:25 +08:00
committed by GitHub
9 changed files with 25 additions and 15 deletions

View File

@ -14,11 +14,12 @@ class MessageHelper(metaclass=Singleton):
self.sys_queue = queue.Queue()
self.user_queue = queue.Queue()
def put(self, message: Any, role: str = "sys"):
def put(self, message: Any, role: str = "sys", note: dict = None):
"""
存消息
:param message: 消息
:param role: 消息通道 sys/user
:param note: 附件json
"""
if role == "sys":
self.sys_queue.put(message)
@ -28,6 +29,7 @@ class MessageHelper(metaclass=Singleton):
elif hasattr(message, "to_dict"):
content = message.to_dict()
content['date'] = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
content['note'] = json.dumps(note) if note else None
self.user_queue.put(json.dumps(content))
def get(self, role: str = "sys") -> Optional[str]:

View File

@ -55,7 +55,7 @@ class ResourceHelper(metaclass=Singleton):
target = resource.get("target")
version = resource.get("version")
# 判断平台
if platform and platform != SystemUtils.platform:
if platform and platform != SystemUtils.platform():
continue
# 判断本地是否存在
local_path = self._base_dir / target / rname