Commit 33d3bdf5 authored by 邱阿朋's avatar 邱阿朋

refactor(vc): 重构 RabbitMQ 连接和关闭逻辑

- 在 payment.py、payment_push.py、return_goods.py 和 spa.py 中添加 rabbit.connection() 调用- 在完成消息发送后添加 rabbit.close() 调用
- 修改 rabbitmq.py 中的 connection 方法,用于初始化连接和通道
parent 4d3149db
...@@ -23,9 +23,7 @@ class RabbitMQClient: ...@@ -23,9 +23,7 @@ class RabbitMQClient:
self.queue = None self.queue = None
self.routing_key = None self.routing_key = None
self._initialize_connection() def connection(self):
def _initialize_connection(self):
"""初始化连接和通道""" """初始化连接和通道"""
try: try:
credentials = pika.PlainCredentials(self.username, self.password) credentials = pika.PlainCredentials(self.username, self.password)
......
...@@ -391,6 +391,7 @@ class Payment(AutoInterface): ...@@ -391,6 +391,7 @@ class Payment(AutoInterface):
excel.save_xls(price_pay_summary, new_file_name, "Price导出明细") excel.save_xls(price_pay_summary, new_file_name, "Price导出明细")
def push_data_queue(self): def push_data_queue(self):
rabbit.connection()
rabbit.connect(queue='refund_robot', routing_key='refund_robot', exchange='reports') rabbit.connect(queue='refund_robot', routing_key='refund_robot', exchange='reports')
data = pd.read_excel(self.result_file_name, keep_default_na=False, na_values=[]) data = pd.read_excel(self.result_file_name, keep_default_na=False, na_values=[])
...@@ -411,3 +412,5 @@ class Payment(AutoInterface): ...@@ -411,3 +412,5 @@ class Payment(AutoInterface):
# 推送数据 # 推送数据
rabbit.send_message(push_data) rabbit.send_message(push_data)
rabbit.close()
\ No newline at end of file
...@@ -49,6 +49,7 @@ class PaymentPush(AutoInterface): ...@@ -49,6 +49,7 @@ class PaymentPush(AutoInterface):
log.info(f"共计:{len(invoices)} 订单") log.info(f"共计:{len(invoices)} 订单")
rabbit.connection()
rabbit.connect(queue='refund_robot', routing_key='refund_robot', exchange='reports') rabbit.connect(queue='refund_robot', routing_key='refund_robot', exchange='reports')
i = 0 i = 0
...@@ -74,4 +75,6 @@ class PaymentPush(AutoInterface): ...@@ -74,4 +75,6 @@ class PaymentPush(AutoInterface):
} }
# 推送数据 # 推送数据
rabbit.send_message(push_data) rabbit.send_message(push_data)
\ No newline at end of file
rabbit.close()
...@@ -7,7 +7,7 @@ import pandas as pd ...@@ -7,7 +7,7 @@ import pandas as pd
from DrissionPage.errors import ElementNotFoundError from DrissionPage.errors import ElementNotFoundError
from app.helper import domain, api, excel, rabbitmq, file from app.helper import domain, api, excel, rabbitmq, file
from app.vc import log from app.vc import log, rabbit
from app.vc.interface import AutoInterface from app.vc.interface import AutoInterface
from DrissionPage import ChromiumPage as Page from DrissionPage import ChromiumPage as Page
...@@ -97,7 +97,7 @@ class ReturnGoods(AutoInterface): ...@@ -97,7 +97,7 @@ class ReturnGoods(AutoInterface):
excel.save_xls(new_list_data, self.result_file_name) excel.save_xls(new_list_data, self.result_file_name)
def push_data_queue(self): def push_data_queue(self):
rabbit = rabbitmq.RabbitMQClient() rabbit.connection()
rabbit.connect(queue='return_robot', routing_key='return_robot', exchange='reports') rabbit.connect(queue='return_robot', routing_key='return_robot', exchange='reports')
data = pd.read_excel(self.result_file_name, keep_default_na=False, na_values=[]) data = pd.read_excel(self.result_file_name, keep_default_na=False, na_values=[])
...@@ -120,3 +120,5 @@ class ReturnGoods(AutoInterface): ...@@ -120,3 +120,5 @@ class ReturnGoods(AutoInterface):
# 推送数据 # 推送数据
rabbit.send_message(push_data) rabbit.send_message(push_data)
rabbit.close()
\ No newline at end of file
...@@ -8,7 +8,7 @@ from datetime import datetime ...@@ -8,7 +8,7 @@ from datetime import datetime
from urllib.parse import urlparse, parse_qs from urllib.parse import urlparse, parse_qs
from DrissionPage import ChromiumPage as Page from DrissionPage import ChromiumPage as Page
from DrissionPage.errors import ElementNotFoundError from DrissionPage.errors import ElementNotFoundError
from app.vc import log from app.vc import log, rabbit
from app.vc.interface import AutoInterface from app.vc.interface import AutoInterface
from app.helper import domain, file, excel, rabbitmq, api from app.helper import domain, file, excel, rabbitmq, api
...@@ -197,7 +197,7 @@ class Spa(AutoInterface): ...@@ -197,7 +197,7 @@ class Spa(AutoInterface):
log.info(f"文件 {new_file_name} 保存完成,路径:{os.path.abspath(new_file_name)}") log.info(f"文件 {new_file_name} 保存完成,路径:{os.path.abspath(new_file_name)}")
def push_data_queue(self): def push_data_queue(self):
rabbit = rabbitmq.RabbitMQClient() rabbit.connection()
rabbit.connect(queue='spa_robot', routing_key='spa_robot', exchange='reports') rabbit.connect(queue='spa_robot', routing_key='spa_robot', exchange='reports')
log.info("开始读取数据....") log.info("开始读取数据....")
data_dict = pd.read_excel(self.result_file_name, sheet_name=None, keep_default_na=False, na_values=[]) data_dict = pd.read_excel(self.result_file_name, sheet_name=None, keep_default_na=False, na_values=[])
...@@ -227,6 +227,8 @@ class Spa(AutoInterface): ...@@ -227,6 +227,8 @@ class Spa(AutoInterface):
# 推送数据 # 推送数据
rabbit.send_message(push_data) rabbit.send_message(push_data)
rabbit.close()
def run(self, file_name: str): def run(self, file_name: str):
# 获取数据 # 获取数据
relation_data = api.sku_relations(self.country) # 获取 ASIN 与 SKU 的对应关系数据 relation_data = api.sku_relations(self.country) # 获取 ASIN 与 SKU 的对应关系数据
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment