Merge remote-tracking branch 'origin/master'

vue-fastapi-backend/module_admin/service/metatask_service.py

@@ -209,7 +209,7 @@ class MetataskService:
                                                             releaseState=config.releaseState
                                                             ).model_dump(exclude_unset=True, by_alias=True)
                form_data = {key: str(value) for key, value in metaprocessconfig_dict.items()}
-               response_post0 = requests.post(url2, headers=headers2,data=form_data)
+               response_post0 = requests.post(url2, headers=headers2,data=form_data,verify=False)
                #text=  '{"code":0,"msg":"success","data":{"id":null,"code":16244510692320,"name":"测试2250-表字段采集","version":0,"releaseState":null,"projectCode":15094503753824,"description":"111","globalParams":"[]","globalParamList":null,"globalParamMap":{},"createTime":"2025-01-08 12:50:39","updateTime":"2025-01-08 12:50:39","flag":"YES","userId":1,"userName":null,"projectName":null,"locations":"[{\\"taskCode\\":16244510678624,\\"x\\":334,\\"y\\":265},{\\"taskCode\\":16244510678625,\\"x\\":334,\\"y\\":390},{\\"taskCode\\":16244510678626,\\"x\\":687,\\"y\\":335}]","scheduleReleaseState":null,"timeout":0,"tenantId":1,"tenantCode":null,"modifyBy":null,"warningGroupId":0,"executionType":"PARALLEL"},"failed":false,"success":true}'
                text= response_post0.text
                responsJson = json.loads(text) 
@@ -273,7 +273,7 @@ class MetataskService:
                                                             taskRelationJson  =modified_json_str2,# 替换taskRelationJson
                                                             ).model_dump(exclude_unset=True, by_alias=True)
                     form_data = {key: str(value) for key, value in metaprocessconfig_dict.items()}
-                    response_put0 = requests.put(f"{url}/{config['dsid']}", headers=headers2,data=form_data)
+                    response_put0 = requests.put(f"{url}/{config['dsid']}", headers=headers2,data=form_data,verify=False)
                     putText= response_put0.text
                     responsPutJson=json.loads(putText) 
                     if responsPutJson['msg'] == 'success':
@@ -312,7 +312,7 @@ class MetataskService:
                                                             taskRelationJson  =modified_json_str2,# 替换taskRelationJson
                                                             ).model_dump(exclude_unset=True, by_alias=True)
                     form_data = {key: str(value) for key, value in metaprocessconfig_dict.items()}
-                    response_put0 = requests.put(f"{url}/{config['dsid']}", headers=headers2,data=form_data)
+                    response_put0 = requests.put(f"{url}/{config['dsid']}", headers=headers2,data=form_data,verify=False)
                     putText= response_put0.text
                     responsPutJson=json.loads(putText) 
                     if responsPutJson['msg'] == 'success':
@@ -392,7 +392,7 @@ class MetataskService:
                 'releaseState': type
                 }
                 form_data = {key: str(value) for key, value in metaprocessconfig_dict.items()}
-                response = requests.post(f"{url}/{config['dsid']}/release", headers=headers,data=form_data)
+                response = requests.post(f"{url}/{config['dsid']}/release", headers=headers,data=form_data,verify=False)
                 text= response.text
                 responsJson = json.loads(text)
                 if responsJson['success'] is True:
@@ -584,7 +584,7 @@ cls, request: Request,id:int,current_user: CurrentUserModel
         headers = {'dashUserName': current_user.user.user_name, 'dashPassword': current_user.user.password}
         response = requests.get(url, headers=headers, verify=False)
         try:
-            response = requests.get(url, headers=headers)
+            response = requests.get(url, headers=headers,verify=False)
             
             if response.reason == 'OK':
                 response_text = response.text