Merge branch 'linuxdeepin:master' into master

src/git/clone.py

@@ -6,6 +6,11 @@ import os
 from setting import conf
 
 
+def git_config():
+    os.system("git config --global http.lowSpeedLimit 0")
+    os.system("git config --global http.lowSpeedTime 999999")
+
+
 def sslclone(
         url: str = None,
         user: str = None,
@@ -16,13 +21,16 @@ def sslclone(
 ):
     branch = branch or conf.BRANCH
     depth = depth or conf.DEPTH
-    os.system(
+    git_config()
+    clone_cmd = (
         f"cd {conf.ROOT_DIR}/src/utils && "
         f"bash sslclone.sh {conf.APPS_PATH} "
         f"{url or conf.GIT_URL} "
         f"{user or conf.GTI_USER} {password or conf.GIT_PASSWORD} "
         f"{branch or ''} {depth or ''}"
     )
+    print(clone_cmd)
+    os.system(clone_cmd)
 
 
 def clone(
@@ -33,8 +41,11 @@ def clone(
 ):
     branch = branch or conf.BRANCH
     depth = depth or conf.DEPTH
-    os.system(
+    git_config()
-        f"cd {conf.APPS_PATH} && git clone {url} "
+    clone_cmd = (
-        f"{url or conf.GIT_URL}"
+        f"cd {conf.APPS_PATH} && git clone "
-        f"{f'-b {branch}' or ''} {f'--depth {depth}' or ''}"
+        f"{url or conf.GIT_URL} "
+        f"{f'-b {branch}' if branch else ''} {f'--depth {depth}' if depth else ''}"
     )
+    print(clone_cmd)
+    os.system(clone_cmd)

src/pms/pms2csv.py

@@ -72,15 +72,13 @@ class Pms2Csv(_Base):
             f'{app_case_id}-{"-" if GlobalConfig.CASE_FROM == "testcase" else ""}all-0-id_desc-0-{MAX_CASE_NUMBER}.json'
         )
         res = self.rx.open_url(case_url, timeout=10)
-        res_str = _unicode_to_cn(res)
-
         try:
-            res_dict = json.loads(res_str)
+            res_dict = json.loads(res)
         except json.decoder.JSONDecodeError:
             logger.error(f"获取pms数据失败, {self.config_error_log}")
             return
 
-        cases = res_dict.get("data").get("cases")
+        cases = json.loads(res_dict["data"]).get("cases")
         res_data = {}
         for i in cases:
             case = cases.get(i)