mdbq 3.6.17__tar.gz → 3.6.19__tar.gz

{mdbq-3.6.17 → mdbq-3.6.19}/PKG-INFO

@@ -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 → mdbq-3.6.19}/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-3.6.17 → mdbq-3.6.19}/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-3.6.17 → mdbq-3.6.19}/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-3.6.17 → mdbq-3.6.19}/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-3.6.17 → mdbq-3.6.19}/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 → mdbq-3.6.19}/mdbq.egg-info/PKG-INFO

@@ -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 → mdbq-3.6.19}/setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 setup(name='mdbq',
-      version='3.6.17',
+      version='3.6.19',
       author='xigua, ',
       author_email="2587125111@qq.com",
       url='https://pypi.org/project/mdbq',