Merge branch 'dev-python'

python/service/OnePicTest.py

@@ -60,8 +60,8 @@ class OnePicTest():
         remove_pic_ins.get_image_cut(file_path=image_path, out_file_path=cut_image_path)
 
         # ==============生成主图====================
-        main_out_path = r"{}\temp\pic_test\{}-主图{}".format(
-            os.getcwd(), os.path.splitext(file)[0], settings.OUT_PIC_MODE
+        main_out_path = r"{}\temp\pic_test\{}-主图.jpg".format(
+            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

@@ -610,7 +610,7 @@ class GeneratePic(object):
                 image=image_bg,
                 file_path=out_path,
                 save_mode=new_format,
-                _format=new_format,
+                # _format=new_format,
             )
 
         if output_queue is not None: