feat

fix  minio and s3

app/service/utils/oss_client.py

@@ -15,8 +15,8 @@ logger = logging.getLogger()
 
 #  获取图片
 def oss_get_image(bucket, object_name, data_type):
+    # cv2 默认全通道读取
     image_object = None
-
     try:
         if OSS == "minio":
             oss_client = Minio(MINIO_URL, access_key=MINIO_ACCESS, secret_key=MINIO_SECRET, secure=MINIO_SECURE)
@@ -24,11 +24,10 @@ def oss_get_image(bucket, object_name, data_type):
         else:
             oss_client = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME)
             image_data = oss_client.get_object(Bucket=bucket, Key=object_name)['Body']
-
         if data_type == "cv2":
             image_bytes = image_data.read()
             image_array = np.frombuffer(image_bytes, np.uint8)  # 转成8位无符号整型
-            image_object = cv2.imdecode(image_array, cv2.IMREAD_COLOR)
+            image_object = cv2.imdecode(image_array, cv2.IMREAD_UNCHANGED)
         else:
             data_bytes = BytesIO(image_data.read())
             image_object = Image.open(data_bytes)
@@ -56,11 +55,12 @@ if __name__ == '__main__':
     # url = "aida-collection-element/11523/Moodboard/f60af0d2-94c2-48f9-90ff-74b8e8a481b5.jpg"
     # url = "aida-sys-image/images/female/outwear/0628000054.jpg"
     # url = "aida-users/89/product_image/string-89.png"
-    # url = "aida-users/89/single_logo/123-89.png"
+    url = "aida-users/89/single_logo/123-89.png"
     # url = 'aida-users/89/relight_image/123-89.png'
     # url = 'aida-users/89/relight_image/123-89.png'
-    url = 'aida-users/89/relight_image/123-89.png'
-    read_type = "PIL"
+    # url = 'aida-users/89/relight_image/123-89.png'
+    # url = "aida-users/89/sketchboard/female/Dress/e6724ab7-8d3f-4677-abe0-c3e42ab7af85.jpeg"
+    read_type = "cv2"
     if read_type == "cv2":
         img = oss_get_image(bucket=url.split('/')[0], object_name=url[url.find('/') + 1:], data_type=read_type)
         cv2.imshow("", img)