作者 bianxinhua

add README

@@ -2,35 +2,8 @@ @@ -2,35 +2,8 @@
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 afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_del_api.yml" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml" afterDir="false" />  
7 - <change afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_del_api.yml" afterDir="false" />  
8 - <change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL006_actual_del_testcases.yml" afterDir="false" />  
9 - <change afterPath="$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml" afterDir="false" />  
10 - <change afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_testcases.yml" afterDir="false" /> 5 + <change afterPath="$PROJECT_DIR$/testcases/m_pwd_updat_testcases.yml" afterDir="false" />
11 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
12 - <change beforePath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" afterDir="false" />  
13 - <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" afterDir="false" />  
14 - <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml" afterDir="false" />  
15 - <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" afterDir="false" />  
16 - <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" />  
17 - <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" afterDir="false" />  
18 - <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" afterDir="false" />  
19 - <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml" afterDir="false" />  
20 - <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml" afterDir="false" />  
21 - <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml" afterDir="false" />  
22 - <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" afterDir="false" />  
23 - <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" afterDir="false" />  
24 - <change beforePath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml" afterDir="false" />  
25 - <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" />  
26 - <change beforePath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_app_db_func.py" afterDir="false" />  
27 - <change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" />  
28 - <change beforePath="$PROJECT_DIR$/logs/testsuites/partner_testsuite.parse_failed.json" beforeDir="false" afterPath="$PROJECT_DIR$/logs/testsuites/partner_testsuite.parse_failed.json" afterDir="false" />  
29 - <change beforePath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" afterDir="false" />  
30 - <change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" afterDir="false" />  
31 - <change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" afterDir="false" />  
32 - <change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" afterDir="false" />  
33 - <change beforePath="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml" afterDir="false" />  
34 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" /> 7 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" />
35 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" /> 8 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
36 </list> 9 </list>
@@ -48,29 +21,29 @@ @@ -48,29 +21,29 @@
48 </component> 21 </component>
49 <component name="FileEditorManager"> 22 <component name="FileEditorManager">
50 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 23 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
51 - <file pinned="false" current-in-tab="false"> 24 + <file pinned="false" current-in-tab="true">
52 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 25 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
53 <provider selected="true" editor-type-id="text-editor"> 26 <provider selected="true" editor-type-id="text-editor">
54 - <state relative-caret-position="722">  
55 - <caret line="89" column="61" selection-start-line="89" selection-start-column="61" selection-end-line="89" selection-end-column="61" /> 27 + <state relative-caret-position="-1092">
  28 + <caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
56 </state> 29 </state>
57 </provider> 30 </provider>
58 </entry> 31 </entry>
59 </file> 32 </file>
60 - <file pinned="false" current-in-tab="true">  
61 - <entry file="file://$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml"> 33 + <file pinned="false" current-in-tab="false">
  34 + <entry file="file://$PROJECT_DIR$/api/m_api/m_pwd_update_api.yml">
62 <provider selected="true" editor-type-id="text-editor"> 35 <provider selected="true" editor-type-id="text-editor">
63 - <state relative-caret-position="676">  
64 - <caret line="26" column="14" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" /> 36 + <state>
  37 + <caret column="10" selection-start-column="10" selection-end-column="10" />
65 </state> 38 </state>
66 </provider> 39 </provider>
67 </entry> 40 </entry>
68 </file> 41 </file>
69 <file pinned="false" current-in-tab="false"> 42 <file pinned="false" current-in-tab="false">
70 - <entry file="file://$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml"> 43 + <entry file="file://$PROJECT_DIR$/testcases/m_pwd_updat_testcases.yml">
71 <provider selected="true" editor-type-id="text-editor"> 44 <provider selected="true" editor-type-id="text-editor">
72 - <state relative-caret-position="468">  
73 - <caret line="18" column="12" lean-forward="true" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="16" /> 45 + <state relative-caret-position="317">
  46 + <caret line="17" column="41" selection-start-line="17" selection-start-column="41" selection-end-line="17" selection-end-column="41" />
