diff --git a/config.yaml b/config.yaml index 76f5f68..1ab87ed 100644 --- a/config.yaml +++ b/config.yaml @@ -27,4 +27,9 @@ email_config: glances: host: "192.168.2.170" - port: 61208 \ No newline at end of file + port: 61208 + + +wx_config: + #微信管理账号,用于接收部分管理员指令 + admin: [ "Jyunere" ] \ No newline at end of file diff --git a/configuration.py b/configuration.py index 09ea26a..2c381f1 100644 --- a/configuration.py +++ b/configuration.py @@ -28,3 +28,6 @@ class Config(object): self.email = yconfig.get("email_config", {}) # glances 监控配置 self.glances = yconfig.get("glances", {}) + + # wx 相关配置 + self.wx_config = yconfig.get("wx_config", {}) diff --git a/plugins/robot_menu/main.py b/plugins/robot_menu/main.py index 956b5a2..c0ce59d 100644 --- a/plugins/robot_menu/main.py +++ b/plugins/robot_menu/main.py @@ -7,7 +7,6 @@ from base.plugin_common.plugin_interface import PluginStatus from utils.decorator.plugin_decorators import plugin_stats_decorator from utils.revoke.message_auto_revoke import MessageAutoRevoke from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager -from utils.decorator.points_decorator import plugin_points_cost from wechat_ipad import WechatAPIClient diff --git a/utils/robot_cmd/robot_command.py b/utils/robot_cmd/robot_command.py index 60dd83f..4ea2152 100644 --- a/utils/robot_cmd/robot_command.py +++ b/utils/robot_cmd/robot_command.py @@ -6,11 +6,13 @@ # 3.群AI能力 #启用群AI #关闭群AI # 4.群总结能力 #启用群总结 #关闭群总结 # 5.sehuatang PDF能力 #启用pdf #关闭pdf +import os from typing import List import redis from enum import Enum +import yaml from loguru import logger from db.connection import DBConnectionManager @@ -51,7 +53,6 @@ class Feature(Enum): AI_AUTO = 23, "💬 仿真对话" GUESS_MUSIC = 24, "🎤 猜歌名游戏 [猜歌名 - 开始 | 猜歌名 歌手名 - 指定歌手 | 猜歌名 歌名 - 提交答案]" - def __new__(cls, value, description): obj = object.__new__(cls) obj._value_ = value @@ -271,18 +272,13 @@ class GroupBotManager: 返回系统管理员的微信ID列表 """ # 从配置文件中获取管理员列表 - config_admin_list = [] # self.config.get("admin_list", []) + pwd = os.path.dirname(os.path.abspath(__file__)) + with open(f"{pwd}/config.yaml", "rb") as fp: + yconfig = yaml.safe_load(fp) + wx_config = yconfig.get("wx_config", {}) + config_admin_list = wx_config.get("admin") # self.config.get("admin_list", []) - # 手动添加的管理员ID列表 - manual_admin_list = [ - "Jyunere", # 示例ID,请替换为实际的微信ID - "filehelper" # 文件传输助手,方便自己测试 - ] - - # 合并所有管理员列表并去重 - all_admin_list = list(set(config_admin_list + manual_admin_list)) - - return all_admin_list + return config_admin_list # 示例命令