Functions-d 1.32__tar.gz → 1.34__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {functions_d-1.32 → functions_d-1.34}/Functions_d/Functions_d.py +6 -11
- {functions_d-1.32 → functions_d-1.34}/Functions_d.egg-info/PKG-INFO +1 -1
- {functions_d-1.32 → functions_d-1.34}/PKG-INFO +1 -1
- {functions_d-1.32 → functions_d-1.34}/setup.cfg +1 -1
- {functions_d-1.32 → functions_d-1.34}/Functions_d/__init__.py +0 -0
- {functions_d-1.32 → functions_d-1.34}/Functions_d.egg-info/SOURCES.txt +0 -0
- {functions_d-1.32 → functions_d-1.34}/Functions_d.egg-info/dependency_links.txt +0 -0
- {functions_d-1.32 → functions_d-1.34}/Functions_d.egg-info/requires.txt +0 -0
- {functions_d-1.32 → functions_d-1.34}/Functions_d.egg-info/top_level.txt +0 -0
- {functions_d-1.32 → functions_d-1.34}/README.md +0 -0
- {functions_d-1.32 → functions_d-1.34}/pyproject.toml +0 -0
- {functions_d-1.32 → functions_d-1.34}/setup.py +0 -0
|
@@ -6,7 +6,6 @@ import logging
|
|
|
6
6
|
import shutil
|
|
7
7
|
import time
|
|
8
8
|
import urllib.request
|
|
9
|
-
import pandas as pd
|
|
10
9
|
import WeComMsg
|
|
11
10
|
import xlwings as xw
|
|
12
11
|
import yagmail
|
|
@@ -24,11 +23,15 @@ from selenium import webdriver
|
|
|
24
23
|
from selenium.webdriver.edge.service import Service
|
|
25
24
|
from selenium.webdriver.edge.options import Options
|
|
26
25
|
from webdriver_manager.microsoft import EdgeChromiumDriverManager
|
|
27
|
-
import requests
|
|
28
26
|
import psutil
|
|
29
27
|
import pythoncom
|
|
30
28
|
from tenacity import retry, stop_after_attempt, wait_fixed
|
|
29
|
+
import requests
|
|
30
|
+
import pandas as pd
|
|
31
31
|
import os
|
|
32
|
+
from io import BytesIO
|
|
33
|
+
from requests.adapters import HTTPAdapter
|
|
34
|
+
from urllib3.util.retry import Retry
|
|
32
35
|
|
|
33
36
|
|
|
34
37
|
class DataProcessingAndMessaging:
|
|
@@ -1694,14 +1697,6 @@ class DataProcessingAndMessaging:
|
|
|
1694
1697
|
:param filename_in_server: 服务器上显示的文件名
|
|
1695
1698
|
:return: 下载链接（失败返回None）
|
|
1696
1699
|
"""
|
|
1697
|
-
import requests
|
|
1698
|
-
import pandas as pd
|
|
1699
|
-
import os
|
|
1700
|
-
import datetime
|
|
1701
|
-
from io import BytesIO
|
|
1702
|
-
from requests.adapters import HTTPAdapter
|
|
1703
|
-
from urllib3.util.retry import Retry
|
|
1704
|
-
|
|
1705
1700
|
upload_url = "http://fs-cc.xin.com"
|
|
1706
1701
|
self.logger.info(f"开始上传数据到内网服务器，服务器文件名：{filename_in_server}")
|
|
1707
1702
|
print(f"📤 正在上传 → 服务器文件名：{filename_in_server}")
|
|
@@ -1768,7 +1763,7 @@ class DataProcessingAndMessaging:
|
|
|
1768
1763
|
session = create_retry_session()
|
|
1769
1764
|
files = {"file": (filename_in_server, file_obj, file_type)}
|
|
1770
1765
|
# ====================== 【按要求修改：读超时改为5分钟（300秒）】 ======================
|
|
1771
|
-
response = session.post(upload_url, files=files, timeout=(10,
|
|
1766
|
+
response = session.post(upload_url, files=files, timeout=(10, 600))
|
|
1772
1767
|
# ======================================================================
|
|
1773
1768
|
|
|
1774
1769
|
# 关闭文件
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|