优化文件上传及列表查询

controller/Tool.py

@@ -42,9 +42,9 @@ def getproject():
     headers=getheader(session.get("id"))
     if not headers:
         return jsonify({"code": 502, "message": "请完善jira信息"}),502
-    result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/rapidviews/viewsData?query=&startAt=0&maxResults=200",headers=headers).json()
-    if result.get("views"):
-        return jsonify({"code": 200, "message": "请求成功", "data": result.get("views")}),200
+    result=requests.request("get",jiraAddress+"/rest/api/2/project",headers=headers)
+    if result.status_code==200:
+        return jsonify({"code": 200, "message": "请求成功", "data": result.json()}),200
     else:
         return jsonify({"code": 402, "message": "未找到相关项目，请确认jira信息是否正确"}),402
     
@@ -53,7 +53,8 @@ def iteration(getproject):
     headers=getheader(session.get("id"))
     if not headers:
         return jsonify({"code": 502, "message": "请完善jira信息"}),502
-    result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/plan/backlog/data.json?rapidViewId="+str(getproject),headers=headers).json()
+    id_=requests.request("get",jiraAddress+"/rest/agile/1.0/board?projectKeyOrId="+getproject,headers=headers).json().get("values")[0].get("id")
+    result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/plan/backlog/data.json?rapidViewId="+str(id_),headers=headers).json()
     res=[]
     for each in result["sprints"]:
         res.append({"key":each["id"],"name":each["name"]})
@@ -67,8 +68,8 @@ def reportinfo():
     project=request.args.get("project")
     iteration=request.args.get("iteration")
     headers=getheader(session.get("id"))
-    # id_=requests.request("get",jiraAddress+"/rest/agile/1.0/board?projectKeyOrId="+project,headers=headers).json().get("values")[0].get("id")
-    result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/plan/backlog/data.json?rapidViewId="+str(project),headers=headers).json()
+    id_=requests.request("get",jiraAddress+"/rest/agile/1.0/board?projectKeyOrId="+project,headers=headers).json().get("values")[0].get("id")
+    result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/plan/backlog/data.json?rapidViewId="+str(id_),headers=headers).json()
     all_=result.get("issues")
     status={}
     for k,v in result["entityData"]["statuses"].items():
@@ -95,17 +96,20 @@ def reportinfo():
     testcase=list(filter(lambda x:type_[x["typeId"]]=="测试用例",all_))
     keylist=list(map(lambda x:x.get("key"),testcase))
     for i in story:
+        print(i)
         i["case"]=[]
         i["childrenTask"]=[i.get("key")]
         chan=''
-        for m in i["extraFields"]:
+        for m in i.get("extraFields") or []:
             if m.get("id")=="reporter":
                 chan=m.get("html")
                 break
+        if not chan:
+            chan=i.get("assigneeName")
         if chan and chan not in peoples["chan"]:
             peoples["chan"].append(chan)
         i["peoples"]=[chan]
-        info=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/issue/details.json?rapidViewId="+str(project)+"&issueIdOrKey="+i["key"]+"&loadSubtasks=true",headers=headers).json()
+        info=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/issue/details.json?rapidViewId="+str(id_)+"&issueIdOrKey="+i["key"]+"&loadSubtasks=true",headers=headers).json()
         for j in info.get("tabs").get("defaultTabs"):
             if j.get("tabId")=="SUB_TASKS":
                 for m in j.get("subtaskEntries"):
@@ -178,7 +182,8 @@ def editemailuser():
 def uplooadcase():
     data_=request.json
     headers=getheader(session.get("id"))
-    result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/plan/backlog/data.json?rapidViewId="+str(data_.get("project")),headers=headers).json()
+    id_=requests.request("get",jiraAddress+"/rest/agile/1.0/board?projectKeyOrId="+data_.get("project"),headers=headers).json().get("values")[0].get("id")
+    result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/plan/backlog/data.json?rapidViewId="+str(id_),headers=headers).json()
     projectId,projectkey=result["projects"][0]["id"],result["projects"][0]["key"]
     data={ "fields": {
         "project": {
@@ -193,8 +198,6 @@ def uplooadcase():
     }
     result=requests.request("post",jiraAddress+"/rest/api/2/issue/",json=data,headers=headers).json()
     globalcaseId=result["id"]
-    print(par_path)
-    print(data_)
     file_path=par_path+'/uploadfile/'+data_.get("file_name")
     content= xmindparser.xmind_to_dict(file_path)
     def a(suiteName,suiteId,info,new,type):
@@ -241,6 +244,7 @@ def uplooadcase():
 @tool.route('/testcase/relevancycase/<id_>', methods=["POST"])
 def relevancycase(id_):
     headers=getheader(session.get("id"))
+    id_=requests.request("get",jiraAddress+"/rest/agile/1.0/board?projectKeyOrId="+id_,headers=headers).json().get("values")[0].get("id")
     result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/plan/backlog/data.json?rapidViewId="+str(id_),headers=headers).json()
     projectkey=result["projects"][0]["key"]
     result=requests.request("get",jiraAddress+"/rest/greenhopper/1.0/xboard/plan/backlog/data.json?rapidViewId="+str(id_)+"&selectedProjectKey="+projectkey,headers=headers).json()

mian.py

@@ -40,7 +40,8 @@ def upload():
     file = request.files['file']
     l=file.filename.split(".")
     if file:
-        if len(l)==2:
+        print(file.__dict__)
+        if len(l)>=2:
             file_name=str(uuid.uuid1())+'.'+l[-1]
         else:
             return jsonify({"code": 503, "message": "文件格式错误"}),503