18 files changed, 26 insertions, 185 deletions
diff --git a/hydroroll/bot.py b/hydroroll/bot.py
index c2b99e6..cbfc07f 100644
--- a/hydroroll/bot.py
+++ b/hydroroll/bot.py
@@ -2,13 +2,10 @@ from iamai import Bot as _Bot
 from typing import Optional, Dict, List, Type, Any, Union
 from pathlib import Path
 import os
-# 获取当前目录路径
-current_dir = Path.cwd()
+from hydroroll.config import GlobalConfig
 
-# 获取当前脚本文件路径
+current_dir = Path.cwd()
 script_file = current_dir.resolve() / __file__
-
-# 获取当前脚本文件所在目录路径
 script_dir = script_file.parent
 
 __all__ = ["Bot"]
@@ -26,10 +23,7 @@ class Bot:
                        config_dict=config_dict
                        )
         self.bot.load_plugins_from_dirs(Path(f"{script_dir}/plugins"))
-        self.create_folders()
-        self.init_data()
-        self.init_conf()
-        self.init_webui()
+        self.create_folder_structure(GlobalConfig._folder_dict)
     
     def run(self) -> None:
         self.bot.run()
@@ -53,12 +47,4 @@ class Bot:
                 os.mkdir(os.path.join(folder_path, 'logs'))
             if not os.path.isdir(os.path.join(folder_path, 'rules')):
                 os.mkdir(os.path.join(folder_path, 'rules'))
-    
-    def init_data(self):
-        ...
-        
-    def init_webui(self):
-        ...
-        
-    def init_conf(self):
-        ...
-\ No newline at end of file
+
diff --git a/hydroroll/config.py b/hydroroll/config.py
index 6739249..4258606 100644
--- a/hydroroll/config.py
+++ b/hydroroll/config.py
@@ -4,9 +4,6 @@ import platform
 from importlib.metadata import version
 from iamai import Plugin
 import os
-import pickle
-import threading
-
 
 # 创建全局 ArgumentParser 对象
 global_parser = argparse.ArgumentParser(description='hydroroll[水系] 全局命令参数')
@@ -20,8 +17,9 @@ class GlobalConfig:
     _iamai_version = version('iamai')
     _python_ver = sys.version
     _python_ver_raw= '.'.join(map(str, platform.python_version_tuple()[:3]))
-    current_path = os.path.dirname(os.path.abspath('__file__'))
-
+    _current_path = os.path.dirname(os.path.abspath('__file__'))
+    _folders = {'config':{},'data':{},'logs':{},'models':{},'rules':{'rules_default'},'users':{},'web':{'frontend':{'static','js','css','public'},'backend':{'app','template'}}}
+    
     # 定义系统组件
     class HydroSystem:
         def __init__(self):
@@ -34,91 +32,4 @@ class GlobalConfig:
     class HydroBot:
         def __init__(self) -> None:
             self.parser = argparse.ArgumentParser(description="Bot命令")
