diff --git "a/air_case/mdm3-es/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272-\346\211\200\346\234\211\350\276\223\345\205\245\351\241\271\345\241\253\345\206\231.air/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272-\346\211\200\346\234\211\350\276\223\345\205\245\351\241\271\345\241\253\345\206\231.py" "b/air_case/mdm3-es/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272-\346\211\200\346\234\211\350\276\223\345\205\245\351\241\271\345\241\253\345\206\231.air/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272-\346\211\200\346\234\211\350\276\223\345\205\245\351\241\271\345\241\253\345\206\231.py" new file mode 100644 index 0000000000000000000000000000000000000000..9b333fd67c95d407c8fe8ef45514bf1af07a55b0 --- /dev/null +++ "b/air_case/mdm3-es/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272-\346\211\200\346\234\211\350\276\223\345\205\245\351\241\271\345\241\253\345\206\231.air/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272-\346\211\200\346\234\211\350\276\223\345\205\245\351\241\271\345\241\253\345\206\231.py" @@ -0,0 +1,39 @@ +# -*- encoding=utf8 -*- +__author__ = "xiaohesheng" + +""" +case_tag:api,mdm-web2,用例集id2226,sit,on +主数据平台:注册企业接口_注册时_有附件 +""" + + +from common.common_func import commonFuc + +module = "mdm3-es" +#企业注册接口 +import os +url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "CompanyRegist_url") +print(url) +# #获取请求头信息 +headers = commonFuc().get_business_data(module, "json_headers", commonFuc().get_business_data(module,"json_contentType")) +print(headers) +name=commonFuc().get_business_data(module,"name1")#获取前缀name +cname=name+commonFuc().randomString(5)#随机数生成拼接企业名称 +request_body = commonFuc().get_business_data(module, "payload2",cname,cname,cname,cname,cname,cname) +print(request_body) +""" + 场景:外网主数据平台企业注册-器械注册人注册接口-正常注册-所有输入项填写 + 用例名称:企业注册接口-器械注册人-正常注册-所有输入项填写 + 输入:企业名称 变量名cname + 输出:"rtn_msg": "返回注册企业信息" +""" +#发送请求 +result = commonFuc().http_post(url, request_body, headers) +print(result) +#获取预期结果 +check_dict = commonFuc().get_business_data(module, "checkDict") +print(check_dict) +#断言实际结果中是否包含预期结果的内容 +commonFuc().check_result(check_dict, result) +#断言实际结果中是否包含预期的文本 +commonFuc().check_text_exist(name,result) diff --git "a/air_case/mdm3-es/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272-\346\234\211\351\231\204\344\273\266.air/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272-\346\234\211\351\231\204\344\273\266.py" "b/air_case/mdm3-es/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272-\346\234\211\351\231\204\344\273\266.air/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272-\346\234\211\351\231\204\344\273\266.py" new file mode 100644 index 0000000000000000000000000000000000000000..16c543f715a06f428276e7eb5616158d35e6f4e5 --- /dev/null +++ "b/air_case/mdm3-es/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272-\346\234\211\351\231\204\344\273\266.air/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272-\346\234\211\351\231\204\344\273\266.py" @@ -0,0 +1,39 @@ +# -*- encoding=utf8 -*- +__author__ = "xiaohesheng" + +""" +case_tag:api,mdm-web1,用例集id2226,sit,on +主数据平台:注册企业接口_注册时_有附件 +""" + + +from common.common_func import commonFuc + +module = "mdm3-es" +#企业注册接口 +import os +url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "CompanyRegist_url") +print(url) +# #获取请求头信息 +headers = commonFuc().get_business_data(module, "json_headers", commonFuc().get_business_data(module,"json_contentType")) +print(headers) +name=commonFuc().get_business_data(module,"name1")#获取前缀name +cname=name+commonFuc().randomString(5)#随机数生成拼接企业名称 +request_body = commonFuc().get_business_data(module, "payload1",cname,cname,cname,cname,cname) +print(request_body) +""" + 场景:外网主数据平台企业注册-器械注册人注册接口-正常注册-有附件 + 用例名称:企业注册接口-器械注册人-正常注册-有附件 + 输入:企业名称 变量名cname + 输出:"rtn_msg": "返回注册企业信息" +""" +#发送请求 +result = commonFuc().http_post(url, request_body, headers) +print(result) +#获取预期结果 +check_dict = commonFuc().get_business_data(module, "checkDict") +print(check_dict) +#断言实际结果中是否包含预期结果的内容 +commonFuc().check_result(check_dict, result) +#断言实际结果中是否包含预期的文本 +commonFuc().check_text_exist(name,result) diff --git "a/air_case/spd3/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.air/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.py" "b/air_case/mdm3-es/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.air/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.py" similarity index 98% rename from "air_case/spd3/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.air/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.py" rename to "air_case/mdm3-es/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.air/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.py" index 338d823fbe0da1813351af0ed951a1e586f78fd8..372b580da2fcd270480675b6c4c926d45cc0e126 100644 --- "a/air_case/spd3/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.air/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.py" +++ "b/air_case/mdm3-es/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.air/\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214-\345\231\250\346\242\260\346\263\250\345\206\214\344\272\272.py" @@ -10,7 +10,7 @@ case_tag:api,mdm-web,用例集id2226,sit,on from common.common_func import commonFuc import time -module = "spd3" +module = "mdm3-es" #企业注册接口 import os url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "CompanyRegist_url") diff --git "a/air_case/spd3/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.air/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.py" "b/air_case/mdm3-es/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.air/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.py" similarity index 93% rename from "air_case/spd3/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.air/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.py" rename to "air_case/mdm3-es/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.air/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.py" index 3f4bc3151f7022eea38a089dc3b135062f8d6333..1baa4c0b068e32823f93f57aa8a0187165f4f4db 100644 --- "a/air_case/spd3/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.air/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.py" +++ "b/air_case/mdm3-es/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.air/\347\231\273\345\275\225\345\244\226\347\275\221\347\263\273\347\273\237.py" @@ -10,7 +10,7 @@ case_tag:mdm-web,100086,用例集id2226 from common.common_func import commonFuc import time -module = "spd3" +module = "mdm3-es" #获取验证码接口 import os url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "VerifyCode_url") diff --git a/common/passwordUtils.py b/common/passwordUtils.py index 819b235bddb741684d14d9f9769adfea09b7e7f6..8fd995c36a5543c7846595a2a3d88a50e9ffa11b 100644 --- a/common/passwordUtils.py +++ b/common/passwordUtils.py @@ -1,56 +1,55 @@ import hashlib from Crypto.Cipher import AES + class PasswordEncrypt(object): """通过对密码进行加密,方便spd系统登录之后获取token spd项目token不存于数据库中,token只存在于内存中 """ - def __init__(self, username, userpwd,verifyCodeId): - self.username = username #用户名 - self.userpwd = userpwd #密码 - self.verifyCodeId=verifyCodeId #验证码id + + def __init__(self, username, userpwd, verifyCodeId): + self.username = username # 用户名 + self.userpwd = userpwd # 密码 + self.verifyCodeId = verifyCodeId # 验证码id # 此函数实现密码加密 def pwd_Encrypt(self): - ''' {"username":"gyqxadmin", "passwd":"af5d87060df01ce434e4a397b51a0b9bd960416aa873177889f6a0104b28e450acc980ab8d6391931a8470a91c37c94fad5d14f4925d860fb3314aca9bc4677a3ade29e23fb469b8710680995f8e218f", "verifyCodeId":"512cdfebc1a042fa89d0f5a56d744f4d","verifyCode":"ece6","projectCode":"warehouse.pc"} ''' - # verifyCodeId = b'512cdfebc1a042fa89d0f5a56d744f4d' - verifyCodeId =bytes(self.verifyCodeId) + verifyCodeId = self.verifyCodeId verifyCode = bytes(verifyCodeId[0:16]) - print("verifyCode:", verifyCode) - username_and_pwd=self.username+self.userpwd + # print("verifyCode:", verifyCode) + username_and_pwd = self.username + self.userpwd sha256EncodeStr = hashlib.sha256(username_and_pwd.encode("utf-8")) - print("sha256EncodeStr:", sha256EncodeStr.hexdigest()) - print("encode sha256EncodeStr:", sha256EncodeStr.hexdigest().encode("utf-8")) + # print("sha256EncodeStr:", sha256EncodeStr.hexdigest()) + # print("encode sha256EncodeStr:", sha256EncodeStr.hexdigest().encode("utf-8")) aes = AES.new(key=bytes(verifyCodeId), iv=verifyCode, mode=AES.MODE_CBC) en_text = aes.encrypt(self.pad(sha256EncodeStr.hexdigest()).encode("utf-8")) # 加密明文 - print("en_text:", en_text) - print("base64 de_text2:", en_text.hex()) + # print("en_text:", en_text) + # print("base64 de_text2:", en_text.hex()) return en_text.hex() - def pad(slef,text): + def pad(slef, text): + print(type(text)) text_length = len(text) amount_to_pad = AES.block_size - (text_length % AES.block_size) + print('amount_to_pad',amount_to_pad) + print(type(amount_to_pad)) if amount_to_pad == 0: amount_to_pad = AES.block_size pad = chr(amount_to_pad) + print('pad',pad) + print(text+pad * amount_to_pad) return text + pad * amount_to_pad + if __name__ == '__main__': - aa=PasswordEncrypt('1679886114521','a123456!',b'9baf0389a84047fa8e8db78bd8c3530a') + aa = PasswordEncrypt('1679886114521', 'a123456!', b'9baf0389a84047fa8e8db78bd8c3530a') print(aa.pwd_Encrypt()) - - - - - - - diff --git a/data/mdm3-es/data b/data/mdm3-es/data new file mode 100644 index 0000000000000000000000000000000000000000..6d92598c1ec5ab3cfbcec183ce27ef98ce56405f --- /dev/null +++ b/data/mdm3-es/data @@ -0,0 +1,250 @@ +# 登录外网(主数据平台)系统 +"VerifyCode_url": "/test2api/oauthService/auth/getVerifyCode" +login_data: {"orderCode": "10200512100243412"} +login_contentType: "application/json" +login_checkDict: {"rtn_code": "0000001"} + + +"login_enc_user_id": "国药集团湖北分公司mQDwR7" +"login_url": "/test2api/oauthService/auth/getVerifyCode" + +#器械注册人接口 +"CompanyRegist_url": "/test2api/mdmService/companyRegistBill/insertCompanyRegist" +json_contentType: "application/json" +json_headers: { + "Content-Type": "%s" +} +"payload": { +"compFunction": "2", +"compFunctionArr": ["2"], +"cname": "%s", +"shortName": "", +"isAbroad": "1", +"addrCodeList": [ +"11" +], +"area": "", +"userName": "%s", +"address": "", +"userLoginCode": "%s", +"userLoginPsw": "a123456!", +"confimPassword": "a123456!", +"registContactUser": "", +"registContactWay": "", +"email": "%s@sina.com", +"registSourceProject": "%s", +"legal": "", +"erpCode": "002", +"dataEntrance": "注册", +"compKind": "0", +"upCompanyId": "", +"companyRegistBizscopeVos": [], +"certVOList": [] +} +"name1": "国药集团公司" +checkDict: {"code": 0,'msg': None} + +"payload": { +"compFunction": "2", +"compFunctionArr": ["2"], +"cname": "%s", +"shortName": "", +"isAbroad": "1", +"addrCodeList": [ +"11" +], +"area": "", +"userName": "%s", +"address": "", +"userLoginCode": "%s", +"userLoginPsw": "a123456!", +"confimPassword": "a123456!", +"registContactUser": "", +"registContactWay": "", +"email": "%s@sina.com", +"registSourceProject": "%s", +"legal": "", +"erpCode": "002", +"dataEntrance": "注册", +"compKind": "0", +"upCompanyId": "", +"companyRegistBizscopeVos": [], +"certVOList": [] +} + +#企业注册-器械注册人-有附件 +"payload1": { + "compFunction": "2", + "compFunctionArr": [ + "2" + ], + "cname": "%s", + "shortName": "", + "isAbroad": "0", + "addrCodeList": [ + "11", + "1101", + "110101" + ], + "area": "北京市市辖区东城区", + "code": "110101", + "userName": "%s", + "address": "", + "userLoginCode": "%s", + "userLoginPsw": "a123456!", + "confimPassword": "a123456!", + "registContactUser": "", + "registContactWay": "", + "email": "%s@sina.com", + "registSourceProject": "%s", + "legal": "", + "dataEntrance": "注册", + "compKind": "0", + "upCompanyId": "", + "companyRegistBizscopeVos": [], + "certVOList": [ + { + "id": 1, + "billId": "", + "certKind": "YYZZ", + "certKindName": "营业执照", + "certCode": "006", + "expdtBeginDate": "2023-04-01 16:05:08", + "expdtEndDate": "2044-04-01 16:05:08", + "isValidingCheck": true, + "isValiding": 1, + "companyRegistCertFile": [ + { + "filePath": "/sfile/2023/pub/src=http___10wallpaper.com_wallp_f7d03d60d2fe42da8be7d65dfe1de601.jpg", + "fileOriginalName": "src=http___10wallpaper.com_wallpaper_2560x1600_1607_Mountains_macos_sierra_sky-Landscape_Theme_Wallpaper_2560x1600.jpg&refer=http___10wallpaper.jpg" + } + ], + "printFile": "", + "certListCode": [] + } + ] +} +#企业注册接口-器械注册人-正常注册-所有输入项填写 +"payload2": { + + "compFunction": "2,3,4", + "compFunctionArr": [ + "2", + "3", + "4" + ], + "cname": "%s", + "shortName": "%s", + "isAbroad": "0", + "addrCodeList": [ + "11", + "1101", + "110101" + ], + "area": "北京市市辖区东城区", + "code": "110101", + "userName": "%s", + "address": "007007007007007007007007007007007007007007007007007007007007007007007007007007007007007007007007007007007007007007007007007", + "userLoginCode": "%s", + "userLoginPsw": "a123456!", + "confimPassword": "a123456!", + "registContactUser": "张三李四", + "registContactWay": "13800138000", + "email": "xhs007@sina.com", + "registSourceProject": "%s", + "legal": "张三李四", + "erpCode": "%s", + "dataEntrance": "注册", + "compKind": "1", + "upCompanyId": "p00cesc", + "companyRegistBizscopeVos": [ + { + "bizScopeCode": "01", + "bizScopeCodeName": "有源手术器械", + "bizScopeType": 2 + }, + { + "bizScopeCode": "6801", + "bizScopeCodeName": "基础外科手术器械", + "bizScopeType": 1 + } + ], + "certVOList": [ + { + "id": 1, + "billId": "", + "certKind": "YLQXJYXKZ", + "certKindName": "医疗器械经营许可证", + "certCode": "007", + "expdtBeginDate": "2023-04-01 16:03:04", + "expdtEndDate": "2044-05-03 16:03:06", + "isValidingCheck": false, + "isValiding": 0, + "companyRegistCertFile": [ + { + "filePath": "/sfile/2023/pub/src=http___10wallpaper.com_wallp_36a6c16d51c34bd5a3c9d41f356bcfc3.jpg", + "fileOriginalName": "src=http___10wallpaper.com_wallpaper_2560x1600_1607_Mountains_macos_sierra_sky-Landscape_Theme_Wallpaper_2560x1600.jpg&refer=http___10wallpaper.jpg" + } + ], + "printFile": "", + "certListCode": [] + }, + { + "id": 2, + "billId": "", + "certKind": "YYZZ", + "certKindName": "营业执照", + "certCode": "007", + "expdtBeginDate": "2023-04-01 16:03:04", + "expdtEndDate": "2055-06-01 16:03:06", + "isValidingCheck": false, + "isValiding": 0, + "companyRegistCertFile": [ + { + "filePath": "/sfile/2023/pub/src=http___10wallpaper.com_wallp_798c90875cae4ca0aa60f2ad1c225583.jpg", + "fileOriginalName": "src=http___10wallpaper.com_wallpaper_2560x1600_1607_Mountains_macos_sierra_sky-Landscape_Theme_Wallpaper_2560x1600.jpg&refer=http___10wallpaper.jpg" + } + ], + "printFile": "", + "certListCode": [] + }, + { + "id": 3, + "billId": "", + "certKind": "YLQXJYBAPZ", + "certKindName": "医疗器械经营备案凭证", + "certCode": "007", + "expdtBeginDate": "2023-04-01 16:03:04", + "expdtEndDate": "2055-07-06 16:03:06", + "isValidingCheck": false, + "isValiding": 0, + "companyRegistCertFile": [ + { + "filePath": "/sfile/2023/pub/src=http___10wallpaper.com_wallp_f176acb649604765a720370b0dc9f4ea.jpg", + "fileOriginalName": "src=http___10wallpaper.com_wallpaper_2560x1600_1607_Mountains_macos_sierra_sky-Landscape_Theme_Wallpaper_2560x1600.jpg&refer=http___10wallpaper.jpg" + } + ], + "printFile": "", + "certListCode": [] + }, + { + "id": 4, + "billId": "", + "certKind": "YLQXSCQYXKZ", + "certKindName": "医疗器械生产企业许可证", + "certCode": "007", + "expdtBeginDate": "2023-04-01 16:03:04", + "expdtEndDate": "2056-07-01 16:03:06", + "isValidingCheck": false, + "isValiding": 0, + "companyRegistCertFile": [ + { + "filePath": "/sfile/2023/pub/src=http___10wallpaper.com_wallp_b729469d97d0465dbcab54dd33fcc457.jpg", + "fileOriginalName": "src=http___10wallpaper.com_wallpaper_2560x1600_1607_Mountains_macos_sierra_sky-Landscape_Theme_Wallpaper_2560x1600.jpg&refer=http___10wallpaper.jpg" + } + ], + "printFile": "", + "certListCode": [] + } + ] +} \ No newline at end of file diff --git a/data/spd3/message b/data/mdm3-es/message similarity index 100% rename from data/spd3/message rename to data/mdm3-es/message diff --git a/data/spd3/sql b/data/mdm3-es/sql similarity index 100% rename from data/spd3/sql rename to data/mdm3-es/sql diff --git a/data/spd3/data b/data/spd3/data deleted file mode 100644 index 36e59291cf61fe278949b2c5f85fc6c6a5d9fe2f..0000000000000000000000000000000000000000 --- a/data/spd3/data +++ /dev/null @@ -1,45 +0,0 @@ -# 登录外网(主数据平台)系统 -"VerifyCode_url": "/test2api/oauthService/auth/getVerifyCode" -login_data: {"orderCode": "10200512100243412"} -login_contentType: "application/json" -login_checkDict: {"rtn_code": "0000001"} - - -"login_enc_user_id": "国药集团湖北分公司mQDwR7" -"login_url": "/test2api/oauthService/auth/getVerifyCode" - -#器械注册人接口 -"CompanyRegist_url": "/test2api/mdmService/companyRegistBill/insertCompanyRegist" -json_contentType: "application/json" -json_headers: { - "Content-Type": "%s" -} -"payload": { -"compFunction": "2", -"compFunctionArr": ["2"], -"cname": "%s", -"shortName": "", -"isAbroad": "1", -"addrCodeList": [ -"11" -], -"area": "", -"userName": "%s", -"address": "", -"userLoginCode": "%s", -"userLoginPsw": "a123456!", -"confimPassword": "a123456!", -"registContactUser": "", -"registContactWay": "", -"email": "%s@sina.com", -"registSourceProject": "%s", -"legal": "", -"erpCode": "002", -"dataEntrance": "注册", -"compKind": "0", -"upCompanyId": "", -"companyRegistBizscopeVos": [], -"certVOList": [] -} -"name1": "国药集团公司" -checkDict: {"code": 0,'msg': None} diff --git a/report/summary.html b/report/summary.html index dc0e274e9aca175e8126c049949627b2fe4a5a5b..052b267301487fc9df0d4dc7b1f57e7e0dc5b956 100644 --- a/report/summary.html +++ b/report/summary.html @@ -54,8 +54,8 @@