bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 8ef206a003e8dc8aa96075825f71ed844ea46324 1 个父辈 242d38dc

add README

内嵌 并排对比
正在显示 10 个修改的文件 包含 117 行增加 和 124 行删除
@@ -2,36 +2,11 @@ @@ -2,36 +2,11 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment=""> 4 <list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment="">
5 - <change beforePath="$PROJECT_DIR$/.env" beforeDir="false" afterPath="$PROJECT_DIR$/.env" afterDir="false" />  
6 - <change beforePath="$PROJECT_DIR$/api/m_api/m_admin_api.yml" beforeDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/api/m_api/m_admin_detail_api.yml" beforeDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/api/m_api/m_admin_forbidden_api.yml" beforeDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/api/m_api/m_admin_list_api.yml" beforeDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/api/m_api/m_admin_update(edit)_api.yml" beforeDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/api/m_api/m_admin_update(new)_api.yml" beforeDir="false" /> 5 + <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" afterDir="false" />
12 <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" />
13 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" /> 7 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" />
14 - <change beforePath="$PROJECT_DIR$/reports/20200703T160428.653066.html" beforeDir="false" />  
15 - <change beforePath="$PROJECT_DIR$/reports/20200703T161235.039886.html" beforeDir="false" />  
16 - <change beforePath="$PROJECT_DIR$/reports/20200704T145321.546364.html" beforeDir="false" />  
17 - <change beforePath="$PROJECT_DIR$/reports/20200704T145529.449679.html" beforeDir="false" />  
18 - <change beforePath="$PROJECT_DIR$/reports/20200704T145733.571779.html" beforeDir="false" />  
19 - <change beforePath="$PROJECT_DIR$/reports/20200704T145908.560212.html" beforeDir="false" />  
20 - <change beforePath="$PROJECT_DIR$/reports/20200704T150102.221713.html" beforeDir="false" />  
21 - <change beforePath="$PROJECT_DIR$/reports/20200704T150127.659168.html" beforeDir="false" />  
22 - <change beforePath="$PROJECT_DIR$/reports/20200704T150155.521761.html" beforeDir="false" />  
23 - <change beforePath="$PROJECT_DIR$/reports/20200705T040834.224819.html" beforeDir="false" />  
24 - <change beforePath="$PROJECT_DIR$/reports/20200705T040842.461290.html" beforeDir="false" />  
25 - <change beforePath="$PROJECT_DIR$/reports/20200705T042603.456831.html" beforeDir="false" />  
26 - <change beforePath="$PROJECT_DIR$/reports/20200705T042607.405057.html" beforeDir="false" />  
27 - <change beforePath="$PROJECT_DIR$/reports/20200705T043106.738178.html" beforeDir="false" />  
28 - <change beforePath="$PROJECT_DIR$/reports/20200705T043225.004655.html" beforeDir="false" />  
29 - <change beforePath="$PROJECT_DIR$/reports/20200705T043304.280901.html" beforeDir="false" />  
30 - <change beforePath="$PROJECT_DIR$/reports/20200705T043951.319183.html" beforeDir="false" />  
31 - <change beforePath="$PROJECT_DIR$/testcases/m_admin_login_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/m_admin_login_testcases.yml" afterDir="false" />  
32 - <change beforePath="$PROJECT_DIR$/testcases/m_partners_login_testcases.yml" beforeDir="false" />  
33 - <change beforePath="$PROJECT_DIR$/testsuites/demo_testsuite.yml" beforeDir="false" />  
34 - <change beforePath="$PROJECT_DIR$/venv/pip-selfcheck.json" beforeDir="false" afterPath="$PROJECT_DIR$/venv/pip-selfcheck.json" afterDir="false" /> 8 + <change beforePath="$PROJECT_DIR$/helpfunc/db_pg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/db_pg_func.py" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
35 </list> 10 </list>
36 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
37 <option name="SHOW_DIALOG" value="false" /> 12 <option name="SHOW_DIALOG" value="false" />
@@ -48,8 +23,8 @@ @@ -48,8 +23,8 @@
48 <file pinned="false" current-in-tab="false"> 23 <file pinned="false" current-in-tab="false">
49 <entry file="file://$PROJECT_DIR$/debugtalk.py"> 24 <entry file="file://$PROJECT_DIR$/debugtalk.py">
50 <provider selected="true" editor-type-id="text-editor"> 25 <provider selected="true" editor-type-id="text-editor">
51 - <state relative-caret-position="770">  
52 - <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" /> 26 + <state relative-caret-position="273">
  27 + <caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
