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

app/service/design_batch/design_batch_celery.py

@@ -4,7 +4,7 @@ import threading
 from celery import Celery
 from minio import Minio
 
-from app.core.config import *
+from app.core.config import settings
 from app.service.design_batch.item import BodyItem, TopItem, BottomItem, OthersItem
 from app.service.design_batch.utils.MQ import publish_status
 from app.service.design_batch.utils.organize import organize_body, organize_clothing, organize_others
@@ -12,12 +12,12 @@ from app.service.design_batch.utils.save_json import oss_upload_json
 from app.service.design_batch.utils.synthesis_item import update_base_size_priority, synthesis, synthesis_single
 
 id_lock = threading.Lock()
-celery_app = Celery('tasks', broker=f'amqp://rabbit:123456@18.167.251.121:5672//', backend='rpc://', BROKER_CONNECTION_RETRY_ON_STARTUP=True)
+celery_app = Celery('tasks', broker=f'amqp://{settings.MQ_USERNAME}:{settings.MQ_PASSWORD}@{settings.MQ_HOST}:{settings.MQ_PORT}//', backend='rpc://')
 celery_app.conf.worker_log_format = '%(asctime)s %(filename)s [line:%(lineno)d] %(levelname)s %(message)s'
 celery_app.conf.worker_hijack_root_logger = False
 logging.getLogger('pika').setLevel(logging.WARNING)
 logger = logging.getLogger()
-minio_client = Minio(MINIO_URL, access_key=MINIO_ACCESS, secret_key=MINIO_SECRET, secure=MINIO_SECURE)
+minio_client = Minio(settings.MINIO_URL, access_key=settings.MINIO_ACCESS, secret_key=settings.MINIO_SECRET, secure=settings.MINIO_SECURE)
 
 print("start")
 
@@ -51,10 +51,12 @@ def process_layer(item, layers):
         front_layer, back_layer = organize_others(item)
         layers.append(front_layer)
         layers.append(back_layer)
+        return None
     else:
         front_layer, back_layer = organize_clothing(item)
         layers.append(front_layer)
         layers.append(back_layer)
+        return None
 
 
 @celery_app.task
@@ -76,12 +78,11 @@ def batch_design(objects_data, tasks_id, json_name):
             for item in object['items']:
                 item_results.append(process_item(item, basic))
             layers = []
-            body_size = None
             for item in item_results:
-                body_size = process_layer(item, layers)
+                process_layer(item, layers)
             layers = sorted(layers, key=lambda s: s.get("priority", float('inf')))
 
-            layers, new_size = update_base_size_priority(layers, body_size)
+            layers, new_size = update_base_size_priority(layers)
 
             for lay in layers:
                 items_response['layers'].append({