From 7c5091ab45901c4a7411cfabefc124386663e0ee Mon Sep 17 00:00:00 2001
From: guanjihuan <guanjihuan@163.com>
Date: Mon, 23 Oct 2023 17:04:08 +0800
Subject: [PATCH] guan-0.1.2

---
 API_Reference/API_Reference.py        | 14 +++++-----
 Source_Code/PyPI/setup.cfg            |  2 +-
 Source_Code/PyPI/src/guan/__init__.py | 38 +++++++++++++--------------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/API_Reference/API_Reference.py b/API_Reference/API_Reference.py
index 42031c4..3d24721 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.1 updated on December 23, 2023.
+# API Reference shows all functions in Guan package. The current version is guan-0.1.2 updated on December 23, 2023.
 
 import guan
 
@@ -936,12 +936,6 @@ hashed_password = guan.encryption_SHA_256(password, salt='')
 # 获取CPU使用率
 cpu_usage = guan.get_cpu_usage(interval=1)
 
-# 获取当前日期字符串
-datetime_date = guan.get_date(bar=True)
-
-# 获取当前时间字符串
-datetime_time = guan.get_time()
-
 # 获取本月的所有日期
 day_array = guan.get_days_of_the_current_month(str_or_datetime='str')
 
@@ -990,6 +984,12 @@ current_function_name = guan.get_current_function_name()
 # 获取调用本函数的函数名
 calling_function_name = guan.get_calling_function_name(layer=1)
 
+# 获取当前日期字符串
+datetime_date = guan.get_date(bar=True)
+
+# 获取当前时间字符串
+datetime_time = guan.get_time()
+
 # Guan软件包的使用统计（不涉及到用户的个人数据）
 guan.statistics_of_guan_package()
 
diff --git a/Source_Code/PyPI/setup.cfg b/Source_Code/PyPI/setup.cfg
index db4cb64..edd3f6c 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.1
+version = 0.1.2
 author = guanjihuan
 author_email = guanjihuan@163.com
 description = An open source python package
diff --git a/Source_Code/PyPI/src/guan/__init__.py b/Source_Code/PyPI/src/guan/__init__.py
index 33d9096..da3c562 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.1, updated on December 23, 2023.
+# The current version is guan-0.1.2, updated on December 23, 2023.
 
 # Installation: pip install --upgrade guan
 
@@ -4530,24 +4530,6 @@ def get_cpu_usage(interval=1):
     guan.statistics_of_guan_package()
     return cpu_usage
 
-# 获取当前日期字符串
-def get_date(bar=True):
-    import datetime
-    datetime_date = str(datetime.date.today())
-    if bar==False:
-        datetime_date = datetime_date.replace('-', '')
-    import guan
-    guan.statistics_of_guan_package()
-    return datetime_date
-
-# 获取当前时间字符串
-def get_time():
-    import datetime
-    datetime_time = datetime.datetime.now().strftime('%H:%M:%S')
-    import guan
-    guan.statistics_of_guan_package()
-    return datetime_time
-
 # 获取本月的所有日期
 def get_days_of_the_current_month(str_or_datetime='str'):
     import datetime
@@ -4898,6 +4880,24 @@ def get_calling_function_name(layer=1):
     calling_function_name = caller.function
     return calling_function_name
 
+# 获取当前日期字符串
+def get_date(bar=True):
+    import datetime
+    datetime_date = str(datetime.date.today())
+    if bar==False:
+        datetime_date = datetime_date.replace('-', '')
+    import guan
+    guan.statistics_of_guan_package()
+    return datetime_date
+
+# 获取当前时间字符串
+def get_time():
+    import datetime
+    datetime_time = datetime.datetime.now().strftime('%H:%M:%S')
+    import guan
+    guan.statistics_of_guan_package()
+    return datetime_time
+
 # Guan软件包的使用统计（不涉及到用户的个人数据）
 def statistics_of_guan_package():
     try: