Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2025-12-15 14:22:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

🐛 修复商店商品为空时报错 (#1634)

Browse Source
This commit is contained in:
HibiKier 2024-09-16 21:17:09 +08:00 committed by GitHub
parent 60f4406ec1
commit fcfaf56021
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zhenxun/builtin_plugins/shop/_data_source.py
View File

@ -633,7 +633,7 @@ class ShopManage:
# await A.apaste(bk, (0, current_h), True) # await A.apaste(bk, (0, current_h), True)
# current_h += 90 # current_h += 90
current_h = 0 current_h = 0
h = sum(img.height + 10 for img in image_list) h = sum(img.height + 10 for img in image_list) or 400
A = BuildImage(1100, h, color="#f9f6f2") A = BuildImage(1100, h, color="#f9f6f2")
for img in image_list: for img in image_list:
await A.paste(img, (0, current_h)) await A.paste(img, (0, current_h))

24
zhenxun/builtin_plugins/web_ui/api/tabs/database/__init__.py
View File

@ -1,16 +1,16 @@
import nonebot import nonebot
from fastapi import APIRouter, Request
from nonebot.drivers import Driver
from tortoise import Tortoise from tortoise import Tortoise
from nonebot.drivers import Driver
from fastapi import Request, APIRouter
from tortoise.exceptions import OperationalError from tortoise.exceptions import OperationalError
from zhenxun.models.plugin_info import PluginInfo
from zhenxun.models.task_info import TaskInfo from zhenxun.models.task_info import TaskInfo
from zhenxun.models.plugin_info import PluginInfo
from ....base_model import BaseResultModel, QueryModel, Result
from ....utils import authentication
from .models.model import SqlModel, SqlText
from .models.sql_log import SqlLog from .models.sql_log import SqlLog
from ....utils import authentication
from .models.model import SqlText, SqlModel
from ....base_model import Result, QueryModel, BaseResultModel
router = APIRouter(prefix="/database") router = APIRouter(prefix="/database")
@ -24,7 +24,8 @@ SQL_DICT = {}
SELECT_TABLE_SQL = """ SELECT_TABLE_SQL = """
select a.tablename as name,d.description as desc from pg_tables a select a.tablename as name,d.description as desc from pg_tables a
left join pg_class c on relname=tablename left join pg_class c on relname=tablename
left join pg_description d on oid=objoid and objsubid=0 where a.schemaname = 'public' left join pg_description d on oid=objoid
and objsubid=0 where a.schemaname = 'public'
""" """
SELECT_TABLE_COLUMN_SQL = """ SELECT_TABLE_COLUMN_SQL = """
@ -57,10 +58,7 @@ async def _():
module2name = {r[0]: r[1] for r in result} module2name = {r[0]: r[1] for r in result}
for s in SQL_DICT: for s in SQL_DICT:
module = SQL_DICT[s].module module = SQL_DICT[s].module
if module in module2name: SQL_DICT[s].name = module2name.get(module, module)
SQL_DICT[s].name = module2name[module]
else:
SQL_DICT[s].name = module
@router.get( @router.get(
@ -77,7 +75,7 @@ async def _() -> Result:
) )
async def _(table_name: str) -> Result: async def _(table_name: str) -> Result:
db = Tortoise.get_connection("default") db = Tortoise.get_connection("default")
print(SELECT_TABLE_COLUMN_SQL.format(table_name)) # print(SELECT_TABLE_COLUMN_SQL.format(table_name))
query = await db.execute_query_dict(SELECT_TABLE_COLUMN_SQL.format(table_name)) query = await db.execute_query_dict(SELECT_TABLE_COLUMN_SQL.format(table_name))
return Result.ok(query) return Result.ok(query)
@ -92,7 +90,7 @@ async def _(sql: SqlText, request: Request) -> Result:
await SqlLog.add(ip or "0.0.0.0", sql.sql, "") await SqlLog.add(ip or "0.0.0.0", sql.sql, "")
return Result.ok(res, "执行成功啦!") return Result.ok(res, "执行成功啦!")
else: else:
result = await TestSQL.raw(sql.sql) result = await TaskInfo.raw(sql.sql)
await SqlLog.add(ip or "0.0.0.0", sql.sql, str(result)) await SqlLog.add(ip or "0.0.0.0", sql.sql, str(result))
return Result.ok(info="执行成功啦!") return Result.ok(info="执行成功啦!")
except OperationalError as e: except OperationalError as e: