From e604ede0391b0353307374b79eecffb685492033 Mon Sep 17 00:00:00 2001
From: zhouchengrong <Zchengrong@yeah.net>
Date: Mon, 17 Jun 2024 11:00:04 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=20=E6=9B=B4=E6=96=B0=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/items/pipelines/painting.py        |   4 ++--
 app/service/design/utils/synthesis_item.py    |  14 +++++++-------
 app/service/design/utils/upload_image.py      |   4 ++--
 .../generate_image/utils/upload_sd_image.py   |   4 ++--
 requirements.txt                              | Bin 1246 -> 1266 bytes
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/service/design/items/pipelines/painting.py b/app/service/design/items/pipelines/painting.py
index 43b42e4..6d88411 100644
--- a/app/service/design/items/pipelines/painting.py
+++ b/app/service/design/items/pipelines/painting.py
@@ -1,6 +1,6 @@
 import random
 from io import BytesIO
-import boto3
+# import boto3
 import cv2
 import numpy as np
 from PIL import Image
@@ -15,7 +15,7 @@ minio_client = Minio(
     secret_key=MINIO_SECRET,
     secure=MINIO_SECURE)
 
-s3 = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME)
+# s3 = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME)
 
 
 @PIPELINES.register_module()
diff --git a/app/service/design/utils/synthesis_item.py b/app/service/design/utils/synthesis_item.py
index 0cf844b..e6a2f25 100644
--- a/app/service/design/utils/synthesis_item.py
+++ b/app/service/design/utils/synthesis_item.py
@@ -11,7 +11,7 @@ import io
 import logging
 import time
 
-import boto3
+# import boto3
 import cv2
 import numpy as np
 from PIL import Image
@@ -27,12 +27,12 @@ minio_client = Minio(
     secret_key=MINIO_SECRET,
     secure=MINIO_SECURE)
 
-s3 = boto3.client(
-    's3',
-    aws_access_key_id=S3_ACCESS_KEY,
-    aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY,
-    region_name=S3_REGION_NAME
-)
+# s3 = boto3.client(
+#     's3',
+#     aws_access_key_id=S3_ACCESS_KEY,
+#     aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY,
+#     region_name=S3_REGION_NAME
+# )
 
 
 def positioning(all_mask_shape, mask_shape, offset):
diff --git a/app/service/design/utils/upload_image.py b/app/service/design/utils/upload_image.py
index 70b259c..2142126 100644
--- a/app/service/design/utils/upload_image.py
+++ b/app/service/design/utils/upload_image.py
@@ -11,7 +11,7 @@ import io
 import logging
 import time
 
-import boto3
+# import boto3
 import cv2
 from minio import Minio
 
@@ -25,7 +25,7 @@ minio_client = Minio(
     secure=MINIO_SECURE)
 
 """S3 上传"""
-s3 = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME)
+# s3 = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME)
 
 
 
diff --git a/app/service/generate_image/utils/upload_sd_image.py b/app/service/generate_image/utils/upload_sd_image.py
index 2773aa2..ec476f9 100644
--- a/app/service/generate_image/utils/upload_sd_image.py
+++ b/app/service/generate_image/utils/upload_sd_image.py
@@ -10,7 +10,7 @@
 import io
 import logging
 
-import boto3
+# import boto3
 import cv2
 from PIL import Image
 from minio import Minio
@@ -18,7 +18,7 @@ from minio import Minio
 from app.core.config import *
 
 minio_client = Minio(MINIO_URL, access_key=MINIO_ACCESS, secret_key=MINIO_SECRET, secure=MINIO_SECURE)
-s3 = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME)
+# s3 = boto3.client('s3', aws_access_key_id=S3_ACCESS_KEY, aws_secret_access_key=S3_AWS_SECRET_ACCESS_KEY, region_name=S3_REGION_NAME)
 
 
 # def upload_single_logo(image, user_id, category, object_name):
diff --git a/requirements.txt b/requirements.txt
index a203fe52a4c8468fb97bf5c8c626c4b12f72e398..1e4ee61b3ae308e66ad8ac8b2039262e18aa6547 100644
GIT binary patch
delta 32
mcmcb|`H6GG875&{23rP020aF21`{A@$Y8`^zWFqhFcScZ{s$2N

delta 12
Tcmeywd5?3$8K%t-n1q-BCl3V*