-        
-
-class ConfigManager:
-    def __init__(self, directory):
-        self.directory = directory
-        self.configs = {}
-        self.locks = {}
-    
-    def get(self, filename, section, key, default=None):
-        if not self._check_file_exists(filename):
-            return default
-        config = self._get_config(filename)
-        if section not in config:
-            return default
-        return config[section].get(key, default)
-    
-    def set(self, filename, section, key, value):
-        config = self._get_config(filename)
-        if section not in config:
-            config[section] = {}
-        config[section][key] = value
-        self._save_config(filename, config)
-    
-    def delete(self, filename, section, key):
-        config = self._get_config(filename)
-        if section not in config:
-            return
-        if key not in config[section]:
-            return
-        del config[section][key]
-        self._save_config(filename, config)
-    
-    def sections(self, filename):
-        if not self._check_file_exists(filename):
-            return []
-        config = self._get_config(filename)
-        return list(config.keys())
-    
-    def section_items(self, filename, section):
-        if not self._check_file_exists(filename):
-            return []
-        config = self._get_config(filename)
-        if section not in config:
-            return []
-        return list(config[section].items())
-    
-    def files(self):
-        return [filename for filename in os.listdir(self.directory) if filename.endswith('.dat')]
-
-    def _get_lock(self, filename):
-        if filename not in self.locks:
-            self.locks[filename] = threading.Lock()
-        return self.locks[filename]
-    
-    def _get_config(self, filename):
-        with self._get_lock(filename):
-            if filename not in self.configs:
-                filepath = os.path.join(self.directory, filename)
-                if os.path.exists(filepath):
-                    try:
-                        with open(filepath, 'rb') as f:
-                            self.configs[filename] = pickle.load(f)
-                    except:
-                        pass
-                if filename not in self.configs:
-                    self.configs[filename] = {}
-        return self.configs[filename]
-    
-    def _save_config(self, filename, config):
-        with self._get_lock(filename):
-            try:
-                filepath = os.path.join(self.directory, filename)
-                backuppath = os.path.join(self.directory, filename + '.bak')
-                lockpath = os.path.join(self.directory, filename + '.lock')
-                with open(lockpath, 'wb') as f:
-                    pass
-                if os.path.exists(filepath):
-                    os.replace(filepath, backuppath)
-                with open(filepath, 'wb') as f:
-                    pickle.dump(config, f)
-                os.remove(backuppath)
-                os.remove(lockpath)
-            except:
-                pass
-    
-    def _check_file_exists(self, filename):
-        filepath = os.path.join(self.directory, filename)
-        return os.path.exists(filepath) and filename.endswith('.dat')
+        
+\ No newline at end of file
diff --git a/hydroroll/plugins/HydroRoll_plugin_dice/__init__.py b/hydroroll/plugins/HydroRoll_plugin_dice/__init__.py
deleted file mode 100644
index 2c9d2b4..0000000
--- a/hydroroll/plugins/HydroRoll_plugin_dice/__init__.py
+++ /dev/null
@@ -1,51 +0,0 @@
-import re
-import random
-
-from iamai.log import logger
-
-from plugins.hydroroll_plugin_base import CommandPluginBase
-
-from .config import Config
-
-__all__ = ["Dice"]
-
-class Dice(CommandPluginBase[None, Config]):
-    Config = Config
-
-    def __post_init__(self):
-        self.re_pattern = re.compile(
-            r"\s*(?P<dice_times>\d+)d(?P<dice_faces>\d+)([*x](?P<dice_multiply>\d+))?",
-            flags=re.I,
-        )
-
-    async def handle(self) -> None:
-        dice_times = int(self.msg_match.group("dice_times"))
-        dice_faces = int(self.msg_match.group("dice_faces"))
-        if self.msg_match.group("dice_multiply") is None:
-            dice_multiply = None
-        else:
-            dice_multiply = int(self.msg_match.group("dice_multiply"))
-
-        if dice_times > self.config.max_dice_times:
-            await self.event.reply(
-                self.format_str(self.config.exceed_max_dice_times_str)
-            )
-            return
-
-        dice = [random.randint(1, dice_faces) for _ in range(dice_times)]
-        dice_sum = sum(dice)
-        if dice_multiply is None:
-            result_str = f"{dice_times}D{dice_faces}="
-            if dice_times != 1:
-                result_str += f"{'+'.join(map(lambda x: str(x), dice))}="
-            result_str += str(dice_sum)
-        else:
-            result_str = f"{dice_times}D{dice_faces}x{dice_multiply}="
-            if dice_times != 1:
-                result_str += (
-                    f"({'+'.join(map(lambda x: str(x), dice))})x{dice_multiply}="
-                )
-            result_str += f"{dice_sum}x{dice_multiply}={dice_sum * dice_multiply}"
-
-        logger.info(f"Dice Plugin: {result_str}")
-        await self.event.reply(self.format_str(self.config.message_str, result_str))
diff --git a/hydroroll/plugins/HydroRoll_plugin_dice/config.py b/hydroroll/plugins/HydroRoll_plugin_dice/config.py
deleted file mode 100644
index 4846409..0000000
--- a/hydroroll/plugins/HydroRoll_plugin_dice/config.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from typing import Set
-
-from plugins.hydroroll_plugin_base import CommandPluginConfig
-
-
-class Config(CommandPluginConfig):
-    __config_name__ = "plugin_dice"
-    command: Set[str] = {"r", "roll", "dice"}
-    """命令文本。"""
-    max_dice_times: int = 1000
-    """最大单次投掷次数。"""
-    exceed_max_dice_times_str: str = "错误：超过最大投掷次数。"
-    """超过最大单次投掷次数时的提示语。"""
diff --git a/hydroroll/plugins/HydroRoll_plugin_base/__init__.py b/hydroroll/plugins/plugin_base/__init__.py
index a050ae1..a050ae1 100644
--- a/hydroroll/plugins/HydroRoll_plugin_base/__init__.py
+++ b/hydroroll/plugins/plugin_base/__init__.py
diff --git a/hydroroll/plugins/HydroRoll_plugin_base/config.py b/hydroroll/plugins/plugin_base/config.py
index 311874c..311874c 100644
--- a/hydroroll/plugins/HydroRoll_plugin_base/config.py
+++ b/hydroroll/plugins/plugin_base/config.py
diff --git a/hydroroll/plugins/HydroRoll_plugin_bot/__init__.py b/hydroroll/plugins/plugin_bot/__init__.py
index 2b3eec8..89ba17b 100644
--- a/hydroroll/plugins/HydroRoll_plugin_bot/__init__.py
+++ b/hydroroll/plugins/plugin_bot/__init__.py
@@ -1,6 +1,6 @@
 import re
 from importlib.metadata import version
