re-common 0.2.53__tar.gz → 0.2.54__tar.gz

{re_common-0.2.53 → re_common-0.2.54}/PKG-INFO

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
 Name: re_common
-Version: 0.2.53
+Version: 0.2.54
 Summary: a library about all python projects
 Home-page: https://gitee.com/xujiangios/re-common
 Author: vic
 Author-email: xujiang5@163.com
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Operating System :: OS Independent
@@ -16,5 +14,3 @@ License-File: LICENSE
 
 
     这是一个基础类，依赖很多的第三方包，是一个用得到的第三方库的封装，可以在此基础上迅速构建项目
-
-

{re_common-0.2.53 → re_common-0.2.54}/re_common/baselibrary/tools/image_to_pdf.py

@@ -1,62 +1,62 @@
-# coding = UTF-8
-
-
-# 导入Python标准库
-import os
-from io import BytesIO
-
-# 导入第三方库
-from PIL import Image
-
-# 防止中文乱码
-os.environ['NLS_LANG'] = 'SIMPLIFIED CHINESE_CHINA.UTF8'
-
-# 支持的图片文件格式
-SUPPORT_SUFFIX = ["jpg", "jpeg", "png"]
-
-
-def pic_to_pdf(image_bytes: bytes) -> bytes:
-    """将单个图片转换为单张PDF
-
-    :param image_bytes: 图片的bytes对象
-    :return: PDF的bytes对象
-    """
-    # 将bytes对象转换为BytesIO对象
-    image_bytes_io = BytesIO(image_bytes)
-    # 从内存中读取图片
-    image_object = Image.open(image_bytes_io)
-    # 打开内存中的文件用于保存PDF
-    with BytesIO() as result_bytes_io:
-        # 将图片保存为单张PDF
-        image_object.save(result_bytes_io, "PDF", resolution=100.0)
-        # 获取内存中的文件
-        data = result_bytes_io.getvalue()
-    # 返回PDF的bytes对象
-    return data
-
-
-def batch_convert(image_path: str, pdf_path: str) -> None:
-    """批量将图片转换为单张PDF
-
-    :param image_path: 图片的文件夹
-    :param pdf_path: PDF文件保存的文件夹
-    """
-    # 遍历文件夹下所有文件
-    for root, dirs, files in os.walk(image_path, topdown=False):
-        for name in files:
-            # 提取文件的后缀名
-            file_suffix = os.path.splitext(name)[-1].lstrip(".").lower()
-            # 检测该文件格式是否受到支持
-            if file_suffix not in SUPPORT_SUFFIX:
-                continue
-            # 拼接出图片文件的绝对路径
-            source_file_path = os.path.join(root, name)
-            # 拼接出PDF文件的绝对路径
-            target_file_path = os.path.join(pdf_path, f"{os.path.splitext(name)[0]}.pdf")
-            # 将图片文件转换为PDF文件
-            with open(source_file_path, "rb") as source:
-                with open(target_file_path, "wb") as target:
-                    target.write(pic_to_pdf(source.read()))
-
-
+# coding = UTF-8
+
+
+# 导入Python标准库
+import os
+from io import BytesIO
+
+# 导入第三方库
+from PIL import Image
+
+# 防止中文乱码
+os.environ['NLS_LANG'] = 'SIMPLIFIED CHINESE_CHINA.UTF8'
+
+# 支持的图片文件格式
+SUPPORT_SUFFIX = ["jpg", "jpeg", "png"]
+
+
+def pic_to_pdf(image_bytes: bytes) -> bytes:
+    """将单个图片转换为单张PDF
+
+    :param image_bytes: 图片的bytes对象
+    :return: PDF的bytes对象
+    """
+    # 将bytes对象转换为BytesIO对象
+    image_bytes_io = BytesIO(image_bytes)
+    # 从内存中读取图片
+    image_object = Image.open(image_bytes_io)
+    # 打开内存中的文件用于保存PDF
+    with BytesIO() as result_bytes_io:
+        # 将图片保存为单张PDF
+        image_object.save(result_bytes_io, "PDF", resolution=100.0)
+        # 获取内存中的文件
+        data = result_bytes_io.getvalue()
+    # 返回PDF的bytes对象
+    return data
+
+
+def batch_convert(image_path: str, pdf_path: str) -> None:
+    """批量将图片转换为单张PDF
+
+    :param image_path: 图片的文件夹
+    :param pdf_path: PDF文件保存的文件夹
+    """
+    # 遍历文件夹下所有文件
+    for root, dirs, files in os.walk(image_path, topdown=False):
+        for name in files:
+            # 提取文件的后缀名
+            file_suffix = os.path.splitext(name)[-1].lstrip(".").lower()
+            # 检测该文件格式是否受到支持
+            if file_suffix not in SUPPORT_SUFFIX:
+                continue
+            # 拼接出图片文件的绝对路径
+            source_file_path = os.path.join(root, name)
+            # 拼接出PDF文件的绝对路径
+            target_file_path = os.path.join(pdf_path, f"{os.path.splitext(name)[0]}.pdf")
+            # 将图片文件转换为PDF文件
+            with open(source_file_path, "rb") as source:
+                with open(target_file_path, "wb") as target:
+                    target.write(pic_to_pdf(source.read()))
+
+
 batch_convert(r"C:\Users\Administrator\Desktop\上传\zhuanhuan\20230404\新建文件夹 (5)",r"C:\Users\Administrator\Desktop\上传\zhuanhuan\20230404\pdf")

{re_common-0.2.53 → re_common-0.2.54}/re_common/baselibrary/utils/baseboto3.py

@@ -70,6 +70,7 @@ class BaseBoto3(object):
             # 按名称创建资源服务客户端
             self.client = self.session.resource('s3', endpoint_url=self.endpoint_url)
             print(type(self.client))
+        return self
 
     def get_all_buckets(self):
         """
@@ -116,6 +117,8 @@ class BaseBoto3(object):
         if self.is_low_level is False:
             self.bucket = self.client.Bucket(bucket_name)
             return self.bucket
+        else:
+            raise Exception("无实现方法")
 
     def get_all_obs_filter(self, Prefix):
         """
@@ -182,16 +185,107 @@ class BaseBoto3(object):
 
     def check_exist(self, bucket_name, key):
         """
+         if self.is_low_level:
+            {'ResponseMetadata': {'RequestId': '17E6A65A2B299D3B', 'HostId': '', 'HTTPStatusCode': 200, 'HTTPHeaders': {'accept-ranges': 'bytes', 'content-length': '117', 'content-security-policy': 'block-all-mixed-content', 'content-type': 'binary/octet-stream', 'etag': '"2237a934f176003e41abf3d733291079"', 'last-modified': 'Thu, 25 Jul 2024 05:49:43 GMT', 'server': 'MinIO', 'strict-transport-security': 'max-age=31536000; includeSubDomains', 'vary': 'Origin, Accept-Encoding', 'x-amz-request-id': '17E6A65A2B299D3B', 'x-content-type-options': 'nosniff', 'x-xss-protection': '1; mode=block', 'date': 'Mon, 29 Jul 2024 09:53:33 GMT'}, 'RetryAttempts': 0}, 'AcceptRanges': 'bytes', 'LastModified': datetime.datetime(2024, 7, 25, 5, 49, 43, tzinfo=tzutc()), 'ContentLength': 117, 'ETag': '"2237a934f176003e41abf3d733291079"', 'ContentType': 'binary/octet-stream', 'Metadata': {}}
         判定文件是否存在，
         :param bucket_name: 桶名
         :param key:  文件key
         :return:
         """