74 </state> 47 </state>
75 </provider> 48 </provider>
76 </entry> 49 </entry>
@@ -78,24 +51,12 @@ @@ -78,24 +51,12 @@
78 <file pinned="false" current-in-tab="false"> 51 <file pinned="false" current-in-tab="false">
79 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 52 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
80 <provider selected="true" editor-type-id="text-editor"> 53 <provider selected="true" editor-type-id="text-editor">
81 - <state relative-caret-position="156"> 54 + <state relative-caret-position="3302">
82 <caret line="127" column="34" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="34" /> 55 <caret line="127" column="34" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="34" />
83 </state> 56 </state>
84 </provider> 57 </provider>
85 </entry> 58 </entry>
86 </file> 59 </file>
87 - <file pinned="false" current-in-tab="false">  
88 - <entry file="file://$PROJECT_DIR$/debugtalk.py">  
89 - <provider selected="true" editor-type-id="text-editor">  
90 - <state relative-caret-position="312">  
91 - <caret line="15" column="21" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="21" />  
92 - <folding>  
93 - <element signature="e#0#13#0" expanded="true" />  
94 - </folding>  
95 - </state>  
96 - </provider>  
97 - </entry>  
98 - </file>  
99 </leaf> 60 </leaf>
100 </component> 61 </component>
101 <component name="FileTemplateManagerImpl"> 62 <component name="FileTemplateManagerImpl">
@@ -145,8 +106,6 @@ @@ -145,8 +106,6 @@
145 <component name="IdeDocumentHistory"> 106 <component name="IdeDocumentHistory">
146 <option name="CHANGED_PATHS"> 107 <option name="CHANGED_PATHS">
147 <list> 108 <list>
148 - <option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" />  
149 - <option value="$PROJECT_DIR$/.env" />  
150 <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" /> 109 <option value="$PROJECT_DIR$/api/app_api/order/statistics_api.yml" />
151 <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" /> 110 <option value="$PROJECT_DIR$/testcases/order/order_statistics_testcases.yml" />
152 <option value="$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/html/template.html" /> 111 <option value="$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/report/html/template.html" />
@@ -193,9 +152,11 @@ @@ -193,9 +152,11 @@
193 <option value="$PROJECT_DIR$/testcases/purpose/ACTUAL007_purpose_del_testcases.yml" /> 152 <option value="$PROJECT_DIR$/testcases/purpose/ACTUAL007_purpose_del_testcases.yml" />
194 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_testcases.yml" /> 153 <option value="$PROJECT_DIR$/testcases/purpose/PURPOSE007_purpose_del_testcases.yml" />
195 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" /> 154 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
196 - <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />  
197 <option value="$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml" /> 155 <option value="$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml" />
198 <option value="$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml" /> 156 <option value="$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml" />
  157 + <option value="$PROJECT_DIR$/testcases/m_pwd_updat_testcases.yml" />
  158 + <option value="$PROJECT_DIR$/api/m_api/m_pwd_update_api.yml" />
  159 + <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