53 <folding> 28 <folding>
54 <element signature="e#0#13#0" expanded="true" /> 29 <element signature="e#0#13#0" expanded="true" />
55 </folding> 30 </folding>
@@ -57,38 +32,38 @@ @@ -57,38 +32,38 @@
57 </provider> 32 </provider>
58 </entry> 33 </entry>
59 </file> 34 </file>
60 - <file pinned="false" current-in-tab="true"> 35 + <file pinned="false" current-in-tab="false">
61 <entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py"> 36 <entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py">
62 <provider selected="true" editor-type-id="text-editor"> 37 <provider selected="true" editor-type-id="text-editor">
63 - <state relative-caret-position="459">  
64 - <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" /> 38 + <state relative-caret-position="63">
  39 + <caret line="21" column="53" selection-start-line="21" selection-start-column="53" selection-end-line="21" selection-end-column="53" />
65 </state> 40 </state>
66 </provider> 41 </provider>
67 </entry> 42 </entry>
68 </file> 43 </file>
69 <file pinned="false" current-in-tab="false"> 44 <file pinned="false" current-in-tab="false">
70 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml"> 45 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml">
71 <provider selected="true" editor-type-id="text-editor"> 46 <provider selected="true" editor-type-id="text-editor">
72 - <state relative-caret-position="151">  
73 - <caret line="20" column="8" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" /> 47 + <state relative-caret-position="239">
  48 + <caret line="24" column="8" selection-start-line="24" selection-start-column="8" selection-end-line="24" selection-end-column="8" />
74 </state> 49 </state>
75 </provider> 50 </provider>
76 </entry> 51 </entry>
77 </file> 52 </file>
78 - <file pinned="false" current-in-tab="false">  
79 - <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml"> 53 + <file pinned="false" current-in-tab="true">
  54 + <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml">
80 <provider selected="true" editor-type-id="text-editor"> 55 <provider selected="true" editor-type-id="text-editor">
81 - <state relative-caret-position="-44">  
82 - <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" /> 56 + <state relative-caret-position="22">
  57 + <caret line="13" column="46" selection-start-line="13" selection-start-column="46" selection-end-line="13" selection-end-column="46" />
83 </state> 58 </state>
84 </provider> 59 </provider>
85 </entry> 60 </entry>
86 </file> 61 </file>
87 <file pinned="false" current-in-tab="false"> 62 <file pinned="false" current-in-tab="false">
88 - <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py"> 63 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml">
89 <provider selected="true" editor-type-id="text-editor"> 64 <provider selected="true" editor-type-id="text-editor">
90 - <state relative-caret-position="396">  
91 - <caret line="18" column="23" selection-start-line="10" selection-start-column="4" selection-end-line="18" selection-end-column="23" /> 65 + <state relative-caret-position="374">
  66 + <caret line="17" selection-start-line="17" selection-end-line="20" selection-end-column="8" />
92 </state> 67 </state>
93 </provider> 68 </provider>
94 </entry> 69 </entry>
@@ -96,17 +71,8 @@ @@ -96,17 +71,8 @@
96 <file pinned="false" current-in-tab="false"> 71 <file pinned="false" current-in-tab="false">
97 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 72 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
98 <provider selected="true" editor-type-id="text-editor"> 73 <provider selected="true" editor-type-id="text-editor">
99 - <state relative-caret-position="211">  
100 - <caret line="18" column="9" selection-start-line="18" selection-start-column="9" selection-end-line="19" selection-end-column="42" />  
101 - </state>  
102 - </provider>  
103 - </entry>  
104 - </file>  
105 - <file pinned="false" current-in-tab="false">  
106 - <entry file="file://$PROJECT_DIR$/.env">  
107 - <provider selected="true" editor-type-id="text-editor">  
108 - <state relative-caret-position="154">  
109 - <caret line="7" column="73" selection-start-line="7" selection-start-column="73" selection-end-line="7" selection-end-column="73" /> 74 + <state relative-caret-position="107">
  75 + <caret line="19" column="63" selection-start-line="19" selection-start-column="63" selection-end-line="19" selection-end-column="63" />