-        try:
-            obj_info = self.client.head_object(
-                Bucket=bucket_name,
-                Key=key
-            )
-            return obj_info
-        except:
-            return None
+
+        if self.is_low_level:
+            try:
+                obj_info = self.client.head_object(
+                    Bucket=bucket_name,
+                    Key=key
+                )
+                return obj_info
+            except:
+                return None
+        else:
+            # 获取指定存储桶
+            bucket = self.client.Bucket(bucket_name)
+            # 检查 key 是否存在
+            objs = list(bucket.objects.filter(Prefix=key))
+            if len(objs) > 0 and objs[0].key == key:
+                # [s3.ObjectSummary(bucket_name='crawl.dc.cqvip.com', key='foreign/organ/parsel_organ_log.txt')]
+                return objs[0]
+            else:
+                return None
+
+    def get_prefix_obj(self, bucket, prefix, delimiter):
+        """
+        Bucket="crawl.dc.cqvip.com",
+         Prefix="foreign/organ/ei/",
+         Delimiter='/'
+
+        Returns:
+
+        """
+        if self.is_low_level:
+            # for common_prefix in response.get('CommonPrefixes', []): 获取子目录
+            return self.client.list_objects_v2(Bucket=bucket,
+                                               Prefix=prefix,
+                                               Delimiter=delimiter)  # 设置 Delimiter='/' 可以确保只列出目录而不是所有对象。
+        else:
+            # 该方法只能列出文件 没办法列出目录
+            # bucket_resource = self.client.Bucket(bucket)
+            # objects = bucket_resource.objects.filter(Prefix=prefix, Delimiter=delimiter)
+            # return list(objects)
+
+            bucket_resource = self.client.Bucket(bucket)
+            return bucket_resource.meta.client.list_objects_v2(Bucket=bucket,
+                                                               Prefix=prefix,
+                                                               Delimiter=delimiter)
+
+    def get_object_value(self, bucket_name, file_key, encoding='utf-8'):
+        """
+        读取文本数据
+        Returns:
+
+        """
+        if self.is_low_level:
+            obj = self.client.get_object(Bucket=bucket_name, Key=file_key)
+            body = obj['Body'].read().decode(encoding)
+            return body
+        else:
+            bucket_resource = self.client.Bucket(bucket_name)
+            obj = bucket_resource.Object(file_key)
+            body = obj.get()['Body'].read().decode(encoding)
+            return body
+
+    def put_object(self, bucket_name, key, body):
+        """
+        直接写内容到文件
+        Args:
+            bucket_name:
+            key:
+            body: 需要 编码 .encode('utf-8')
+
+        Returns:
+
+        """
+        if self.is_low_level:
+            self.client.put_object(Bucket=bucket_name,
+                                   Key=key,
+                                   Body=body)
+        else:
+            # 获取 Bucket 对象
+            bucket_resource = self.client.Bucket(bucket_name)
+
+            # 将内容写入文件
+            bucket_resource.put_object(Key=key, Body=body)
+
+
+bb = BaseBoto3(aws_access_key_id="UM51J2G5ZG0FE5CCERB9",
+               aws_secret_access_key="u+OEmhE2fahF2L+oXB+HXe8IJs22Lo38icvlF+Yq",
+               endpoint_url="http://192.168.31.135:9000"
+               )
+bb.conn_session()
+bb.set_is_low_level(False)
+bb.get_client()
+
+result = bb.check_exist("crawl.dc.cqvip.com",
+                        "foreign/organ/parsel_organ_log.txt")
+
+print(result)

{re_common-0.2.53 → re_common-0.2.54}/re_common/baselibrary/utils/core/requests_core.py

