增加部分逻辑及新增html报告

blueprints/KeyData

@@ -3,7 +3,7 @@ a = 1
 channnelid = 214
 fundcorpid = 480
 merchantid = 27
-execjsonversion = {'configuration_center':'1.0.1','zhongtai_hetong':'1.0.1','account':'2.0','risk':'2.0','trade':'2.0','zijin':'2.0','msg':'1.0.1'}
+execjsonversion = {'configuration_center':'1.0.1','account':'2.0','risk':'2.0','trade':'2.0','zijin':'2.0'}
 issimple = 0
 
 [baseinfo]
@@ -11,12 +11,12 @@ usered = qa
 defaluttime = 2
 timeout = 20
 phone_no = 13700000001
-environment = qa3
+environment = msg
 term = 6
 amount = 10000
 productid = 1
 repaymenttype = 微信
-bancode = {'ICBC':'62220202'}
+bancode = {'ICBC':'62220202','PINGAN':'62229848'}
 terms = [1,2,3,6,9,12]
 amounts = [2000,4000,6000,10000,20000,30000]
 productids = [1,4]
@@ -42,7 +42,7 @@ hetongtoken = a758d7e9323225494c74a52b3a43af3e
 cardno = 6222020234701809463
 msgtoken = {token}
 sceneid = 5
-deadline = 1589025567000
+deadline = 1589164833000
 paymenttoken = ff928a66-15f2-444f-852a-e4cff2a508e5
 requestid = 63119890137088
 vcode = 238345
@@ -50,11 +50,11 @@ applyno = AN000000140595662094934016
 voicetoken = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1ODgxNTE1OTgsInVzZXJuYW1lIjoidHgueHlxYiJ9.W4fKn-tdbOORELBfUd6KOjrygjzWWFY0zf6dmcqsjiI
 
 [testsuit]
-cases_number1 = [358, 359, 360,323, 382, 383, 384, 385,361, 402, 403, 404, 405,401,399,407,367,574,575,577,576,368,371,372,374,375,376,378,363,364,369,370,409,373,410,412,411,413,387, 388,389,390, 391, 392,389, 390, 394, 395, 396, 397]
+cases_number1 = [816,817,358, 359, 360,323, 382, 383, 384, 385,361, 402, 403, 404, 405,401,399,407,367,574,575,577,576,368,371,372,374,375,376,378,363,364,369,370,409,373,410,412,411,413,387, 388,389,390, 391, 392,389, 390, 394, 395, 396, 397]
 case_number_fengkong = [509, 510, 511, 512, 538, 539, 540, 541, 542, 543, 544, 545, 546, 547, 548, 549]
 case_number3 = [358, 359, 360,323,382, 383,399, 385,407,367,368,371,372,374,375,376,378,363,364,369,370,409,373,410,412,411,413,387, 388,389,390, 391, 392,389, 390, 394, 395, 396, 397]
 case_number_usercenter = [504, 494, 508,479, 477, 498, 476, 499, 495, 483, 505, 488, 471, 502, 484, 492, 493,  503, 470, 489, 473, 490, 486, 500, 501, 487, 491, 472, 496, 480, 506, 475, 474, 507, 481, 497, 478,482,485]
-person_test_number = case_number_sidecar
+person_test_number = case_number_msg
 cases_number_temp = [358, 359, 360,323, 382, 383, 384, 385,361, 402, 403, 404, 405,401,399,407,367,368]
 case_number_33 = [358, 359, 360,323,383,385,399,367,372,378,363,364,369,370,409,373,410,412,411,413,387, 388,389,390, 391, 389, 390, 394, 395, 396, 397]
 case_number_newhetong = [416, 420, 421, 417, 426, 427, 431, 424, 432, 428, 425, 414, 422, 418, 419, 423, 415]
