feat : 代码梳理 移除所有敏感密钥 通过环境变量方式配置

app/service/design_batch/utils/synthesis_item.py

@@ -13,9 +13,12 @@ import logging
 import cv2
 import numpy as np
 from PIL import Image
-
+from minio import Minio
+from app.core.config import settings
 from app.service.utils.generate_uuid import generate_uuid
-from app.service.utils.oss_client import oss_upload_image
+from app.service.utils.new_oss_client import oss_upload_image
+
+minio_client = Minio(settings.MINIO_URL, access_key=settings.MINIO_ACCESS, secret_key=settings.MINIO_SECRET, secure=settings.MINIO_SECURE)
 
 
 def positioning(all_mask_shape, mask_shape, offset):
@@ -136,7 +139,7 @@ def synthesis(data, size, basic_info):
         image_bytes = image_data.read()
         bucket_name = "aida-results"
         object_name = f'result_{generate_uuid()}.png'
-        req = oss_upload_image(bucket=bucket_name, object_name=object_name, image_bytes=image_bytes)
+        oss_upload_image(oss_client=minio_client, bucket=bucket_name, object_name=object_name, image_bytes=image_bytes)
         return f"{bucket_name}/{object_name}"
         # return f"aida-results/{minio_client.put_object('aida-results', f'result_{generate_uuid()}.png', io.BytesIO(image_bytes), len(image_bytes), content_type='image/png').object_name}"
 
@@ -177,11 +180,11 @@ def synthesis_single(front_image, back_image):
     # oss upload
     bucket_name = 'aida-results'
     object_name = f'result_{generate_uuid()}.png'
-    req = oss_upload_image(bucket=bucket_name, object_name=object_name, image_bytes=image_bytes)
+    oss_upload_image(oss_client=minio_client, bucket=bucket_name, object_name=object_name, image_bytes=image_bytes)
     return f"{bucket_name}/{object_name}"
 
 
-def update_base_size_priority(layers, size):
+def update_base_size_priority(layers):
     # 计算透明背景图片的宽度
     min_x = min(info['position'][1] for info in layers)
     x_list = []