xtn-tools-pro 1.0.0.0.5__py3-none-any.whl → 1.0.0.0.7__py3-none-any.whl

xtn_tools_pro/db/MongoDB.py

@@ -8,11 +8,11 @@
 # --------------------------------------------------------------------------------------------------
 # 2024/4/17    xiatn     V00.01.000    新建
 # --------------------------------------------------------------------------------------------------
-from xtn_tools_pro.tools_time import *
 from urllib import parse
+from typing import List, Dict, Optional
+from xtn_tools_pro.utils.time_utils import *
 from pymongo import MongoClient as _MongoClient
 from pymongo.database import Database as _Database
-from typing import List, Dict, Optional
 from pymongo.collection import Collection as _Collection
 from pymongo.errors import DuplicateKeyError, BulkWriteError
 

xtn_tools_pro/proxy/XiaoXiangProxy.py

@@ -10,7 +10,7 @@
 # --------------------------------------------------------------------------------------------------
 import requests, time, random
 from xtn_tools_pro.db.RedisDB import RedisDBPro
-from xtn_tools_pro.tools_time import get_time_now_timestamp, get_time_now_day59_timestamp
+from xtn_tools_pro.utils.time_utils import get_time_now_timestamp, get_time_now_day59_timestamp
 
 import warnings
 from urllib3.exceptions import InsecureRequestWarning

xtn_tools_pro/proxy/proxy.py