199 </list> 160 </list>
200 </option> 161 </option>
201 </component> 162 </component>
@@ -231,20 +192,6 @@ @@ -231,20 +192,6 @@
231 <path> 192 <path>
232 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 193 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
233 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 194 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
234 - <item name="api" type="462c0819:PsiDirectoryNode" />  
235 - <item name="m_api" type="462c0819:PsiDirectoryNode" />  
236 - <item name="actual" type="462c0819:PsiDirectoryNode" />  
237 - </path>  
238 - <path>  
239 - <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />  
240 - <item name="partner_api" type="462c0819:PsiDirectoryNode" />  
241 - <item name="api" type="462c0819:PsiDirectoryNode" />  
242 - <item name="m_api" type="462c0819:PsiDirectoryNode" />  
243 - <item name="dividends" type="462c0819:PsiDirectoryNode" />  
244 - </path>  
245 - <path>  
246 - <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />  
247 - <item name="partner_api" type="462c0819:PsiDirectoryNode" />  
248 <item name="helpfunc" type="462c0819:PsiDirectoryNode" /> 195 <item name="helpfunc" type="462c0819:PsiDirectoryNode" />
249 </path> 196 </path>
250 <path> 197 <path>
@@ -256,12 +203,6 @@ @@ -256,12 +203,6 @@
256 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 203 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
257 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 204 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
258 <item name="testcases" type="462c0819:PsiDirectoryNode" /> 205 <item name="testcases" type="462c0819:PsiDirectoryNode" />
259 - <item name="actual" type="462c0819:PsiDirectoryNode" />  
260 - </path>  
261 - <path>  
262 - <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />  
263 - <item name="partner_api" type="462c0819:PsiDirectoryNode" />  
264 - <item name="testcases" type="462c0819:PsiDirectoryNode" />  
265 <item name="dividends" type="462c0819:PsiDirectoryNode" /> 206 <item name="dividends" type="462c0819:PsiDirectoryNode" />
266 </path> 207 </path>
267 <path> 208 <path>
@@ -287,22 +228,22 @@ @@ -287,22 +228,22 @@
287 </component> 228 </component>
288 <component name="PropertiesComponent"> 229 <component name="PropertiesComponent">
289 <property name="WebServerToolWindowFactoryState" value="false" /> 230 <property name="WebServerToolWindowFactoryState" value="false" />
290 - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> 231 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../task_api" />
291 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 232 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
292 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 233 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
293 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> 234 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
294 </component> 235 </component>
295 <component name="RecentsManager"> 236 <component name="RecentsManager">
296 - <key name="MoveFile.RECENT_KEYS">  
297 - <recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />  
298 - <recent name="E:\mmm_auto\partner_api\api\m_api\partners" />  
299 - </key>  
300 <key name="CopyFile.RECENT_KEYS"> 237 <key name="CopyFile.RECENT_KEYS">
  238 + <recent name="E:\partner_api\testcases" />
301 <recent name="E:\partner_api\testcases\dividends" /> 239 <recent name="E:\partner_api\testcases\dividends" />
302 <recent name="E:\partner_api\api\m_api\dividends" /> 240 <recent name="E:\partner_api\api\m_api\dividends" />
303 <recent name="E:\partner_api\testcases\purpose" /> 241 <recent name="E:\partner_api\testcases\purpose" />
304 <recent name="E:\partner_api\api\m_api\purpose" /> 242 <recent name="E:\partner_api\api\m_api\purpose" />
305 - <recent name="E:\partner_api\testcases\actual" /> 243 + </key>
  244 + <key name="MoveFile.RECENT_KEYS">
  245 + <recent name="E:\mmm_auto\partner_api\api\m_api\purpose" />
  246 + <recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
306 </key> 247 </key>
307 </component> 248 </component>
308 <component name="RunDashboard"> 249 <component name="RunDashboard">
@@ -462,20 +403,21 @@ @@ -462,20 +403,21 @@
462 <workItem from="1597211046716" duration="9744000" /> 403 <workItem from="1597211046716" duration="9744000" />
463 <workItem from="1597281783377" duration="7250000" /> 404 <workItem from="1597281783377" duration="7250000" />
464 <workItem from="1597383690773" duration="12705000" /> 405 <workItem from="1597383690773" duration="12705000" />
  406 + <workItem from="1597627721793" duration="3189000" />