@@ -79,5 +79,5 @@ case_number_ka_koala_repay = [{'ka_koala_repay':['791','789','790','786','787','
 case_number_test = [{'passportapi':[323,382,383,384]},{'koala_repay':[679, 680]},{'passportapi':[323,382,383,384]}]
 
 [sqldata]
-sqldata = [9]
+sqldata = [139]
 

blueprints/exec-temp.py

@@ -163,7 +163,7 @@ if __name__ == '__main__':
 
     # name='account'
     ###############
-    name='sidecar' #'account' or 'configuration_center'or
+    #name='sidecar' #'account' or 'configuration_center'or
     # name='ka_koala_repay'
 
     # ############

blueprints/requestResult.py

@@ -148,8 +148,15 @@ class requestResult:
 
     def writeKeyDatafile(self,name,data):
         #print(data,name)
-        if data:
-            self.keydata.writeKeyData('baseinfo', name, data if data else None)
+        try:
+            if data:
+                if isinstance(data,list):
+                    self.keydata.writeKeyData('baseinfo', name, data[0] if data else None)
+                else:
+                    self.keydata.writeKeyData('baseinfo', name, data if data else None)
+        except:
+            pass
+
 
 
 
@@ -659,13 +666,13 @@ if __name__ == '__main__':
 
 
     #cases_number= [323, 382, 383, 384, 385,361, 402, 403, 404, 405,401]
-    cases_number=[806]
+    cases_number=[452]
     #cases_number = [369,370,409,373]
     #cases_number=[358, 359, 360,323, 382, 383, 384, 385,361, 402, 403, 404, 405,401,399,407,367,368,371,372,374,375,376,378,363,364,369,370]
     t = '.json,'.join([str(i) for i in cases_number]) + ".json"
     # casefile = [{'passportapi':['323.json', '382.json','383.json', '384.json', '385.json']},{'payment': t.split(',')}]
 
-    casefile =[{'sidecar': t.split(',')}]
+    casefile =[{'msg': t.split(',')}]
 
     #casefile = [{'passportapi': t.split(',')}]
 

blueprints/tools/zentaopms_cases.py

@@ -257,7 +257,7 @@ def zentaopms_data(panda_name,projectId,psid):
 if __name__ == "__main__":
 
 
-    names=['ka_koala_repay']
+    names=['msg']
     #names=['zhongtai_hetong','msg','configuration_center']
 
     for name in names:
@@ -369,16 +369,16 @@ if __name__ == "__main__":
     # zentaopms_data(panda_name, projectId, psid)
 
     # KA-考拉放款
-    projectId = 49
-    psid = 7
-    panda_name = 'ka_koala_loan'
-    zentaopms_data(panda_name, projectId, psid)
-    #
-    # KA-考拉还款
-    projectId = 50
-    psid = 7
-    panda_name = 'ka_koala_repay'
-    zentaopms_data(panda_name, projectId, psid)
+    # projectId = 49
+    # psid = 7
+    # panda_name = 'ka_koala_loan'
+    # zentaopms_data(panda_name, projectId, psid)
+    # #
+    # # KA-考拉还款
+    # projectId = 50
+    # psid = 7
+    # panda_name = 'ka_koala_repay'
+    # zentaopms_data(panda_name, projectId, psid)
 
     #a = zentaopms_data(cases_number)
     #print(a)

testCase/ka_koala_repay/786.json

@@ -17,4 +17,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/ka_koala_repay/787.json

@@ -29,4 +29,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/ka_koala_repay/788.json

@@ -17,4 +17,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/ka_koala_repay/789.json

@@ -16,4 +16,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/ka_koala_repay/790.json

@@ -30,4 +30,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/ka_koala_repay/791.json

@@ -17,4 +17,4 @@
     "header": {
         "Content-Type": "application/x-www-form-urlencoded"
     }
-}
+}
\ No newline at end of file

testCase/msg/433.json

@@ -23,4 +23,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/434.json

@@ -12,4 +12,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/435.json

@@ -12,4 +12,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/436.json

@@ -22,4 +22,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/437.json

@@ -24,4 +24,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/438.json

@@ -22,4 +22,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/439.json

@@ -21,4 +21,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/440.json

@@ -21,4 +21,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/441.json

@@ -22,4 +22,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/442.json

 {
     "method": "POST",
     "commit": "新增/修改消息模板-修改(POST)",
-    "url": "/middle_office/template/modify",
+    "url": "/middle_office/template",
     "casename": "token",
     "sql": "select id,concat('测试',content), concat('测试',title) from msg.msg_template where LOCATE('测试',content)>0 order by rand() limit 1;",
     "db": "msg",
@@ -26,4 +26,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/443.json

@@ -22,4 +22,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/444.json

 {
     "method": "POST",
     "commit": "新增/修改消息模板-新增(POST)",
-    "url": "/middle_office/template/modify",
+    "url": "/middle_office/template",
     "casename": "token",
     "result": {
         "code": "0"
@@ -20,4 +20,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/445.json

@@ -19,4 +19,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/446.json

@@ -20,4 +20,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/447.json

@@ -19,4 +19,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/448.json

@@ -19,4 +19,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/449.json

@@ -19,4 +19,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/450.json

@@ -25,4 +25,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/452.json

@@ -12,4 +12,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/453.json

@@ -12,4 +12,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/455.json

@@ -22,4 +22,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/457.json

@@ -25,4 +25,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/458.json

@@ -22,4 +22,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/459.json

@@ -20,4 +20,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/460.json

@@ -26,4 +26,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/808.json

@@ -18,4 +18,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/msg/809.json

@@ -15,4 +15,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file

testCase/sidecar/806.json

@@ -3,7 +3,7 @@
     "commit": "查询「下载要素清单模板」(GET)",
     "url": "/middle_office/chaos/case_manifest",
     "casename": "token",
-    "sql": "select  distinct b.loan_application_history_id\r\nfrom xyqb.repayment_record a \r\njoin xyqb.loan_application_history c on c.id=a.loan_application_history_id\r\njoin xyqb.repayment_plan b on a.loan_application_history_id=b.loan_application_history_id and a.repayment_plan_id=b.id\r\nwhere c.progress=15 and b.loan_application_history_id!=140\r\norder by rand() limit 1;",
+    "sql": "select  distinct b.loan_application_history_id\r\nfrom xyqb.repayment_record a \r\njoin xyqb.loan_application_history c on c.id=a.loan_application_history_id\r\njoin xyqb.repayment_plan b on a.loan_application_history_id=b.loan_application_history_id and a.repayment_plan_id=b.id\r\nwhere c.progress=15 and b.loan_application_history_id=8 and b.loan_application_history_id!=140\r\norder by rand() limit 1;",
     "db": "xyqb_user",
     "result": {
         "code": "0",

testCase/zhongtai_hetong/711.json

@@ -3,7 +3,7 @@
     "commit": "签署合同 - 组捆绑-nocallback(POST)",
     "url": "/middle_office/contract/signBatch",
     "casename": "token",
-    "sql": "select a.user_id,a.source_id,b.id,a.contract_no,a.ssq_contract_no from contract.contracts a, contract.contract_template_new b\r\nwhere a.ssq_contract_no is not null and a.source_id is not null and a.template_id !=b.id and b.status=1 order by rand() limit 1;",
+    "sql": "select a.user_id,a.source_id,960,a.contract_no,a.ssq_contract_no from contract.contracts a, contract.contract_template_new b\r\nwhere a.ssq_contract_no is not null and a.source_id is not null and a.template_id !=b.id and b.status=1 and a.user_id=1 order by rand() limit 1;",
     "db": "msg",
     "result": {
         "code": "0"
@@ -17,4 +17,4 @@
     "header": {
         "Content-Type": "application/json"
     }
-}
+}
\ No newline at end of file