@@ -0,0 +1,189 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# 说明：
+#    小象代理专用
+# History:
+# Date          Author    Version       Modification
+# --------------------------------------------------------------------------------------------------
+# 2024/4/27    xiatn     V00.01.000    新建
+# --------------------------------------------------------------------------------------------------
+import requests, time, random
+from xtn_tools_pro.db.RedisDB import RedisDBPro
+from xtn_tools_pro.utils.time_utils import get_time_now_timestamp, get_time_now_day59_timestamp
+
+import warnings
+from urllib3.exceptions import InsecureRequestWarning
+
+warnings.filterwarnings("ignore", category=InsecureRequestWarning)
+
+
+class ProxyPool:
+    def __init__(self, ip, port, db=0, user_pass="", redis_proxy_name="", usage_cnt=100, usage_time=100,*args,**kwargs):
+        """
+        :param ip: redis 数据库 ip
+        :param port: redis 数据库 端口
+        :param db: redis 数据库 db
+        :param user_pass: redis 数据库 密码
+        :param redis_proxy_name: redis 数据库 用于存储代理的key
+        :param usage_cnt: 每个代理最长使用次数 单位秒 维护代理时用
+        :param usage_time: 每个代理最长使用时间 单位秒 维护代理时用
+        :param is_log: 是否记录日志
+        """
+        r = RedisDBPro(ip=ip, port=port, db=db, user_pass=user_pass)
+        self.__redis_pool = r
+        self.__redisProxyName = redis_proxy_name
+
+        # 获取当天0点时间戳
+        self.__now_day59_timestamp = get_time_now_day59_timestamp()
+        self.__usage_cnt = usage_cnt
+        self.__usage_time = usage_time
+
+    def __log(self, text):
+        """
+            记录日志
+        :param text:
+        :return:
+        """
+        print(text)
+
+    def __check_proxy(self):
+        """
+            维护检查代理，删除无用代理
+            删除标准：1.代理使用超过xx次；2.使用时间超过xx秒；3.被爬虫标记使用次数为 999999 会被删除
+        :return:
+        """
+        proxy_val_list = list(self.__redis_pool.get_all_key("{}*".format(self.__redisProxyName)))
+        for proxy_val in proxy_val_list:
+            # 获取时间
+            time_out = proxy_val.split(":")[-1]
+            # 获取使用次数
+            proxy_val_count = self.__redis_pool.get(proxy_val)
+            if int(time_out) + self.__usage_time < get_time_now_timestamp(is_time_10=True):
+                del_state = self.__redis_pool.delete(proxy_val)
+                self.__log(
+                    "当前代理状态:{proxy_val},{time_out}_{py_time}当前代理已超过使用时间,删除状态为：{del_state}".
+                        format(proxy_val=proxy_val, del_state=del_state,
+                               time_out=time_out, py_time=get_time_now_timestamp(is_time_10=True)))
+            elif int(proxy_val_count) >= self.__usage_cnt:
+                del_state = self.__redis_pool.delete(proxy_val)
+                self.__log(
+                    "当前代理状态:{proxy_val},{text},删除状态为：{del_state}".format(proxy_val=proxy_val,
+                                                                         text="当前代理被爬虫标记为不可用" if proxy_val_count >= 999999 else "当前代理已超过使用时间",
+                                                                         del_state=del_state))
+
+    def __get_proxy_length(self):
+        """
+            获取代理数
+        :return:
+        """
+        proxy_val_list = list(self.__redis_pool.get_all_key("{}*".format(self.__redisProxyName)))
+        return len(proxy_val_list)
+
+    def __incr_proxy(self, proxy_val):
+        """
+            自增代理使用次数
+        :param proxy_val: 代理
+        :return:
+        """
+        proxy_val_con = self.__redis_pool.incr(proxy_val)
+        return proxy_val_con
+
+    def __get_api_proxy(self):
+        """
+            通过接口获取小象代理，并存储至数据库
+            响应：
+                {"code":1010,"success":false,"data":null,"msg":"请求过于频繁"}
+                {"code":200,"success":true,"data":[{"ip":"125.123.244.60","port":37635,"realIp":null,"startTime":"2024-04-27 14:09:42","during":2}],"msg":"操作成功"}
+        :return:
+        """
+        while True:
+            self.__check_proxy()
+            try:
+                response = requests.get(url=self.__XiaoXiangProxyAPI, verify=False, timeout=3)
+                if response.status_code == 200:
+                    if response.json().get("msg") == "请求过于频繁":
+                        self.__log("获取小象代理过于频繁，等待2s，{content}".format(content=response.text))
+                        time.sleep(2)
+                        continue
+                    # 获取data
+                    proxy_data_list = response.json().get("data", [])
+                    if not proxy_data_list:
+                        self.__log("获取小象代理失败 data 为空，等待2s，{content}".format(content=response.text))
+                        time.sleep(2)
+                        continue
+                    else:
+                        for data in proxy_data_list:
+                            ip = "http://{ip}".format(ip=data.get("ip"))
+                            port = data.get("port")
+                            time_out = get_time_now_timestamp(is_time_10=True)
+                            proxy_key = "{redis_proxy_name}:{ip}:{port}:{timeOut}".format(
+                                redis_proxy_name=self.__redisProxyName,
+                                ip=ip,
+                                port=port,
+                                timeOut=time_out,
+                            )
+                            proxy_key_con = self.__incr_proxy(proxy_key)
+                            self.__log("获取代理:{proxy_key}，插入数据库状态为{proxy_key_con}".format(proxy_key=proxy_key,
+                                                                                         proxy_key_con=proxy_key_con))
+                        return True  # 获取成功
+                else:
+                    self.__log("获取小象代理返回响应码不为200，等待2s，{content}".format(content=response.text))
+                    time.sleep(2)
+                    continue
+            except Exception as e:
+                self.__log("获取小象代理报错：{e}".format(e=e))
+
+    def run(self):
+        try:
+            while True:
+                # 检查代理
+                self.__check_proxy()
+                # 获取小象代理
+                self.__get_api_proxy()
+                time.sleep(1)
+                # 判断时间是否超过当前23:59分时间戳
+                if get_time_now_timestamp(is_time_10=True) >= self.__now_day59_timestamp:
+                    self.__log("时间23:59，结束循环，{t}".format(t=int(time.time())))
+                    break
+        except Exception as eee:
+            self.__log("程序异常报错:{eee}".format(eee=eee))
+            # self.__del__()
+
+    def get_proxy(self):
+        """
+            从代理池中获取代理
+        :return:
+        """
+        try:
+            while True:
+                proxy_val_list = list(self.__redis_pool.get_all_key("{}*".format(self.__redisProxyName)))
+                if proxy_val_list:
+                    proxy_val = random.choice(proxy_val_list)
+                    proxy_v = ":".join(str(proxy_val).split(":")[1:-1])
+                    self.__log("获取到的代理为：{proxy_v}".format(proxy_v=proxy_v))
+                    return proxy_v
+                else:
+                    self.__log("暂无代理，等待中")
+                    time.sleep(2)
+        except Exception as e:
+            self.__log("从代理池中获取代理：{e}".format(e=e))
+
+    def set_proxy_error(self, proxy_v):
+        """
+            爬虫手动传入代理，设置为 999999 不可用
+        :param proxyV:
+        :return:
+        """
+        try:
+            self.__redis_pool.set(proxy_v, "999999")
+            self.__log("设置不可用的代理 {proxy_v} 为 999999".format(proxy_v=proxy_v))
+        except Exception as e:
+            self.__log("爬虫手动传入代理：{e}".format(e=e))
+
+
+if __name__ == '__main__':
+    # p = ProxyPool(ip="127.0.0.1", port=6379, db=0, user_pass="xtn-kk", XiaoXiangProxyAppKey="1101384562594172928",
+    #               XiaoXiangProxyAppSecret="PJ0QBWML")
+    # print(p.get_proxy())
+    pass

xtn_tools_pro/tools.py

@@ -8,169 +8,16 @@
 # --------------------------------------------------------------------------------------------------
 # 2024/4/17    xiatn     V00.01.000    新建
 # --------------------------------------------------------------------------------------------------
-import hashlib, json, math,re
-from pprint import pformat
-from urllib.parse import urlencode
 
 
-def get_md5_32(s, is_upper=False):
-    """
-        获取文本的md5值 32位
-    :param s: 文本
-    :param is_upper: 是否转大写 默认False
-    :return:
-    """
-    # s.encode()#变成bytes类型才能加密
-    m = hashlib.md5(s.encode())  # 长度是32
-    if is_upper:
-        return m.hexdigest().upper()
-    return m.hexdigest()
-
-
-def get_md5_16(s, is_upper=False):
-    """
-        获取文本的md5值 16位
-    :param s: 文本
-    :param is_upper: 是否转大写 默认False
-    :return:
-    """
-    result = get_md5_32(s, is_upper)
-    return result[8:24]
-
-
-def get_binary_content_md5_32(content, is_upper=False):
-    """
-        二进制内容md5 例如图片
-    :param content: 二进制内容
-    :param is_upper: 是否转大写 默认False
-    :return:
-    """
-    md5_hash = hashlib.md5(content)
-    md5_hexdigest = md5_hash.hexdigest()
-    if is_upper:
-        return md5_hexdigest.upper()
-    return md5_hexdigest
-
-
-def get_binary_content_md5_16(content, is_upper=False):
-    """
-        二进制内容md5 例如图片
-    :param content: 二进制内容
-    :param is_upper: 是否转大写 默认False
-    :return:
-    """
-    result = get_binary_content_md5_32(content, is_upper)
-    return result[8:24]
-
-
-def get_file_md5_32(file_path, is_upper=False):
-    """
-        获取文件md5值
-    :param file_path: 文件路径
-    :param is_upper: 是否转大写 默认False
-    :return: 
-    """
-    with open(file_path, 'rb') as file:
-        data = file.read()
-        md5_hash = hashlib.md5(data).hexdigest()
-    if is_upper:
-        return md5_hash.upper()
-    return md5_hash
-
-
-def get_file_md5_16(file_path, is_upper=False):
-    """
-        获取文件md5值
-    :param file_path: 文件路径
-    :param is_upper: 是否转大写 默认False
-    :return: 
-    """
-    result = get_file_md5_32(file_path, is_upper)
-    return result[8:24]
-
-
-def get_str_to_json(str_json):
-    """
-        字符串类型的json格式 转 json
-    :param str_json: 字符串json
-    :return:
-    """
-    try:
-        new_str_json = str_json.replace("'", '"'). \
-            replace("None", "null").replace("True", "true"). \
-            replace("False", "false")
-        return json.loads(new_str_json)
-    except Exception as e:
-        return {}
-
-
-def get_build_url_with_params(url, params):
-    """
-        传入url和params拼接完整的url ->效果 https://wwww.xxxx.com/?xxx1=1&xxx2=2
-    :param url:
-    :param params:
-    :return:
-    """
-    encoded_params = urlencode(params)
-    full_url = url + "?" + encoded_params
-    return full_url
-
-
-def get_calculate_total_page(total, limit):
-    """
-        根据total和limit计算出一共有多少页
-    :param total:
-    :param limit:
-    :return:
-    """
-    if limit <= 0:
-        return 0
-    # 根据总条数和limit计算总页数
-    total_pages = math.ceil(total / limit)
-    return total_pages
-
-def list_to_strtuple(datas):
-    """
-        列表转字符串
-    :param datas: datas: [1, 2]
-    :return: (1, 2) 字符串类型
-    """
-    data_str = str(tuple(datas))
-    data_str = re.sub(",\)$", ")", data_str)
-    return data_str
-
-
-
-
-def dumps_json(data,indent=4,sort_keys=False):
+def split_image(img):
     """
-        将JSON数据格式化为可打印的字符串
-    :param data:
-    :param indent: 每一级嵌套都使用4个空格进行缩进
-    :param sort_keys: 是否排序
+        切割图片
+    :param img:
     :return:
     """
