From 29e21caf3f6517cb97d89c8172dbd0c209b27b3a Mon Sep 17 00:00:00 2001
From: chenwj <654891551@qq.com>
Date: Tue, 17 Jan 2023 15:37:35 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93=E6=93=8D=E4=BD=9C=E5=AF=B9=E8=B1=A1=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/biz/__init__.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/biz/__init__.py b/src/biz/__init__.py
index ccca6ff..9cbe673 100644
--- a/src/biz/__init__.py
+++ b/src/biz/__init__.py
@@ -33,7 +33,7 @@ class DB:
         temp_sql = "\n".join([l.strip() for l in temp_sql.split("\n")])
 
         # 用于输出日志
-        log_string = "执行SQL: {}\n参数: {}".format(temp_sql.strip(), str(kwargs)[:400])
+        log_string = f"执行SQL: {temp_sql.strip()}\n参数: {str(kwargs)[:400]}"
         t = time.time()
         try:
             pars = dict(**kwargs)
@@ -45,14 +45,14 @@ class DB:
             if orig.args[0] in [111, 1205, 1213, 2003, 2013]:
                 raise
             if orig.args[0] == 1044:
-                logger.error("(pymysql.err.OperationalError) (1044, Access denied for {})".format(self.session.bind.url))
+                logger.error(f"(pymysql.err.OperationalError) (1044, Access denied for {self.session.bind.url})")
                 logger.error(format_exc())
                 raise
-            log_string += "\n执行结果:\n 执行失败了 ,错误信息:" + str(e)
+            log_string += f"\n执行结果:\n 执行失败了 ,错误信息:{e}"
             logger.error(log_string)
             raise
         except Exception as e:
-            log_string += "\n执行结果:\n 执行失败了 ,错误信息:" + str(e)
+            log_string += f"\n执行结果:\n 执行失败了 ,错误信息:{e}"
             logger.error(log_string)
             raise
         finally:
@@ -61,12 +61,12 @@ class DB:
         self.rowcount = self.result.rowcount
         # 插入数据时返回的主键数据
         self.lastrowid = self.result.lastrowid
-        logger.debug("执行结果:\n 受影响行数:%d" % self.rowcount)
+        logger.debug(f"执行结果:\n 受影响行数:{self.rowcount}")
         return self
 
     def all(self):
         # 获取查询列表。把ResultProxy和RowProxy类型封装成python的list和dict类型
-        data = [ i._asdict() for i in self.result]
+        data = [dict(zip(i.keys(), i.values())) for i in self.result]
         self.result.close()
         return data
 
@@ -92,7 +92,7 @@ class DB:
         row = None
         # 获取第一行数据
         for i in self.result:
-            row = i._asdict()
+            row = dict(zip(i.keys(), i.values()))
             break
         self.result.close()
         return row