465 </task> 407 </task>
466 <servers /> 408 <servers />
467 </component> 409 </component>
468 <component name="TimeTrackingManager"> 410 <component name="TimeTrackingManager">
469 - <option name="totallyTimeSpent" value="215162000" /> 411 + <option name="totallyTimeSpent" value="218351000" />
470 </component> 412 </component>
471 <component name="ToolWindowManager"> 413 <component name="ToolWindowManager">
472 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 414 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
473 <layout> 415 <layout>
474 <window_info id="Favorites" order="0" side_tool="true" /> 416 <window_info id="Favorites" order="0" side_tool="true" />
475 - <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.3138412" /> 417 + <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.31813306" />
476 <window_info id="Structure" order="2" side_tool="true" weight="0.25" /> 418 <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
477 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> 419 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
478 - <window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.2857143" /> 420 + <window_info anchor="bottom" id="Terminal" order="1" visible="true" weight="0.2857143" />
479 <window_info anchor="bottom" id="Message" order="2" /> 421 <window_info anchor="bottom" id="Message" order="2" />
480 <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.5005365" side_tool="true" weight="0.32700893" /> 422 <window_info anchor="bottom" id="Event Log" order="3" sideWeight="0.5005365" side_tool="true" weight="0.32700893" />
481 <window_info anchor="bottom" id="Find" order="4" sideWeight="0.49946353" weight="0.328125" /> 423 <window_info anchor="bottom" id="Find" order="4" sideWeight="0.49946353" weight="0.328125" />
@@ -498,28 +440,6 @@ @@ -498,28 +440,6 @@
498 <option name="version" value="1" /> 440 <option name="version" value="1" />
499 </component> 441 </component>
500 <component name="editorHistoryManager"> 442 <component name="editorHistoryManager">
501 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" />  
502 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml">  
503 - <provider selected="true" editor-type-id="text-editor">  
504 - <state relative-caret-position="421">  
505 - <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />  
506 - </state>  
507 - </provider>  
508 - </entry>  
509 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE001_add_purpose_testcases.yml">  
510 - <provider selected="true" editor-type-id="text-editor">  
511 - <state relative-caret-position="320">  
512 - <caret line="13" column="55" selection-start-line="13" selection-start-column="55" selection-end-line="13" selection-end-column="55" />  
513 - </state>  
514 - </provider>  
515 - </entry>  
516 - <entry file="file://$PROJECT_DIR$/testcases/purpose/PURPOSE002_edit_purpose_testcases.yml">  
517 - <provider selected="true" editor-type-id="text-editor">  
518 - <state relative-caret-position="338">  
519 - <caret line="13" column="56" selection-start-line="13" selection-start-column="56" selection-end-line="13" selection-end-column="56" />  
520 - </state>  
521 - </provider>  
522 - </entry>  
523 <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml"> 443 <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_add_api.yml">
524 <provider selected="true" editor-type-id="text-editor"> 444 <provider selected="true" editor-type-id="text-editor">
525 <state relative-caret-position="20"> 445 <state relative-caret-position="20">
@@ -761,16 +681,6 @@ @@ -761,16 +681,6 @@
761 </state> 681 </state>
762 </provider> 682 </provider>
763 </entry> 683 </entry>
764 - <entry file="file://$PROJECT_DIR$/debugtalk.py">  
765 - <provider selected="true" editor-type-id="text-editor">  
766 - <state relative-caret-position="312">  
767 - <caret line="15" column="21" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="21" />  
768 - <folding>  
769 - <element signature="e#0#13#0" expanded="true" />  
770 - </folding>  
771 - </state>  
772 - </provider>  
773 - </entry>  
774 <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml"> 684 <entry file="file://$PROJECT_DIR$/api/m_api/purpose/m_order_purpose_sendout_api.yml">
775 <provider selected="true" editor-type-id="text-editor"> 685 <provider selected="true" editor-type-id="text-editor">
776 <state relative-caret-position="312"> 686 <state relative-caret-position="312">
@@ -799,45 +709,75 @@ @@ -799,45 +709,75 @@
799 </state> 709 </state>
800 </provider> 710 </provider>
801 </entry> 711 </entry>
  712 + <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
  713 + <provider selected="true" editor-type-id="text-editor">
  714 + <state relative-caret-position="364">
  715 + <caret line="14" column="19" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" />
  716 + </state>
  717 + </provider>
  718 + </entry>
  719 + <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
  720 + <provider selected="true" editor-type-id="text-editor">
  721 + <state relative-caret-position="338">
  722 + <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="53" />
  723 + </state>
  724 + </provider>
  725 + </entry>
  726 + <entry file="file://$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml">
  727 + <provider selected="true" editor-type-id="text-editor">
  728 + <state relative-caret-position="468">
  729 + <caret line="18" column="12" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="16" />
  730 + </state>
  731 + </provider>
  732 + </entry>
