diff --git a/app/schemas/design.py b/app/schemas/design.py index 98d0a29..3fb6de7 100644 --- a/app/schemas/design.py +++ b/app/schemas/design.py @@ -10,6 +10,7 @@ class DesignStreamModel(BaseModel): objects: list[dict] process_id: str requestId: str + callback_url: str class DesignProgressModel(BaseModel): diff --git a/app/service/design_fast/design_generate.py b/app/service/design_fast/design_generate.py index 10b5e9e..eb0b8f9 100644 --- a/app/service/design_fast/design_generate.py +++ b/app/service/design_fast/design_generate.py @@ -145,10 +145,11 @@ def design_generate(request_data): @RunTime def design_generate_v2(request_data): objects_data = request_data.dict()['objects'] + callback_url = request_data.callback_url request_id = request_data.requestId threads = [] - def process_object(step, object): + def process_object(step, object, callback_url): basic = object['basic'] items_response = { 'layers': [], @@ -211,12 +212,8 @@ def design_generate_v2(request_data): }) items_response['synthesis_url'] = synthesis_single(item_result['front_image'], item_result['back_image']) # 发送结果给java端 - url = JAVA_STREAM_API_URL - xu_pei_test_url = "https://137f6b5c3490.ngrok-free.app/api/third/party/receiveDesignResults" - tianxaing_test_url = "https://d7436c137fb9.ngrok-free.app/api/third/party/receiveDesignResults" + url = callback_url logger.info(f"java 回调 -> {url}") - logger.info(f"xupei java 回调 -> {xu_pei_test_url}") - logger.info(f"tianxiang java 回调 -> {tianxaing_test_url}") headers = { 'Accept': "*/*", @@ -231,17 +228,8 @@ def design_generate_v2(request_data): # 打印结果 logger.info(response.text) - test_xp_response = post_request(xu_pei_test_url, json_data=items_response, headers=headers) - test_response = post_request(tianxaing_test_url, json_data=items_response, headers=headers) - - if test_response: - # 打印结果 - logger.info(f"tianxiang test response : {test_response.text}") - if test_xp_response: - logger.info(f"xupei test response : {test_xp_response.text}") - for step, object in enumerate(objects_data): - t = threading.Thread(target=process_object, args=(step, object)) + t = threading.Thread(target=process_object, args=(step, object, callback_url)) threads.append(t) t.start()