mdbq 1.7.8__py3-none-any.whl → 1.8.0__py3-none-any.whl

mdbq/aggregation/query_data.py

@@ -431,6 +431,28 @@ class MysqlDatasQuery:
         start_date = f'{start_date.year}-{start_date.month}-01'  # 替换为 n 月以前的第一天
         return pd.to_datetime(start_date), pd.to_datetime(end_date)
 
+    def tm_search(self):
+        start_date, end_date = self.months_data(num=self.months)
+        projection = {
+            '日期': 1,
+            '关键词': 1,
+            '访客数': 1,
+            '支付转化率': 1,
+            '支付金额': 1,
+            '下单金额': 1,
+            '支付买家数': 1,
+            '下单买家数': 1,
+            '加购人数': 1,
+            '新访客': 1,
+        }
+        df = self.download.data_to_df(
+            db_name='生意参谋2',
+            table_name='店铺来源_手淘搜索',
+            start_date=start_date,
+            end_date=end_date,
+            projection=projection,
+        )
+        return df
 
 class GroupBy:
     """
@@ -978,6 +1000,22 @@ class GroupBy:
             df['s_是否品牌词'] = df['搜索词'].str.contains('万里马|wanlima', regex=True)
             df['s_是否品牌词'] = df['s_是否品牌词'].apply(lambda x: '品牌词' if x else '')
             return df
+        elif '天猫店铺来源_手淘搜索' in table_name:
+            df = df.groupby(
+                ['日期', '关键词'],
+                as_index=False).agg(
+                **{
+                    '访客数': ('访客数', np.max),
+                    '支付转化率': ('支付转化率', np.max),
+                    '支付金额': ('支付金额', np.max),
+                    '下单金额': ('下单金额', np.max),
+                    '支付买家数': ('支付买家数', np.max),
+                    '下单买家数': ('下单买家数', np.max),
+                    '加购人数': ('加购人数', np.max),
+                    '新访客': ('新访客', np.max),
+                }
+            )
+            return df
         else:
             print(f'<{table_name}>: Groupby 类尚未配置，数据为空')
             return pd.DataFrame({})
@@ -1340,6 +1378,12 @@ def data_aggregation(service_databases=[{}], months=1):
                     '唯一主键': ['日期', '报表类型', '推广渠道', '营销场景', '花费'],
                     '数据主体': sdq.pxb_zh(),
                 },
+                {
+                    '数据库名': '聚合数据',
+                    '集合名': '天猫店铺来源_手淘搜索',
+                    '唯一主键': ['日期', '关键词', '访客数'],
+                    '数据主体': sdq.tm_search(),
+                },
             ]
             for items in data_dict:  # 遍历返回结果
                 db_name, table_name, unique_key_list, df = items['数据库名'], items['集合名'], items['唯一主键'], items['数据主体']

mdbq/company/copysh.py

@@ -368,7 +368,7 @@ def main():
             time.sleep(60)
             op_data(days=100)  # 数据清理和聚合
 
-        t.sleep_minutes = 30  # 同步前休眠时间
+        t.sleep_minutes = 5  # 同步前休眠时间
         t.tb_file()
         time.sleep(600)  # 检测间隔
 

mdbq/other/sku_picture.py

@@ -0,0 +1,487 @@
+# -*- coding:utf-8 -*-
+import datetime
+import getpass
+import json
+import os
+import platform
+import random
+import re
+import time
+import warnings
+import pandas as pd
+from lxml import etree
+from selenium import webdriver
+from selenium.webdriver.support.wait import WebDriverWait
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.chrome.service import Service
+from mdbq.config import set_support
+from mdbq.config import get_myconf
+from mdbq.mysql import mysql
+
+warnings.filterwarnings('ignore')
+
+if platform.system() == 'Windows':
+    Share_Path = os.path.join(r'\\192.168.1.198\时尚事业部\01.运营部\天猫报表')  # 共享文件根目录
+elif platform.system() == 'Darwin':
+    Share_Path = os.path.join('/Volumes/时尚事业部/01.运营部/天猫报表')  # 共享文件根目录
+else:
+    Share_Path = ''
+
+
+class LoadAccount:
+    """ 如果需要获取 cookie 需要注释无界面模式 """
+
+    def __init__(self):
+        self.url = 'https://login.taobao.com/'  # 默认登录淘宝
+        self.cookie_path = os.path.join(set_support.SetSupport(dirname='support').dirname, 'cookies')
+
+    def __call__(self, *args, **kwargs):
+        self.check_cookie()  # 检测cookie有效期, 但不阻断任务
+
+    def load_account(self, shop_name):
+        option = webdriver.ChromeOptions()
+        # option.add_argument("--headless")  # 设置无界面模式
+        # 调整chrome启动配置
+        option.add_argument("--disable-gpu")
+        option.add_argument("--no-sandbox")
+        option.add_argument("--disable-dev-shm-usage")
+        option.add_experimental_option("excludeSwitches", ["enable-automation"])
+        option.add_experimental_option('excludeSwitches', ['enable-logging'])  # 禁止日志输出，减少控制台干扰
+        option.add_experimental_option("useAutomationExtension", False)
+        option.add_argument('--ignore-ssl-error')  # 忽略ssl错误
+        prefs = {
+            'profile.default_content_settings.popups': 0,  # 禁止弹出所有窗口
+            "browser.download.manager. showAlertOnComplete": False,  # 下载完成后不显示下载完成提示框
+            "profile.default_content_setting_values.automatic_downloads": 1,  # 允许自动下载多个文件
+        }
+
+        option.add_experimental_option('perfLoggingPrefs', {
+            'enableNetwork': True,
+            'enablePage': False,
+        })
+        option.set_capability("goog:loggingPrefs", {
+            'browser': 'ALL',
+            'performance': 'ALL',
+        })
+        option.set_capability("goog:perfLoggingPrefs", {
+            'enableNetwork': True,
+            'enablePage': False,
+            'enableTimeline': False
+        })
+
+
+
+        option.add_experimental_option('prefs', prefs)
+        option.add_experimental_option('excludeSwitches', ['enable-automation'])  # 实验性参数, 左上角小字
+        if platform.system() == 'Windows':
+            service = Service(os.path.join(f'C:\\Users\\{getpass.getuser()}\\chromedriver.exe'))
+        else:
+            service = Service('/usr/local/bin/chromedriver')
+        _driver = webdriver.Chrome(options=option, service=service,  )  # 创建Chrome驱动程序实例
+        _driver.maximize_window()  # 窗口最大化 方便后续加载数据
+
+        if 'jd' in shop_name:  # 切换为京东
+            self.url = 'https://shop.jd.com/jdm/home/'
+        # 登录
+        _driver.get(self.url)
+        _driver.delete_all_cookies()  # 首先清除浏览器打开已有的cookies
+        name_lists = os.listdir(self.cookie_path)  # cookie 放在主目录下的 cookies 文件夹
+        for name in name_lists:
+            if shop_name in name and name.endswith('.txt') and '~' not in name and '.DS' not in name:
+                with open(os.path.join(self.cookie_path, name), 'r') as f:
+                    cookies_list = json.load(f)  # 使用json读取cookies 注意读取的是文件 所以用load而不是loads
+                    for cookie in cookies_list:
+                        _driver.add_cookie(cookie)  # 添加cookies信息
+                break
+        # 以上从get url开始的操作要即时完成，不能进入time.sleep，否则登录失败
+        if 'jd' in shop_name:
+            return _driver
+        else:
+            _driver.refresh()
+            time.sleep(random.uniform(5, 8))
+            html = etree.HTML(_driver.page_source)
+            user_name = html.xpath('//div[@class="site-nav-user"]/a/text()')
+            if user_name:  # 1877西门吹风
+                print(f'当前账号：{user_name} 登录成功')
+                return _driver
+
+            elements = _driver.find_elements(
+                By.XPATH, '//*[id="login-error"]/div')
+            if elements:  # 您已登录，子账号不能访问.... 其实已经处于登录状态
+                if self.other(_driver):
+                    return _driver
+            elements = _driver.find_elements(
+                By.XPATH, '//div[@class="captcha-tips"]/div[@class="warnning-text"]')
+            if elements:    # 滑块验证，但其实已经处于登录状态
+                if self.other(_driver):
+                    return _driver
+            wait = WebDriverWait(_driver, timeout=15)
+            try:
+                button = wait.until(
+                    EC.element_to_be_clickable(
+                        (By.XPATH, '//button[@class="fm-button fm-submit " and @type="submit"]')
+                    )
+                )  # 快速进入按钮
+                _driver.execute_script("arguments[0].click();", button)  # 点击登录
+                time.sleep(3)
+            except:
+                # 店铺账号
+                try:
+                    wait.until(
+                        EC.presence_of_element_located(
+                            (By.XPATH, '//*[@id="icestark-container"]/div[1]/div/div[1]/img')))
+                    html = etree.HTML(_driver.page_source)
+                    user_name = html.xpath('//div[@class="UserArea--shopName--3Z5NVbD"]/text()')
+                    print(f'当前账号：{user_name} 登录成功')
+                    return _driver
+                except:
+                    print(f'{shop_name} -> {self.url} 尝试跨页登录1')
+                    # self.other(_driver)
+
+            # 店铺账号, 有时候刷新cookies后系统会自动登录，不需要手动点击登录，因此多加一次判断
+            try:
+                wait.until(
+                    EC.presence_of_element_located((By.XPATH, '//*[@id="icestark-container"]/div[1]/div/div[1]/img')))
+                html = etree.HTML(_driver.page_source)
+                user_name = html.xpath('//div[@class="UserArea--shopName--3Z5NVbD"]/text()')
+                print(f'当前账号：{user_name} 登录成功')
+            except:
+                print(f'{shop_name} -> {self.url} 尝试跨页登录2')
+                self.other(_driver)
+            return _driver
+
+    @staticmethod
+    def other(_driver):
+        """ 淘宝账号不知为何刷新cookies后不跳转, """
+        _driver.get('https://myseller.taobao.com')
+        time.sleep(3)
+        try:
+            wait = WebDriverWait(_driver, timeout=15)
+            wait.until(EC.presence_of_element_located((By.XPATH, '//div[contains(@class, "UserArea--shopName")]')))
+            print('登录成功')
+            return True
+        except Exception as e:
+            print(e)
+            print('登录失败')
+            _driver.quit()
+            return False
+
+    def d_new_cookies(self, _driver, _shopname):
+        """ 负责检查并刷新 cookies 文件"""
+        try:
+            _file = os.path.join(self.cookie_path, f'cookie_{_shopname}.txt')
+            _c = os.stat(_file).st_mtime  # 读取文件的元信息 >>>文件修改时间
+            _c_time = datetime.datetime.fromtimestamp(_c)  # 格式化修改时间
+            _today = datetime.datetime.today()
+            if (_today - _c_time).total_seconds() > 170000:
+                with open(_file, 'w') as f:
+                    # 将cookies保存为json格式
+                    cookies_list = _driver.get_cookies()
+                    for cookie in cookies_list:
+                        # 该字段有问题所以删除就可以
+                        if 'expiry' in cookie:
+                            del cookie['expiry']
+                        if 'domain' in cookie and '万里马官方' in _shopname:  # 仅仅是天猫淘宝需要修改此值, 京东别改
+                            cookie['domain'] = '.taobao.com'
+                    cookies_list = json.dumps(cookies_list)
+                    f.write(cookies_list)
+                    # print(f'cookie已保存: {_file}')
+        except Exception as e:
+            print(e)
+
+    def check_cookie(self):
+        """
+        检查cookies，如果过期则重新获取
+        still_get: 设置该参数立即更新cookie, 不论是否过期
+        """
+        if not os.path.exists(self.cookie_path):
+            print(f'没有找到cookies文件: {self.cookie_path}')
+            return False
+        files = os.listdir(self.cookie_path)
+        cook = []
+        for file in files:
+            if file.endswith('txt') and 'cookie_' in file:
+                cook.append(file)
+                c_ = os.stat(os.path.join(self.cookie_path, file)).st_mtime  # 读取文件的元信息 >>>文件修改时间
+                c_time_ = datetime.datetime.fromtimestamp(c_)  # 格式化修改时间
+                today = datetime.datetime.today()
+                if (today - c_time_).total_seconds() > 864000:
+                    # 超过时间重新获取cookies
+                    print(f' {file}cookie已过期，请重新获取cookies')
+                    return None
+
+    def tb_cookie(self, _url='https://login.taobao.com/'):
+        """
+        本函数需要谨慎调用，不要弄错账号以免cookies混乱
+        扫码获取cookies，下载到cookies文件夹
+        is_wlm_cookie: 单独创建一个wlm的cookies，保存在上层目录，用于日常数据下载，其他淘宝爬虫不要调用
+        c_account：设置为True时，检测店铺账号，False检测非店铺账号
+        """
+        option = webdriver.ChromeOptions()  # 浏览器启动选项
+        option.headless = True  # False指定为无界面模式
+        # 调整chrome启动配置
+        option.add_argument("--disable-gpu")
+        option.add_argument("--no-sandbox")
+        option.add_argument("--disable-dev-shm-usage")
+        option.add_experimental_option("excludeSwitches", ["enable-automation"])
+        option.add_experimental_option("useAutomationExtension", False)
+        if platform.system() == 'Windows':
+            service = Service(os.path.join(f'C:\\Users\\{getpass.getuser()}\\chromedriver.exe'))
+        else:
+            service = Service('/usr/local/bin/chromedriver')
+        _driver = webdriver.Chrome(service=service, options=option)  # 创建Chrome驱动程序实例
+        # 登录
+        _driver.get(_url)
+        time.sleep(1)
+        _driver.maximize_window()  # 窗口最大化 方便后续加载数据
+        wait = WebDriverWait(_driver, timeout=120)  # 等待登录二维码
+        wait.until(EC.element_to_be_clickable(
+            (By.XPATH, '//div[@class="qrcode-login"]/div/div[@class="qrcode-img"]')))
+
+        user_name = None
+        for i in range(10):
+            d_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+            print(f'{d_time} 当前验证：等待非店账号扫码，请尽快扫码...')
+            wait = WebDriverWait(_driver, timeout=10)  # 等待扫码登录后的页面, 左上角加载的一张图片
+            try:  # 非店铺账号
+                wait.until(
+                    EC.presence_of_element_located((By.XPATH, '//*[@id="J_SiteNavLogin"]/div[1]/div/a')))
+                html = etree.HTML(_driver.page_source)
+                user_name = html.xpath('//*[@id="J_SiteNavLogin"]/div[1]/div/a/text()')
+                break
+            except:
+                d_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+                print(f'{d_time} 当前验证：等待店铺账号扫码...')
+                wait = WebDriverWait(_driver, timeout=15)
+                try:  # 等待左上角的牵牛图标
+                    wait.until(
+                        EC.presence_of_element_located(
+                            (By.XPATH, '//*[@id="icestark-container"]/div[1]/div/div[1]/img')))
+                    html = etree.HTML(_driver.page_source)  # 登录店铺名称
+                    user_name = html.xpath('//div[contains(@class, "UserArea--shopName")]/text()')
+                    break
+                except:
+                    d_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+                    print(f'{d_time} {_url} 第 {i + 1}/10 次等待登录超时，正在重试')
+                    if i > 8:
+                        return None
+        d_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        print(f'{d_time} 登录成功，正在获取cookie...')
+        time.sleep(1)
+        sp_id = ['649844025963', '732863024183', '640779963378', '677330842517']
+        sp_id = random.choice(sp_id)
+        _driver.get(f'https://detail.tmall.com/item.htm?id={sp_id}')
+        time.sleep(3)
+        if user_name:
+            user_name = user_name[0]
+            user_name = re.sub(':', '_', user_name)  # 删除用户名中的冒号
+        else:
+            user_name = ''
+
+        if not os.path.exists(self.cookie_path):
+            os.makedirs(self.cookie_path)
+        _file = os.path.join(self.cookie_path, f'cookie_{user_name}.txt')
+        with open(_file, 'w') as f:
+            # 将cookies保存为json格式
+            cookies_list = _driver.get_cookies()
+            for cookie in cookies_list:
+                # 该字段有问题所以删除就可以
+                if 'expiry' in cookie:
+                    del cookie['expiry']
+                if 'domain' in cookie:
+                    cookie['domain'] = '.taobao.com'
+            cookies_list = json.dumps(cookies_list)
+            f.write(cookies_list)
+            print(f'cookie已保存: {_file}')
+        _driver.quit()
+
+    def jd_cookie(self, _url='https://shop.jd.com/jdm/home/'):
+        option = webdriver.ChromeOptions()  # 浏览器启动选项
+        option.headless = True  # False指定为无界面模式
+        if platform.system() == 'Windows':
+            service = Service(os.path.join(f'C:\\Users\\{getpass.getuser()}\\chromedriver.exe'))
+        else:
+            service = Service('/usr/local/bin/chromedriver')
+        _driver = webdriver.Chrome(service=service, options=option)  # 创建Chrome驱动程序实例
+        # 登录
+        _driver.get(_url)
+        time.sleep(1)
+        _driver.maximize_window()  # 窗口最大化 方便后续加载数据
+        print('等待登录京东商家后台...')
+        wait = WebDriverWait(_driver, timeout=300)
+        try:
+            wait.until(
+                EC.presence_of_element_located((By.XPATH, '//span[text()="京准通"]')))
+        except:
+            print('等待京东登录超时！')
+        d_time = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        print(f'{d_time} 登录成功，正在获取cookie...')
+        time.sleep(3)
+        # d_time = datetime.datetime.now().strftime('%Y%m%d%H%M%S')
+
+        if not os.path.exists(self.cookie_path):
+            os.makedirs(self.cookie_path)
+        _file = os.path.join(self.cookie_path, 'cookie_jd.txt')
+        with open(_file, 'w') as f:
+            # 将cookies保存为json格式
+            cookies_list = _driver.get_cookies()
+            for cookie in cookies_list:
+                # 该字段有问题所以删除就可以
+                if 'expiry' in cookie:
+                    del cookie['expiry']
+            cookies_list = json.dumps(cookies_list)
+            f.write(cookies_list)
+            print(f'cookie已保存: {_file}')
+        time.sleep(1)
+        _driver.quit()
+
+
+class SkuPicture:
+    def __init__(self, driver):
+        self.driver = driver
+        self.path = os.path.join(Share_Path, '其他文件')
+        self.filename = '商品id编码表.xlsx'
+        self.urls = []
+        self.datas = []  # 从单品页面获取数据，存储这部分数据，作为中转
+        self.df = pd.DataFrame()
+
+    def each_page(self):
+        wait = WebDriverWait(self.driver, timeout=15)
+        num = len(self.urls)
+        i = 0
+        for data in self.urls:
+            url = f'https://sell.publish.tmall.com/tmall/publish.htm?id={data['商品id']}'
+            print(f'当前任务: {i}/{num}   {url}')
+            try:
+                self.driver.get(url)
+                time.sleep(3)
+                # elements = self.driver.find_elements(
+                #     By.XPATH, '//h2[text()="很抱歉，您查看的商品找不到了！"]')
+                # if len(elements) > 0:
+                #     continue
+                wait.until(EC.presence_of_element_located((By.XPATH, '//tr[@class="sku-table-row"]')))
+                html = etree.HTML(self.driver.page_source)
+                imgs = html.xpath('//img[contains(@class, "img-block")]/@src')
+                imgs = [f'https:{item}' for item in imgs if 'http' not in item]
+                titles = html.xpath('//img[contains(@class, "img-block")]/../span/@title')
+                # img = html.xpath('//tr[@class="sku-table-row"]/td/div/div/div/img[@class="img-block"]/@src')
+                sku_price = html.xpath(
+                    '//tr[@class="sku-table-row"]/td[contains(@class, "sell-sku-cell-money")]//input/@value')
+                desc = html.xpath(
+                    '//tr[@class="sku-table-row"]/td[contains(@class, "sell-sku-cell-skuIndividualCom")]//em/@title')
+                sales = html.xpath(
+                    '//tr[@class="sku-table-row"]/td[contains(@class, "sell-sku-cell-number")]//input/@value')
+                sku_spbm = html.xpath(
+                    '//tr[@class="sku-table-row"]/td[contains(@class, "sell-sku-cell-input") and contains(@id, "skuOuterId")]//input/@value')
+                leimu = html.xpath(
+                    '//h2[@id="text-catpath"]/div/text()')
+                sp_titles = html.xpath(
+                    '//div[@class="tm-title normal"]/span/span/input/@value')
+
+                if sp_titles:
+                    sp_titles = sp_titles[0]
+                else:
+                    sp_titles = ''
+                if leimu:
+                    leimu = re.sub('>>', '_', leimu[0])
+                    leimu = re.sub('当前类目：', '', leimu)
+                else:
+                    leimu = ''
+                if not titles:
+                    titles = ''
+                if not imgs:
+                    imgs = ''
+                if not sales:
+                    sales = ''
+                if not sku_price:
+                    sku_price = ''
+                if not sku_spbm:
+                    sku_spbm = ''
+                if not desc:
+                    desc = ''
+
+                # print(sp_titles)
+                # print(titles)
+                # print(imgs)
+                # print(sales)
+                # print(sku_price)
+                # print(sku_spbm)
+                # print(desc)
+                # print(leimu)
+                self.datas.append(
+                    {
+                        '日期': datetime.date.today(),
+                        '商品id': data['商品id'],
+                        '商品标题': sp_titles,
+                        '商品链接': f'https://detail.tmall.com/item.htm?id={data['商品id']}',
+                        'sku名称': titles,
+                        'sku图片链接': imgs,
+                        '库存数量': sales,
+                        '价格': sku_price,
+                        'sku编码': sku_spbm,
+                        '商家编码': data['商家编码'],
+                        '推荐卖点': desc,
+                        '是否新增': data['是否新增'],
+                        '类目': leimu,
+                    }
+                )
+            except Exception as e:
+                # print(e)
+                pass
+            i += 1
+            # if i > 3:
+            #     break
+            time.sleep(1)
+
+        results = []
+        for data in self.datas:
+            try:
+                df = pd.DataFrame.from_dict(data, orient='columns')
+                results.append(df)
+            except:
+                pass
+
+        if results:
+            self.df = pd.concat(results)
+
+    def read_df(self):
+        path = os.path.join(self.path, self.filename)
+        df = pd.read_excel(path, header=0)
+        df = df[['商品id', '商家编码', '是否新增']]
+        df = df.astype({'是否新增': int})
+        df = df[df['是否新增'] == 1]
+        self.urls = df.to_dict('records')
+
+
+def main(service_name, database):
+    if not os.path.exists(Share_Path):
+        print(f'当前系统环境不支持')
+        return
+
+    _driver = LoadAccount()  # 账号域不同, 要重新实例化
+    # tb_driver2 = 1
+    tb_driver2 = _driver.load_account(shop_name='万里马官方旗舰店')
+    if tb_driver2:
+        s = SkuPicture(driver=tb_driver2)
+        s.read_df()  # 从本地文件中读取商品id，并更新 urls 参数
+        s.each_page()  # 根据 urls 获取每个商品数据并更新为 df
+        tb_driver2.quit()
+
+        # s.df.to_csv('/Users/xigua/Downloads/test.csv', encoding='utf-8_sig', index=False, header=True)
+        username, password, host, port = get_myconf.select_config_values(target_service=service_name, database=database)
+        m = mysql.MysqlUpload(username=username, password=password, host=host, port=port)
+        m.df_to_mysql(
+            df=s.df,
+            db_name='属性设置2',
+            table_name='天猫商品sku信息',
+            move_insert=True,  # 先删除，再插入
+            # df_sql=True,
+            # drop_duplicates=False,
+            # icm_update=unique_key_list,
+            service_database={service_name: database},
+        )  # 3. 回传数据库
+
+
+if __name__ == '__main__':
+    main(service_name='company', database='mysql')

mdbq/pbix/refresh_all.py

@@ -63,7 +63,7 @@ class RefreshAll:
             if filename.endswith('.xlsx'):
                 try:
                     print(f'正在刷新 >>>{filename}')
-                    path = os.path.join(self.run_py_path, filename)  # 拼接文件路径
+                    path = os.path.join(top_path, self.run_py_path, filename)  # 拼接文件路径
                     xlapp = win32com.client.Dispatch('Excel.Application')  # 创建Excel程序App
                     xlapp.Visible = False  # 窗口是否可见
                     xlapp.DisplayAlerts = False  # 是否显示警告信息

{mdbq-1.7.8.dist-info → mdbq-1.8.0.dist-info}/METADATA

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

{mdbq-1.7.8.dist-info → mdbq-1.8.0.dist-info}/RECORD

@@ -5,13 +5,13 @@ mdbq/aggregation/aggregation.py,sha256=sgsetJHK4fOcXvqQCVgJoSIwZQLMznVG3I-MqHlW_
 mdbq/aggregation/df_types.py,sha256=oQJS2IBU3_IO6GMgbssHuC2yCjNnbta0QPGrFOwNLnU,7591
 mdbq/aggregation/mysql_types.py,sha256=DQYROALDiwjJzjhaJfIIdnsrNs11i5BORlj_v6bp67Y,11062
 mdbq/aggregation/optimize_data.py,sha256=u2Kl_MFtZueXJ57ycy4H2OhXD431RctUYJYCl637uT0,4176
-mdbq/aggregation/query_data.py,sha256=9UhWwFAhMieC5iOIna_sAhsk2WvSpzGd5aDvkRo_pVE,68486
+mdbq/aggregation/query_data.py,sha256=dzS1XvoJ0oEckrvIF-_uUALnPIRG4mOwG5ktr3LWsKY,70243
 mdbq/bdup/__init__.py,sha256=AkhsGk81SkG1c8FqDH5tRq-8MZmFobVbN60DTyukYTY,28
 mdbq/bdup/bdup.py,sha256=LAV0TgnQpc-LB-YuJthxb0U42_VkPidzQzAagan46lU,4234
 mdbq/clean/__init__.py,sha256=A1d6x3L27j4NtLgiFV5TANwEkLuaDfPHDQNrPBbNWtU,41
 mdbq/clean/data_clean.py,sha256=T0WYOKFwNZTNk3temKOw1K2H54kxu9QBJjlTbkMtxNk,94217
 mdbq/company/__init__.py,sha256=qz8F_GsP_pMB5PblgJAUAMjasuZbOEp3qQOCB39E8f0,21
-mdbq/company/copysh.py,sha256=z1jql2UABdKGGPYF6VRhXcBwCYaCBFR91kZwthBlOdU,17754
+mdbq/company/copysh.py,sha256=tEWittsWE_ocp-ilUvbDQncIVaVgtjjja5M0WHjecE4,17753
 mdbq/config/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/config/get_myconf.py,sha256=-CFEW0dQh4OIwVgwK-cL0eVp1LN3PjJgN89d4P5TB9I,6011
 mdbq/config/products.py,sha256=vIK8DJ-F3XXwvNPK-4OJq2tZITNlL6Sub8QBdoOng8U,5676
@@ -30,12 +30,13 @@ mdbq/mysql/year_month_day.py,sha256=VgewoE2pJxK7ErjfviL_SMTN77ki8GVbTUcao3vFUCE,
 mdbq/other/__init__.py,sha256=jso1oHcy6cJEfa7udS_9uO5X6kZLoPBF8l3wCYmr5dM,18
 mdbq/other/porxy.py,sha256=UHfgEyXugogvXgsG68a7QouUCKaohTKKkI4RN-kYSdQ,4961
 mdbq/other/pov_city.py,sha256=AEOmCOzOwyjHi9LLZWPKi6DUuSC-_M163664I52u9qw,21050
+mdbq/other/sku_picture.py,sha256=U9NG-laKns3g0FJsK-JwqlW1EQZRTEXvIsbdFNBR0Ro,22250
 mdbq/other/ua_sj.py,sha256=JuVYzc_5QZ9s_oQSrTHVKkQv4S_7-CWx4oIKOARn_9U,22178
 mdbq/pbix/__init__.py,sha256=Trtfaynu9RjoTyLLYBN2xdRxTvm_zhCniUkVTAYwcjo,24
 mdbq/pbix/pbix_refresh.py,sha256=JUjKW3bNEyoMVfVfo77UhguvS5AWkixvVhDbw4_MHco,2396
-mdbq/pbix/refresh_all.py,sha256=sBZ61LKvm-raa9ROnC-AAvPYLU7dbudmuxy__5QCB2A,7176
+mdbq/pbix/refresh_all.py,sha256=0uAnBKCd5cx5FLTkawN1GV9yi87rfyMgYal5LABtumQ,7186
 mdbq/spider/__init__.py,sha256=RBMFXGy_jd1HXZhngB2T2XTvJqki8P_Fr-pBcwijnew,18
-mdbq-1.7.8.dist-info/METADATA,sha256=GSjzapW9LjD8Jco2uKTvfb6Ex9lWJW1Eo33BpvXLUls,245
-mdbq-1.7.8.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-mdbq-1.7.8.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
-mdbq-1.7.8.dist-info/RECORD,,
+mdbq-1.8.0.dist-info/METADATA,sha256=hb11aMvPCn1u8Jtmn2BQaMfgkUloamu_-ri-FFpgpns,245
+mdbq-1.8.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+mdbq-1.8.0.dist-info/top_level.txt,sha256=2FQ-uLnCSB-OwFiWntzmwosW3X2Xqsg0ewh1axsaylA,5
+mdbq-1.8.0.dist-info/RECORD,,