Commit 3d8caa3cad423d80bedb805882a753f49851841a

Authored by lixi
2 parents 0693c2a6 5420ffa0

Merge remote-tracking branch 'origin/master'

report/test.log
1   -[2021-09-29 10:29:40] [INFO] : ======================================================================================
2   -[2021-09-29 10:29:40] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
3   -[2021-09-29 10:29:40] [INFO] : http://10.28.12.150:80/api/authenticationApi/loginWeb
4   -{'data': None, 'json': {'userName': '111222', 'password': 'IWOpywOAiznF9DG4JYfr8AYelY4t93yAuXw4eepmGh2+Ydd5atUFcrSiqKfA8d1VmVDUsTRUyvZ4D/mqtyGmwCTPPfdFwaNVk6a6nB+jLGL3IZI79UrSwb5II8s86lLX7CXMTK1VYugQkL1Rm+GaQ5xZo95+aVPSLl0vq8460iQ='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
5   -
6   -[2021-09-29 10:29:40] [INFO] : ======================================================================================
7   -[2021-09-29 10:29:40] [INFO] : http://test.uap.diligrp.com/login/login.action
8   -[2021-09-29 10:29:40] [INFO] : http://10.28.12.150:80/login/login.action
  1 +[2021-09-29 10:37:05] [INFO] : ======================================================================================
  2 +[2021-09-29 10:37:05] [INFO] : http://test.uap.diligrp.com/api/authenticationApi/loginWeb
  3 +[2021-09-29 10:37:05] [INFO] : http://10.28.12.150:80/api/authenticationApi/loginWeb
  4 +{'data': None, 'json': {'userName': '111222', 'password': 'JYcz8+r+PzhufWkE3cKKOatUNSVV4aTCoQjA98jqBrJEVOVYRUU4Py3VYXZi6pI8O7dp0dl1Wvo5INVPTZ/lBKT6RY7HLbcZG2qgAe3TYS3XhNpR+Ifygo8UHw1lGf9setUdUW3qFFoplndGKVFpMMBKXMM0mXhXs6dk1MqneuQ='}, 'headers': {'Content-Type': 'text/plain;charset=utf-8', 'Host': 'test.uap.diligrp.com', 'Content-Length': '209', 'Expect': '100-continue'}}
  5 +
  6 +[2021-09-29 10:37:05] [INFO] : ======================================================================================
  7 +[2021-09-29 10:37:05] [INFO] : http://test.uap.diligrp.com/login/login.action
  8 +[2021-09-29 10:37:05] [INFO] : http://10.28.12.150:80/login/login.action
9 9 {'data': b'userName=111222&password=111111', 'json': None, 'headers': {'Host': 'test.uap.diligrp.com', 'Connection': 'keep-alive', 'Content-Length': '33', 'Cache-Control': 'max-age=0', 'Upgrade-Insecure-Requests': '1', 'Origin': 'http://test.uap.diligrp.com', 'Content-Type': 'application/x-www-form-urlencoded', 'User-Agent': 'Mozilla/5.0(WindowsNT10.0;Win64;x64)AppleWebKit/537.36(KHTML,likeGecko)Chrome/90.0.4430.212Safari/537.36', 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9', 'Referer': 'http://test.uap.diligrp.com/login/index.html', 'Accept-Encoding': 'gzip,deflate', 'Accept-Language': 'zh-CN,zh-TW;q=0.9,zh;q=0.8,en;q=0.7', 'Cookie': 'UAP_accessToken=;UAP_refreshToken=;UAP_loginPath='}, 'allow_redirects': False}
10 10  
11   -[2021-09-29 10:29:41] [INFO] : ======================================================================================
12   -[2021-09-29 10:29:41] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/businessChargeItem/listBusinessChargeItem
  11 +[2021-09-29 10:37:05] [INFO] : ======================================================================================
  12 +[2021-09-29 10:37:05] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/businessChargeItem/listBusinessChargeItem
13 13 {"marketId": 15, "businessType": "501"}
14 14 {}
15 15  
16   -[2021-09-29 10:29:41] [INFO] : ======================================================================================
17   -[2021-09-29 10:29:41] [INFO] : http://test.gateway.diligrp.com:8285/card-web/accountQuery/simpleInfo.action
  16 +[2021-09-29 10:37:05] [INFO] : ======================================================================================
  17 +[2021-09-29 10:37:05] [INFO] : http://test.gateway.diligrp.com:8285/card-web/accountQuery/simpleInfo.action
18 18 None
19 19 {'params': {'cardNo': '888800010591'}}
20 20  
21   -[2021-09-29 10:29:41] [INFO] : ======================================================================================
22   -[2021-09-29 10:29:41] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/city/listByKeywordsWithCityCode
  21 +[2021-09-29 10:37:05] [INFO] : ======================================================================================
  22 +[2021-09-29 10:37:05] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/city/listByKeywordsWithCityCode
23 23 {"allLevelKeyword": "\u4e07\u5dde"}
24 24 {}
25 25  
26   -[2021-09-29 10:29:41] [INFO] : ======================================================================================
27   -[2021-09-29 10:29:41] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/district/search
  26 +[2021-09-29 10:37:05] [INFO] : ======================================================================================
  27 +[2021-09-29 10:37:05] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/district/search
28 28 {"marketId": 15, "nameLike": "\u897f\u533a"}
29 29 {}
30 30  
31   -[2021-09-29 10:29:41] [INFO] : ======================================================================================
32   -[2021-09-29 10:29:41] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
  31 +[2021-09-29 10:37:05] [INFO] : ======================================================================================
  32 +[2021-09-29 10:37:05] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
33 33 {"marketId": 15, "keyword": "\u8461\u8404", "state": 1}
34 34 {}
35 35  
36   -[2021-09-29 10:29:41] [INFO] : ======================================================================================
37   -[2021-09-29 10:29:41] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
  36 +[2021-09-29 10:37:05] [INFO] : ======================================================================================
  37 +[2021-09-29 10:37:05] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
38 38 {"businessType": "501", "chargeItem": 518, "marketId": 15}
39 39 {}
40 40  
41   -[2021-09-29 10:29:41] [INFO] : ======================================================================================
42   -[2021-09-29 10:29:41] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
  41 +[2021-09-29 10:37:06] [INFO] : ======================================================================================
  42 +[2021-09-29 10:37:06] [INFO] : http://test.gateway.diligrp.com:8285/dili-rule/api/chargeRule/queryFee
43 43 {"businessType": "501", "chargeItem": 520, "marketId": 15}
44 44 {}
45 45  
46   -[2021-09-29 10:29:41] [INFO] : ======================================================================================
47   -[2021-09-29 10:29:41] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/registerRecord/save
  46 +[2021-09-29 10:37:06] [INFO] : ======================================================================================
  47 +[2021-09-29 10:37:06] [INFO] : http://test.gateway.diligrp.com:8285/hg-trading/api/registerRecord/save
48 48 {"accountId": 107796, "cardNo": "888800010591", "customerId": 142000, "customerCode": "00131702", "customerName": "\u53f2\u4e1c\u6676", "fixedphoneNumber": null, "mobilephoneNumber": "18080008020", "identityCardAddress": "", "identityCardNo": "110101202109024587", "identityCardType": "ID", "registerDetailDtoList": [{"id": 0, "areaId": 272, "areaName": "\u897f\u533a", "quantity": 0, "productId": 754107, "registerRecordId": 0, "remark": null, "weight": "50", "weightType": 0, "created": null, "createdById": 0, "createdByName": null, "createdByDepartmentId": 0, "createdByDepartmentName": null, "registerCertificateList": null, "product": null, "registerCertificateDtoList": null, "productDto": {"id": 0, "originId": 500101, "originName": "\u4e07\u5dde\u533a", "pieceWeight": 0, "categoryId": 754107, "categoryCode": 754107, "categoryName": "\u8461\u8404", "created": null}}], "registerFeeDtoList": [{"id": 0, "actualFee": 1500, "receivableFee": 1500, "discountFee": 0, "registerRecordId": 0, "payStatus": 0, "chargeItemName": "\u5176\u4ed6\u6536\u8d39", "chargeType": 1, "chargeItemId": 518, "registerFeeType": 999, "created": null, "createdById": 0, "createdByName": null, "settleDate": null, "isBehalf": 0, "registerLoadingFeeExtDto": null}], "tradePassword": "111111"}
49 49 {}
50 50  
... ...
testcase/hg/createBatch/createBatch.py
... ... @@ -11,16 +11,17 @@
11 11  
12 12 import sys
13 13 from commons.api.hg.CheckIn import CheckInMoreGoods as CIMG
  14 +from commons.scripts.readConf import rC
14 15 from commons.MySession import sessionHg
15 16  
16 17  
17 18  
18 19 class createBat(object):
19 20 def __init__(self):
20   - self.host = "http://test.gateway.diligrp.com:8285"
  21 + self.host = rC.returnOptionsItems("host", "gatewayHost")
21 22 data = {i.split("=")[0]: i.split("=")[1] for i in sys.argv if "=" in i}
22 23 if "ic" not in data.keys() or data["ic"] == "":
23   - self.ic = "888800010591"
  24 + self.ic = rC.returnOptionsItems("testInfo", "hg_cardNumRe_01")
24 25 if "goodsName" not in data.keys() or data["goodsName"] == "":
25 26 self.goodsName = "葡萄"
26 27 if "allLevelKeyword" not in data.keys() or data["allLevelKeyword"] == "":
... ...