-    try:
-        if isinstance(data, str):
-            data = get_str_to_json(data)
-
-        data = json.dumps(
-            data,
-            ensure_ascii=False,
-            indent=indent,
-            skipkeys=True,
-            sort_keys=sort_keys,
-            default=str,
-        )
-
-    except Exception as e:
-        data = pformat(data)
-
-    return data
-
-
-def split_image(img):
     pass
 
+
 if __name__ == '__main__':
     pass

xtn_tools_pro/utils/crypto.py

@@ -0,0 +1,104 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# 说明：
+#    加解密、编解码
+# History:
+# Date          Author    Version       Modification
+# --------------------------------------------------------------------------------------------------
+# 2024/5/13    xiatn     V00.01.000    新建
+# --------------------------------------------------------------------------------------------------
+import hashlib
+
+
+def get_md5_32(s: str, is_upper=False):
+    """
+        获取文本的md5值 32位
+    :param s: 文本
+    :param is_upper: 是否转大写 默认False
+    :return:
+    """
+    # s.encode()#变成bytes类型才能加密
+    m = hashlib.md5(s.encode())  # 长度是32
+    if is_upper:
+        return m.hexdigest().upper()
+    return m.hexdigest()
+
+
+def get_md5_16(s: str, is_upper=False):
+    """
+        获取文本的md5值 16位
+    :param s: 文本
+    :param is_upper: 是否转大写 默认False
+    :return:
+    """
+    result = get_md5_32(s, is_upper)
+    return result[8:24]
+
+
+def get_binary_content_md5_32(content, is_upper=False):
+    """
+        二进制内容md5 例如图片
+    :param content: 二进制内容
+    :param is_upper: 是否转大写 默认False
+    :return:
+    """
+    md5_hash = hashlib.md5(content)
+    md5_hexdigest = md5_hash.hexdigest()
+    if is_upper:
+        return md5_hexdigest.upper()
+    return md5_hexdigest
+
+
+def get_binary_content_md5_16(content, is_upper=False):
+    """
+        二进制内容md5 例如图片
+    :param content: 二进制内容
+    :param is_upper: 是否转大写 默认False
+    :return:
+    """
+    result = get_binary_content_md5_32(content, is_upper)
+    return result[8:24]
+
+
+def get_file_md5_32(file_path, is_upper=False):
+    """
+        获取文件md5值
+    :param file_path: 文件路径
+    :param is_upper: 是否转大写 默认False
+    :return:
+    """
+    with open(file_path, 'rb') as file:
+        data = file.read()
+        md5_hash = hashlib.md5(data).hexdigest()
+    if is_upper:
+        return md5_hash.upper()
+    return md5_hash
+
+
+def get_file_md5_16(file_path, is_upper=False):
+    """
+        获取文件md5值
+    :param file_path: 文件路径
+    :param is_upper: 是否转大写 默认False
+    :return:
+    """
+    result = get_file_md5_32(file_path, is_upper)
+    return result[8:24]
+
+
+def get_sha1(s: str, is_upper=False):
+    """
+        sha1
+    :param s: 文本
+    :param is_upper: 是否转大写 默认False
+    :return:
+    """
+    # 使用sha1算法进行哈希
+    sha1_hash = hashlib.sha1(s.encode()).hexdigest()
+    if is_upper:
+        return sha1_hash.upper()
+    return sha1_hash
+
+if __name__ == '__main__':
+    print(get_sha1("111"))

xtn_tools_pro/utils/file_utils.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# 说明：
+#    文件
+# History:
+# Date          Author    Version       Modification
+# --------------------------------------------------------------------------------------------------
+# 2024/5/13    xiatn     V00.01.000    新建
+# --------------------------------------------------------------------------------------------------
+import os
+import re
+
+
+def get_file_extension(file_name):
+    """
+        根据文件名获取文件扩展名/后缀名
+    :param file_name: 文件名称
+    :return:
+    """
+    _, file_extension = os.path.splitext(file_name)
+    return file_extension
+
+
+def get_file_check_filename(file_name):
+    """
+        传入文件名返回一个合法的文件名 会替换掉一些特殊符号 常用于爬虫写文件时文件名中带有特殊符号的情况...
+    :param filename: 文件名
+    :return:
+    """
+    file_extension = get_file_extension(file_name)
+    # 删除非法字符
+    sanitized_filename = re.sub(r'[\/:*?"<>|]', '', file_name)
+    max_length = 255  # 操作系统限制文件名的最大长度为255个
+    sanitized_filename = sanitized_filename[:max_length]
+    return sanitized_filename
+
+
+if __name__ == '__main__':
+    pass
+    print(get_file_extension('file/2024-04-19/BOSCH GEX 125-1A/125-1AE砂磨机操作说明书:[1]_jingyan.txt'))
+    print(get_file_check_filename('file/2024-04-19/BOSCH GEX 125-1A/125-1AE砂磨机操作说明书:[1]_jingyan.txt'))

xtn_tools_pro/utils/helpers.py

@@ -0,0 +1,126 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# 说明：
+#    杂七杂八
+# History:
+# Date          Author    Version       Modification
+# --------------------------------------------------------------------------------------------------
+# 2024/5/13    xiatn     V00.01.000    新建
+# --------------------------------------------------------------------------------------------------
+import re
+import uuid
+import math
+import json
+from uuid import UUID
+from pprint import pformat
+from urllib.parse import urlencode
+
+
+def get_uuid(version=4, namespace: UUID = uuid.NAMESPACE_DNS, name=""):
+    """
+        生成uuid
+    :param version:版本号
+        1:基于当前时间和 MAC 地址生成版本 1 的 UUID，具有唯一性，但可能存在一定的安全风险。
+        3:基于名称和命名空间的方式生成。它通过将名称和命名空间的标识符组合起来进行哈希计算，生成一个唯一的标识符。UUID 版本 3 使用的哈希算法是 MD5。
+        4:使用随机数生成版本 4 的 UUID，具有足够的随机性和唯一性。
+        5:使用基于命名空间和名称生成版本 5 的 UUID，可以使用自定义的命名空间和名称。
+    :param namespace:命名空间 uuid.NAMESPACE_DNS、uuid.NAMESPACE_URL、uuid.NAMESPACE_OID、uuid.NAMESPACE_X500
+    :param name:名称 自定义
+    :return:
+    """
+    if version == 1:
+        result = uuid.uuid1()
+    elif version == 3:
+        result = uuid.uuid3(namespace, name)
+    elif version == 5:
+        result = uuid.uuid5(namespace, name)
+    else:
+        result = uuid.uuid4()
+
+    # uuid_str = str(result)
+    # uuid_hex = uuid_obj.hex
+    # uuid_int = uuid_obj.int
+    # uuid_bytes = uuid_obj.bytes
+    return result
+
+
+def get_str_to_json(str_json):
+    """
+        字符串类型的json格式 转 json
+    :param str_json: 字符串json
+    :return:
+    """
+    try:
+        new_str_json = str_json.replace("'", '"'). \
+            replace("None", "null").replace("True", "true"). \
+            replace("False", "false")
+        return json.loads(new_str_json)
+    except Exception as e:
+        return {}
+
+
+def list_to_strtuple(datas):
+    """
+        列表转字符串元组
+    :param datas: datas: [1, 2]
+    :return: (1, 2) 字符串类型
+    """
+    data_str = str(tuple(datas))
+    data_str = re.sub(",\)$", ")", data_str)
+    return data_str
+
+
+def dumps_json(data, indent=4, sort_keys=False):
+    """
+        将JSON数据格式化为可打印的字符串
+    :param data:
+    :param indent: 每一级嵌套都使用4个空格进行缩进
+    :param sort_keys: 是否排序
+    :return:
+    """
+    try:
+        if isinstance(data, str):
+            data = get_str_to_json(data)
+
+        data = json.dumps(
+            data,
+            ensure_ascii=False,
+            indent=indent,
+            skipkeys=True,
+            sort_keys=sort_keys,
+            default=str,
+        )
+
+    except Exception as e:
+        data = pformat(data)
+
+    return data
+
+
+def get_calculate_total_page(total, limit):
+    """
+        根据total和limit计算出一共有多少页
+    :param total:
+    :param limit:
+    :return:
+    """
+    if limit <= 0:
+        return 0
+    # 根据总条数和limit计算总页数
+    total_pages = math.ceil(total / limit)
+    return total_pages
+
+def get_build_url_with_params(url, params):
+    """
+        传入url和params拼接完整的url ->效果 https://wwww.xxxx.com/?xxx1=1&xxx2=2
+    :param url:
+    :param params:
+    :return:
+    """
+    encoded_params = urlencode(params)
+    full_url = url + "?" + encoded_params
+    return full_url
+
+if __name__ == '__main__':
+    print(get_uuid(4))