802 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 733 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
803 <provider selected="true" editor-type-id="text-editor"> 734 <provider selected="true" editor-type-id="text-editor">
804 - <state relative-caret-position="156"> 735 + <state relative-caret-position="3302">
805 <caret line="127" column="34" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="34" /> 736 <caret line="127" column="34" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="34" />
806 </state> 737 </state>
807 </provider> 738 </provider>
808 </entry> 739 </entry>
809 - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 740 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
810 <provider selected="true" editor-type-id="text-editor"> 741 <provider selected="true" editor-type-id="text-editor">
811 - <state relative-caret-position="722">  
812 - <caret line="89" column="61" selection-start-line="89" selection-start-column="61" selection-end-line="89" selection-end-column="61" /> 742 + <state relative-caret-position="130">
  743 + <caret line="15" column="21" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="21" />
  744 + <folding>
  745 + <element signature="e#0#13#0" expanded="true" />
  746 + </folding>
813 </state> 747 </state>
814 </provider> 748 </provider>
815 </entry> 749 </entry>
816 - <entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml"> 750 + <entry file="file://$PROJECT_DIR$/api/m_api/m_login_api.yml">
  751 + <provider selected="true" editor-type-id="text-editor" />
  752 + </entry>
  753 + <entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
  754 + <provider selected="true" editor-type-id="text-editor" />
  755 + </entry>
  756 + <entry file="file://$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml">
817 <provider selected="true" editor-type-id="text-editor"> 757 <provider selected="true" editor-type-id="text-editor">
818 - <state relative-caret-position="364">  
819 - <caret line="14" column="19" selection-start-line="14" selection-start-column="19" selection-end-line="14" selection-end-column="19" /> 758 + <state relative-caret-position="104">
  759 + <caret line="7" selection-start-line="7" selection-end-line="9" selection-end-column="52" />
820 </state> 760 </state>
821 </provider> 761 </provider>
822 </entry> 762 </entry>
823 - <entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml"> 763 + <entry file="file://$PROJECT_DIR$/testcases/m_pwd_updat_testcases.yml">
824 <provider selected="true" editor-type-id="text-editor"> 764 <provider selected="true" editor-type-id="text-editor">
825 - <state relative-caret-position="338">  
826 - <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="53" /> 765 + <state relative-caret-position="317">
  766 + <caret line="17" column="41" selection-start-line="17" selection-start-column="41" selection-end-line="17" selection-end-column="41" />
827 </state> 767 </state>
828 </provider> 768 </provider>
829 </entry> 769 </entry>
830 - <entry file="file://$PROJECT_DIR$/testcases/dividends/dividend_edit_testcases.yml"> 770 + <entry file="file://$PROJECT_DIR$/api/m_api/m_pwd_update_api.yml">
831 <provider selected="true" editor-type-id="text-editor"> 771 <provider selected="true" editor-type-id="text-editor">
832 - <state relative-caret-position="468">  
833 - <caret line="18" column="12" lean-forward="true" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="16" /> 772 + <state>
  773 + <caret column="10" selection-start-column="10" selection-end-column="10" />