@@ -1,103 +1,103 @@
-USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.106 Safari/537.36'
-
-USER_AGENTS = [
-    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.62 Safari/537.36",
-    "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; AcooBrowser; .NET CLR 1.1.4322; .NET CLR 2.0.50727)",
-    "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Acoo Browser; SLCC1; .NET CLR 2.0.50727; Media Center PC 5.0; .NET CLR 3.0.04506)",
-    "Mozilla/4.0 (compatible; MSIE 7.0; AOL 9.5; AOLBuild 4337.35; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)",
-    "Mozilla/5.0 (Windows; U; MSIE 9.0; Windows NT 9.0; en-US)",
-    "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Win64; x64; Trident/5.0; .NET CLR 3.5.30729; .NET CLR 3.0.30729; .NET CLR 2.0.50727; Media Center PC 6.0)",
-    "Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0; WOW64; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; .NET CLR 1.0.3705; .NET CLR 1.1.4322)",
-    "Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 5.2; .NET CLR 1.1.4322; .NET CLR 2.0.50727; InfoPath.2; .NET CLR 3.0.04506.30)",
-    "Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN) AppleWebKit/523.15 (KHTML, like Gecko, Safari/419.3) Arora/0.3 (Change: 287 c9dfb30)",
-    "Mozilla/5.0 (X11; U; Linux; en-US) AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.6",
-    "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.2pre) Gecko/20070215 K-Ninja/2.1.1",
-    "Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9) Gecko/20080705 Firefox/3.0 Kapiko/3.0",
-    "Mozilla/5.0 (X11; Linux i686; U;) Gecko/20070322 Kazehakase/0.4.5",
-    "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.8) Gecko Fedora/1.9.0.8-1.fc10 Kazehakase/0.5.6",
-    "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11",
-    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.20 (KHTML, like Gecko) Chrome/19.0.1036.7 Safari/535.20",
-    "Opera/9.80 (Macintosh; Intel Mac OS X 10.6.8; U; fr) Presto/2.9.168 Version/11.52",
-]
-
-INSIDE_HEADERS = {
-    "accept": "application/json",
-    "content-type": "application/json"
-}
-
-
-def set_proxy(proxy):
-    Proxiesss = {
-        'http': proxy,
-        'https': proxy
-    }
-    return Proxiesss
-
-
-def set_proxy_aio(proxy):
-    if proxy:
-        return r"http://" + proxy
-    return None
-
-
-def set_proxy_httpx(proxy):
-    if proxy.find("socks") > -1:
-        return proxy
-    if proxy:
-        Proxiesss = {
-            'http://': "http://" + proxy,
-            'https://': "http://" + proxy
-        }
-        return Proxiesss
-    else:
-        return None
-
-
-class MsgCode(object):
-    SUCCESS_CODE: int = 200  # 成功状态码
-
-    NO_RESOURCE: int = 421  # 网页明确表明无资源
-    PAGE_BLANK: int = 420  # 网页空白页
-    END_STRING_ERROR: int = 210  # html结尾验证错误
-    MARK_ERROR: int = 211  # 验证html错误，验证没有通过
-    NOT_IS_JSON: int = 212  # 验证返回是否是json
-    VER_CODE: int = 213  # 需要验证码
-    NONE_HTML: int = 214  # html为空 空的html 在使用某些代理时 如果https 写成了http,会有这种情况
-    STATUS_ERROR: int = 215  # API接口内部执行错误
-    CODE_ERROR: int = 216  # data 状态码错误
-    URL_TIMEOUT: int = 217
-
-    SETTING_CONFIG_ERROR: int = 251 # 特定错误 更新taskinfo_save_setting的任务控制配置失败(switch参数错误,只能为0或1)
-
-    API_FAIL_CODE: int = 400  # api失败，但具体原因未知的状态码
-    TIME_OUT_ERROR: int = 408  # 超时错误
-    PROXY_ERROR: int = 422  # 代理错误
-    PAYLOAD_ERROR: int = 423  # 非法的压缩格式，错误的chunk编码，数据不足Content-length的大小。通常为Accept-Encoding:gzip, deflate, br ，也就是三种编码格式。但其实，aiohttp默认没有br解码，或者html编码格式错误
-    SERVER_ERROR: int = 530  # 服务器异常错误，被捕获发送
-    CHAOXIN_COOKIE_ERROR: int = 556  # 超星期刊获取cookie失败
-
-    DATABASE_CONFIG_IN_CODE: int = 998  # 在代码中配置数据库无对应错误码
-
-    ON_KNOW: int = 1000  # 未知错误
-
-    MONGO_ERROR: int = 1001  # mongodb 錯誤系列由1000 到 1100
-    MONGO_NO_ID: int = 1002  # 操作时由于没有该id的状态码，比如更新时ID不存在
-
-    PARE_STRUCTURE_ERROR: int = 1101  # 解析系列由1100 到 1200，解析结构错误
-    PARE_NO_DATA: int = 1102  # 没有数据，且认为是正常的没有数据的标识
-    PARE_NO_DATA_ERR: int = 1103  # 没有数据，且认为是非正常的没有数据的标识
-    PARE_NO_DATA_1: int = 1104  # 预留几个无数据，在不同库不同意义
-    PARE_NO_DATA_2: int = 1105  # 预留几个无数据，在不同库不同意义
-    PARE_NO_DATA_3: int = 1106  # 预留几个无数据，在不同库不同意义
-    SQL_INSERT_ERROR: int = 1201  # sql错误 由 1200 到 1300 insert 错误
-    SQL_UPDATE_ERROR: int = 1202  # update 错误
-    SQL_SELECT_ALL_ERROR: int = 1203  # 执行fetchall 错误
-    SQL_EXECUTEMANY_ERROR: int = 1204  # executemany 执行错误
-    SQL_EXECUTE_ERROR: int = 1205  # execute 执行错误
-    SQL_REPLACE_ERROR: int = 1206  # replace 执行错误
-
-    GRPC_MESSAGE_DECODEERROR: int = 1301  # grpc服务编码错误
-
-
-SUCCESS = "SUCCESS"
-FAILED = "FAILED"
+USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.106 Safari/537.36'
+
+USER_AGENTS = [
+    "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.62 Safari/537.36",
+    "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; AcooBrowser; .NET CLR 1.1.4322; .NET CLR 2.0.50727)",
+    "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; Acoo Browser; SLCC1; .NET CLR 2.0.50727; Media Center PC 5.0; .NET CLR 3.0.04506)",
+    "Mozilla/4.0 (compatible; MSIE 7.0; AOL 9.5; AOLBuild 4337.35; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)",
+    "Mozilla/5.0 (Windows; U; MSIE 9.0; Windows NT 9.0; en-US)",
+    "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Win64; x64; Trident/5.0; .NET CLR 3.5.30729; .NET CLR 3.0.30729; .NET CLR 2.0.50727; Media Center PC 6.0)",
+    "Mozilla/5.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0; WOW64; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; .NET CLR 1.0.3705; .NET CLR 1.1.4322)",
+    "Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 5.2; .NET CLR 1.1.4322; .NET CLR 2.0.50727; InfoPath.2; .NET CLR 3.0.04506.30)",
+    "Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN) AppleWebKit/523.15 (KHTML, like Gecko, Safari/419.3) Arora/0.3 (Change: 287 c9dfb30)",
+    "Mozilla/5.0 (X11; U; Linux; en-US) AppleWebKit/527+ (KHTML, like Gecko, Safari/419.3) Arora/0.6",
+    "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.2pre) Gecko/20070215 K-Ninja/2.1.1",
+    "Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-CN; rv:1.9) Gecko/20080705 Firefox/3.0 Kapiko/3.0",
+    "Mozilla/5.0 (X11; Linux i686; U;) Gecko/20070322 Kazehakase/0.4.5",
+    "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.8) Gecko Fedora/1.9.0.8-1.fc10 Kazehakase/0.5.6",
+    "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11",
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/535.20 (KHTML, like Gecko) Chrome/19.0.1036.7 Safari/535.20",
+    "Opera/9.80 (Macintosh; Intel Mac OS X 10.6.8; U; fr) Presto/2.9.168 Version/11.52",
+]
+
+INSIDE_HEADERS = {
+    "accept": "application/json",
+    "content-type": "application/json"
+}
+
+
+def set_proxy(proxy):
+    Proxiesss = {
+        'http': proxy,
+        'https': proxy
+    }
+    return Proxiesss
+
+
+def set_proxy_aio(proxy):
+    if proxy:
+        return r"http://" + proxy
+    return None
+
+
+def set_proxy_httpx(proxy):
+    if proxy.find("socks") > -1:
+        return proxy
+    if proxy:
+        Proxiesss = {
+            'http://': "http://" + proxy,
+            'https://': "http://" + proxy
+        }
+        return Proxiesss
+    else:
+        return None
+
+
+class MsgCode(object):
+    SUCCESS_CODE: int = 200  # 成功状态码
+
+    NO_RESOURCE: int = 421  # 网页明确表明无资源
+    PAGE_BLANK: int = 420  # 网页空白页
+    END_STRING_ERROR: int = 210  # html结尾验证错误
+    MARK_ERROR: int = 211  # 验证html错误，验证没有通过
+    NOT_IS_JSON: int = 212  # 验证返回是否是json
+    VER_CODE: int = 213  # 需要验证码
+    NONE_HTML: int = 214  # html为空 空的html 在使用某些代理时 如果https 写成了http,会有这种情况
+    STATUS_ERROR: int = 215  # API接口内部执行错误
+    CODE_ERROR: int = 216  # data 状态码错误
+    URL_TIMEOUT: int = 217
+
+    SETTING_CONFIG_ERROR: int = 251 # 特定错误 更新taskinfo_save_setting的任务控制配置失败(switch参数错误,只能为0或1)
+
+    API_FAIL_CODE: int = 400  # api失败，但具体原因未知的状态码
+    TIME_OUT_ERROR: int = 408  # 超时错误
+    PROXY_ERROR: int = 422  # 代理错误
+    PAYLOAD_ERROR: int = 423  # 非法的压缩格式，错误的chunk编码，数据不足Content-length的大小。通常为Accept-Encoding:gzip, deflate, br ，也就是三种编码格式。但其实，aiohttp默认没有br解码，或者html编码格式错误
+    SERVER_ERROR: int = 530  # 服务器异常错误，被捕获发送
+    CHAOXIN_COOKIE_ERROR: int = 556  # 超星期刊获取cookie失败
+
+    DATABASE_CONFIG_IN_CODE: int = 998  # 在代码中配置数据库无对应错误码
+
+    ON_KNOW: int = 1000  # 未知错误
+
+    MONGO_ERROR: int = 1001  # mongodb 錯誤系列由1000 到 1100
+    MONGO_NO_ID: int = 1002  # 操作时由于没有该id的状态码，比如更新时ID不存在
+
+    PARE_STRUCTURE_ERROR: int = 1101  # 解析系列由1100 到 1200，解析结构错误
+    PARE_NO_DATA: int = 1102  # 没有数据，且认为是正常的没有数据的标识
+    PARE_NO_DATA_ERR: int = 1103  # 没有数据，且认为是非正常的没有数据的标识
+    PARE_NO_DATA_1: int = 1104  # 数据不全,但可以接受
+    PARE_NO_DATA_2: int = 1105  # 预留几个无数据，在不同库不同意义
+    PARE_NO_DATA_3: int = 1106  # 预留几个无数据，在不同库不同意义
+    SQL_INSERT_ERROR: int = 1201  # sql错误 由 1200 到 1300 insert 错误
+    SQL_UPDATE_ERROR: int = 1202  # update 错误
+    SQL_SELECT_ALL_ERROR: int = 1203  # 执行fetchall 错误
+    SQL_EXECUTEMANY_ERROR: int = 1204  # executemany 执行错误
+    SQL_EXECUTE_ERROR: int = 1205  # execute 执行错误
+    SQL_REPLACE_ERROR: int = 1206  # replace 执行错误
+
+    GRPC_MESSAGE_DECODEERROR: int = 1301  # grpc服务编码错误
+
+
+SUCCESS = "SUCCESS"
+FAILED = "FAILED"

