From 4f36df09a7314254ed6043f7ea5848ce0ac37ae0 Mon Sep 17 00:00:00 2001 From: guanjihuan Date: Thu, 2 Nov 2023 02:01:22 +0800 Subject: [PATCH] 0.1.8 --- API_Reference/API_Reference.py | 5 ++++- Source_Code/PyPI/setup.cfg | 2 +- Source_Code/PyPI/src/guan.egg-info/PKG-INFO | 2 +- Source_Code/PyPI/src/guan/__init__.py | 18 ++++++++++++++++-- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/API_Reference/API_Reference.py b/API_Reference/API_Reference.py index 128f2e8..f12ca9c 100644 --- a/API_Reference/API_Reference.py +++ b/API_Reference/API_Reference.py @@ -1,4 +1,4 @@ -# API Reference shows all functions in Guan package. The current version is guan-0.1.7 updated on November 01, 2023. +# API Reference shows all functions in Guan package. The current version is guan-0.1.8 updated on November 02, 2023. import guan @@ -990,6 +990,9 @@ datetime_date = guan.get_date(bar=True) # 获取当前时间字符串 datetime_time = guan.get_time() +# 获取MAC地址 +mac_address = guan.get_mac_address() + # Guan软件包的使用统计(不涉及到用户的个人数据) guan.statistics_of_guan_package() diff --git a/Source_Code/PyPI/setup.cfg b/Source_Code/PyPI/setup.cfg index 730bb56..4c7c731 100644 --- a/Source_Code/PyPI/setup.cfg +++ b/Source_Code/PyPI/setup.cfg @@ -1,7 +1,7 @@ [metadata] # replace with your username: name = guan -version = 0.1.7 +version = 0.1.8 author = guanjihuan author_email = guanjihuan@163.com description = An open source python package diff --git a/Source_Code/PyPI/src/guan.egg-info/PKG-INFO b/Source_Code/PyPI/src/guan.egg-info/PKG-INFO index ca67720..9bed0c7 100644 --- a/Source_Code/PyPI/src/guan.egg-info/PKG-INFO +++ b/Source_Code/PyPI/src/guan.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: guan -Version: 0.1.7 +Version: 0.1.8 Summary: An open source python package Home-page: https://py.guanjihuan.com Author: guanjihuan diff --git a/Source_Code/PyPI/src/guan/__init__.py b/Source_Code/PyPI/src/guan/__init__.py index 980f950..264e069 100644 --- a/Source_Code/PyPI/src/guan/__init__.py +++ b/Source_Code/PyPI/src/guan/__init__.py @@ -1,6 +1,6 @@ # Guan is an open-source python package developed and maintained by https://www.guanjihuan.com/about (Ji-Huan Guan, 关济寰). The primary location of this package is on website https://py.guanjihuan.com. GitHub link: https://github.com/guanjihuan/py.guanjihuan.com. -# The current version is guan-0.1.7, updated on November 01, 2023. +# The current version is guan-0.1.8, updated on November 02, 2023. # Installation: pip install --upgrade guan @@ -4891,6 +4891,13 @@ def get_time(): datetime_time = datetime.datetime.now().strftime('%H:%M:%S') return datetime_time +# 获取MAC地址 +def get_mac_address(): + import uuid + mac_address = uuid.UUID(int=uuid.getnode()).hex[-12:].upper() + mac_address = '-'.join([mac_address[i:i+2] for i in range(0, 11, 2)]) + return mac_address + # Guan软件包的使用统计(不涉及到用户的个人数据) def statistics_of_guan_package(): try: @@ -4904,8 +4911,15 @@ def statistics_of_guan_package(): client_socket.settimeout(0.5) client_socket.connect(('py.guanjihuan.com', 12345)) message = guan.get_calling_function_name(layer=2)+"\n" - send_message = datetime_date + ' ' + datetime_time + ' version_0.1.7 guan.' + message + send_message = datetime_date + ' ' + datetime_time + ' version_0.1.8 guan.' + message client_socket.send(send_message.encode()) client_socket.close() + client_socket2 = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + client_socket2.settimeout(0.5) + client_socket2.connect(('py.guanjihuan.com', 12345)) + mac_address = get_mac_address() + send_mac_address = 'version_0.1.8 MAC_address: '+mac_address + client_socket2.send(send_mac_address.encode()) + client_socket2.close() except: pass \ No newline at end of file