11

core/JX3Function.py

@@ -2,8 +2,8 @@ from datetime import datetime
 
 from astrbot.api import logger
 
-from .class_reqsest import APIClient
-from .cless_mysql import AsyncMySQL
+from .APIClient import APIClient
+from .AsyncMySQL import AsyncMySQL
 from .function_basic import load_template,extract_field,flatten_field,extract_fields,gold_to_string,plot_line_chart_base64
 
 class JX3Function:

core/WZRYFunction.py

@@ -2,8 +2,8 @@ from datetime import datetime
 import base64
 from astrbot.api import logger
 
-from .class_reqsest import APIClient
-from .cless_mysql import AsyncMySQL
+from .APIClient import APIClient
+from .AsyncMySQL import AsyncMySQL
 from .function_basic import load_template,extract_field,flatten_field,extract_fields,gold_to_string,plot_line_chart_base64
 
 class WZRYFunction:
@@ -95,7 +95,7 @@ class WZRYFunction:
         # 需要提取的字段
         fields = ["gametime","killcnt","deadcnt","assistcnt","gameresult","mvpcnt","losemvp","mapName",
                   "oldMasterMatchScore","newMasterMatchScore","usedTime","winNum","failNum","roleJobName","stars","desc",
-                  "gradeGame","heroIcon","godLikeCnt", "firstBlood","hero1TripleKillCnt","hero1UltraKillCnt","hero1RampageCnt"]
+                  "gradeGame","heroIcon","godLikeCnt", "firstBlood","hero1TripleKillCnt","hero1UltraKillCnt","hero1RampageCnt","evaluateUrlV3","mvpUrlV3"]
         # 处理返回数据
         try:
             # 获取数据
@@ -103,22 +103,22 @@ class WZRYFunction:
             if not data:
                 return_data["msg"] = "获取接口信息失败"
                 return  return_data   
+            # 提取字段
             result = extract_fields(data["list"], fields)
-            result = result[:20]
+            result = result[:25]
             # 数据处理
             for m in result:
                 minutes = m["usedTime"] // 60
                 seconds = m["usedTime"] % 60
                 m["time_str"] = f"{minutes}:{seconds:02d}"
                 
-            return_data["data"] = result
-               
+            return_data["data"] = result  
         except Exception as e:
             logger.error(f"处理数据时出错: {e}")
             return_data["msg"] = "处理接口返回信息时出错"
         # 加载模板
         try:
-            return_data["temp"] = load_template("temp_test.html")
+            return_data["temp"] = load_template("wangzhezhanji.html")
         except FileNotFoundError as e:
             logger.error(f"加载模板失败: {e}")
             return_data["msg"] = "系统错误：模板文件不存在"
@@ -126,41 +126,37 @@ class WZRYFunction:
         return_data["code"] = 200       
         return return_data
 
-    async def ziliao(self,name: str):
-        """
-        资料查询
-        """
+    async def ziliao(self, name: str):
         return_data = {
             "code": 0,
             "msg": "功能函数未执行",
             "data": {}
         }
-        #id查询
-        sql = "SELECT id FROM wzydid WHERE name = %s or id = %s"
-        sqlid = await self.__db.fetch_one(sql, (name,name)) 
-        #在配置文件中获取接口配置
+        # 查询 ID
+        sql_id = await self._SELECT_ID(name)
+        
+        if sql_id is None:
+            return_data["msg"] = "未查询到该用户，请确认输入正确的昵称或营地ID"
+            return return_data
         api_config = self.__api_config["wzry_ziliao"]
-        #更新参数
-        api_config["params"]["id"] = sqlid["id"]
-        # 处理返回数据
+        api_config["params"]["id"] = sql_id
+
         try:
-            # 获取数据
-            data = await self.__api.get(api_config["url"],api_config["params"])        
-            if not data:
-                return_data["msg"] = "获取接口信息失败"
-                return  return_data   
-            # 数据处理
-            return_data["data"]["img_base64"] = base64.b64encode(data).decode('utf-8')
-               
+            data = await self.__api.get(api_config["url"], api_config["params"])
+            # 转 base64
+            return_data["data"]["img_base64"] = base64.b64encode(data).decode("utf-8")
+            return_data["code"] = 200
+
         except Exception as e:
             logger.error(f"处理数据时出错: {e}")
             return_data["msg"] = "处理接口返回信息时出错"
+
         # 加载模板
         try:
             return_data["temp"] = load_template("wzry_zl.html")
-        except FileNotFoundError as e:
-            logger.error(f"加载模板失败: {e}")
+        except FileNotFoundError:
+            logger.error(f"加载模板失败")
             return_data["msg"] = "系统错误：模板文件不存在"
-            return return_data   
-        return_data["code"] = 200       
+
         return return_data
+