834 </state> 774 </state>
835 </provider> 775 </provider>
836 </entry> 776 </entry>
837 - <entry file="file://$PROJECT_DIR$/api/m_api/dividends/m_order_dividends_edit_api.yml"> 777 + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
838 <provider selected="true" editor-type-id="text-editor"> 778 <provider selected="true" editor-type-id="text-editor">
839 - <state relative-caret-position="676">  
840 - <caret line="26" column="14" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" /> 779 + <state relative-caret-position="-1092">
  780 + <caret line="3" column="10" lean-forward="true" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="10" />
841 </state> 781 </state>
842 </provider> 782 </provider>
843 </entry> 783 </entry>
  1 +name: 修改密码
  2 +base_url: ${ENV(base_manager_url)}
  3 +teardown_hooks:
  4 + - ${teardown_hook_get_m_accesstoken($response)}
  5 +request:
  6 + headers:
  7 + Content-Type: application/json;charset=utf-8
  8 + User-Agent: okhttp/3.12.3
  9 + Authorization: Bearer ${get_m_accesstoken()}
  10 + json:
  11 + pwd: '7c4a8d09ca3762af61e59520943dc26494f8941b'
  12 + method: POST
  13 + url: v1/auth/login
  14 +validate:
  15 +- eq:
  16 + - content.msg
  17 + - ok
  18 +
  1 +config:
  2 + name: login_testcases
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${get_admin_account_from_database(admin_user)}
  6 +
  7 +teststeps:
  8 +- name: $phone 登录系统
  9 + api: api/m_api/m_login_api.yml
  10 + teardown_hooks:
  11 + - ${teardown_hook_get_m_accesstoken($response)}
  12 + validate:
  13 + - eq:
  14 + - content.msg
  15 + - ok
  16 +
  17 + - name: $phone 修改密码
  18 + api: api/m_api/m_pwd_update_api.yml
  19 + validate:
  20 + - eq:
  21 + - content.msg
  22 + - ok
@@ -3,106 +3,106 @@ config: @@ -3,106 +3,106 @@ config:
3 name: 合伙人测试集 3 name: 合伙人测试集
4 testcases: 4 testcases:
5 5
6 -#- name: ADMIN001:新增管理员  
7 -# testcase: testcases/admin/ADMIN001_add_admin_testcases.yml  
8 -# parameters:  
9 -# account: ${create_phone_number(1)}  
10 -#  
11 -#- name: ADMIN002:编辑管理员  
12 -# testcase: testcases/admin/ADMIN002_edit_admin_testcases.yml  
13 -#  
14 -#- name: ADMIN003:搜索管理员  
15 -# testcase: testcases/admin/ADMIN003_list_admin_testcases.yml  
16 -#  
17 -#- name: ADMIN004:查看管理员  
18 -# testcase: testcases/admin/ADMIN004_detail_admin_testcases.yml  
19 -##  
20 -#- name: ADMIN005:禁用管理员  
21 -# testcase: testcases/admin/ADMIN005_forbidden_admin_testcases.yml  
22 -#  
23 -#- name: ADMIN006:启用管理员  
24 -# testcase: testcases/admin/ADMIN006_forbidden_admin_testcases.yml  
25 -#  
26 -#- name: PARTNERS001:新增合伙人  
27 -# testcase: testcases/partners/PARTNERS001_add_partner_testcases.yml  
28 -# parameters:  
29 -# account: ${create_phone_number(1)}  
30 -#  
31 -#- name: PARTNERS002:编辑合伙人  
32 -# testcase: testcases/partners/PARTNERS002_edit_partner_testcases.yml  
33 -#  
34 -#- name: PARTNERS003:搜索合伙类型  
35 -# testcase: testcases/partners/PARTNERS003_list_partner_testcases.yml  
36 -#  
37 -#- name: PARTNERS004:搜索合伙人名称  
38 -# testcase: testcases/partners/PARTNERS004_list_partner_testcases.yml  
39 -#  
40 -#- name: PARTNERS005:查看合伙人  
41 -# testcase: testcases/partners/PARTNERS005_detail_partner_testcases.yml  
42 -#  
43 -#- name: PARTNERS006:禁用合伙人  
44 -# testcase: testcases/partners/PARTNERS006_set-status_partner1_testcases.yml  
45 -#  
46 -#- name: PARTNERS006:启用合伙人  
47 -# testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml  
48 -##  
49 -#- name: ACTUAL001:新增实际订单  
50 -# testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml  
51 -# parameters:  
52 -# account: ${create_phone_number(1)}  
53 -#  
54 -#- name: ACTUAL003:合伙人搜索——实际订单列表  
55 -# testcase: testcases/actual/ACTUAL003_actual_list_testcases.yml 6 +- name: ADMIN001:新增管理员
  7 + testcase: testcases/admin/ADMIN001_add_admin_testcases.yml
  8 + parameters:
  9 + account: ${create_phone_number(1)}
  10 +
  11 +- name: ADMIN002:编辑管理员
  12 + testcase: testcases/admin/ADMIN002_edit_admin_testcases.yml
  13 +
  14 +- name: ADMIN003:搜索管理员
  15 + testcase: testcases/admin/ADMIN003_list_admin_testcases.yml
  16 +
  17 +- name: ADMIN004:查看管理员
  18 + testcase: testcases/admin/ADMIN004_detail_admin_testcases.yml
