autotest / trading · Commits

Commit 784ebb582731c9e573bfbc38070de1b87faa61e1

Authored by lixi
1 parent e933a101
build: skipped

更新文件

Inline Side-by-side
Showing 8 changed files with 516 additions and 22 deletions
commons/MySession.py
  View file @784ebb5
... ... @@ -295,7 +295,7 @@ my.set_mark()
295 295 # 哈尔滨客户端session
296 296 # sessionHeb = mysession().cliLogin("hd_userName_01")
297 297 #获取对应市场session
298   -sy1=mysession("host1").get_session_client("sy_user01")
  298 +# sy1=mysession("host1").get_session_client("sy_user01")
299 299 # heb=mysession("host1").get_session_client("heb_user01")
300 300 hg=mysession("host2").get_session_client("hg_user01")
301 301 # 检测登录接口
... ...
commons/basic/duplicateToken.py
  View file @784ebb5
... ... @@ -16,18 +16,14 @@ class duplicateToken():
16 16 "Host": "test.gateway.diligrp.com:8285",
17 17 "Connection":"Keep-Alive"}
18 18  
19   - def __init__(self,market):
20   - self.market=market
21   - self.url = duplicateToken.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
  19 + def __init__(self):
  20 + self.url = duplicateToken.url
22 21 self.header = duplicateToken.header
23   - self.header["UAP_accessToken"] = self.market.cookies["UAP_accessToken"]
24   - self.header["UAP_refreshToken"] = self.market.cookies["UAP_refreshToken"]
25   - self.header["UAP_firmId"] = self.market.cookies["UAP_firmId"]
26 22  
27 23  
28   - def duplicate_commit_token(self):
29   - re = self.market.get(url=self.url, headers=self.header)
  24 + def duplicate_commit_token(self,market):
  25 + re = market.get(url=self.url, headers=self.header)
30 26 return re.json()["data"]
31 27  
32 28  
33   -# print(duplicateToken(hg).duplicate_commit_token())
  29 +print(duplicateToken().duplicate_commit_token(hg))
... ...
commons/basic/recharge.py
  View file @784ebb5
... ... @@ -23,18 +23,15 @@ class recharge():
23 23 body = {"amount": 500000000, "cardNo": "888810026785", "accountId": 107792, "customerId": 141992, "tradePwd": "",
24 24 "tradeChannel": 2}
25 25  
26   - def __init__(self, market):
27   - self.market = market
28   - self.url = recharge.url.replace("http://test.", com.get_global_config("global_data", "environment", "en"))
  26 + def __init__(self, ):
  27 + self.url = recharge.url
29 28 self.header = recharge.header
30   - self.header["UAP_accessToken"] = self.market.cookies["UAP_accessToken"]
31   - self.header["UAP_refreshToken"] = self.market.cookies["UAP_refreshToken"]
32 29 self.body = recharge.body
33 30  
34   - def refresh_commit_token(self):
35   - self.header["duplicate_commit_token"] = duplicateToken(self.market).duplicate_commit_token()
36   -
37   -# tt = recharge(hg)
38   -# for i in range(0,100):
39   -# tt.refresh_commit_token()
  31 + def refresh_commit_token(self,market):
  32 + self.header["duplicate_commit_token"] = duplicateToken().duplicate_commit_token(market)
  33 +#
  34 +# tt = recharge()
  35 +# for i in range(0,10):
  36 +# tt.refresh_commit_token(hg)
40 37 # hg.post(url=tt.url, json=tt.body, headers=tt.header, proxies=hg.myproxies)
... ...
config/api/hg/__init__.py 0 → 100644
  View file @784ebb5
config/api/hg/cusCategory.py 0 → 100644
  View file @784ebb5
  1 +data={
  2 + "code": "200",
  3 + "data": [
  4 + {
  5 + "categoryId": 237,
  6 + "createTime": "2021-07-22 10:32:50",
  7 + "creatorId": 2499,
  8 + "id": 374690,
  9 + "keycode": "pg",
  10 + "marketId": 15,
  11 + "modifyTime": "2021-07-22 10:32:50",
  12 + "name": "苹果",
  13 + "parent": 0,
  14 + "path": "374690,",
  15 + "pingying": "pingguo",
  16 + "pyInitials": "pg",
  17 + "state": 1
  18 + },
  19 + {
  20 + "categoryId": 237,
  21 + "createTime": "2021-07-22 10:34:09",
  22 + "creatorId": 2499,
  23 + "id": 374691,
  24 + "keycode": "aks",
  25 + "marketId": 15,
  26 + "modifyTime": "2021-07-22 10:34:09",
  27 + "name": "阿克苏",
  28 + "parent": 374690,
  29 + "path": "374690,374691,",
  30 + "pingying": "akesu",
  31 + "pyInitials": "aks",
  32 + "state": 1
  33 + },
  34 + {
  35 + "categoryId": 237,
  36 + "createTime": "2021-07-22 10:35:22",
  37 + "creatorId": 2499,
  38 + "id": 374692,
  39 + "keycode": "xjaks",
  40 + "marketId": 15,
  41 + "modifyTime": "2021-07-22 10:35:22",
  42 + "name": "新疆阿克苏",
  43 + "parent": 374691,
  44 + "path": "374690,374691,374692,",
  45 + "pingying": "xinjiangakesu",
  46 + "pyInitials": "xjaks",
  47 + "state": 1
  48 + },
  49 + {
  50 + "categoryId": 1,
  51 + "createTime": "2021-08-26 15:33:12",
  52 + "creatorId": 202,
  53 + "id": 754097,
  54 + "keycode": "001",
  55 + "marketId": 15,
  56 + "modifyTime": "2021-08-26 15:33:12",
  57 + "name": "阿克苏糖心苹果",
  58 + "parent": 374691,
  59 + "path": "374690,374691,754097,",
  60 + "pingying": "akesutangxinpingguo",
  61 + "pyInitials": "akstxpg",
  62 + "state": 1
  63 + },
  64 + {
  65 + "categoryId": 242,
  66 + "createTime": "2021-08-26 15:33:58",
  67 + "creatorId": 202,
  68 + "id": 754102,
  69 + "keycode": "ll",
  70 + "marketId": 15,
  71 + "modifyTime": "2021-08-26 15:33:58",
  72 + "name": "梨类",
  73 + "parent": 0,
  74 + "path": "754102,",
  75 + "pingying": "lilei",
  76 + "pyInitials": "ll",
  77 + "state": 1
  78 + },
  79 + {
  80 + "categoryId": 242,
  81 + "createTime": "2021-08-26 15:34:34",
  82 + "creatorId": 202,
  83 + "id": 754103,
  84 + "keycode": "xjl",
  85 + "marketId": 15,
  86 + "modifyTime": "2021-08-26 15:34:34",
  87 + "name": "新疆梨",
  88 + "parent": 754102,
  89 + "path": "754102,754103,",
  90 + "pingying": "xinjiangli",
  91 + "pyInitials": "xjl",
  92 + "state": 1
  93 + },
  94 + {
  95 + "categoryId": 242,
  96 + "createTime": "2021-08-26 15:35:19",
  97 + "creatorId": 202,
  98 + "id": 754104,
  99 + "keycode": "xl",
  100 + "marketId": 15,
  101 + "modifyTime": "2021-08-26 15:35:19",
  102 + "name": "香梨",
  103 + "parent": 754103,
  104 + "path": "754102,754103,754104,",
  105 + "pingying": "xiangli",
  106 + "pyInitials": "xl",
  107 + "state": 1
  108 + },
  109 + {
  110 + "categoryId": 242,
  111 + "createTime": "2021-08-26 15:38:10",
  112 + "creatorId": 459,
  113 + "id": 754105,
  114 + "keycode": "144",
  115 + "marketId": 15,
  116 + "modifyTime": "2021-08-26 15:38:10",
  117 + "name": "哈密小香梨",
  118 + "parent": 754104,
  119 + "path": "754102,754103,754104,754105,",
  120 + "pingying": "hamixiaoxiangli",
  121 + "pyInitials": "hmxxl",
  122 + "state": 1
  123 + },
  124 + {
  125 + "categoryId": 383,
  126 + "createTime": "2021-08-26 15:37:40",
  127 + "creatorId": 453,
  128 + "id": 754106,
  129 + "keycode": "111",
  130 + "marketId": 15,
  131 + "modifyTime": "2021-08-26 15:37:40",
  132 + "name": "杭果",
  133 + "parent": 0,
  134 + "path": "754106,",
  135 + "pingying": "hangguo",
  136 + "pyInitials": "hg",
  137 + "state": 1
  138 + },
  139 + {
  140 + "categoryId": 307,
  141 + "createTime": "2021-08-26 15:38:01",
  142 + "creatorId": 453,
  143 + "id": 754107,
  144 + "keycode": "222",
  145 + "marketId": 15,
  146 + "modifyTime": "2021-08-26 15:38:01",
  147 + "name": "葡萄",
  148 + "parent": 754106,
  149 + "path": "754106,754107,",
  150 + "pingying": "putao",
  151 + "pyInitials": "pt",
  152 + "state": 1
  153 + },
  154 + {
  155 + "categoryId": 471,
  156 + "createTime": "2021-08-26 15:38:26",
  157 + "creatorId": 453,
  158 + "id": 754108,
  159 + "keycode": "333",
  160 + "marketId": 15,
  161 + "modifyTime": "2021-08-26 15:38:26",
  162 + "name": "香蕉",
  163 + "parent": 754106,
  164 + "path": "754106,754108,",
  165 + "pingying": "xiangjiao",
  166 + "pyInitials": "xj",
  167 + "state": 1
  168 + },
  169 + {
  170 + "categoryId": 432,
  171 + "createTime": "2021-08-26 16:09:59",
  172 + "creatorId": 462,
  173 + "id": 754109,
  174 + "keycode": "999",
  175 + "marketId": 15,
  176 + "modifyTime": "2021-08-26 16:09:59",
  177 + "name": "水果",
  178 + "parent": 0,
  179 + "path": "754109,",
  180 + "pingying": "shuiguo",
  181 + "pyInitials": "sg",
  182 + "state": 1
  183 + },
  184 + {
  185 + "categoryId": 2,
  186 + "createTime": "2021-08-31 14:53:40",
  187 + "creatorId": 462,
  188 + "id": 754112,
  189 + "keycode": "77",
  190 + "marketId": 15,
  191 + "modifyTime": "2021-08-31 14:53:40",
  192 + "name": "无花果",
  193 + "parent": 754109,
  194 + "path": "754109,754112,",
  195 + "pingying": "wuhuaguo",
  196 + "pyInitials": "whg",
  197 + "state": 1
  198 + },
  199 + {
  200 + "categoryId": 463,
  201 + "createTime": "2021-08-30 14:13:10",
  202 + "creatorId": 462,
  203 + "id": 754113,
  204 + "keycode": "43",
  205 + "marketId": 15,
  206 + "modifyTime": "2021-08-30 14:13:10",
  207 + "name": "西瓜",
  208 + "parent": 754109,
  209 + "path": "754109,754113,",
  210 + "pingying": "xigua",
  211 + "pyInitials": "xg",
  212 + "state": 1
  213 + },
  214 + {
  215 + "categoryId": 399,
  216 + "createTime": "2021-08-31 09:54:50",
  217 + "creatorId": 462,
  218 + "id": 754114,
  219 + "keycode": "66",
  220 + "marketId": 15,
  221 + "modifyTime": "2021-08-31 09:54:50",
  222 + "name": "荔枝",
  223 + "parent": 754109,
  224 + "path": "754109,754114,",
  225 + "pingying": "lizhi",
  226 + "pyInitials": "lz",
  227 + "state": 1
  228 + },
  229 + {
  230 + "categoryId": 257,
  231 + "createTime": "2021-08-31 14:56:48",
  232 + "creatorId": 463,
  233 + "id": 754115,
  234 + "keycode": "22",
  235 + "marketId": 15,
  236 + "modifyTime": "2021-08-31 14:56:48",
  237 + "name": "桃子",
  238 + "parent": 754109,
  239 + "path": "754109,754115,",
  240 + "pingying": "taozi",
  241 + "pyInitials": "tz",
  242 + "state": 1
  243 + },
  244 + {
  245 + "categoryId": 273,
  246 + "createTime": "2021-08-31 14:57:30",
  247 + "creatorId": 463,
  248 + "id": 754116,
  249 + "keycode": "33",
  250 + "marketId": 15,
  251 + "modifyTime": "2021-08-31 14:57:30",
  252 + "name": "李子",
  253 + "parent": 754109,
  254 + "path": "754109,754116,",
  255 + "pingying": "lizi",
  256 + "pyInitials": "lz",
  257 + "state": 1
  258 + },
  259 + {
  260 + "categoryId": 332,
  261 + "createTime": "2021-08-31 14:58:41",
  262 + "creatorId": 463,
  263 + "id": 754117,
  264 + "keycode": "99",
  265 + "marketId": 15,
  266 + "modifyTime": "2021-08-31 14:58:41",
  267 + "name": "火龙果",
  268 + "parent": 754109,
  269 + "path": "754109,754117,",
  270 + "pingying": "huolongguo",
  271 + "pyInitials": "hlg",
  272 + "state": 1
  273 + },
  274 + {
  275 + "categoryId": 323,
  276 + "createTime": "2021-08-31 14:59:16",
  277 + "creatorId": 463,
  278 + "id": 754118,
  279 + "keycode": "55",
  280 + "marketId": 15,
  281 + "modifyTime": "2021-08-31 14:59:17",
  282 + "name": "石榴",
  283 + "parent": 754109,
  284 + "path": "754109,754118,",
  285 + "pingying": "shiliu",
  286 + "pyInitials": "sl",
  287 + "state": 1
  288 + },
  289 + {
  290 + "categoryId": 319,
  291 + "createTime": "2021-09-01 10:00:03",
  292 + "creatorId": 453,
  293 + "id": 754119,
  294 + "keycode": "444",
  295 + "marketId": 15,
  296 + "modifyTime": "2021-09-01 10:00:03",
  297 + "name": "军事",
  298 + "parent": 754106,
  299 + "path": "754106,754119,",
  300 + "pingying": "junshi",
  301 + "pyInitials": "js",
  302 + "state": 1
  303 + }
  304 + ],
  305 + "message": "OK",
  306 + "result": "OK",
  307 + "success": True
  308 +}
0 309 \ No newline at end of file
... ...
config/api/hg/district.py 0 → 100644
  View file @784ebb5
  1 +data={
  2 + "footer": [
  3 + {
  4 + "name": "总数:9",
  5 + "id": "",
  6 + "iconCls": "icon-sum"
  7 + }
  8 + ],
  9 + "rows": [
  10 + {
  11 + "bb": "西区",
  12 + "isDelete": 0,
  13 + "kind": 2,
  14 + "departmentId": "水果部",
  15 + "creatorId": 462,
  16 + "parentId": 0,
  17 + "marketId": 15,
  18 + "number": "001",
  19 + "$_departmentId": "177",
  20 + "modifyTime": 1629962766000,
  21 + "createTime": 1629962766000,
  22 + "name": "西区",
  23 + "id": 272,
  24 + "state": "closed"
  25 + },
  26 + {
  27 + "bb": "东区",
  28 + "isDelete": 0,
  29 + "kind": 2,
  30 + "departmentId": "借款,水果部,结算部",
  31 + "creatorId": 453,
  32 + "parentId": 0,
  33 + "marketId": 15,
  34 + "number": "111",
  35 + "$_departmentId": "176,177,178",
  36 + "modifyTime": 1629964443000,
  37 + "createTime": 1629964443000,
  38 + "name": "东区",
  39 + "id": 273,
  40 + "state": "closed"
  41 + },
  42 + {
  43 + "bb": "东区,东区01",
  44 + "notes": "",
  45 + "isDelete": 0,
  46 + "kind": 2,
  47 + "departmentId": "hg果品部yfc,借款,水果部,结算部",
  48 + "parentId": 273,
  49 + "marketId": 15,
  50 + "number": "1001",
  51 + "$_departmentId": "175,176,177,178",
  52 + "modifyTime": 1629970198000,
  53 + "createTime": 1629964483000,
  54 + "name": "东区01",
  55 + "id": 274,
  56 + "state": "closed"
  57 + },
  58 + {
  59 + "bb": "东区,东区02",
  60 + "notes": "",
  61 + "isDelete": 0,
  62 + "kind": 2,
  63 + "departmentId": "借款,水果部,结算部",
  64 + "parentId": 273,
  65 + "marketId": 15,
  66 + "number": "1002",
  67 + "$_departmentId": "176,177,178",
  68 + "modifyTime": 1629964483000,
  69 + "createTime": 1629964483000,
  70 + "name": "东区02",
  71 + "id": 275,
  72 + "state": "closed"
  73 + },
  74 + {
  75 + "bb": "东区,东区03",
  76 + "notes": "",
  77 + "isDelete": 0,
  78 + "kind": 2,
  79 + "departmentId": "hg果品部yfc,借款,水果部,结算部",
  80 + "parentId": 273,
  81 + "marketId": 15,
  82 + "number": "1003",
  83 + "$_departmentId": "176,177,178,175",
  84 + "modifyTime": 1630029769000,
  85 + "createTime": 1629964483000,
  86 + "name": "东区03",
  87 + "id": 276,
  88 + "state": "closed"
  89 + },
  90 + {
  91 + "bb": "东区,东区04",
  92 + "notes": "",
  93 + "isDelete": 0,
  94 + "kind": 2,
  95 + "departmentId": "借款,水果部,结算部",
  96 + "parentId": 273,
  97 + "marketId": 15,
  98 + "number": "1004",
  99 + "$_departmentId": "176,177,178",
  100 + "modifyTime": 1629964483000,
  101 + "createTime": 1629964483000,
  102 + "name": "东区04",
  103 + "id": 277,
  104 + "state": "closed"
  105 + },
  106 + {
  107 + "bb": "北区的北区的北区的",
  108 + "isDelete": 0,
  109 + "kind": 3,
  110 + "departmentId": "结算部",
  111 + "creatorId": 462,
  112 + "parentId": 0,
  113 + "marketId": 15,
  114 + "number": "004",
  115 + "$_departmentId": "178",
  116 + "modifyTime": 1630311429000,
  117 + "createTime": 1630311405000,
  118 + "name": "北区的北区的北区的",
  119 + "id": 278,
  120 + "state": "closed"
  121 + },
  122 + {
  123 + "bb": "区域09031",
  124 + "isDelete": 0,
  125 + "kind": 2,
  126 + "departmentId": "结算部",
  127 + "creatorId": 473,
  128 + "parentId": 0,
  129 + "marketId": 15,
  130 + "number": "0903",
  131 + "$_departmentId": "178",
  132 + "modifyTime": 1630633729000,
  133 + "createTime": 1630633729000,
  134 + "name": "区域09031",
  135 + "id": 280,
  136 + "state": "closed"
  137 + },
  138 + {
  139 + "bb": "区域09031,区域09032",
  140 + "isDelete": 0,
  141 + "kind": 2,
  142 + "departmentId": "结算部",
  143 + "parentId": 280,
  144 + "marketId": 15,
  145 + "number": "1903",
  146 + "$_departmentId": "178",
  147 + "modifyTime": 1630633771000,
  148 + "createTime": 1630633771000,
  149 + "name": "区域09032",
  150 + "id": 281,
  151 + "state": "closed"
  152 + }
  153 + ]
  154 +}
