mdbq 3.6.17__py3-none-any.whl → 3.6.19__py3-none-any.whl

mdbq/aggregation/optimize_data.py

@@ -22,6 +22,11 @@ elif socket.gethostname() in ['company', 'Mac2.local']:
     data = conf['Windows']['company']['mysql']['local']
     username, password, host, port = data['username'], data['password'], data['host'], data['port']
     service_database = {'company': 'mysql'}
+elif socket.gethostname() == 'xigua_ts':
+    conf = myconfig.main()
+    data = conf['Windows']['xigua_ts']['mysql']['remoto']
+    username, password, host, port = data['username'], data['password'], data['host'], data['port']
+    service_database = {'xigua_ts': 'mysql'}
 if not username:
     logger.info(f'找不到主机：')
 

mdbq/aggregation/query_data.py

@@ -50,7 +50,25 @@ if socket.gethostname() == 'company' or socket.gethostname() == 'Mac2.local':
         charset='utf8mb4'
     )
     targe_host = 'company'
-
+elif socket.gethostname() == 'xigua_ts':
+    conf = myconfig.main()
+    conf_data = conf['Windows']['xigua_ts']['mysql']['remoto']
+    username, password, host, port = conf_data['username'], conf_data['password'], conf_data['host'], conf_data['port']
+    m_engine = mysql.MysqlUpload(
+        username=username,
+        password=password,
+        host=host,
+        port=port,
+        charset='utf8mb4'
+    )
+    username, password, host, port = '', '', '', 3306
+    company_engine = mysql.MysqlUpload(
+        username=username,
+        password=password,
+        host=host,
+        port=port,
+        charset='utf8mb4'
+    )
 else:
     conf = myconfig.main()
 
@@ -98,8 +116,8 @@ class MysqlDatasQuery:
             try:
                 return func(*args, **kwargs)
             except Exception as e:
-                logger.info(f'{func.__name__}, {e}')  # 将异常信息返回
-                with open(error_file, 'a') as f:
+                logger.info(f'函数: {func.__name__}, 报错信息: {e}')  # 将异常信息返回
+                with open(error_file, 'a', encoding='utf-8') as f:
                     now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
                     f.write(f'\n{now}\n')
                     # f.write(f'报错的文件:\n{e.__traceback__.tb_frame.f_globals["__file__"]}\n')  # 发生异常所在的文件

mdbq/mysql/mysql.py

@@ -122,7 +122,7 @@ class MysqlUpload:
                 return func(*args, **kwargs)
             except Exception as e:
                 logger.error(f'{func.__name__}, {e}')  # 将异常信息返回
-                with open(error_file, 'a') as f:
+                with open(error_file, 'a', encoding='utf-8') as f:
                     now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
                     f.write(f'\n{now} \n')
                     f.write(f'函数注释内容(用于定位函数): {func.__doc__} \n')

mdbq/other/download_sku_picture.py

@@ -60,6 +60,12 @@ elif socket.gethostname() in ['company', 'Mac2.local']:
     conf_data = conf['Windows']['company']['mysql']['local']
     username, password, host, port = conf_data['username'], conf_data['password'], conf_data['host'], conf_data['port']
     service_database = {'company': 'mysql'}
+elif socket.gethostname() == 'xigua_ts':
+    conf = myconfig.main()
+    conf_data = conf['Windows']['xigua_ts']['mysql']['remote']
+    username, password, host, port = conf_data['username'], conf_data['password'], conf_data['host'], conf_data['port']
+    service_database = {'xigua_ts': 'mysql'}
+
 if not username:
     print(f'找不到主机：')
 

mdbq/redis/getredis.py

@@ -33,6 +33,11 @@ elif socket.gethostname() == 'MacBookPro':
     conf_data = conf['Windows']['xigua_lx']['mysql']['local']
     username, password, host, port = conf_data['username'], conf_data['password'], conf_data['host'], conf_data['port']
     redis_password = conf['Windows']['company']['redis']['local']['password']
+elif socket.gethostname() == 'xigua_ts':
+    conf = myconfig.main()
+    conf_data = conf['Windows']['xigua_ts']['mysql']['remote']
+    username, password, host, port = conf_data['username'], conf_data['password'], conf_data['host'], conf_data['port']
+    redis_password = conf['Windows']['xigua_ts']['redis']['local']['password']
 else:
     conf = myconfig.main()
     conf_data = conf['Windows']['xigua_lx']['mysql']['local']

{mdbq-3.6.17.dist-info → mdbq-3.6.19.dist-info}/METADATA

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

{mdbq-3.6.17.dist-info → mdbq-3.6.19.dist-info}/RECORD

