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

app/service/design_fast/design_generate.py

@@ -5,7 +5,7 @@ import time
 import requests
 from minio import Minio
 
-from app.core.config import *
+from app.core.config import settings
 from app.service.design_fast.item import BodyItem, TopItem, BottomItem, OthersItem
 from app.service.design_fast.utils.organize import organize_body, organize_clothing, organize_others
 from app.service.design_fast.utils.progress import final_progress, update_progress
@@ -16,7 +16,7 @@ id_lock = threading.Lock()
 
 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)
 
 
 def process_item(item, basic):
@@ -48,10 +48,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
 
 
 @RunTime
@@ -73,12 +75,11 @@ def design_generate(request_data):
             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)
             # pattern_overall_image_url 、 pattern_print_image_url
             for lay in layers:
                 items_response['layers'].append({
@@ -149,7 +150,7 @@ def design_generate_v2(request_data):
     request_id = request_data.requestId
     threads = []
 
-    def process_object(step, object, callback_url):
+    def process_object(object, callback_url):
         basic = object['basic']
         items_response = {
             'layers': [],
@@ -161,12 +162,11 @@ def design_generate_v2(request_data):
             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({
@@ -229,7 +229,7 @@ def design_generate_v2(request_data):
             logger.info(response.text)
 
     for step, object in enumerate(objects_data):
-        t = threading.Thread(target=process_object, args=(step, object, callback_url))
+        t = threading.Thread(target=process_object, args=(object, callback_url))
         threads.append(t)
         t.start()