From 0981f22295b1e57ee4bd47e0c33f68ece2413a71 Mon Sep 17 00:00:00 2001 From: xiao-hesheng <xhs89@sina.com> Date: Fri, 22 Sep 2023 16:05:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E6=A2=B0=E6=B3=A8=E5=86=8C=E4=BA=BA?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...41\346\240\270\351\251\263\345\233\236.py" | 63 +++++++++++++++++++ ...27\350\241\250\346\225\260\346\215\256.py" | 2 +- ...45\350\257\242\346\225\260\346\215\256.py" | 8 +-- ...60\346\263\250\345\206\214\344\272\272.py" | 2 +- data/mdm3_ir/data | 12 +++- report/summary.html | 6 +- 6 files changed, 81 insertions(+), 12 deletions(-) create mode 100644 "air_case/mdm3_ir/b\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\345\256\241\346\240\270\351\251\263\345\233\236.air/b\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\345\256\241\346\240\270\351\251\263\345\233\236.py" diff --git "a/air_case/mdm3_ir/b\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\345\256\241\346\240\270\351\251\263\345\233\236.air/b\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\345\256\241\346\240\270\351\251\263\345\233\236.py" "b/air_case/mdm3_ir/b\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\345\256\241\346\240\270\351\251\263\345\233\236.air/b\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\345\256\241\346\240\270\351\251\263\345\233\236.py" new file mode 100644 index 00000000..2ec8897c --- /dev/null +++ "b/air_case/mdm3_ir/b\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\345\256\241\346\240\270\351\251\263\345\233\236.air/b\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\345\256\241\346\240\270\351\251\263\345\233\236.py" @@ -0,0 +1,63 @@ +# -*- encoding=utf8 -*- +from air_case.mdm_login.鐧诲綍澶栫綉绯荤粺.鐧诲綍澶栫綉绯荤粺 import login_system +from common.common_func import commonFuc +from common.timeUtils import timeUtils +from common.fileUtls import FileUtils +import sys + +__author__ = "xiaohesheng" + +""" +case_tag:api,mdm-web,鍣ㄦ娉ㄥ唽浜哄鏍搁┏鍥�,id2254,id2254-7,sit,on +涓绘暟鎹钩鍙�:鍣ㄦ娉ㄥ唽浜哄鏍搁┏鍥� +""" +module = "mdm3_ir" +from common.common_func import commonFuc, using +from air_case.mdm_login.鐧诲綍澶栫綉绯荤粺.鐧诲綍澶栫綉绯荤粺 import login_system +pro_path=commonFuc().get_pro_path() +#鐢虫姤 +sys.path.append(pro_path+r'\\air_case\\mdm3_ir\\a2鍣ㄦ娉ㄥ唽浜虹敵鎶�.air') +using(pro_path+r'\\air_case\\mdm3_ir\\a2鍣ㄦ娉ㄥ唽浜虹敵鎶�.air') +from a2鍣ㄦ娉ㄥ唽浜虹敵鎶� import * + +#鏌ヨid +sys.path.append(pro_path+r'\\air_case\\mdm3_ir\\a2鏌ヨ鑾峰彇鍣ㄦ娉ㄥ唽浜篿d.air') +using(pro_path+r'\\air_case\\mdm3_ir\\a2鏌ヨ鑾峰彇鍣ㄦ娉ㄥ唽浜篿d.air') +from a2鏌ヨ鑾峰彇鍣ㄦ娉ㄥ唽浜篿d import * +#璁ら閿佸畾 +sys.path.append(pro_path+r'\\air_case\\mdm3_ir\\a鍣ㄦ娉ㄥ唽浜鸿棰�.air') +using(pro_path+r'\\air_case\\mdm3_ir\\a鍣ㄦ娉ㄥ唽浜鸿棰�.air') +from a鍣ㄦ娉ㄥ唽浜鸿棰� import * + +# print(cname,'aaaaaaaaaaaaaaaaaaa') +""" + 鍦烘櫙:鍣ㄦ娉ㄥ唽浜哄鏍搁┏鍥� + 鐢ㄤ緥鍚嶇О锛氬櫒姊版敞鍐屼汉瀹℃牳椹冲洖 + 杈撳叆锛歩d + 杈撳嚭锛�"rtn_msg": "ok" +""" +# 鐧诲綍 +username = commonFuc().get_business_data(module, "username") +password = commonFuc().get_business_data(module, "password") +# print(username, password) +# 鑾峰彇token鍜宲rojectCode +token, projectCode, uxid, corpId,info = login_system(username, password).get_token() +# 鍣ㄦ娉ㄥ唽浜哄鏍搁┏鍥� +url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "updateById_url") +# print(url) +# 鑾峰彇璇锋眰澶翠俊鎭� +headers = commonFuc().get_business_data(module, "json_headers2", + commonFuc().get_business_data(module, "json_contentType"), token, + projectCode) + +request_body = commonFuc().get_business_data(module, "payload7", CRID) + +# 鍙戦€佽姹� +result = commonFuc().http_post(url, request_body, headers) +print('瀹℃牳椹冲洖瀹為檯鍊�',result) +code=commonFuc().analysis_json('code',commonFuc().analysis_json('data',result)) +checkDict = commonFuc().get_business_data(module, "checkDict") +#鏂█瀹為檯缁撴灉涓槸鍚﹀寘鍚鏈熺粨鏋滅殑鍐呭 +commonFuc().check_result(checkDict, result) +#鏂█瀹為檯缁撴灉涓槸鍚﹀寘鍚鏈熺殑鏂囨湰 +commonFuc().check_text_exist(code,result) diff --git "a/air_case/mdm3_ir/c\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\350\216\267\345\217\226\345\210\227\350\241\250\346\225\260\346\215\256.air/c\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\350\216\267\345\217\226\345\210\227\350\241\250\346\225\260\346\215\256.py" "b/air_case/mdm3_ir/c\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\350\216\267\345\217\226\345\210\227\350\241\250\346\225\260\346\215\256.air/c\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\350\216\267\345\217\226\345\210\227\350\241\250\346\225\260\346\215\256.py" index ac00ea4b..96ec8722 100644 --- "a/air_case/mdm3_ir/c\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\350\216\267\345\217\226\345\210\227\350\241\250\346\225\260\346\215\256.air/c\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\350\216\267\345\217\226\345\210\227\350\241\250\346\225\260\346\215\256.py" +++ "b/air_case/mdm3_ir/c\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\350\216\267\345\217\226\345\210\227\350\241\250\346\225\260\346\215\256.air/c\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\350\216\267\345\217\226\345\210\227\350\241\250\346\225\260\346\215\256.py" @@ -8,7 +8,7 @@ import sys __author__ = "xiaohesheng" """ -case_tag:api,mdm-web,鍣ㄦ娉ㄥ唽浜篲鑾峰彇鍒楄〃鏁版嵁,id2254,id2254-7,sit,on +case_tag:api,mdm-web,鍣ㄦ娉ㄥ唽浜篲鑾峰彇鍒楄〃鏁版嵁,id2254,id2254-8,sit,on 涓绘暟鎹钩鍙�:鍣ㄦ娉ㄥ唽浜篲鑾峰彇鍒楄〃鏁版嵁 """ module = "mdm3_ir" diff --git "a/air_case/mdm3_ir/d\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\346\237\245\350\257\242\346\225\260\346\215\256.air/d\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\346\237\245\350\257\242\346\225\260\346\215\256.py" "b/air_case/mdm3_ir/d\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\346\237\245\350\257\242\346\225\260\346\215\256.air/d\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\346\237\245\350\257\242\346\225\260\346\215\256.py" index 7774ff0e..cbc4a40e 100644 --- "a/air_case/mdm3_ir/d\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\346\237\245\350\257\242\346\225\260\346\215\256.air/d\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\346\237\245\350\257\242\346\225\260\346\215\256.py" +++ "b/air_case/mdm3_ir/d\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\346\237\245\350\257\242\346\225\260\346\215\256.air/d\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272_\346\237\245\350\257\242\346\225\260\346\215\256.py" @@ -8,7 +8,7 @@ import sys __author__ = "xiaohesheng" """ -case_tag:api,mdm-web,娣诲姞鍣ㄦ娉ㄥ唽浜篲鏌ヨ鏁版嵁,id2254,id2254-8,sit,on +case_tag:api,mdm-web,娣诲姞鍣ㄦ娉ㄥ唽浜篲鏌ヨ鏁版嵁,id2254,id2254-9,sit,on 涓绘暟鎹钩鍙�:娣诲姞鍣ㄦ娉ㄥ唽浜篲鏌ヨ鏁版嵁 """ module = "mdm3_ir" @@ -27,12 +27,8 @@ sys.path.append(pro_path+r'\\air_case\\mdm3_ir\\a鍣ㄦ娉ㄥ唽浜鸿棰�.air') using(pro_path+r'\\air_case\\mdm3_ir\\a鍣ㄦ娉ㄥ唽浜鸿棰�.air') from a鍣ㄦ娉ㄥ唽浜鸿棰� import * -sys.path.append(pro_path+r'\\air_case\\mdm3_ir\\b鍣ㄦ娉ㄥ唽浜篲瀹℃牳閫氳繃.air') -using(pro_path+r'\\air_case\\mdm3_ir\\b鍣ㄦ娉ㄥ唽浜篲瀹℃牳閫氳繃.air') -from b鍣ㄦ娉ㄥ唽浜篲瀹℃牳閫氳繃 import * - -# CRID=global_var_CRID +CRID=global_var_CRID # print(cname,'aaaaaaaaaaaaaaaaaaa') """ 鍦烘櫙:娣诲姞鍣ㄦ娉ㄥ唽浜篲鏌ヨ鏁版嵁 diff --git "a/air_case/mdm3_ir/\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.air/\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.py" "b/air_case/mdm3_ir/\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.air/\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.py" index c9058ae2..9e9d8e03 100644 --- "a/air_case/mdm3_ir/\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.air/\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.py" +++ "b/air_case/mdm3_ir/\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.air/\346\267\273\345\212\240\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.py" @@ -8,7 +8,7 @@ import sys __author__ = "xiaohesheng" """ -case_tag:api,mdm-web,娣诲姞鍣ㄦ娉ㄥ唽浜�,id2254,id2254-9,sit,on +case_tag:api,mdm-web,娣诲姞鍣ㄦ娉ㄥ唽浜�,id2254,id2254-10,sit,on 涓绘暟鎹钩鍙�:娣诲姞鍣ㄦ娉ㄥ唽浜� """ module = "mdm3_ir" diff --git a/data/mdm3_ir/data b/data/mdm3_ir/data index 92ca5d60..ff1db77a 100644 --- a/data/mdm3_ir/data +++ b/data/mdm3_ir/data @@ -8,6 +8,7 @@ "ZZLX_url": "/test2api/platformService/dict/f/getDictionary/ZZLX/" "queryMdmAndProdCompanyPage_url": "/test2api/mdmService/mdmCompany/queryMdmAndProdCompanyPage/" "inserMdmComPanyPerson_url": "/test2api/mdmService/provMfrsInfo/inserMdmComPanyPerson/" + "name1": "鍥借嵂闆嗗洟婀栧寳鍖荤枟鍣ㄦ鏈夐檺鍏徃" json_contentType: "application/json" json_headers: { @@ -80,5 +81,14 @@ json_headers2: { "provId": "%s" } + +"payload7": { + "id": "%s", + "version":1, + "isLocked":0, + "auditStatus":"30" + +} + checkDict: {"code": 0,'msg': None,'data':1} -checkDict1: {"code": 0,"msg": null,"data":"瀹℃牳閫氳繃"} \ No newline at end of file +checkDict1: {"code": 0,"msg": null,"data":"瀹℃牳閫氳繃"} diff --git a/report/summary.html b/report/summary.html index 22d45685..4635bca7 100644 --- a/report/summary.html +++ b/report/summary.html @@ -56,7 +56,7 @@ <tr width="600"> <td class='details-col-elapsed'>1</td> <td class='details-col-elapsed'>1</td> - <td class='details-col-elapsed'>0鍒�3绉�</td> + <td class='details-col-elapsed'>0鍒�1绉�</td> <td class="details-col-elapsed">100.0%</td> </tr> </table> @@ -72,9 +72,9 @@ </tr> <tr width="600"> - <td class="details-col-elapsed"><a href='../log/a8浜у搧鏂板鍜屽鏍搁┏鍥�/log.html' target='_blank'>a8浜у搧鏂板鍜屽鏍搁┏鍥�</a></td> + <td class="details-col-elapsed"><a href='../log/b鍣ㄦ娉ㄥ唽浜篲瀹℃牳椹冲洖/log.html' target='_blank'>b鍣ㄦ娉ㄥ唽浜篲瀹℃牳椹冲洖</a></td> <td class="success">鎴愬姛</td> - <td class="details-col-elapsed">3.733</td> + <td class="details-col-elapsed">1.713</td> <td class="details-col-elapsed">xiaohesheng</td> </tr> -- GitLab