Merge branch 'main' of http://49.235.115.212:3000/zw/iOSAI

# Conflicts:
#	.idea/workspace.xml
#	Module/FlaskService.py
#	Utils/AiUtils.py
#	tidevice_entry.py

Utils/AiUtils.py

@@ -459,3 +459,18 @@ class AiUtils(object):
                 return t
 
         return ""
+
+    # 检查字符串中是否包含中文
+    @classmethod
+    def contains_chinese(cls, text):
+        """
+        判断字符串中是否包含中文字符。
+        参数:
+            text (str): 要检测的字符串。
+
+        返回:
+            bool: 如果字符串中包含中文，返回 True；否则返回 False。
+        """
+        # 使用正则表达式匹配中文字符
+        pattern = re.compile(r'[\u4e00-\u9fff]')
+        return bool(pattern.search(text))

Utils/LogManager.py

@@ -1,85 +1,4 @@
-# import logging
-# import os
-# import sys
-# import shutil
-# from pathlib import Path
-#
-#
-# class LogManager:
-#     # 运行根目录：打包后取 exe 目录；源码运行取项目目录
-#     if getattr(sys, "frozen", False):
-#         projectRoot = os.path.dirname(sys.executable)
-#     else:
-#         projectRoot = os.path.dirname(os.path.dirname(__file__))
-#
-#     logDir = os.path.join(projectRoot, "log")
-#     _loggers = {}
-#
-#     @classmethod
-#     def _setupLogger(cls, udid, name, logName, level=logging.INFO):
-#         """创建或获取 logger，并绑定到文件"""
-#         deviceLogDir = os.path.join(cls.logDir, udid)
-#         os.makedirs(deviceLogDir, exist_ok=True)
-#         logFile = os.path.join(deviceLogDir, logName)
-#
-#         logger_name = f"{udid}_{name}"
-#         logger = logging.getLogger(logger_name)
-#         logger.setLevel(level)
-#
-#         # 避免重复添加 handler
-#         if not any(
-#             isinstance(h, logging.FileHandler) and h.baseFilename == os.path.abspath(logFile)
-#             for h in logger.handlers
-#         ):
-#             fileHandler = logging.FileHandler(logFile, mode="a", encoding="utf-8")
-#             formatter = logging.Formatter(
-#                 "%(asctime)s - %(name)s - %(levelname)s - %(message)s",
-#                 datefmt="%Y-%m-%d %H:%M:%S"
-#             )
-#             fileHandler.setFormatter(formatter)
-#             logger.addHandler(fileHandler)
-#
-#         return logger
-#
-#     @classmethod
-#     def info(cls, text, udid="system"):
-#         cls._setupLogger(udid, "infoLogger", "info.log", level=logging.INFO).info(f"[{udid}] {text}")
-#
-#     @classmethod
-#     def warning(cls, text, udid="system"):
-#         cls._setupLogger(udid, "warningLogger", "warning.log", level=logging.WARNING).warning(f"[{udid}] {text}")
-#
-#     @classmethod
-#     def error(cls, text, udid="system"):
-#         cls._setupLogger(udid, "errorLogger", "error.log", level=logging.ERROR).error(f"[{udid}] {text}")
-#
-#     # 清空日志
-#     @classmethod
-#     def clearLogs(cls):
-#         """启动时清空 log 目录下所有文件"""
-#         print("开始清空日志...")
-#
-#         # 关闭所有 handler
-#         for name, logger in logging.Logger.manager.loggerDict.items():
-#             if isinstance(logger, logging.Logger):
-#                 for handler in logger.handlers[:]:
-#                     try:
-#                         handler.close()
-#                     except Exception:
-#                         pass
-#                     logger.removeHandler(handler)
-#
-#         # 仅删除目录里的所有文件和子目录
-#         log_path = Path(cls.logDir)
-#         if log_path.exists():
-#             for item in log_path.iterdir():
-#                 if item.is_file():
-#                     item.unlink()
-#                 elif item.is_dir():
-#                     import shutil
-#                     shutil.rmtree(item)
-#
-#         print("日志清空完成")
+
 import datetime
 import io
 import logging
@@ -89,11 +8,8 @@ import sys
 import shutil
 import zipfile
 from pathlib import Path
-
 import requests
 
-import Entity.Variables
-
 
 class LogManager:
     # 运行根目录：打包后取 exe 目录；源码运行取项目目录
@@ -235,7 +151,6 @@ class LogManager:
     @classmethod
     def clearLogs(cls):
         """启动时清空 log 目录下所有文件"""
-        print("开始清空日志...")
 
         # 关闭所有 handler
         for name, logger in logging.Logger.manager.loggerDict.items():
@@ -258,13 +173,11 @@ class LogManager:
 
         # 清缓存
         cls._method_loggers.clear()
-        print("日志清空完成")
 
     @classmethod
     def upload_all_logs(cls, server_url, token, userId, tenantId):
         log_path = Path(cls.logDir)
         if not log_path.exists():
-            print("[upload_all_logs] 日志目录不存在")
             return False
 
         timestamp = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -286,20 +199,9 @@ class LogManager:
         files = {
             "file": (filename, io.BytesIO(zip_bytes), "application/zip")
         }
-        print(
-            f"[upload_all_logs] "
-            f"server={server_url} (type={type(server_url)}) "
-            f"tenantId={tenantId} (type={type(tenantId)}) "
-            f"userId={userId} (type={type(userId)}) "
-            f"token={token} (type={type(token)})"
-        )
 
-        print("开始上传")
         # 3) 上传
         resp = requests.post(server_url, headers=headers, data=data, files=files)
-        print(resp.text)
-        print("上传结束")
-
         if resp.json()['data']:
             return True
         return False