{re_common-0.2.53 → re_common-0.2.54}/re_common/baselibrary/utils/my_abc/better_abc.py

@@ -1,32 +1,32 @@
-from abc import ABCMeta as NativeABCMeta
-
-
-class DummyAttribute:
-    pass
-
-
-def abstract_attribute(obj=None):
-    if obj is None:
-        obj = DummyAttribute()
-    obj.__is_abstract_attribute__ = True
-    return obj
-
-
-class ABCMeta(NativeABCMeta):
-
-    def __call__(cls, *args, **kwargs):
-        instance = NativeABCMeta.__call__(cls, *args, **kwargs)
-        abstract_attributes = {
-            name
-            for name in dir(instance)
-            if getattr(getattr(instance, name), '__is_abstract_attribute__', False)
-        }
-        if abstract_attributes:
-            raise NotImplementedError(
-                "Can't instantiate abstract class {} with"
-                " abstract attributes: {}".format(
-                    cls.__name__,
-                    ', '.join(abstract_attributes)
-                )
-            )
-        return instance
+from abc import ABCMeta as NativeABCMeta
+
+
+class DummyAttribute:
+    pass
+
+
+def abstract_attribute(obj=None):
+    if obj is None:
+        obj = DummyAttribute()
+    obj.__is_abstract_attribute__ = True
+    return obj
+
+
+class ABCMeta(NativeABCMeta):
+
+    def __call__(cls, *args, **kwargs):
+        instance = NativeABCMeta.__call__(cls, *args, **kwargs)
+        abstract_attributes = {
+            name
+            for name in dir(instance)
+            if getattr(getattr(instance, name), '__is_abstract_attribute__', False)
+        }
+        if abstract_attributes:
+            raise NotImplementedError(
+                "Can't instantiate abstract class {} with"
+                " abstract attributes: {}".format(
+                    cls.__name__,
+                    ', '.join(abstract_attributes)
+                )
+            )
+        return instance

