调整目录结构，将框架内容放到base里面

base/event_system/events/plugin_events.py

@@ -2,7 +2,7 @@ from dataclasses import dataclass
 from typing import Dict, Any, Optional
 from datetime import datetime
 
-from event_system.event_manager import Event
+from base.event_system.event_manager import Event
 
 
 @dataclass

base/plugin_common/message_plugin_interface.py

@@ -1,5 +1,5 @@
 from typing import Dict, Any, Tuple, Optional, List
-from plugin_common.plugin_interface import PluginInterface
+from base.plugin_common.plugin_interface import PluginInterface
 from wechat_ipad import WechatAPIClient
 
 

base/plugin_common/plugin_manager.py

@@ -2,15 +2,15 @@ import importlib
 import inspect
 import os
 import sys
-from typing import Dict, List, Any, Optional, Type, Tuple
+from typing import Dict, List, Any, Optional, Tuple
 
 from loguru import logger
 
-from plugin_common.plugin_interface import PluginInterface, PluginStatus
+from base.plugin_common.plugin_interface import PluginInterface, PluginStatus
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.scheduled_plugin_interface import ScheduledPluginInterface
+from base.plugin_common.scheduled_plugin_interface import ScheduledPluginInterface
-from plugin_common.plugin_registry import PluginRegistry
+from base.plugin_common.plugin_registry import PluginRegistry
-from plugin_common.event_system import EventSystem, EventType
+from base.plugin_common.event_system import EventSystem, EventType
 from wechat_ipad import WechatAPIClient
 
 

base/plugin_common/plugin_registry.py

@@ -1,5 +1,5 @@
 from typing import Dict, List, Optional, Type
-from plugin_common.plugin_interface import PluginInterface, PluginStatus
+from base.plugin_common.plugin_interface import PluginInterface, PluginStatus
 
 
 class PluginRegistry:

base/plugin_common/scheduled_plugin_interface.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 from typing import Dict, Any, List, Tuple, Callable
 
-from plugin_common.plugin_interface import PluginInterface, PluginStatus
+from base.plugin_common.plugin_interface import PluginInterface
 
 
 class ScheduledPluginInterface(PluginInterface):

plugins/ai_auto_response/main.py

@@ -1,14 +1,11 @@
 from loguru import logger
 import os
-import json
 import requests
 from typing import Dict, Any, List, Optional, Tuple
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
-from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager
-from utils.decorator.points_decorator import plugin_points_cost
 from wechat_ipad import WechatAPIClient
 
 from .bot_ai import InterventionBot

plugins/beautyleg/main.py

@@ -4,8 +4,8 @@ from typing import Dict, Any, List, Optional, Tuple
 
 from pathlib import Path
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager
 from utils.decorator.points_decorator import plugin_points_cost

plugins/dify/main.py

@@ -7,8 +7,8 @@ from typing import Dict, Any, List, Optional, Tuple
 
 from pathlib import Path
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.markdown_to_image import convert_md_str_to_image
 from utils.revoke.message_auto_revoke import MessageAutoRevoke

plugins/douyin_parser/main.py

@@ -7,8 +7,8 @@ from typing import Dict, Any, List, Optional, Tuple
 
 from loguru import logger
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager
 from wechat_ipad import WechatAPIClient

plugins/game_task/main.py

@@ -5,8 +5,8 @@ from typing import Dict, Any, List, Optional, Tuple
 from loguru import logger
 
 from async_job import async_job
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager
 from utils.decorator.points_decorator import points_reward_decorator

plugins/global_news/main.py

@@ -3,8 +3,8 @@ import threading
 import time  # 添加这一行
 from typing import Dict, Any, List, Optional, Tuple
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager
 from utils.decorator.points_decorator import plugin_points_cost

plugins/group_auto_invite/main.py

@@ -1,10 +1,9 @@
-from loguru import logger
 import redis
 import re
 from typing import Dict, Any, List, Optional, Tuple
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.robot_cmd.robot_command import GroupBotManager
 from utils.wechat.contact_manager import ContactManager

plugins/group_member_change/main.py

@@ -3,8 +3,8 @@ from typing import Dict, Any, List, Optional, Tuple
 
 import xml.etree.ElementTree as ET
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager
 from wechat_ipad import WechatAPIClient
 

plugins/group_virtual/main.py

@@ -1,8 +1,7 @@
 from typing import Dict, Any, List, Optional, Tuple
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
-from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.wechat.contact_manager import ContactManager
 from db.connection import DBConnectionManager
 from db.group_virtual_redis import GroupVirtualRedisDB

plugins/jd_sign_token/main.py

@@ -1,15 +1,13 @@
 from loguru import logger
 import requests
 import re
-import os
 from json import dumps as jsonDumps
 from typing import Dict, Any, List, Optional, Tuple
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager
-from utils.decorator.points_decorator import plugin_points_cost
 from wechat_ipad import WechatAPIClient
 
 

plugins/message_sign/main.py