0 155 \ No newline at end of file
... ...
config/api/hg/prove_type.py 0 → 100644
  View file @784ebb5
  1 +data={
  2 + "code": "200",
  3 + "message": "操作成功",
  4 + "data": [
  5 + {
  6 + "key": 1,
  7 + "value": "检测报告"
  8 + },
  9 + {
  10 + "key": 2,
  11 + "value": "产地证明"
  12 + },
  13 + {
  14 + "key": 3,
  15 + "value": "检疫合格证"
  16 + },
  17 + {
  18 + "key": 4,
  19 + "value": "购货凭证"
  20 + },
  21 + {
  22 + "key": 5,
  23 + "value": "报关单"
  24 + },
  25 + {
  26 + "key": 6,
  27 + "value": "采购协议"
  28 + },
  29 + {
  30 + "key": 8,
  31 + "value": "处理结果"
  32 + },
  33 + {
  34 + "key": 99,
  35 + "value": "其他"
  36 + }
  37 + ],
  38 + "success": True
  39 +}
0 40 \ No newline at end of file
... ...
config/global_data.conf
  View file @784ebb5
... ... @@ -93,7 +93,7 @@ host2={
93 93 "test.scheduler.diligrp.com": "10.28.11.149",
94 94 "test.account.diligrp.com": "10.28.11.149:8186",
95 95 "test.rule.diligrp.com": "10.28.10.127:8284",
96   - "test.bd.diligrp.com": "10.28.10.127",
  96 + "test.bd.diligrp.com": "10.28.10.127:8384",
97 97 "test.customer.diligrp.com": "10.28.10.127:8384",
98 98 "test.report.diligrp.com": "10.28.10.127:8388",
99 99 "test.jmsf.diligrp.com": "10.28.10.127:8385",
... ...