-from plugins.hydroroll_plugin_base import CommandPluginBase
+from plugins.plugin_base import CommandPluginBase
 from hydroroll.config import GlobalConfig
 
 from .config import Config
diff --git a/hydroroll/plugins/HydroRoll_plugin_bot/config.py b/hydroroll/plugins/plugin_bot/config.py
index 717b7b2..640f23a 100644
--- a/hydroroll/plugins/HydroRoll_plugin_bot/config.py
+++ b/hydroroll/plugins/plugin_bot/config.py
@@ -1,6 +1,6 @@
 from typing import Set
 
-from plugins.hydroroll_plugin_base import CommandPluginConfig
+from plugins.plugin_base import CommandPluginConfig
 
 
 class Config(CommandPluginConfig):
diff --git a/hydroroll/plugins/HydroRoll_plugin_echo/__init__.py b/hydroroll/plugins/plugin_echo/__init__.py
index e800384..faa47df 100644
--- a/hydroroll/plugins/HydroRoll_plugin_echo/__init__.py
+++ b/hydroroll/plugins/plugin_echo/__init__.py
@@ -1,6 +1,6 @@
 import re
 
-from plugins.hydroroll_plugin_base import CommandPluginBase
+from plugins.plugin_base import CommandPluginBase
 
 from .config import Config
 
diff --git a/hydroroll/plugins/HydroRoll_plugin_echo/config.py b/hydroroll/plugins/plugin_echo/config.py
index 030bbec..c047134 100644
--- a/hydroroll/plugins/HydroRoll_plugin_echo/config.py
+++ b/hydroroll/plugins/plugin_echo/config.py
@@ -1,6 +1,6 @@
 from typing import Set
 
-from plugins.hydroroll_plugin_base import CommandPluginConfig
+from plugins.plugin_base import CommandPluginConfig
 
 
 class Config(CommandPluginConfig):