@@ -4,8 +4,8 @@ import pytz
 from typing import Dict, Any, List, Optional, Tuple
 
 from db.connection import DBConnectionManager
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+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

plugins/message_summary/main.py

@@ -1,8 +1,6 @@
-import asyncio
 import json
 import os
 import re
-import threading
 import time
 from pathlib import Path
 from typing import Dict, Any, Tuple, Optional, List
@@ -13,8 +11,8 @@ from utils.revoke.message_auto_revoke import MessageAutoRevoke
 from utils.string_utils import remove_trailing_content
 from utils.wechat.message_to_db import MessageStorage
 from utils.compress_chat_data import compress_chat_data
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.decorator.points_decorator import plugin_points_cost
 from utils.markdown_to_image import convert_md_str_to_image
 from utils.decorator.plugin_decorators import plugin_stats_decorator

plugins/music/main.py

@@ -4,8 +4,8 @@ from loguru import logger
 import requests
 from typing import Dict, Any, List, Optional, Tuple
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager
 from utils.decorator.points_decorator import plugin_points_cost

plugins/plugin_manager/main.py

@@ -2,10 +2,10 @@ from loguru import logger
 import os
 from typing import Dict, Any, List, Optional, Tuple
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
-from plugin_common.plugin_registry import PluginRegistry
+from base.plugin_common.plugin_registry import PluginRegistry
-from plugin_common.plugin_manager import PluginManager
+from base.plugin_common.plugin_manager import PluginManager
 from utils.robot_cmd.robot_command import GroupBotManager
 from wechat_ipad import WechatAPIClient
 

plugins/point_trade/main.py

@@ -6,8 +6,8 @@ import xml.etree.ElementTree as ET
 
 from db.connection import DBConnectionManager
 from db.points_db import PointsDBOperator
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+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

plugins/stats_collector/main.py

@@ -1,12 +1,10 @@
 from loguru import logger
-import time
 from typing import Dict, Any, Tuple, Optional, List
-from datetime import datetime
 
-from plugin_common.plugin_interface import PluginInterface, PluginStatus
+from base.plugin_common.plugin_interface import PluginInterface, PluginStatus
-from event_system.event_manager import EventManager
+from base.event_system.event_manager import EventManager
 # 使用正确的事件类型导入
-from event_system.events.plugin_events import PluginCallStartEvent, PluginCallEndEvent, PluginCallErrorEvent
+from base.event_system.events.plugin_events import PluginCallStartEvent, PluginCallEndEvent, PluginCallErrorEvent
 # 数据库导入
 from db.stats_db import StatsDBOperator
 from db.connection import DBConnectionManager

plugins/system_updater/main.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-import os
 import subprocess
 from loguru import logger
 from typing import Dict, Any, List, Optional, Tuple
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.robot_cmd.robot_command import Feature, PermissionStatus
 from wechat_ipad import WechatAPIClient
 

plugins/video/main.py

@@ -7,8 +7,8 @@ from typing import Dict, Any, List, Optional, Tuple
 from pathlib import Path
 
 import cv2
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager
 from utils.decorator.points_decorator import plugin_points_cost

plugins/video_man/main.py

@@ -7,8 +7,8 @@ import requests
 from loguru import logger
 from pathlib import Path
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.decorator.points_decorator import plugin_points_cost
 from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager

plugins/weather/main.py

@@ -3,8 +3,8 @@ import aiohttp
 import os
 from typing import Dict, Any, List, Optional, Tuple
 
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.robot_cmd.robot_command import Feature, PermissionStatus, GroupBotManager
 from utils.decorator.points_decorator import plugin_points_cost

plugins/xiuren_image/main.py

@@ -2,12 +2,11 @@ from pathlib import Path
 
 from loguru import logger
 import os
-import random
 from typing import Dict, Any, List, Optional, Tuple
 
 from db.connection import DBConnectionManager
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
 from plugins.xiuren_image.images_cache import ImageCacheManager
 from utils.decorator.plugin_decorators import plugin_stats_decorator
 from utils.revoke.message_auto_revoke import MessageAutoRevoke

robot.py

@@ -11,11 +11,11 @@ from loguru import logger
 from base.func_epic import is_friday, get_free
 from base.func_news import News
 from configuration import Config
-from plugin_common.event_system import EventType, EventSystem
+from base.plugin_common.event_system import EventType, EventSystem
-from plugin_common.message_plugin_interface import MessagePluginInterface
+from base.plugin_common.message_plugin_interface import MessagePluginInterface
-from plugin_common.plugin_interface import PluginStatus
+from base.plugin_common.plugin_interface import PluginStatus
-from plugin_common.plugin_manager import PluginManager
+from base.plugin_common.plugin_manager import PluginManager
-from plugin_common.plugin_registry import PluginRegistry
+from base.plugin_common.plugin_registry import PluginRegistry
 from utils.sehuatang.shehuatang import pdf_file_path
 from utils.email_util import EmailSender
 from utils.revoke.message_auto_revoke import MessageAutoRevoke