110 </state> 76 </state>
111 </provider> 77 </provider>
112 </entry> 78 </entry>
@@ -123,11 +89,14 @@ @@ -123,11 +89,14 @@
123 <option value="$PROJECT_DIR$/.env" /> 89 <option value="$PROJECT_DIR$/.env" />
124 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml" /> 90 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml" />
125 <option value="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" /> 91 <option value="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" />
126 - <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />  
127 <option value="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" /> 92 <option value="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" />
128 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" /> 93 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" />
129 <option value="$PROJECT_DIR$/debugtalk.py" /> 94 <option value="$PROJECT_DIR$/debugtalk.py" />
130 <option value="$PROJECT_DIR$/helpfunc/db_pg_func.py" /> 95 <option value="$PROJECT_DIR$/helpfunc/db_pg_func.py" />
  96 + <option value="$PROJECT_DIR$/testcases/admin/ADMIN002_list_admin_testcases.yml" />
  97 + <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
  98 + <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" />
  99 + <option value="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" />
131 </list> 100 </list>
132 </option> 101 </option>
133 </component> 102 </component>
@@ -278,22 +247,22 @@ @@ -278,22 +247,22 @@
278 <updated>1594200816252</updated> 247 <updated>1594200816252</updated>
279 <workItem from="1594200819333" duration="5002000" /> 248 <workItem from="1594200819333" duration="5002000" />
280 <workItem from="1594223232686" duration="1195000" /> 249 <workItem from="1594223232686" duration="1195000" />
281 - <workItem from="1594261507053" duration="15616000" /> 250 + <workItem from="1594261507053" duration="21390000" />
282 </task> 251 </task>
283 <servers /> 252 <servers />
284 </component> 253 </component>
285 <component name="TimeTrackingManager"> 254 <component name="TimeTrackingManager">
286 - <option name="totallyTimeSpent" value="21813000" /> 255 + <option name="totallyTimeSpent" value="27587000" />
287 </component> 256 </component>
288 <component name="ToolWindowManager"> 257 <component name="ToolWindowManager">
289 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 258 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
290 <editor active="true" /> 259 <editor active="true" />
291 <layout> 260 <layout>
292 <window_info id="Favorites" order="0" side_tool="true" /> 261 <window_info id="Favorites" order="0" side_tool="true" />
293 - <window_info content_ui="combo" id="Project" order="1" weight="0.24962178" /> 262 + <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.24962178" />
294 <window_info id="Structure" order="2" side_tool="true" weight="0.25" /> 263 <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
295 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> 264 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
296 - <window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.5076661" /> 265 + <window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.39523" />
297 <window_info anchor="bottom" id="Message" order="2" /> 266 <window_info anchor="bottom" id="Message" order="2" />
298 <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" /> 267 <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" />
299 <window_info anchor="bottom" id="Find" order="4" /> 268 <window_info anchor="bottom" id="Find" order="4" />
@@ -311,29 +280,6 @@ @@ -311,29 +280,6 @@
311 <window_info anchor="right" id="Ant Build" order="3" weight="0.25" /> 280 <window_info anchor="right" id="Ant Build" order="3" weight="0.25" />
312 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="4" weight="0.25" /> 281 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="4" weight="0.25" />
313 </layout> 282 </layout>
314 - <layout-to-restore>  
315 - <window_info id="Favorites" order="0" side_tool="true" />  
316 - <window_info content_ui="combo" id="Project" order="1" weight="0.24962178" />  
317 - <window_info id="Structure" order="2" side_tool="true" weight="0.25" />  
318 - <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />  
319 - <window_info anchor="bottom" id="Terminal" order="1" visible="true" weight="0.38841566" />  
320 - <window_info anchor="bottom" id="Message" order="2" />  
321 - <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" />  
322 - <window_info anchor="bottom" id="Find" order="4" />  
323 - <window_info anchor="bottom" id="Python Console" order="5" weight="0.32879046" />  
324 - <window_info anchor="bottom" id="Database Changes" order="6" />  
325 - <window_info anchor="bottom" id="Run" order="7" weight="0.40545145" />  
326 - <window_info anchor="bottom" id="Version Control" order="8" weight="0.32879046" />  
327 - <window_info anchor="bottom" id="Debug" order="9" weight="0.4" />  
328 - <window_info anchor="bottom" id="Cvs" order="10" weight="0.25" />  
329 - <window_info anchor="bottom" id="Inspection" order="11" weight="0.4" />  
330 - <window_info anchor="bottom" id="TODO" order="12" />  
331 - <window_info anchor="right" id="Database" order="0" />  
332 - <window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />  
333 - <window_info anchor="right" id="SciView" order="2" />  
334 - <window_info anchor="right" id="Ant Build" order="3" weight="0.25" />  
335 - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="4" weight="0.25" />  
336 - </layout-to-restore>  
337 </component> 283 </component>
338 <component name="TypeScriptGeneratedFilesManager"> 284 <component name="TypeScriptGeneratedFilesManager">
339 <option name="version" value="1" /> 285 <option name="version" value="1" />
@@ -369,13 +315,6 @@ @@ -369,13 +315,6 @@
369 </state> 315 </state>
370 </provider> 316 </provider>
371 </entry> 317 </entry>
372 - <entry file="file://$PROJECT_DIR$/.env">  
373 - <provider selected="true" editor-type-id="text-editor">  
374 - <state relative-caret-position="154">  
375 - <caret line="7" column="73" selection-start-line="7" selection-start-column="73" selection-end-line="7" selection-end-column="73" />  
376 - </state>  
377 - </provider>  
378 - </entry>  
379 <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml"> 318 <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml">
380 <provider selected="true" editor-type-id="text-editor"> 319 <provider selected="true" editor-type-id="text-editor">
381 <state relative-caret-position="198"> 320 <state relative-caret-position="198">
@@ -397,48 +336,69 @@ @@ -397,48 +336,69 @@
397 </state> 336 </state>
398 </provider> 337 </provider>
399 </entry> 338 </entry>
400 - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 339 + <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
401 <provider selected="true" editor-type-id="text-editor"> 340 <provider selected="true" editor-type-id="text-editor">
402 - <state relative-caret-position="211">  
403 - <caret line="18" column="9" selection-start-line="18" selection-start-column="9" selection-end-line="19" selection-end-column="42" /> 341 + <state relative-caret-position="396">
  342 + <caret line="18" column="23" selection-start-line="10" selection-start-column="4" selection-end-line="18" selection-end-column="23" />