{re_common-0.2.53 → re_common-0.2.54}/re_common.egg-info/PKG-INFO

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
-Name: re-common
-Version: 0.2.53
+Name: re_common
+Version: 0.2.54
 Summary: a library about all python projects
 Home-page: https://gitee.com/xujiangios/re-common
 Author: vic
 Author-email: xujiang5@163.com
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Operating System :: OS Independent
@@ -16,5 +14,3 @@ License-File: LICENSE
 
 
     这是一个基础类，依赖很多的第三方包，是一个用得到的第三方库的封装，可以在此基础上迅速构建项目
-
-

{re_common-0.2.53 → re_common-0.2.54}/setup.py

@@ -21,7 +21,8 @@ re_common
   password = pypi-AgEIcHlwaS5vcmcCJDdlYTBjNzZjLTU2NDItNGExYy04NzY4LWIxM2IyMzgzZjFiYgACJXsicGVybWlzc2lvbnMiOiAidXNlciIsICJ2ZXJzaW9uIjogMX0AAAYgPjmPag7MzYc7m6hG5x5-RGYtOolOXPWtTb88iMdB3xE
   # 请使用新的令牌
   password_new = pypi-AgEIcHlwaS5vcmcCJGU4NzNiN2QyLWY3NDgtNGVhZC04YTM1LThhZDNlZThlY2E1NgACEVsxLFsicmUtY29tbW9uIl1dAAIsWzIsWyIwYWIzYjIzMy0zZTlmLTQ1ZjAtYWQ5OC03NjJhNDM5NjNiZmUiXV0AAAYgGvyJ9zFd7e-sy4JMScCo23eNGqKFLWIIZMSiKqDkV0g
-  
+  # new 20250224
+password_new = pypi-AgEIcHlwaS5vcmcCJDJkMzJhNWZkLTBkOTktNGE4Yi1iN2Q5LWU0ZjNjMGNiNzhjYwACEVsxLFsicmUtY29tbW9uIl1dAAIsWzIsWyIwYWIzYjIzMy0zZTlmLTQ1ZjAtYWQ5OC03NjJhNDM5NjNiZmUiXV0AAAYg0Pu6BqqupvhX7ad69d8e6XS8BmnLav6x6D9HJ-U3gko
 python setup.py sdist bdist_wheel
 python -m twine upload dist/*
 
@@ -31,7 +32,7 @@ long_description = """
 """
 setuptools.setup(
     name="re_common",
-    version="0.2.53",
+    version="0.2.54",
     author="vic",
     author_email="xujiang5@163.com",
     description="a library about all python projects",