浏览代码

现有bug修复

rambo 4 月之前
父节点
当前提交
2d2b9747cd

+ 5 - 10
python/api.py

@@ -25,14 +25,6 @@ from service.base import check_move_goods_art_no_folder
 import hashlib
 import win32api, win32gui, win32con
 from win32gui import EnumWindows, GetWindowText
-
-
-# from service.AutoDealPics import AutoDealPics
-# for plugin in settings.plugins:
-#     module_path, class_name = plugin.rsplit(".", 1)
-#     print("module_path", module_path, class_name)
-#     module = importlib.import_module(module_path)
-#     getattr(module, class_name)
 def calculate_md5(filepath):
     # 打开文件,以二进制只读模式打开
     with open(filepath, "rb") as f:
@@ -315,6 +307,7 @@ async def handle_detail(request: Request, params: HandlerDetail):
     limit_path = "output/{}".format(
         time.strftime("%Y-%m-%d", time.localtime(time.time()))
     )
+    check_path(limit_path)
     # 该数组表示是否需要后面的移动文件夹操作,减少重复抠图,提升抠图时间和速度
     move_folder_array = check_move_goods_art_no_folder(
         "output", goods_art_no_arrays, limit_path
@@ -481,9 +474,11 @@ async def handle_detail(request: Request, params: HandlerDetail):
             handler_result.append(
                 {"goods_art_no": "", "success": False, "info": "处理失败"}
             )
+    except UnicornException as e:
+        handler_result_folder = ""
+        handler_result = e.msg
     except Exception as e:
-        print(e.__traceback__.tb_frame.f_globals["__file__"])   # 发生异常所在的文件
-        print(e.__traceback__.tb_lineno)                        # 发生异常所在的行数
+        handler_result_folder = ""
         handler_result.append({"goods_art_no": "", "success": False, "info": str(e)})
     return {
         "code": 0,

+ 1 - 1
python/config.ini

@@ -10,7 +10,7 @@ app_run=api:app
 # 端口号
 port=7074
 debug=false
-env=prod
+env=dev
 # 线程数
 works=5
 project=惠利玛

+ 0 - 0
python/service/__init__.py


+ 0 - 0
python/service/auto_deal_pics/__init__.py


+ 1 - 0
python/service/base.py

@@ -248,6 +248,7 @@ def check_move_goods_art_no_folder(path, goods_art_nos,limit_folder):
                 if not os.path.exists(f"{limit_folder}/{goods_art_no}"):
                     # 目标不存在
                     folder_list[goods_art_no] = folder_data
+                    print("移动目录", folder_data["folder_path"], limit_folder)
                     shutil.move(folder_data["folder_path"], limit_folder)
                 else:
                     # 如果希望覆盖

+ 0 - 0
python/service/generate_goods_art_no_table/__init__.py


+ 0 - 0
python/service/generate_goods_no_detail_pic/__init__.py


+ 0 - 0
python/service/generate_main_image/__init__.py


+ 0 - 0
python/service/jack_cloud.py


+ 0 - 0
python/service/manual_image_matching/__init__.py


+ 0 - 0
python/service/match_and_cutout_mode_control/__init__.py


+ 0 - 0
python/service/matching_photos/__init__.py


+ 0 - 0
python/service/online_request/__init__.py


+ 2 - 3
python/service/run_main.py

@@ -469,7 +469,7 @@ class RunMain():
                 return_data["data"]["config_data"]["success_handler"].append(
                     {
                         "goods_art_no": one_folder,
-                        "success": True,
+                        "success": False,
                         "info":f"文件夹:{one_folder} 找不到对应数据",
                     }
                 )
@@ -658,8 +658,7 @@ class RunMain():
         print("635  check_for_detail_first_call_back")
         print(data)
         if code != 0:
-            raise UnicornException(data["message"])
-            return False
+            raise UnicornException(config_data["success_handler"])
 
         do_next = False
         if data["message"]: