re-common 10.0.39__py3-none-any.whl → 10.0.41__py3-none-any.whl

re_common/baselibrary/utils/baseip.py

@@ -1,87 +1,87 @@
-import re
-import socket
-import time
-
-import requests
-from re_common.baselibrary.utils.core.mdeprecated import deprecated
-
-
-def GetLocalIPByPrefix(prefix):
-    """
-    多网卡情况下，根据前缀获取IP
-    prefix = "192.168"
-    """
-    localIP = ''
-    for ip in socket.gethostbyname_ex(socket.gethostname())[2]:
-        if ip.startswith(prefix):
-            localIP = ip
-    return localIP
-
-
-def get_local_ip(ifname='eth0'):
-    """
-        prefix = enp2s0  or eth0
-    :param ifname:
-    :return:
-    """
-    import socket, fcntl, struct
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    return socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, struct.pack('256s', bytes(ifname[:15], 'utf-8')))[20:24])
-
-
-
-
-class BaseIp(object):
-    def __init__(self):
-        self.ocalIP = ''
-
-    @deprecated
-    def get_ip(self, proxy=None, count=0):
-        """
-        获取外网ip
-        :return:
-        """
-        year = str(time.localtime().tm_year)
-        url = "http://" + year + ".ip138.com/ic.asp"
-        print(url)
-        try:
-            response = requests.get(url, proxies=proxy, timeout=(30, 60))
-            ip = re.search(r"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}", response.content.decode(errors='ignore')).group(0)
-            return ip
-        except Exception as e:
-            print(str(e))
-            count += 1
-            if count > 2:
-                print("出现 错误请检查url是否因年份发生改变")
-                return False
-            return self.get_ip(proxy, count)
-
-    def GetLocalIPByPrefix(self, prefix):
-        """
-        # 多网卡情况下，根据前缀获取IP
-        :param prefix: 192.168
-        :return:
-        """
-        for ip in socket.gethostbyname_ex(socket.gethostname())[2]:
-            if ip.startswith(prefix):
-                self.localIP = ip
-        return self.localIP
-
-
-    def work_server(self):
-        """
-        开启监测访问本机ip的ip
-        :return:
-        """
-
-        def hello_world_app(environ, start_response):
-            status = '200 OK'  # HTTP Status
-            headers = [('Content-type', 'text/plain; charset=utf-8')]  # HTTP Headers
-            start_response(status, headers)
-            msg = 'Hello %s\n' % environ["REMOTE_ADDR"]
-            return [msg.encode('utf8')]
-
-        from wsgiref.simple_server import make_server
-        with make_server('', 5678, hello_world_app) as httpd:
-            print("Serving on port 5678...")
-            httpd.serve_forever()
+import re
+import socket
+import time
+
+import requests
+from re_common.baselibrary.utils.core.mdeprecated import deprecated
+
+
+def GetLocalIPByPrefix(prefix):
+    """
+    多网卡情况下，根据前缀获取IP
+    prefix = "192.168"
+    """
+    localIP = ''
+    for ip in socket.gethostbyname_ex(socket.gethostname())[2]:
+        if ip.startswith(prefix):
+            localIP = ip
+    return localIP
+
+
+def get_local_ip(ifname='eth0'):
+    """
+        prefix = enp2s0  or eth0
+    :param ifname:
+    :return:
+    """
+    import socket, fcntl, struct
+    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+    return socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, struct.pack('256s', bytes(ifname[:15], 'utf-8')))[20:24])
+
+
+
+
+class BaseIp(object):
+    def __init__(self):
+        self.ocalIP = ''
+
+    @deprecated
+    def get_ip(self, proxy=None, count=0):
+        """
+        获取外网ip
+        :return:
+        """
+        year = str(time.localtime().tm_year)
+        url = "http://" + year + ".ip138.com/ic.asp"
+        print(url)
+        try:
+            response = requests.get(url, proxies=proxy, timeout=(30, 60))
+            ip = re.search(r"\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}", response.content.decode(errors='ignore')).group(0)
+            return ip
+        except Exception as e:
+            print(str(e))
+            count += 1
+            if count > 2:
+                print("出现 错误请检查url是否因年份发生改变")
+                return False
+            return self.get_ip(proxy, count)
+
+    def GetLocalIPByPrefix(self, prefix):
+        """
+        # 多网卡情况下，根据前缀获取IP
+        :param prefix: 192.168
+        :return:
+        """
+        for ip in socket.gethostbyname_ex(socket.gethostname())[2]:
+            if ip.startswith(prefix):
+                self.localIP = ip
+        return self.localIP
+
+
+    def work_server(self):
+        """
+        开启监测访问本机ip的ip
+        :return:
+        """
+
+        def hello_world_app(environ, start_response):
+            status = '200 OK'  # HTTP Status
+            headers = [('Content-type', 'text/plain; charset=utf-8')]  # HTTP Headers
+            start_response(status, headers)
+            msg = 'Hello %s\n' % environ["REMOTE_ADDR"]
+            return [msg.encode('utf8')]
+
+        from wsgiref.simple_server import make_server
+        with make_server('', 5678, hello_world_app) as httpd:
+            print("Serving on port 5678...")
+            httpd.serve_forever()

re_common/baselibrary/utils/basejson.py

@@ -1,2 +1,2 @@
-
-
+
+

re_common/baselibrary/utils/baselist.py

@@ -1,32 +1,32 @@
-class BaseList(object):
-
-    def remove_null(self, lists):
-        """
-        清除列表的所有空字符串
-        :param lists:
-        :return:
-        """
-        return [r for r in lists if r != ""]
-
-    def remove_blank_space(self, lists):
-        """
-        清除列表的所有空格数据,有其他字符的不算
-        ["a","     ","  b"],　比如清除中间的　不清除ｂ
-        :return:
-        """
-        return [r for r in lists if not r.isspace()]
-
-    def clean_space_first_end(self, lists):
-        """
-        清理列表里每个字符串前后的空格
-        :param lists:
-        :return:
-        """
-        return [r.strip() for r in lists]
-
-    def get_index(self, lists, obj):
-        """
-        从列表中找出某个值第一个匹配项的索引位置
-        :return:
-        """
-        return lists.index(obj)
+class BaseList(object):
+
+    def remove_null(self, lists):
+        """
+        清除列表的所有空字符串
+        :param lists:
+        :return:
+        """
+        return [r for r in lists if r != ""]
+
+    def remove_blank_space(self, lists):
+        """
+        清除列表的所有空格数据,有其他字符的不算
+        ["a","     ","  b"],　比如清除中间的　不清除ｂ
+        :return:
+        """
+        return [r for r in lists if not r.isspace()]
+
+    def clean_space_first_end(self, lists):
+        """
+        清理列表里每个字符串前后的空格
+        :param lists:
+        :return:
+        """
+        return [r.strip() for r in lists]
+
+    def get_index(self, lists, obj):
+        """
+        从列表中找出某个值第一个匹配项的索引位置
+        :return:
+        """
+        return lists.index(obj)

re_common/baselibrary/utils/basemotor.py

@@ -1,190 +1,190 @@
-import asyncio
-from typing import List
-
-from motor.motor_asyncio import AsyncIOMotorClient
-
-
-class BaseMotor(object):
-
-    def __init__(self):
-        pass
-
-    def AsyncIOMotorClient(self, uri, dbname):
-        """
-        异步链接mongo客户端
-        :param uri:
-        :param dbname:
-        :return:
-        """
-        self.connection = AsyncIOMotorClient(uri)
-        self.db = self.connection[dbname]
-        return self
-
-    def get_col(self, colname):
-        """
-        获取表
-        :param colname:
-        :return:
-        """
-        self.col = self.db[colname]
-        return self.col
-
-    async def select_yield(self, query=None):
-        """
-        异步查询
-        :param query:
-        :return:
-        """
-        if query is None:
-            query = {}
-        async for doc in self.col.find(query):
-            yield doc
-
-    async def select(self, query=None):
-        """
-        异步查询
-        :param query:
-        :return:
-        """
-        if query is None:
-            query = {}
-        docs = self.col.find(query)
-        lists = await docs.to_list(None)
-        return lists
-
-    async def select_one(self, query=None):
-        """
-        异步查询一条
-        :param query:
-        :return:
-        """
-        if query is None:
-            query = {}
-        doc = await self.col.find_one(query)
-        # print(doc)
-        return doc
-
-    async def insert_many(self, lists: List[dict], ordered=False, *args, **kwargs):
-
-        """
-        插入一个列表（列表内为dict类型）
-        :param lists:
-        :param ordered: 如果某一条出现错误 设置为False会继续处理其他数据，默认为true
-        :param args:
-        :param kwargs:
-        :return:
-        """
-        result = await self.col.insert_many(lists, ordered=ordered, *args, **kwargs)
-        # print('inserted %d docs' % (len(result.inserted_ids),))
-        return result
-
-    async def update_one(self, query=None, update=None, upsert=False, *args, **kwargs):
-        """
-
-        :param query:  样例{"_id" : "1234"}，注意巨杉数据库要使用分区键
-        :param update: 更新条件 巨杉replace使用update_one {'$replace': {'x': 3}}
-        :param upsert:
-        :param args:
-        :param kwargs:
-        :return:
-        """
-        result = await self.col.update_one(query, update, upsert, **kwargs)
-        # print('matched %d, modified %d' %
-        #       (result.matched_count, result.modified_count))
-        return result
-
-    async def insert_one(self, dicts):
-        """
-        异步插入一条
-        :param dicts:
-        :return:
-        """
-        result = await self.col.insert_one(dicts)
-        # print('result %s' % repr(result.inserted_id))
-        return result
-
-    async def replace_one(self, dicts, iddicts=None):
-        if iddicts is None:
-            iddicts = {"_id": dicts["_id"]}
-        result = await self.col.replace_one(iddicts, dicts)
-        # print('result %s' % repr(result.modified_count))
-        return result
-
-    async def find(self, doc_hook, query=None, feild=None):
-        """
-        异步查询
-        for document in await cursor.to_list(length=100):
-        """
-        async for doc in self.col.find(query, feild):  # 查询所有文档
-            await doc_hook(doc)
-
-    async def update(self, query, sets):
-        result = await self.col.update_one(query, {'$set': sets})
-        return result
-        # print('updated %s document' % result.modified_count)
-
-    async def run_common(self, doc_hook, commons):
-        result = await self.db.command(commons)
-        return doc_hook(result)
-
-    async def delete_many(self, query):
-        """
-
-        :param query: 一个字典 按照条件删除
-        :return:
-        """
-        result = await self.col.delete_many(query)
-        return result
-
-    async def delet_one(self, query):
-        """
-        删除一条数据
-        :param query_id:
-        :return:
-        """
-        result = await self.col.delete_one(query)
-        return result
-
-#
-# bs = BaseMotor()
-# bs.AsyncIOMotorClient(
-#     "mongodb://192.168.31.26:11817/html_other.justtest?authSource=html_other",
-#     "html_other")
-# bs.get_col("justtest")
-#
-# asyncio.get_event_loop().run_until_complete(bs.update_one({"_id" : "1234"},{'$replace': {"_id" : "1235",'x': 4}}))
-#
-# print(bs.select_one({"_id":"Patent_AU19920025315"}))
-#
-# i = 0
-# lists = []
-# start_time = time.time()
-# for file in BaseDir.get_dir_all_files(r"F:\fun2\gz"):
-#     print(file)
-#     for line in BaseGzip(100).read_gz_file(file):
-#         i = i + 1
-#         line = line.strip()
-#         dicts = json.loads(line)
-#         dicts["export_stat"] = 0
-#         dicts["_id"] = dicts["rawid"]
-#         del dicts["rawid"]
-#         lists.append(dicts)
-#         if i % 100000 == 1:
-#             print(i)
-#             try:
-#                 asyncio.get_event_loop().run_until_complete(bs.insert_many(lists))
-#             except BulkWriteError as e:
-#                 print(e.args)
-#                 # print(e.details)
-#             lists.clear()
-#             print(time.time()-start_time)
-#
-# try:
-#     asyncio.get_event_loop().run_until_complete(bs.insert_many(lists))
-# except BulkWriteError as e:
-#     print(e.args)
-#     # print(e.details)
-# lists.clear()
-# print(time.time() - start_time)
-# print(i)
-# asyncio.get_event_loop().run_until_complete(bs.select_one({"_id": "Patent_AU19920025315"}))
+import asyncio
+from typing import List
+
+from motor.motor_asyncio import AsyncIOMotorClient
+
+
+class BaseMotor(object):
+
+    def __init__(self):
+        pass
+
+    def AsyncIOMotorClient(self, uri, dbname):
+        """
+        异步链接mongo客户端
+        :param uri:
+        :param dbname:
+        :return:
+        """
+        self.connection = AsyncIOMotorClient(uri)
+        self.db = self.connection[dbname]
+        return self
+
+    def get_col(self, colname):
+        """
+        获取表
+        :param colname:
+        :return:
+        """
+        self.col = self.db[colname]
+        return self.col
+
+    async def select_yield(self, query=None):
+        """
+        异步查询
+        :param query:
+        :return:
+        """
+        if query is None:
+            query = {}
+        async for doc in self.col.find(query):
+            yield doc
+
+    async def select(self, query=None):
+        """
+        异步查询
+        :param query:
+        :return:
+        """
+        if query is None:
+            query = {}
+        docs = self.col.find(query)
+        lists = await docs.to_list(None)
+        return lists
+
+    async def select_one(self, query=None):
+        """
+        异步查询一条
+        :param query:
+        :return:
+        """
+        if query is None:
+            query = {}
+        doc = await self.col.find_one(query)
+        # print(doc)
+        return doc
+
+    async def insert_many(self, lists: List[dict], ordered=False, *args, **kwargs):
+
+        """
+        插入一个列表（列表内为dict类型）
+        :param lists:
+        :param ordered: 如果某一条出现错误 设置为False会继续处理其他数据，默认为true
+        :param args:
+        :param kwargs:
+        :return:
+        """
+        result = await self.col.insert_many(lists, ordered=ordered, *args, **kwargs)
+        # print('inserted %d docs' % (len(result.inserted_ids),))
+        return result
+
+    async def update_one(self, query=None, update=None, upsert=False, *args, **kwargs):
+        """
+
+        :param query:  样例{"_id" : "1234"}，注意巨杉数据库要使用分区键
+        :param update: 更新条件 巨杉replace使用update_one {'$replace': {'x': 3}}
+        :param upsert:
+        :param args:
+        :param kwargs:
+        :return:
+        """
+        result = await self.col.update_one(query, update, upsert, **kwargs)
+        # print('matched %d, modified %d' %
+        #       (result.matched_count, result.modified_count))
+        return result
+
+    async def insert_one(self, dicts):
+        """
+        异步插入一条
+        :param dicts:
+        :return:
+        """
+        result = await self.col.insert_one(dicts)
+        # print('result %s' % repr(result.inserted_id))
+        return result
+
+    async def replace_one(self, dicts, iddicts=None):
+        if iddicts is None:
+            iddicts = {"_id": dicts["_id"]}
+        result = await self.col.replace_one(iddicts, dicts)
+        # print('result %s' % repr(result.modified_count))
+        return result
+
+    async def find(self, doc_hook, query=None, feild=None):
+        """
+        异步查询
+        for document in await cursor.to_list(length=100):
+        """
+        async for doc in self.col.find(query, feild):  # 查询所有文档
+            await doc_hook(doc)
+
+    async def update(self, query, sets):
+        result = await self.col.update_one(query, {'$set': sets})
+        return result
+        # print('updated %s document' % result.modified_count)
+
+    async def run_common(self, doc_hook, commons):
+        result = await self.db.command(commons)
+        return doc_hook(result)
+
+    async def delete_many(self, query):
+        """
+
+        :param query: 一个字典 按照条件删除
+        :return:
+        """
+        result = await self.col.delete_many(query)
+        return result
+
+    async def delet_one(self, query):
+        """
+        删除一条数据
+        :param query_id:
+        :return:
+        """
+        result = await self.col.delete_one(query)
+        return result
+
+#
+# bs = BaseMotor()
+# bs.AsyncIOMotorClient(
+#     "mongodb://192.168.31.26:11817/html_other.justtest?authSource=html_other",
+#     "html_other")
+# bs.get_col("justtest")
+#
+# asyncio.get_event_loop().run_until_complete(bs.update_one({"_id" : "1234"},{'$replace': {"_id" : "1235",'x': 4}}))
+#
+# print(bs.select_one({"_id":"Patent_AU19920025315"}))
+#
+# i = 0
+# lists = []
+# start_time = time.time()
+# for file in BaseDir.get_dir_all_files(r"F:\fun2\gz"):
+#     print(file)
+#     for line in BaseGzip(100).read_gz_file(file):
+#         i = i + 1
+#         line = line.strip()
+#         dicts = json.loads(line)
+#         dicts["export_stat"] = 0
+#         dicts["_id"] = dicts["rawid"]
+#         del dicts["rawid"]
+#         lists.append(dicts)
+#         if i % 100000 == 1:
+#             print(i)
+#             try:
+#                 asyncio.get_event_loop().run_until_complete(bs.insert_many(lists))
+#             except BulkWriteError as e:
+#                 print(e.args)
+#                 # print(e.details)
+#             lists.clear()
+#             print(time.time()-start_time)
+#
+# try:
+#     asyncio.get_event_loop().run_until_complete(bs.insert_many(lists))
+# except BulkWriteError as e:
+#     print(e.args)
+#     # print(e.details)
+# lists.clear()
+# print(time.time() - start_time)
+# print(i)
+# asyncio.get_event_loop().run_until_complete(bs.select_one({"_id": "Patent_AU19920025315"}))