From 8a2c65d76ecc3773b4d34f93a3d4d3f9e26c9666 Mon Sep 17 00:00:00 2001 From: z66 <1415243231@qq.com> Date: Tue, 11 Nov 2025 09:21:00 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=AD=E7=BA=A6=E5=BE=85=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back_ground_module/common_module.py | 3 +- .../revisit_renew_services_90_120_180.py | 1 + config.py | 8 +- test/result.json | 191 ++++++++++++++++++ test/yida_xuyuedaiban_paifa.py | 1 + test/续约待办派发.py | 28 --- 6 files changed, 195 insertions(+), 37 deletions(-) create mode 100644 test/result.json diff --git a/back_ground_module/common_module.py b/back_ground_module/common_module.py index 12fa813..8f4b862 100644 --- a/back_ground_module/common_module.py +++ b/back_ground_module/common_module.py @@ -25,7 +25,6 @@ class CommonModule: # 创建一个存储日期的集合，用于去重 self.date_set = set() self.conn = Config.CONN_INFO - self.renewal_conn = Config.CONN_INFO_RENEWAL def time_to_UTC(self, time_input): """ @@ -180,7 +179,7 @@ class CommonModule: """ try: # 获得连接 - conn = psycopg2.connect(**self.renewal_conn) + conn = psycopg2.connect(**self.conn) cursor = conn.cursor() # 获取指定天数前的日期 diff --git a/back_ground_module/revisit_renew_services_90_120_180.py b/back_ground_module/revisit_renew_services_90_120_180.py index 24dae6a..4d05e04 100644 --- a/back_ground_module/revisit_renew_services_90_120_180.py +++ b/back_ground_module/revisit_renew_services_90_120_180.py @@ -278,6 +278,7 @@ class RenewServicesRevisit: # 处理字符串数据并显式指定数据类型 data_NGV = data_NGV.apply(replace_values) + # 针对公司主店过期，取公司最高等级版本派发 # 过滤多公司 data_NGV = data_NGV[~data_NGV['id_own_group'].isin(all_filter_company_list)] diff --git a/config.py b/config.py index c169270..fc2110f 100644 --- a/config.py +++ b/config.py @@ -13,13 +13,7 @@ class Config: "port": "80" } # SaaS-NGV 数据库链接配置-postgresql - CONN_INFO_RENEWAL = { - "database": "f6_bi", - "user": "LTAI5tMJsijFA9BS1R6uBpUT", - "password": "PajEQMIRWNRcipd8mYvlud2KHWJr6N", - "host": "hgpostcn-cn-m1e4gikbu00l-cn-shanghai.hologres.aliyuncs.com", - "port": "80" - } # 续约回访数据库链接配置-postgresql + HS_DB_Config = { 'host': "f6-public.rwlb.rds.aliyuncs.com", diff --git a/test/result.json b/test/result.json new file mode 100644 index 0000000..f8d6f46 --- /dev/null +++ b/test/result.json @@ -0,0 +1,191 @@ +{ + "code": 200, + "data": { + "franchiseGroupInfo": None, + "yidaFormData": { + "dateField_ksirro5k": "1709049600000", + "dateField_ksirro5l": "1773072000000", + "dateField_ksirro5m": "1740672000000", + "dateField_ksirro5n": "1741536000000", + "dateField_ksydghri": "", + "dateField_ksydghrj": "", + "dateField_ksydghrl": "", + "dateField_kto3q3ex": "", + "dateField_ku0vf77m": "", + "dateField_kuhnydlr": "", + "dateField_kuhnydlt": "", + "dateField_kuhnydlv": "", + "dateField_kuhnydmf": "", + "dateField_kuhnydmh": "", + "dateField_kuhnydmj": "", + "dateField_kuhnydn2": "", + "dateField_kuhnydn4": "", + "dateField_kuhnydn6": "", + "employeeField_ksirro5o": "14583865321049759", + "employeeField_ksirro5o_id": None, + "employeeField_ksydghrd": "0103433535667605", + "employeeField_ksydghre": "232229053125844557", + "employeeField_ksydght0": "171128505620867604", + "employeeField_kykw5ege": "14583865321049759", + "multiSelectField_kuhnydlh": "", + "multiSelectField_kuhnydlh_id": "", + "multiSelectField_kuhnydli": "", + "multiSelectField_kuhnydli_id": "", + "multiSelectField_kuhnydlj": "", + "multiSelectField_kuhnydlj_id": "", + "multiSelectField_kuhnydlk": "", + "multiSelectField_kuhnydlk_id": "", + "multiSelectField_kuhnydll": "", + "multiSelectField_kuhnydll_id": "", + "multiSelectField_kuhnydlm": "", + "multiSelectField_kuhnydlm_id": "", + "multiSelectField_kuhnydlo": "", + "multiSelectField_kuhnydlo_id": "", + "multiSelectField_kuhnydlx": "", + "multiSelectField_kuhnydlx_id": "", + "multiSelectField_kuhnydly": "", + "multiSelectField_kuhnydly_id": "", + "multiSelectField_kuhnydlz": "", + "multiSelectField_kuhnydlz_id": "", + "multiSelectField_kuhnydm0": "", + "multiSelectField_kuhnydm0_id": "", + "multiSelectField_kuhnydm1": "", + "multiSelectField_kuhnydm1_id": "", + "multiSelectField_kuhnydm2": "", + "multiSelectField_kuhnydm2_id": "", + "multiSelectField_kuhnydm3": "", + "multiSelectField_kuhnydm3_id": "", + "multiSelectField_kuhnydml": "", + "multiSelectField_kuhnydml_id": "", + "multiSelectField_kuhnydmm": "", + "multiSelectField_kuhnydmm_id": "", + "multiSelectField_kuhnydmn": "", + "multiSelectField_kuhnydmn_id": "", + "multiSelectField_kuhnydmo": "", + "multiSelectField_kuhnydmo_id": "", + "multiSelectField_kuhnydmp": "", + "multiSelectField_kuhnydmp_id": "", + "multiSelectField_kuhnydmq": "", + "multiSelectField_kuhnydmq_id": "", + "multiSelectField_kuhnydmr": "", + "multiSelectField_kuhnydmr_id": "", + "multiSelectField_kuhnydn8": "", + "multiSelectField_kuhnydn8_id": "", + "multiSelectField_kuhnydn9": "", + "multiSelectField_kuhnydn9_id": "", + "multiSelectField_kuhnydna": "", + "multiSelectField_kuhnydna_id": "", + "multiSelectField_kuhnydnb": "", + "multiSelectField_kuhnydnb_id": "", + "multiSelectField_kuhnydnc": "", + "multiSelectField_kuhnydnc_id": "", + "multiSelectField_kuhnydnd": "", + "multiSelectField_kuhnydnd_id": "", + "multiSelectField_kuhnydne": "", + "multiSelectField_kuhnydne_id": "", + "numberField_ksydghrh": "", + "numberField_ktuxbopu": "", + "numberField_ku0vf77l": "", + "numberField_kuhnydlq": "", + "numberField_kuhnydme": "", + "numberField_kuhnydn1": "", + "radioField_ksydghrf": "", + "radioField_ksydghrf_id": "", + "radioField_ksydghrk": "", + "radioField_ksydghrk_id": "", + "radioField_ktuxbopv": "是", + "radioField_kuhnydlp": "", + "radioField_kuhnydlp_id": "", + "radioField_kuhnydlu": "", + "radioField_kuhnydlu_id": "", + "radioField_kuhnydmd": "", + "radioField_kuhnydmd_id": "", + "radioField_kuhnydmi": "", + "radioField_kuhnydmi_id": "", + "radioField_kuhnydn0": "", + "radioField_kuhnydn0_id": "", + "radioField_kuhnydn5": "", + "radioField_kuhnydn5_id": "", + "radioField_kuntp6fm": "小六", + "radioField_kuntp6fm_id": "", + "radioField_kuntp6fn": "小六", + "radioField_kuntp6fn_id": "", + "radioField_kurxyhvp": "小六", + "radioField_kurxyhvp_id": "", + "radioField_kurxyhvq": "小六", + "radioField_kurxyhvq_id": "", + "selectField_kuwa866e": "进行中", + "selectField_kuz7mfmc": "20", + "selectField_kuz7mfmd": "35", + "textField_ksirm9xx": "西安元匠汽车检测服务有限公司", + "textField_ksirro5g": "10", + "textField_ksirro5h": "高粉", + "textField_ksirro5i": "13720536884", + "textField_ksirro5j": "西安元匠汽车检测服务有限公司", + "textField_ksydghqw": "CHS202402280259527", + "textField_ksydghqx": "高粉", + "textField_ksydghqy": "13720536884", + "textField_ksydghr1": "快修快保", + "textField_ksydghr2": "C", + "textField_ksydghr5": "是", + "textField_ksydghr6": "9", + "textField_ksydghr7": "30", + "textField_ksydghr8": "是", + "textField_ksydghr9": "30", + "textField_ksydghra": "否", + "textField_ksydghrb": "0", + "textField_ksydghrc": "深度挖掘", + "textField_ksydghrg": "", + "textField_ksydghrm": "", + "textField_kto3q3ev": "", + "textField_ktp3uuo7": "自主开户", + "textField_ku3uk6su": "", + "textField_kuhnydls": "", + "textField_kuhnydlw": "", + "textField_kuhnydmg": "", + "textField_kuhnydmk": "", + "textField_kuhnydn3": "", + "textField_kuhnydn7": "", + "textField_kuhnydnn": "", + "textField_kuj8nx00": "陕西省", + "textField_kuj8nx01": "西安市", + "textField_kujm5mv8": "SaaS续约:2399.00", + "textField_kuntp6fj": "11240984669917925022", + "textField_kuntp6fk": "11240984669917933022", + "textField_kuntp6fl": "XYFWD20251110059", + "textField_kuzcvh3b": "621天", + "textField_kycfic6o": "普通客户（VIP）", + "textField_kyjy1kkm": "", + "textField_kyjy1kkn": "", + "textareaField_ksydghsq": "", + "textareaField_ksydghsr": "", + "textareaField_ksydghss": "", + "textareaField_ksydghsu": "", + "textareaField_ksydghsw": "", + "textareaField_ksydghsy": "", + "textareaField_ksydghsz": "", + "textareaField_kuhnydm4": "", + "textareaField_kuhnydm5": "", + "textareaField_kuhnydm6": "", + "textareaField_kuhnydm7": "", + "textareaField_kuhnydm8": "", + "textareaField_kuhnydm9": "", + "textareaField_kuhnydma": "", + "textareaField_kuhnydms": "", + "textareaField_kuhnydmt": "", + "textareaField_kuhnydmu": "", + "textareaField_kuhnydmv": "", + "textareaField_kuhnydmw": "", + "textareaField_kuhnydmx": "", + "textareaField_kuhnydmy": "", + "textareaField_kuhnydnf": "", + "textareaField_kuhnydng": "", + "textareaField_kuhnydnh": "", + "textareaField_kuhnydni": "", + "textareaField_kuhnydnj": "", + "textareaField_kuhnydnk": "", + "textareaField_kuhnydnl": "" + } + }, + "message": "SUCCESS" +} \ No newline at end of file diff --git a/test/yida_xuyuedaiban_paifa.py b/test/yida_xuyuedaiban_paifa.py index 67b68d9..d01d3a7 100644 --- a/test/yida_xuyuedaiban_paifa.py +++ b/test/yida_xuyuedaiban_paifa.py @@ -324,6 +324,7 @@ try: 't':ts, 'r':randint } + res = requests.post(url,data=data) formData = res.json()['data']['yidaFormData'] # 过期日期的时间戳 diff --git a/test/续约待办派发.py b/test/续约待办派发.py index d1458b8..34d539e 100644 --- a/test/续约待办派发.py +++ b/test/续约待办派发.py @@ -15,8 +15,6 @@ import requests from pyDes import des, CBC, PAD_PKCS5 import mysql.connector from mysql.connector import Error - -# PostgreSQL（如果你用到了） import psycopg2 # 自定义模块 @@ -40,32 +38,6 @@ class RenewalToDo: self.NGV_data_list = None - @staticmethod - def des_encrypt(s): - """ - DES 加密 - :param s: 原始字符串 - :return: 加密后字符串，16进制 - """ - secret_key = 'HwdMBW8o' - iv = secret_key - k = des(secret_key, CBC, iv, pad=None, padmode=PAD_PKCS5) - en = k.encrypt(s, padmode=PAD_PKCS5) - return binascii.b2a_base64(en, newline=False) - - @staticmethod - def des_descrypt(s): - """ - DES 解密 - :param s: 加密后的字符串，16进制 - :return: 解密后的字符串 - """ - secret_key = 'HwdMBW8o' - iv = secret_key - k = des(secret_key, CBC, iv, pad=None, padmode=PAD_PKCS5) - de = k.decrypt(binascii.a2b_base64(s), padmode=PAD_PKCS5) - return de - def load_all_data(self): # 获取NGV数据 payload = {"api_key": "675b900991ad2491c69389ca", "entry_id": "675bb02bd2d53c2034c665e4"}