diff --git a/.gitignore b/.gitignore index 5da69533..6d5de378 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,5 @@ cookies.json res/announcement_saved res/announcement_saved.json cmdpriv.json -tips.py \ No newline at end of file +tips.py +.venv \ No newline at end of file diff --git a/config-template.py b/config-template.py index 3ba73d8c..dbb9283e 100644 --- a/config-template.py +++ b/config-template.py @@ -4,9 +4,10 @@ import logging # 消息处理协议适配器 # 目前支持以下适配器: # - "yirimirai": YiriMirai框架适配器, 请填写mirai_http_api_config +# - "nakuru": 通过nakuru-project框架连接go-cqhttp,请填写nakuru_config msg_source_adapter = "yirimirai" -# [必需] Mirai的配置 +# [必需(与nakuru二选一,取决于msg_source_adapter)] Mirai的配置 # 请到配置mirai的步骤中的教程查看每个字段的信息 # adapter: 选择适配器,目前支持HTTPAdapter和WebSocketAdapter # host: 运行mirai的主机地址 @@ -23,6 +24,15 @@ mirai_http_api_config = { "qq": 1234567890 } +# [必需(与mirai二选一,取决于msg_source_adapter)] +# 使用nakuru-project框架连接go-cqhttp的配置 +nakuru_config = { + "host": "localhost", # go-cqhttp的地址 + "port": 6700, # go-cqhttp的正向websocket端口 + "http_port": 5700, # go-cqhttp的正向http端口 + "token": "" # 若在go-cqhttp的config.yml设置了access_token, 则填写此处 +} + # [必需] OpenAI的配置 # api_key: OpenAI的API Key # http_proxy: 请求OpenAI时使用的代理,None为不使用,https和socks5暂不能使用 diff --git a/requirements.txt b/requirements.txt index ac56cf0d..7ef00a46 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,5 @@ yiri-mirai~=0.2.6.1 websockets urllib3~=1.26.10 func_timeout~=4.3.5 -Pillow \ No newline at end of file +Pillow +nakuru-project-test \ No newline at end of file