Commit 17a9731b611130ea97041b291f74398d94cece12

Authored by lixi
2 parents 92d2738c b68e7d55

Merge remote-tracking branch 'origin/master'

commons/scripts/dealContentType.py
@@ -9,10 +9,10 @@ @@ -9,10 +9,10 @@
9 用于hearders中Content-Type格式处理 9 用于hearders中Content-Type格式处理
10 """ 10 """
11 11
12 -def jsonCT(headers=None): 12 +def jsonCode(headers={}):
13 headers["Content-Type"] = "application/json; charset=UTF-8" 13 headers["Content-Type"] = "application/json; charset=UTF-8"
14 return headers 14 return headers
15 15
16 -def urlCode(headers=None): 16 +def urlCode(headers={}):
17 headers["Content-Type"] = "application/x-www-form-urlencoded" 17 headers["Content-Type"] = "application/x-www-form-urlencoded"
18 return headers 18 return headers
19 \ No newline at end of file 19 \ No newline at end of file
commons/scripts/readConf.py
@@ -53,7 +53,7 @@ class readConfig(object): @@ -53,7 +53,7 @@ class readConfig(object):
53 print(self.file_path) 53 print(self.file_path)
54 return self.file_path 54 return self.file_path
55 55
56 -# rc = readConfig() 56 +rC = readConfig()
57 # rc.returnSections() 57 # rc.returnSections()
58 # rc.returnOptions("loginInfo") 58 # rc.returnOptions("loginInfo")
59 # rc.returnOptionsInfo("loginInfo") 59 # rc.returnOptionsInfo("loginInfo")
report/test.log
  1 +[2021-07-29 14:16:42] [INFO] : ======================================================================================
  2 +[2021-07-29 14:16:42] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
  3 +{"businessCode": "jmsf"}
  4 +{}
  5 +
  6 +[2021-07-29 14:16:43] [INFO] : ======================================================================================
  7 +[2021-07-29 14:16:43] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
  8 +{"marketId": 9, "state": 1, "keyword": "\u5c71\u836f"}
  9 +{}
  10 +
  11 +[2021-07-29 14:16:43] [INFO] : ======================================================================================
  12 +[2021-07-29 14:16:43] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
  13 +{"firmCode": "sy", "departmentId": 58, "keyword": ""}
  14 +{}
  15 +
  16 +[2021-07-29 14:16:44] [INFO] : ======================================================================================
  17 +[2021-07-29 14:16:44] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
  18 +{"pageNum": 100, "pageSize": 100, "marketId": 9}
  19 +{}
  20 +
  21 +[2021-07-29 14:16:44] [INFO] : ======================================================================================
  22 +[2021-07-29 14:16:44] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
  23 +None
  24 +{'params': {'pid': 'goods_tag'}}
  25 +
  26 +[2021-07-29 14:16:49] [INFO] : ======================================================================================
  27 +[2021-07-29 14:16:49] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
  28 +{"province": "C", "city": null, "area": null}
  29 +{}
  30 +
  31 +[2021-07-29 14:16:50] [INFO] : ======================================================================================
  32 +[2021-07-29 14:16:50] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
  33 +{"keyword": ""}
  34 +{}
  35 +
  36 +[2021-07-29 14:16:50] [INFO] : ======================================================================================
  37 +[2021-07-29 14:16:50] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
  38 +None
  39 +{'params': {'pid': 'prove_type'}}
  40 +
  41 +[2021-07-29 14:16:51] [INFO] : ======================================================================================
  42 +[2021-07-29 14:16:51] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
  43 +None
  44 +{}
  45 +
  46 +[2021-07-29 14:16:51] [INFO] : ======================================================================================
  47 +[2021-07-29 14:16:51] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
  48 +{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddA12323", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "productId": 14156, "productName": "\u5c71\u836f", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 3.0, "grossWeightDate": "2021-07-28 16:28:24", "newWeight": 2.0, "tareWeight": 1.0, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddA12323", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 58, "depName": "\u6c34\u679c\u90e8", "cateId": 14156, "notice": 0, "backSkinTwo": -1, "recordOriginId": 0, "recordOriginName": null, "recordProductId": 0, "recordProductName": null, "recordWeight": null, "codeIc": null, "codeId": 0, "difference": 0, "bindRecordSign": 0, "recordDesc": null, "hasCodeItems": false, "customerId": 0, "customerName": "", "driverIc": null, "driverName": null, "totalPrice": null, "originId": 500101, "origin": "\u4e07\u5dde\u533a", "originCode": "023", "tradeType": "9001", "tradeTypeName": "\u6c88\u96331\u53f7", "weight": 2.0, "pwd": "", "type": 1, "ic": "", "boothNumber": "210728154359", "productState": "1", "accountId": 0, "passCheckId": 0, "passCheckName": null, "tradeTypeId": 70, "id": 0, "protocolId": null, "goodsTagId": 663}
  49 +{}
  50 +
  51 +[2021-07-29 14:16:53] [INFO] : ======================================================================================
  52 +[2021-07-29 14:16:53] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCarType
  53 +{"businessCode": "jmsf"}
  54 +{}
  55 +
  56 +[2021-07-29 14:16:54] [INFO] : ======================================================================================
  57 +[2021-07-29 14:16:54] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/cusCategory/getTree
  58 +{"marketId": 9, "state": 1, "keyword": "\u852c\u83dc"}
  59 +{}
  60 +
  61 +[2021-07-29 14:16:54] [INFO] : ======================================================================================
  62 +[2021-07-29 14:16:54] [INFO] : http://test.gateway.diligrp.com:8285/dili-uap/userApi/listByExample.api
  63 +{"firmCode": "sy", "departmentId": 58, "keyword": ""}
  64 +{}
  65 +
  66 +[2021-07-29 14:16:54] [INFO] : ======================================================================================
  67 +[2021-07-29 14:16:54] [INFO] : http://test.gateway.diligrp.com:8285/assets-service/api/tradeType/query
  68 +{"pageNum": 100, "pageSize": 100, "marketId": 9}
  69 +{}
  70 +
  71 +[2021-07-29 14:16:54] [INFO] : ======================================================================================
  72 +[2021-07-29 14:16:54] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
  73 +None
  74 +{'params': {'pid': 'goods_tag'}}
  75 +
  76 +[2021-07-29 14:16:55] [INFO] : ======================================================================================
  77 +[2021-07-29 14:16:55] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/address
  78 +{"province": "C", "city": null, "area": null}
  79 +{}
  80 +
  81 +[2021-07-29 14:16:55] [INFO] : ======================================================================================
  82 +[2021-07-29 14:16:55] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/dep
  83 +{"keyword": ""}
  84 +{}
  85 +
  86 +[2021-07-29 14:16:55] [INFO] : ======================================================================================
  87 +[2021-07-29 14:16:55] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/jmsf/query/listCodeByPid
  88 +None
  89 +{'params': {'pid': 'prove_type'}}
  90 +
  91 +[2021-07-29 14:16:56] [INFO] : ======================================================================================
  92 +[2021-07-29 14:16:56] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/appCommon/duplicateToken.action
  93 +None
  94 +{}
  95 +
  96 +[2021-07-29 14:16:56] [INFO] : ======================================================================================
  97 +[2021-07-29 14:16:56] [INFO] : http://test.gateway.diligrp.com:8285/jmsf-web/api/entrace/wholeCarWeighSave
  98 +{"carTypeCode": "003", "carTypeId": 53, "carTypeName": "\u677f\u8f66", "carTypeWeight": 333, "plate": "\u5dddA12323", "inGreeterId": 223, "inGreeterName": "\u6d4b\u8bd5\u6c88\u9633", "productId": 14152, "productName": "\u852c\u83dc", "proveTypeCode": 665, "proveTypeName": "\u98df\u54c1\u5b89\u5168", "weighRemark": "\u5907\u6ce8", "weighmanRecord": {"grossWeight": 3.0, "grossWeightDate": "2021-07-28 16:28:24", "newWeight": 2.0, "tareWeight": 1.0, "tareWeightDate": null, "weighImgs": []}, "productCode": null, "trailerNumber": "\u5dddA12323", "pathAddress": "A4-BB-6D-0A-F4-13", "haveTruckWeight": false, "source": 4, "entryPlateInputType": 1, "dep": 58, "depName": "\u6c34\u679c\u90e8", "cateId": 14152, "notice": 0, "backSkinTwo": -1, "recordOriginId": 0, "recordOriginName": null, "recordProductId": 0, "recordProductName": null, "recordWeight": null, "codeIc": null, "codeId": 0, "difference": 0, "bindRecordSign": 0, "recordDesc": null, "hasCodeItems": false, "customerId": 0, "customerName": "", "driverIc": null, "driverName": null, "totalPrice": null, "originId": 500101, "origin": "\u4e07\u5dde\u533a", "originCode": "023", "tradeType": "9001", "tradeTypeName": "\u6c88\u96331\u53f7", "weight": 2.0, "pwd": "", "type": 1, "ic": "", "boothNumber": "210728154359", "productState": "1", "accountId": 0, "passCheckId": 0, "passCheckName": null, "tradeTypeId": 70, "id": 0, "protocolId": null, "goodsTagId": 663}
  99 +{}
  100 +