From 13ff17e8141d81d56658091bb88e2f5845a52509 Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Wed, 14 Sep 2022 20:40:27 -0400
Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=9C=B0=E7=90=86?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=87=BD=E6=95=B0=E5=8F=AA=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmds/cmd_package/cmd_package_update.py | 40 +++++++++++++++++---------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/cmds/cmd_package/cmd_package_update.py b/cmds/cmd_package/cmd_package_update.py
index ad55e87f..9a12e565 100644
--- a/cmds/cmd_package/cmd_package_update.py
+++ b/cmds/cmd_package/cmd_package_update.py
@@ -134,21 +134,35 @@ def is_user_mange_package(bsp_package_path, pkg):
     return False
 
 
-def need_using_mirror_download():
-    try:
-        ip = requests.get('http://ip.42.pl/raw').content.decode()
-        url = 'http://www.ip-api.com/json/' + ip
-        if requests.get(url).json()['country'] == 'China':
-            print("Use gitee mirror sever")
-            return True
-        else:
-            return False
-    except:
-        if (-time.timezone)/3600 == 8:
-            return True
+class GeographyLocation():
+    _is_china = False
+
+    def __init__(self):
+        try:
+            ip = requests.get('http://ip.42.pl/raw').content.decode()
+            url = 'http://www.ip-api.com/json/' + ip
+            if requests.get(url).json()['country'] == 'China':
+                self._is_china = True
+            else:
+                self._is_china = False
+        except:
+            if (-time.timezone)/3600 == 8:
+                self._is_china = True
+            else:
+                self._is_china = False
+
+        if(self._is_china):
+            print("[Use Gitee server]")
         else:
-            False
+            print("[Use Github server]")
 
+    def isChina (self):
+        return self._is_china
+
+iplocation = GeographyLocation()
+
+def need_using_mirror_download():
+    return iplocation.isChina()
 
 def is_git_url(package_url):
     return package_url.endswith('.git')

From af9fb5c1af17445cdd2740c7684be8ab68c84336 Mon Sep 17 00:00:00 2001
From: Meco Man <920369182@qq.com>
Date: Wed, 14 Sep 2022 21:33:22 -0400
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BD=BF=E7=94=A8ifconfig.me=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=85=AC=E7=BD=91ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmds/cmd_package/cmd_package_update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmds/cmd_package/cmd_package_update.py b/cmds/cmd_package/cmd_package_update.py
index 9a12e565..30466c9c 100644
--- a/cmds/cmd_package/cmd_package_update.py
+++ b/cmds/cmd_package/cmd_package_update.py
@@ -139,7 +139,7 @@ class GeographyLocation():
 
     def __init__(self):
         try:
-            ip = requests.get('http://ip.42.pl/raw').content.decode()
+            ip = requests.get('https://ifconfig.me/ip').content.decode()
             url = 'http://www.ip-api.com/json/' + ip
             if requests.get(url).json()['country'] == 'China':
                 self._is_china = True