Merge branch 'master' into develop

This commit is contained in:
saipo 2025-04-28 20:33:30 +08:00
commit f350ad8d5d
2 changed files with 7 additions and 9 deletions

View File

@ -10,8 +10,7 @@ class Tool:
self.typeid = typeid self.typeid = typeid
@staticmethod def get_tool_name(id):
def get_tool_name(id):
conn=pymysql.connect(host = '192.168.31.9' # 连接名称,默认 conn=pymysql.connect(host = '192.168.31.9' # 连接名称,默认
,user = 'saipo' ,user = 'saipo'
,passwd='Grasste0403' # 密码 ,passwd='Grasste0403' # 密码
@ -20,7 +19,7 @@ class Tool:
,charset='utf8' # 字符编码 ,charset='utf8' # 字符编码
) )
cur = conn.cursor() cur = conn.cursor()
sql = "SELECT name FROM tool WHERE id = %s" sql = "SELECT name FROM dajiaotool WHERE id = %s"
cur.execute(sql, (id,)) cur.execute(sql, (id,))
result = cur.fetchone() result = cur.fetchone()
cur.close() cur.close()

11
main.py
View File

@ -1,18 +1,17 @@
import json import json
import Tool
from astrbot.api.event import filter, AstrMessageEvent, MessageEventResult from astrbot.api.event import filter, AstrMessageEvent, MessageEventResult
from astrbot.api.star import Context, Star, register from astrbot.api.star import Context, Star, register
from astrbot.api import logger from astrbot.api import logger
import random import random
from .back import time_long, volume, isUserExist, insertUser, seconds_to_hms, ml_to_l_ml, get_user_name from .back import time_long, volume, isUserExist, insertUser, seconds_to_hms, ml_to_l_ml, get_user_name
import pymysql import pymysql
from .Tool import get_tool_name
@register("helloworld", "YourName", "一个简单的 Hello World 插件", "1.0.0") @register("helloworld", "YourName", "一个简单的 Hello World 插件", "1.0.0")
class MyPlugin(Star): class MyPlugin(Star):
def __init__(self, context: Context): def __init__(self, context: Context):
super().__init__(context) super().__init__(context)
@filter.command("打打我的") @filter.command("打打我的")
async def dajiao(self, event: AstrMessageEvent): async def dajiao(self, event: AstrMessageEvent):
if isUserExist(event.get_sender_id()) != True: if isUserExist(event.get_sender_id()) != True:
@ -149,16 +148,16 @@ class MyPlugin(Star):
date = cur.fetchone() date = cur.fetchone()
baglist = json.loads(date[0]) baglist = json.loads(date[0])
baglist_str = "" baglist_str = ""
if len(baglist) == 0: if len(baglist["baglist"]) == 0:
baglist_str = "背包空空如也" baglist_str = "背包空空如也"
else: else:
for item in baglist: for item in baglist["baglist"]:
if Tool.get_tool_name(item["id"]) is None: if get_tool_name(item["id"]) is None:
cur.close() cur.close()
conn.close() conn.close()
yield event.plain_result(f"背包存在异常!") yield event.plain_result(f"背包存在异常!")
else: else:
baglist_str += f"{Tool.get_tool_name(item["id"])} x {item['num']}\n" baglist_str += f"{get_tool_name(item['id'])} x {item['num']}\n"
cur.close() cur.close()
conn.close() conn.close()
yield event.plain_result(f"背包列表:\n{baglist_str}") yield event.plain_result(f"背包列表:\n{baglist_str}")