56 # 19 #
57 -#- name: ACTUAL004:搜索发货单号——实际订单列表  
58 -# testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml 20 +- name: ADMIN005:禁用管理员
  21 + testcase: testcases/admin/ADMIN005_forbidden_admin_testcases.yml
  22 +
  23 +- name: ADMIN006:启用管理员
  24 + testcase: testcases/admin/ADMIN006_forbidden_admin_testcases.yml
  25 +
  26 +- name: PARTNERS001:新增合伙人
  27 + testcase: testcases/partners/PARTNERS001_add_partner_testcases.yml
  28 + parameters:
  29 + account: ${create_phone_number(1)}
  30 +
  31 +- name: PARTNERS002:编辑合伙人
  32 + testcase: testcases/partners/PARTNERS002_edit_partner_testcases.yml
  33 +
  34 +- name: PARTNERS003:搜索合伙类型
  35 + testcase: testcases/partners/PARTNERS003_list_partner_testcases.yml
  36 +
  37 +- name: PARTNERS004:搜索合伙人名称
  38 + testcase: testcases/partners/PARTNERS004_list_partner_testcases.yml
  39 +
  40 +- name: PARTNERS005:查看合伙人
  41 + testcase: testcases/partners/PARTNERS005_detail_partner_testcases.yml
  42 +
  43 +- name: PARTNERS006:禁用合伙人
  44 + testcase: testcases/partners/PARTNERS006_set-status_partner1_testcases.yml
  45 +
  46 +- name: PARTNERS006:启用合伙人
  47 + testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml
59 # 48 #
60 -#- name: ACTUAL005:查看实际订单详情  
61 -# testcase: testcases/actual/ACTUAL005_actual_detail_testcases.yml 49 +- name: ACTUAL001:新增实际订单
  50 + testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
  51 + parameters:
  52 + account: ${create_phone_number(1)}
  53 +
  54 +- name: ACTUAL003:合伙人搜索——实际订单列表
  55 + testcase: testcases/actual/ACTUAL003_actual_list_testcases.yml
  56 +
  57 +- name: ACTUAL004:搜索发货单号——实际订单列表
  58 + testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml
  59 +
  60 +- name: ACTUAL005:查看实际订单详情
  61 + testcase: testcases/actual/ACTUAL005_actual_detail_testcases.yml
62 62
63 -#- name: ACTUAL006:删除实际订单  
64 -# testcase: testcases/actual/ACTUAL006_actual_del_testcases.yml 63 +- name: ACTUAL006:删除实际订单
  64 + testcase: testcases/actual/ACTUAL006_actual_del_testcases.yml