404 </state> 343 </state>
405 </provider> 344 </provider>
406 </entry> 345 </entry>
407 - <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py"> 346 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
408 <provider selected="true" editor-type-id="text-editor"> 347 <provider selected="true" editor-type-id="text-editor">
409 - <state relative-caret-position="396">  
410 - <caret line="18" column="23" selection-start-line="10" selection-start-column="4" selection-end-line="18" selection-end-column="23" /> 348 + <state relative-caret-position="273">
  349 + <caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
  350 + <folding>
  351 + <element signature="e#0#13#0" expanded="true" />
  352 + </folding>
  353 + </state>
  354 + </provider>
  355 + </entry>
  356 + <entry file="file://$PROJECT_DIR$/.env">
  357 + <provider selected="true" editor-type-id="text-editor">
  358 + <state relative-caret-position="154">
  359 + <caret line="7" column="73" selection-start-line="7" selection-start-column="73" selection-end-line="7" selection-end-column="73" />
411 </state> 360 </state>
412 </provider> 361 </provider>
413 </entry> 362 </entry>
414 <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml"> 363 <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml">
415 <provider selected="true" editor-type-id="text-editor"> 364 <provider selected="true" editor-type-id="text-editor">
416 - <state relative-caret-position="-44"> 365 + <state relative-caret-position="9">
417 <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" /> 366 <caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" />
418 </state> 367 </state>
419 </provider> 368 </provider>
420 </entry> 369 </entry>
421 <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml"> 370 <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml">
422 <provider selected="true" editor-type-id="text-editor"> 371 <provider selected="true" editor-type-id="text-editor">
423 - <state relative-caret-position="151">  
424 - <caret line="20" column="8" selection-start-line="20" selection-start-column="8" selection-end-line="20" selection-end-column="8" /> 372 + <state relative-caret-position="374">
  373 + <caret line="17" selection-start-line="17" selection-end-line="20" selection-end-column="8" />