xtn_tools_pro/utils/log.py

@@ -10,11 +10,10 @@
 # --------------------------------------------------------------------------------------------------
 import os
 import sys
-import time
 import inspect
 import logging
-from xtn_tools_pro.tools_time import get_time_timestamp_to_datestr
 from logging.handlers import BaseRotatingHandler
+from xtn_tools_pro.utils.time_utils import get_time_timestamp_to_datestr
 
 
 class RotatingFileHandler(BaseRotatingHandler):

xtn_tools_pro/utils/sql.py

@@ -9,7 +9,7 @@
 # 2024/5/12    xiatn     V00.01.000    新建
 # --------------------------------------------------------------------------------------------------
 import datetime
-from xtn_tools_pro.tools import list_to_strtuple, dumps_json
+from xtn_tools_pro.utils.helpers import list_to_strtuple, dumps_json
 
 
 def format_sql_value(value):

xtn_tools_pro/utils/time_utils.py

@@ -0,0 +1,143 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# 说明：
+#    时间
+# History:
+# Date          Author    Version       Modification
+# --------------------------------------------------------------------------------------------------
+# 2024/5/13    xiatn     V00.01.000    新建
+# --------------------------------------------------------------------------------------------------
+import time
+import datetime
+
+
+def get_time_now_timestamp(is_time_10=False, is_time_13=False):
+    """
+        获取当前时间戳
+    :param is_time_10: 是否需要处理为10位的时间戳，默认不处理
+    :param is_time_13: 是否需要处理为13位的时间戳，默认不处理
+    :return:
+    """
+
+    if is_time_10:
+        val = int(time.time())
+    elif is_time_13:
+        val = int(time.time() * 1000)
+    else:
+        val = time.time()
+    return val
+
+
+def get_time_now_day0_timestamp(is_time_13=False):
+    """
+        获取当天0点时间戳
+    :param is_time_13: 是否需要处理为13位的时间戳，默认不处理并且返回10位时间戳
+    :return:
+    """
+    val = time.mktime(datetime.date.today().timetuple())
+    if is_time_13:
+        return int(val * 1000)
+    else:
+        return int(val)
+
+
+def get_time_now_day59_timestamp(is_time_13=False):
+    """
+        获取当天23:59:59点时间戳
+    :param is_time_13: 是否需要处理为13位的时间戳，默认不处理并且返回10位时间戳
+    :return:
+    """
+    # 获取当前日期时间
+    now = datetime.datetime.now()
+    # 设置小时、分钟、秒为 23:59:59
+    last_second = now.replace(hour=23, minute=59, second=59)
+    # 转换为时间戳
+    timestamp = time.mktime(last_second.timetuple())
+    # 转换为整数类型
+    if is_time_13:
+        return get_time_10_to_13_timestamp(timestamp)
+    else:
+        return int(timestamp)
+
+
+def get_time_x_day_timestamp(x, is_time_13=False):
+    """
+        获取x天的0点的时间戳
+    :param x: 0:当天; 1:1天后; -1:一天前
+    :param is_time_13: 是否需要处理为13位的时间戳，默认不处理并且返回10位时间戳
+    :return:
+    """
+    if x == 0:
+        date_string = datetime.datetime.now().strftime("%Y-%m-%d")  # 当天日期
+    elif x > 0:
+        future_date = datetime.datetime.now() + datetime.timedelta(days=x)
+        date_string = future_date.strftime("%Y-%m-%d")  # x天后的日期
+    else:
+        past_date = datetime.datetime.now() - datetime.timedelta(days=abs(x))
+        date_string = past_date.strftime("%Y-%m-%d")  # x天前的日期
+
+    timestamp = get_time_datestr_to_timestamp(date_string=date_string, is_time_13=is_time_13)
+    return timestamp
+
+
+def get_time_datestr_to_timestamp(date_string, date_format="%Y-%m-%d", is_time_13=False):
+    """
+        根据日期格式转换为时间戳，date_string和date_format需要配合，自行传参修改，这里是以%Y-%m-%d为格式也就是2024-04-18
+    :param date_string: 字符串类型的日期格式 例如：2024-04-18
+    :param date_format: 时间格式
+    :param is_time_13: 是否需要处理为13位的时间戳，默认不处理并且返回10位时间戳
+    :return:
+    """
+    date_obj = datetime.datetime.strptime(date_string, date_format)
+    timestamp = date_obj.timestamp()
+    if is_time_13:
+        return get_time_10_to_13_timestamp(timestamp)
+    else:
+        return int(timestamp)
+
+
+def get_time_10_to_13_timestamp(timestamp):
+    """
+        10位时间戳转13位时间戳
+    :param timestamp:
+    :return:
+    """
+    val = int(timestamp)
+    if len(str(val)) == 10:
+        return int(val * 1000)
+    return val
+
+
+def get_time_13_to_10_timestamp(timestamp):
+    """
+        13位时间戳转10位时间戳
+    :param timestamp:
+    :return:
+    """
+    val = int(timestamp)
+    if len(str(val)) == 13:
+        return int(val // 1000)
+    return val
+
+
+def get_time_timestamp_to_datestr(format='%Y-%m-%d %H:%M:%S', now_time=0):
+    """
+        根据时间戳转换为日期格式，兼容10位时间戳和13位时间戳
+    :param format: 日期格式，常用：%Y-%m-%d %H:%M:%S、%Y-%m-%d、%Y/%m/%d、%H:%M:%S ...
+    :param now_time: 时间戳，默认0表示当前时间戳
+    :return:
+    """
+    # 根据格式获取当前转换好的时间
+    if not now_time:
+        now_time = get_time_now_timestamp()
+    now_time = get_time_13_to_10_timestamp(now_time)
+    val = time.strftime(format, time.localtime(now_time))
+    return val
+
+
+if __name__ == '__main__':
+    pass
+    print(get_time_timestamp_to_datestr())
+    print(get_time_timestamp_to_datestr(format="%H:%M:%S", now_time=get_time_now_timestamp(is_time_10=True)))
+    print(get_time_timestamp_to_datestr(now_time=get_time_now_timestamp(is_time_13=True)))

{xtn_tools_pro-1.0.0.0.5.dist-info → xtn_tools_pro-1.0.0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.0.0.5
+Version: 1.0.0.0.7
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@163.com

xtn_tools_pro-1.0.0.0.7.dist-info/RECORD

@@ -0,0 +1,24 @@
+xtn_tools_pro/__init__.py,sha256=26Tf9j2wj88M1Ldg3b1DJ40KyGgN9ZmQdBLuV453388,395
+xtn_tools_pro/tools.py,sha256=KmOOrSnjZNJ3u9vFkMO3FX0DxtlW3fnI5fL4e_raCRs,542
+xtn_tools_pro/tools_flie.py,sha256=-FID31G8AnV2u2djRO3Ae3Ei9ld9bSBWgzwqhYzZ5JQ,1517
+xtn_tools_pro/tools_time.py,sha256=DMjsw9h4E_mrPsanPA8CEhpUE1AA6Z2FU4OJqJKZc1k,4867
+xtn_tools_pro/db/MongoDB.py,sha256=zQLfZ-mhZWCFgY3dPF3dRAzAR3C8hrXO_yLZw9cUUUY,5573
+xtn_tools_pro/db/MysqlDB.py,sha256=SBJrcjbZdxmtTKPGwl57NthPhs4uX8J3P6o_rK01O4k,13373
+xtn_tools_pro/db/RedisDB.py,sha256=ep32Yj8AAkUHRshSBhKsdl06UwO7Z-gQJLaezspVRKw,6053
+xtn_tools_pro/db/__init__.py,sha256=Zg91UWS02TO0Ba_0AY56s0oabRy93xLNFkpIIL_6mMM,416
+xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=6jzGgN2t2zLPIKbSgN8seixwDLY4IjoZvB26f8yTUME,9848
+xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmcyo,418
+xtn_tools_pro/proxy/proxy.py,sha256=No6E1pFY5yx2F4976pXPrLtq-QEVp79KupzcufjSN58,8703
+xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
+xtn_tools_pro/utils/crypto.py,sha256=qOsVpQo_2yoPZ71Vcr-W_YGyDwi6iNJNFxR9MnnhG4s,2770
+xtn_tools_pro/utils/file_utils.py,sha256=4Bmb1ISxqQC-7doPXDyY2o-H0m4upj_-hlLrO36sKJg,1509
+xtn_tools_pro/utils/helpers.py,sha256=VzevgDk0tZAxFmuFlMBIaJ3QyiFxp5Qg-mLPgE83jRI,3773
+xtn_tools_pro/utils/log.py,sha256=8CRMiY7Q9LWGJLhfL0YfpANBwLets9f2qWfMOe5PpNM,8139
+xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
+xtn_tools_pro/utils/sql.py,sha256=EAKzbkZP7Q09j15Gm6o0_uq0qgQmcCQT6EAawbpp4v0,6263
+xtn_tools_pro/utils/time_utils.py,sha256=TUtzG61PeVYXhaQd6pBrXAdlz7tBispNIRQRcGhE2No,4859
+xtn_tools_pro-1.0.0.0.7.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.0.7.dist-info/METADATA,sha256=epiyUW1nMeu4dZ000DVFujSlMFf1uIv8wO-LnRAAXMQ,431
+xtn_tools_pro-1.0.0.0.7.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.0.7.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.0.7.dist-info/RECORD,,

xtn_tools_pro-1.0.0.0.5.dist-info/RECORD

@@ -1,19 +0,0 @@
-xtn_tools_pro/__init__.py,sha256=26Tf9j2wj88M1Ldg3b1DJ40KyGgN9ZmQdBLuV453388,395
-xtn_tools_pro/tools.py,sha256=xOqTL7jrJvmsPZBiUizKe7yWkmqvEbt-WGylGswNcQ8,4457
-xtn_tools_pro/tools_flie.py,sha256=-FID31G8AnV2u2djRO3Ae3Ei9ld9bSBWgzwqhYzZ5JQ,1517
-xtn_tools_pro/tools_time.py,sha256=DMjsw9h4E_mrPsanPA8CEhpUE1AA6Z2FU4OJqJKZc1k,4867
-xtn_tools_pro/db/MongoDB.py,sha256=_GiX1MHNl9CtI-uLDgY_NmMSvRJei-mtKq3Hhe6ly1E,5567
-xtn_tools_pro/db/MysqlDB.py,sha256=SBJrcjbZdxmtTKPGwl57NthPhs4uX8J3P6o_rK01O4k,13373
-xtn_tools_pro/db/RedisDB.py,sha256=ep32Yj8AAkUHRshSBhKsdl06UwO7Z-gQJLaezspVRKw,6053
-xtn_tools_pro/db/__init__.py,sha256=Zg91UWS02TO0Ba_0AY56s0oabRy93xLNFkpIIL_6mMM,416
-xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=xrEBJZ6Cjuh6IBZVB17oXHwByaeKcWVUSSWSg17tujE,9842
-xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmcyo,418
-xtn_tools_pro/utils/__init__.py,sha256=I1_n_NP23F2lBqlF4EOlnOdLYxM8M4pbn63UhJN1hRE,418
-xtn_tools_pro/utils/log.py,sha256=bSuPsGKVBbGLT5hmIcfRi9TeuJApALcPa1qGMrCHk24,8146
-xtn_tools_pro/utils/retry.py,sha256=0wjHsR5DBBKpv4naMfxiky8kprrZes4WURIfFQ4H708,1657
-xtn_tools_pro/utils/sql.py,sha256=YSDx2BxkQk-QA6RGBiImR9bbT4WyKDiCYU8Q4ZdaMG0,6255
-xtn_tools_pro-1.0.0.0.5.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.0.5.dist-info/METADATA,sha256=JAHmDIpLXqWb8Y5SoEso1ss7gh09BfnMEhmUIBc_D6c,431
-xtn_tools_pro-1.0.0.0.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.0.5.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.0.5.dist-info/RECORD,,