From 0a1e68f6369d479680565a5ddca5779be51b656e Mon Sep 17 00:00:00 2001
From: dongjie110 <17621827400@163.com>
Date: Thu, 3 Mar 2022 18:56:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=AE=9Agitee=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=9C=A8=E8=AE=BE=E5=AE=9A=E8=AF=B7=E6=B1=82=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E4=B8=8A=E9=99=90=E4=BB=BB=E5=A4=B1=E8=B4=A5=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=97=A5=E5=BF=97=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/check_meta_service.py | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/core/check_meta_service.py b/core/check_meta_service.py
index 8d9c4f2..f2701f0 100644
--- a/core/check_meta_service.py
+++ b/core/check_meta_service.py
@@ -580,10 +580,10 @@ class CheckMetaPull(object):
         log.info("************************************** GET RELASE MANAGEMENT DATA**********************")
         release_management_data = []
         sha_api_url = "https://gitee.com/api/v5/repos/openeuler/release-management/branches/master?access_token={}".format(self.token)
-        sha_value = self._gitee_api_request(sha_api_url)['commit'].get('sha', '')
+        sha_value = self._gitee_api_request(sha_api_url,'shav')
         if sha_value:
             api_url = "https://gitee.com/api/v5/repos/openeuler/release-management/git/trees/{}?access_token={}".format(sha_value, self.token)
-            release_manage_value = self._gitee_api_request(api_url).get('tree','')
+            release_manage_value = self._gitee_api_request(api_url,'manage')
             if release_manage_value:
                 for current_file in release_manage_value:
                     if current_file['type'] == 'tree':
@@ -591,19 +591,25 @@ class CheckMetaPull(object):
         log.info("************************************** GET RELASE MANAGEMENT DATA**********************")
         return release_management_data
 
-    def _gitee_api_request(self, url):
+    def _gitee_api_request(self, url,flag):
         """
         gitee api interface
         """
         retries = 0
+        success = False
         while retries < 5:
-            log.info("try to request data from gitee {}".format(retries))
-            response = requests.get(url,timeout=3)
-            if response.status_code == 200:
-                response_value = response.json()
-                return response_value
-            else:
+            try:
+                log.info("try to request data from gitee {}".format(retries))
+                response = requests.request(method='get', url=url)
+                if flag == 'shav':
+                    response_value = response.json()['commit']['sha']
+                    return response_value
+                else:
+                    response_value = response.json()['tree']
+                    return response_value
+            except Exception as e:
+                log.info("try to request data from gitee {} failed,retry!!!".format(retries))
                 retries += 1
                 if retries == 5:
                     log.error("***************Get Request Data From Gitee ERROR***************")
-                    raise SystemExit("*******error request data from gitee,please wait and retry*******")
\ No newline at end of file
+                    raise SystemExit("*******error request data from gitee,please wait and retry*******")
-- 
Gitee