425 </state> 374 </state>
426 </provider> 375 </provider>
427 </entry> 376 </entry>
428 - <entry file="file://$PROJECT_DIR$/debugtalk.py"> 377 + <entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py">
429 <provider selected="true" editor-type-id="text-editor"> 378 <provider selected="true" editor-type-id="text-editor">
430 - <state relative-caret-position="770">  
431 - <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />  
432 - <folding>  
433 - <element signature="e#0#13#0" expanded="true" />  
434 - </folding> 379 + <state relative-caret-position="63">
  380 + <caret line="21" column="53" selection-start-line="21" selection-start-column="53" selection-end-line="21" selection-end-column="53" />
435 </state> 381 </state>
436 </provider> 382 </provider>
437 </entry> 383 </entry>
438 - <entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py"> 384 + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
  385 + <provider selected="true" editor-type-id="text-editor">
  386 + <state relative-caret-position="107">
  387 + <caret line="19" column="63" selection-start-line="19" selection-start-column="63" selection-end-line="19" selection-end-column="63" />
  388 + </state>
  389 + </provider>
  390 + </entry>
  391 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml">
  392 + <provider selected="true" editor-type-id="text-editor">
  393 + <state relative-caret-position="239">
  394 + <caret line="24" column="8" selection-start-line="24" selection-start-column="8" selection-end-line="24" selection-end-column="8" />
  395 + </state>
  396 + </provider>
  397 + </entry>
  398 + <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml">
439 <provider selected="true" editor-type-id="text-editor"> 399 <provider selected="true" editor-type-id="text-editor">
440 - <state relative-caret-position="459">  
441 - <caret line="45" lean-forward="true" selection-start-line="45" selection-end-line="45" /> 400 + <state relative-caret-position="22">
  401 + <caret line="13" column="46" selection-start-line="13" selection-start-column="46" selection-end-line="13" selection-end-column="46" />