65 65
66 - name: PURPOSE001:新增意向订单 66 - name: PURPOSE001:新增意向订单
67 testcase: testcases/purpose/PURPOSE001_add_purpose_testcases.yml 67 testcase: testcases/purpose/PURPOSE001_add_purpose_testcases.yml
68 parameters: 68 parameters:
69 account: ${create_phone_number(1)} 69 account: ${create_phone_number(1)}
70 70
71 -#- name: PURPOSE002:编辑意向订单  
72 -# testcase: testcases/purpose/PURPOSE002_edit_purpose_testcases.yml 71 +- name: PURPOSE002:编辑意向订单
  72 + testcase: testcases/purpose/PURPOSE002_edit_purpose_testcases.yml
73 73
74 -#- name: PURPOSE003:合伙人搜索——意向订单列表  
75 -# testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml 74 +- name: PURPOSE003:合伙人搜索——意向订单列表
  75 + testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml
76 76
77 -#- name: PURPOSE004:搜索订单号——意向订单列表  
78 -# testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml 77 +- name: PURPOSE004:搜索订单号——意向订单列表
  78 + testcase: testcases/purpose/PURPOSE003_purpose_list_testcases.yml
79 79
80 - name: PURPOSE005:意向订单发货 80 - name: PURPOSE005:意向订单发货
81 testcase: testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml 81 testcase: testcases/purpose/PURPOSE005_purpose_sendout_testcases.yml
82 82
83 -#- name: PURPOSE006:查看意向订单详情  
84 -# testcase: testcases/purpose/PURPOSE006_purpose_detail_testcases.yml 83 +- name: PURPOSE006:查看意向订单详情
  84 + testcase: testcases/purpose/PURPOSE006_purpose_detail_testcases.yml
85 85
86 -#- name: ACTUAL007:删除意向订单  
87 -# testcase: testcases/purpose/PURPOSE007_purpose_del_testcases.yml 86 +- name: ACTUAL007:删除意向订单
  87 + testcase: testcases/purpose/PURPOSE007_purpose_del_testcases.yml
88 88
89 - name: dividends:分红管理-编辑 89 - name: dividends:分红管理-编辑
90 testcase: testcases/dividends/dividend_edit_testcases.yml 90 testcase: testcases/dividends/dividend_edit_testcases.yml
91 91
92 -#- name: statistics:订单统计  
93 -# testcase: testcases/order/order_statistics_testcases.yml 92 +- name: statistics:订单统计
  93 + testcase: testcases/order/order_statistics_testcases.yml
94 94
95 -#- name: statistics:订单详情  
96 -# testcase: testcases/order/order_details_testcases.yml 95 +- name: statistics:订单详情
  96 + testcase: testcases/order/order_details_testcases.yml
97 97
98 -#- name: statistics:分红统计  
99 -# testcase: testcases/dividend/dividend_statistics_testcases.yml 98 +- name: statistics:分红统计
  99 + testcase: testcases/dividend/dividend_statistics_testcases.yml
100 100
101 -#- name: orders001:已收明细——分红订单  
102 -# testcase: testcases/dividend/dividend_orders001_testcases.yml 101 +- name: orders001:已收明细——分红订单
  102 + testcase: testcases/dividend/dividend_orders001_testcases.yml
103 103
104 -#- name: orders002:未收明细——分红订单  
105 -# testcase: testcases/dividend/dividend_orders002_testcases.yml 104 +- name: orders002:未收明细——分红订单
  105 + testcase: testcases/dividend/dividend_orders002_testcases.yml
106 106
107 -#- name: list:实发订单列表  
108 -# testcase: testcases/order/order_list_testcases.yml  
  107 +- name: list:实发订单列表
  108 + testcase: testcases/order/order_list_testcases.yml