mdbq 3.8.10__py3-none-any.whl → 3.8.11__py3-none-any.whl

mdbq/__version__.py

@@ -1 +1 @@
-VERSION = '3.8.10'
+VERSION = '3.8.11'

mdbq/log/spider_logging.py

@@ -6,7 +6,7 @@ import sys
 import getpass
 
 
-def setup_logging(reMoveOldHandler=True):
+def setup_logging(reMoveOldHandler=True, filename='spider_tg.log'):
     """
     reMoveOldHandler: 替换根日志记录器的所有现有处理器
     """
@@ -14,7 +14,7 @@ def setup_logging(reMoveOldHandler=True):
     if not os.path.isdir(os.path.join(dir_path, 'logfile')):
         os.makedirs(os.path.join(dir_path, 'logfile'))
 
-    log_file = os.path.join(dir_path, 'logfile', 'spider_tg.log')
+    log_file = os.path.join(dir_path, 'logfile', filename)
     file_handler = RotatingFileHandler(
         filename=log_file,
         maxBytes=3*1024*1024,  # 3MB

mdbq/other/otk.py

@@ -4,6 +4,31 @@ import datetime
 from dateutil.relativedelta import relativedelta
 import pandas as pd
 import numpy as np
+from mdbq.other import ua_sj
+import requests
+
+
+def get_public_ip():
+    services = [
+        'https://checkip.amazonaws.com',
+        'https://ipinfo.io/ip',
+        'https://icanhazip.com',
+        'https://ifconfig.me/ip',
+        'https://ipecho.net/plain',
+        'https://myexternalip.com/raw',
+        'https://ipapi.co/ip'
+    ]
+    for url in services:
+        try:
+            response = requests.get(url, timeout=5, headers={'User-Agent': ua_sj.get_ua()})
+            if response.status_code == 200:
+                response = re.findall(r'\d+\.\d+\.\d+\.\d+', response.text.strip())
+                if response:
+                    return response[0]
+        except:
+            continue
+    print("无法获取外网 IP")
+    return '120.236.0.0/8'
 
 
 def first_and_last_day(date):
@@ -148,4 +173,4 @@ def is_integer(int_str):
 
 
 if __name__ == '__main__':
-    pass
+    pass

{mdbq-3.8.10.dist-info → mdbq-3.8.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: mdbq
-Version: 3.8.10
+Version: 3.8.11
 Home-page: https://pypi.org/project/mdbq
 Author: xigua, 
 Author-email: 2587125111@qq.com

{mdbq-3.8.10.dist-info → mdbq-3.8.11.dist-info}/RECORD

@@ -1,17 +1,17 @@
 mdbq/__init__.py,sha256=Il5Q9ATdX8yXqVxtP_nYqUhExzxPC_qk_WXQ_4h0exg,16
-mdbq/__version__.py,sha256=30BOEMWMMdvugdYm1n90xiBvxiQzusLf7XtVO4-Zjr8,18
+mdbq/__version__.py,sha256=7-v8Hf_oxS-viT6kvnNbH682QvNI_Gm_tpfZZWxVbI0,18
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
 mdbq/aggregation/query_data.py,sha256=-4HWC1HZmgqUAuvcRiHZU4FLtI70nRq_Hp3eXVZTyH8,185843
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/config/config.py,sha256=eaTfrfXQ65xLqjr5I8-HkZd_jEY1JkGinEgv3TSLeoQ,3170
 mdbq/log/__init__.py,sha256=Mpbrav0s0ifLL7lVDAuePEi1hJKiSHhxcv1byBKDl5E,15
-mdbq/log/spider_logging.py,sha256=KX9TTUn9naZNBACCEFhyTktnWhr5JaSNQLppLGyrm9Y,1645
+mdbq/log/spider_logging.py,sha256=-ozWWEGm3HVv604ozs_OOvVwumjokmUPwbaodesUrPY,1664
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
 mdbq/mysql/mysql.py,sha256=2cPuqX4zq2b6ghFWxTylr52DPZGE2WNrCdFV0RcF6LY,89048
 mdbq/mysql/s_query.py,sha256=X055aLRAgxVvueXx4NbfNjp6MyBI02_XBb1pTKw09L0,8660
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/download_sku_picture.py,sha256=YU8DxKMXbdeE1OOKEA848WVp62jYHw5O4tXTjUdq9H0,44832
-mdbq/other/otk.py,sha256=amIFeLDNUJpSi0U6hXbnqXeGTbYL-8-5U5yAATzSM3Y,5947
+mdbq/other/otk.py,sha256=i8Eomxk7i3tU41Pv_dbFCo8ghZ1dQsMJVRp3ZWVtCY8,6710
 mdbq/other/pov_city.py,sha256=AEOmCOzOwyjHi9LLZWPKi6DUuSC-_M163664I52u9qw,21050
 mdbq/other/ua_sj.py,sha256=JuVYzc_5QZ9s_oQSrTHVKkQv4S_7-CWx4oIKOARn_9U,22178
 mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
@@ -21,7 +21,7 @@ mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
 mdbq/redis/getredis.py,sha256=Uk8-cOWT0JU1qRyIVqdbYokSLvkDIAfcokmYj1ebw8k,24104
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=YLRTDgOKPGDyNB-z5dPOJhBoTzM6Rmbjy1Qng_KyJQc,19906
-mdbq-3.8.10.dist-info/METADATA,sha256=bYHqcx9saoyDq-BQSXUtUQWTcDNICdZeF5jaKP6Dlyc,364
-mdbq-3.8.10.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-mdbq-3.8.10.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.8.10.dist-info/RECORD,,
+mdbq-3.8.11.dist-info/METADATA,sha256=ZAydGB5l32CZnEjgk21kkCz1gKhGrzxXgtoXNBscLc4,364
+mdbq-3.8.11.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+mdbq-3.8.11.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.8.11.dist-info/RECORD,,