diff --git a/hydroroll/plugins/HydroRoll_plugin_luck/__init__.py b/hydroroll/plugins/plugin_luck/__init__.py
index a30c964..7967a0b 100644
--- a/hydroroll/plugins/HydroRoll_plugin_luck/__init__.py
+++ b/hydroroll/plugins/plugin_luck/__init__.py
@@ -2,7 +2,7 @@ import re
 import time
 import random
 
-from plugins.hydroroll_plugin_base import CommandPluginBase
+from plugins.plugin_base import CommandPluginBase
 
 from .config import Config
 
diff --git a/hydroroll/plugins/HydroRoll_plugin_luck/config.py b/hydroroll/plugins/plugin_luck/config.py
index eeef14b..6190531 100644
--- a/hydroroll/plugins/HydroRoll_plugin_luck/config.py
+++ b/hydroroll/plugins/plugin_luck/config.py
@@ -1,6 +1,6 @@
 from typing import Set
 
-from plugins.hydroroll_plugin_base import CommandPluginConfig
+from plugins.plugin_base import CommandPluginConfig
 
 
 class Config(CommandPluginConfig):
diff --git a/hydroroll/plugins/HydroRoll_plugin_send/__init__.py b/hydroroll/plugins/plugin_send/__init__.py
index 234e5b3..2468189 100644
--- a/hydroroll/plugins/HydroRoll_plugin_send/__init__.py
+++ b/hydroroll/plugins/plugin_send/__init__.py
@@ -1,6 +1,6 @@
 import re
 
-from plugins.hydroroll_plugin_base import CommandPluginBase
+from plugins.plugin_base import CommandPluginBase
 
 from .config import Config
 
diff --git a/hydroroll/plugins/HydroRoll_plugin_send/config.py b/hydroroll/plugins/plugin_send/config.py
index 6903c0f..5b7fe7b 100644
--- a/hydroroll/plugins/HydroRoll_plugin_send/config.py
+++ b/hydroroll/plugins/plugin_send/config.py
@@ -1,6 +1,6 @@
 from typing import Set, Optional
 
-from plugins.hydroroll_plugin_base import CommandPluginConfig
+from plugins.plugin_base import CommandPluginConfig
 
 
 class Config(CommandPluginConfig):
diff --git a/hydroroll/plugins/HydroRoll_plugin_system/__init__.py b/hydroroll/plugins/plugin_system/__init__.py
index 6e4f232..ea797d3 100644
--- a/hydroroll/plugins/HydroRoll_plugin_system/__init__.py
+++ b/hydroroll/plugins/plugin_system/__init__.py
@@ -1,5 +1,5 @@
 import re
-from plugins.hydroroll_plugin_base import CommandPluginBase
+from plugins.plugin_base import CommandPluginBase
 from .config import Config
 import psutil
 import time
diff --git a/hydroroll/plugins/HydroRoll_plugin_system/config.py b/hydroroll/plugins/plugin_system/config.py
index 416fcbe..aa5f51b 100644
--- a/hydroroll/plugins/HydroRoll_plugin_system/config.py
+++ b/hydroroll/plugins/plugin_system/config.py
@@ -1,6 +1,6 @@
 from typing import Set
 
-from plugins.hydroroll_plugin_base import CommandPluginConfig
+from plugins.plugin_base import CommandPluginConfig
 
 
 class Config(CommandPluginConfig):
diff --git a/hydroroll/plugins/test.py b/hydroroll/plugins/test.py
new file mode 100644
index 0000000..01d0615
--- /dev/null
+++ b/hydroroll/plugins/test.py
@@ -0,0 +1,8 @@
+from iamai import Plugin
+
+class Test(Plugin):
+    async def handle(self) -> None:
+        ...
+        
+    async def rule(self) -> None:
+        ...
+\ No newline at end of file
diff --git a/hydroroll/test.py b/hydroroll/test.py
deleted file mode 100644
index e69de29..0000000
--- a/hydroroll/test.py
+++ /dev/null