442 </state> 402 </state>
443 </provider> 403 </provider>
444 </entry> 404 </entry>
1 -name: 管理员列表：/v1/admin/list 1 +name: 管理员列表
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - phone: 15005046165  
5 - password: d033e22ae348aeb5660fc2140aec35850c4da997 4 + searchText: ${get_admin_account_from_database(admin_user)}
6 request: 5 request:
7 headers: 6 headers:
8 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
9 User-Agent: okhttp/3.12.3 8 User-Agent: okhttp/3.12.3
10 - Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1ODc0NTg0MjgsImlhdCI6MTU4NzQzNjgyNywiaXNzIjoibW1tX29wcG1nIiwibmJmIjoxNTg3NDM2ODI3LCJ1aWQiOjMyNDQ3NDc3Mjg1MzMyNDgsImNvbXBhbnlfaWQiOjM2MCwidXNlcl9jb21wYW55X2lkIjozMjQ0NzQ3NzI4NTMzMjQ4fQ.5t4HO5gbAXT_WXHGNf8ZsbXpPHrzsFhnuXWBtPZ4tWs 9 + Authorization: Bearer ${get_m_accesstoken()}
11 json: 10 json:
12 - searchText: 11 + searchText: $searchText
13 pageNumber: 1 12 pageNumber: 1
14 pageSize: 10 13 pageSize: 10
15 method: POST 14 method: POST
16 - url: /v1/admin/list 15 + url: v1/admin/list
  16 +validate:
  17 + - eq:
  18 + - content.msg
  19 + - ok
  20 + - eq:
  21 + - content.data.gridResult.lists.0.account
  22 + - $searchText
  23 + - eq:
  24 + - content.data.gridResult.lists.0.statue
  25 + - 1
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQzMzczMDUsImlhdCI6MTU5NDI5NDEwNSwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDI5NDEwNSwidWlkIjoxOH0.dV65voPHf0XECR6M3Te3yNLdhfgzmCkw8OXhzPnpOvY  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQzNTQyMzAsImlhdCI6MTU5NDMxMTAzMCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDMxMTAzMCwidWlkIjoxOH0.9r2J8CDgqpHRdAfMh9IAl4Hjr67MPoewgUEywQAiVo0
@@ -29,7 +29,7 @@ def create_channel(num): @@ -29,7 +29,7 @@ def create_channel(num):
29 def create_phone_number(num): 29 def create_phone_number(num):
30 phone_number = [] 30 phone_number = []
31 for i in range(num): 31 for i in range(num):
32 - phone_number.append('181%08d'%i) 32 + phone_number.append('182%08d'%i)
33 # print(phone_number) 33 # print(phone_number)
34 return phone_number 34 return phone_number
35 35
@@ -19,7 +19,7 @@ def GetConnect(): @@ -19,7 +19,7 @@ def GetConnect():
19 def get_admin_id_from_database(tbl): 19 def get_admin_id_from_database(tbl):
20 db = GetConnect() 20 db = GetConnect()
21 cursor = db.cursor() 21 cursor = db.cursor()
22 - sql= "select id from " + tbl + ' ' + 'order by create_at desc ' 22 + sql= "select id from " + tbl + ' ' + 'order by id desc '
23 try: 23 try:
24 cursor.execute(sql) 24 cursor.execute(sql)
25 result = cursor.fetchone() 25 result = cursor.fetchone()
@@ -33,7 +33,7 @@ def get_admin_id_from_database(tbl): @@ -33,7 +33,7 @@ def get_admin_id_from_database(tbl):
33 def get_admin_account_from_database(tbl): 33 def get_admin_account_from_database(tbl):
34 db = GetConnect() 34 db = GetConnect()
35 cursor = db.cursor() 35 cursor = db.cursor()
36 - sql= "select account from " + tbl + ' ' + 'order by create_at desc ' 36 + sql= "select account from " + tbl + ' ' + 'order by id desc '
37 try: 37 try:
38 cursor.execute(sql) 38 cursor.execute(sql)
39 result = cursor.fetchone() 39 result = cursor.fetchone()
  1 +config:
  2 + name: 编辑管理员
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${convert_to_string(10000000001)}
  6 + teardown_hooks:
  7 + - ${sleep(2)}
  8 +
  9 +teststeps:
  10 +- name: $phone 登录系统
  11 + testcase: testcases/m_admin_login_testcases.yml
  12 +
  13 +- name: $phone 管理员搜索
  14 + api: api/m_api/admin/m_admin_list_api.yml
  15 + validate:
  16 + - eq:
  17 + - content.msg
  18 + - ok
  19 + - eq:
  20 + - content.data.gridResult.lists.0.account
  21 + - $searchText
  22 + - eq:
  23 + - content.data.gridResult.lists.0.statue
  24 + - 1
@@ -8,13 +8,13 @@ testcases: @@ -8,13 +8,13 @@ testcases:
8 # parameters: 8 # parameters:
9 # channel: ${create_channel(10)} 9 # channel: ${create_channel(10)}
10 10
11 -#- name: ADMIN001：新增管理员  
12 -# testcase: testcases/admin/ADMIN001_add_admin_testcases.yml  
13 -# parameters:  
14 -# account: ${create_phone_number(1)} 11 +- name: ADMIN001：新增管理员
  12 + testcase: testcases/admin/ADMIN001_add_admin_testcases.yml
  13 + parameters:
  14 + account: ${create_phone_number(1)}
15 15
16 - name: ADMIN002：修改管理员 16 - name: ADMIN002：修改管理员
17 testcase: testcases/admin/ADMIN002_edit_admin_testcases.yml 17 testcase: testcases/admin/ADMIN002_edit_admin_testcases.yml
18 -# parameters:  
19 -# account: ${get_admin_account('admin_user')}  
20 -# id: ${get_admin_id('admin_user')} 18 +
  19 +- name: ADMIN003：搜索管理员
  20 + testcase: testcases/admin/ADMIN003_list_admin_testcases.yml