Merge branch 'dev-python' into dev-smartshooter5

python/api.py

@@ -300,7 +300,7 @@ async def handle_detail(request: Request, params: HandlerDetail):
                 ),  # 是否使用excel
                 "excel_path": params.excel_path,  # excel路径
                 "is_check_color_is_all": False,
-                "cutout_is_pass": False,
+                "cutout_is_pass": True,
                 "assigned_page_dict": {},
                 "detail_is_pass": False,
                 "upload_is_pass": False,

python/service/OnePicTest.py

@@ -61,7 +61,7 @@ class OnePicTest():
 
         # ==============生成主图====================
         main_out_path = r"{}\temp\pic_test\{}-主图.jpg".format(
-            os.getcwd(), os.path.splitext(file)[0]
+            os.getcwd(), os.path.splitext(file)[0], 
         )
         print("image_path", image_path)
         print("cut_image_path", cut_image_path)

python/service/generate_main_image/grenerate_main_image_test.py

@@ -577,7 +577,7 @@ class GeneratePic(object):
             image_bg = image_bg.resize(
                 (out_pic_size, out_pic_size), resample=settings.RESIZE_IMAGE_MODE
             )
-
+        print("图片保存格式", settings.OUT_PIC_MODE)
         if settings.OUT_PIC_MODE == ".jpg":
             if settings.OUT_PIC_QUALITY == "普通":
                 self.saver.save_image(
@@ -607,7 +607,10 @@ class GeneratePic(object):
         else:
             new_format = settings.OUT_PIC_MODE.split(".")[-1]
             self.saver.save_image(
-                image=image_bg, file_path=out_path, save_mode=new_format
+                image=image_bg,
+                file_path=out_path,
+                save_mode=new_format,
+                # _format=new_format,
             )
 
         if output_queue is not None:

python/service/remove_bg_ali.py

@@ -18,8 +18,8 @@ from func_timeout import FunctionTimedOut
 from .multi_threaded_image_saving import ImageSaver
 
 # 自己的
-AccessKeyId = 'LTAI5t7GVSbV5GuqUo935v4f'
-AccessKeySecret = 'IAe8CMw5PTp61zrV2rEYeLtKRVdL3A'
+AccessKeyId = "LTAI5tCk4p881X8hymj2FYFk"
+AccessKeySecret = "yBYIYzX8CL24r5ZgEx2AgZyDBmFkIK"
 
 # 惠利玛公司的KEY
 # AccessKeyId = 'LTAI5tCk4p881X8hymj2FYFk'