@@ -3,8 +3,8 @@ mdbq/__version__.py,sha256=y9Mp_8x0BCZSHsdLT_q5tX9wZwd5QgqrSIENLrb6vXA,62
 mdbq/aggregation/__init__.py,sha256=EeDqX2Aml6SPx8363J-v1lz0EcZtgwIBYyCJV6CcEDU,40
 mdbq/aggregation/aggregation.py,sha256=-yzApnlqSN2L0E1YMu5ml-W827qpKQvWPCOI7jj2kzY,80264
 mdbq/aggregation/datashow.py,sha256=1AYSIDkdUx-4as1Ax2rPj0cExM9d-qFMrFYLAaPHNuk,54962
-mdbq/aggregation/optimize_data.py,sha256=87Dc2RQTF-wqp8Gct_e0S_xwiNlzsEmM82mwuHPZKlc,3152
-mdbq/aggregation/query_data.py,sha256=7g1Z2qyU8dgnOHdpN5ltr7BX8ZFRrbVmFpk6s9045Pw,193363
+mdbq/aggregation/optimize_data.py,sha256=Iy_hqIpYrvIqRok-FwhaGit2RiZXqJiBri_LuCGh3A0,3428
+mdbq/aggregation/query_data.py,sha256=OCgVMkhmgYmM1vVG7ajmWMW1CHyRXwKLEPanklqS6xk,194047
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
@@ -18,11 +18,11 @@ mdbq/log/mylogger.py,sha256=oaT7Bp-Hb9jZt52seP3ISUuxVcI19s4UiqTeouScBO0,3258
 mdbq/mongo/__init__.py,sha256=SILt7xMtQIQl_m-ik9WLtJSXIVf424iYgCfE_tnQFbw,13
 mdbq/mongo/mongo.py,sha256=M9DUeUCMPDngkwn9-ui0uTiFrvfNU1kLs22s5SmoNm0,31899
 mdbq/mysql/__init__.py,sha256=A_DPJyAoEvTSFojiI2e94zP0FKtCkkwKP1kYUCSyQzo,11
-mdbq/mysql/mysql.py,sha256=v9nr-tb2L1VN0mKUVqEkfcWP1qXQRPVHIOHs3q89Cos,98531
+mdbq/mysql/mysql.py,sha256=xvwAfhIWppYaynLhvNs8DBzI5-gy0xdNJP21Sa7U2Uw,98549
 mdbq/mysql/s_query.py,sha256=pj5ioJfUT81Su9S-km9G49gF5F2MmXXfw_oAIUzhN28,8794
 mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,1523
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
-mdbq/other/download_sku_picture.py,sha256=GdphR7Q3psXXVuZoyJ4u_6OWn_rWlcbT0iJ-1zPT6O0,45368
+mdbq/other/download_sku_picture.py,sha256=r4MiKuaeYFZeH4ofwz1vNrnyKRsXKZQY_6RM2B4U9OY,45665
 mdbq/other/porxy.py,sha256=UHfgEyXugogvXgsG68a7QouUCKaohTKKkI4RN-kYSdQ,4961
 mdbq/other/pov_city.py,sha256=AEOmCOzOwyjHi9LLZWPKi6DUuSC-_M163664I52u9qw,21050
 mdbq/other/sku_picture.py,sha256=JwSXYlzamVqcKCD2tRH2VqYVZNr8fM6f--kcGlTVRnM,50026
@@ -32,10 +32,10 @@ mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,239
 mdbq/pbix/refresh_all.py,sha256=OBT9EewSZ0aRS9vL_FflVn74d4l2G00wzHiikCC4TC0,5926
 mdbq/pbix/refresh_all_old.py,sha256=_pq3WSQ728GPtEG5pfsZI2uTJhU8D6ra-htIk1JXYzw,7192
 mdbq/redis/__init__.py,sha256=YtgBlVSMDphtpwYX248wGge1x-Ex_mMufz4-8W0XRmA,12
-mdbq/redis/getredis.py,sha256=XUuUEsvRzbknloSxC6poA_-AE29eSGmUAqcbK2RjZYQ,26662
+mdbq/redis/getredis.py,sha256=42_37DkixBOF3m0ED1Yo9oceaPaRbCdAS1uoohh8JjE,26997
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
 mdbq/spider/aikucun.py,sha256=v7VO5gtEXR6_4Q6ujbTyu1FHu7TXHcwSQ6hIO249YH0,22208
-mdbq-3.6.17.dist-info/METADATA,sha256=DMsQwJrQfNY8_7rOCmElf9lnitv8qHLqsUZa2bGkb74,244
-mdbq-3.6.17.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-mdbq-3.6.17.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-3.6.17.dist-info/RECORD,,
+mdbq-3.6.19.dist-info/METADATA,sha256=PAwSTNQprma0UwQfUhqbAf27-yiTnMQoX6G9W2NJn8g,244
+mdbq-3.6.19.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-3.6.19.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-3.6.19.dist-info/RECORD,,

{mdbq-3.6.17.dist-info → mdbq-3.6.19.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.0)
+Generator: bdist_wheel (0.44.0)
 Root-Is-Purelib: true
 Tag: py3-none-any