bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 dd2d872b190c7c87ab2928fe0fec363c29733467 1 个父辈 1aba3a62

add README

内嵌 并排对比
正在显示 34 个修改的文件 包含 627 行增加 和 271 行删除
... ... @@ -2,32 +2,35 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/demo_api.yml" beforeDir="false" />
<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" />
<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" />
<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" />
<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" />
<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" />
<change beforePath="$PROJECT_DIR$/api/m_api/m_partner_detail_api.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/m_partner_edit_api.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/m_partner_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/m_partner_set-status_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" afterDir="false" />
<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" />
<change beforePath="$PROJECT_DIR$/api/m_api/m_order_actual_api.yml" beforeDir="false" />
<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" />
<change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/helpfunc/db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/db_func.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/helpfunc/db_pg_func.py" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" />
<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" />
<change beforePath="$PROJECT_DIR$/reports/20200711T163748.576936.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/m_login_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/m_login_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml" afterDir="false" />
<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" />
<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" />
<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" />
<change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
</list>
... ... @@ -40,69 +43,33 @@
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1594439962224" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/partner_api$db_pg_func.coverage" NAME="db_pg_func Coverage Results" MODIFIED="1594485069390" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
<SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1594569809263" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
<SUITE FILE_PATH="coverage/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1594655535228" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="13" selection-start-line="13" selection-end-line="16" selection-end-column="12" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="11" selection-start-column="11" selection-end-column="11" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-66">
<caret column="11" selection-start-column="11" selection-end-column="11" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="46" selection-start-line="4" selection-start-column="46" selection-end-line="4" selection-end-column="46" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" selection-start-line="3" selection-end-line="4" selection-end-column="48" />
<caret line="3" column="30" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="46" selection-start-line="4" selection-start-column="46" selection-end-line="4" selection-end-column="46" />
<state relative-caret-position="22">
<caret line="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
<state relative-caret-position="246">
<caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
</state>
</provider>
</entry>
... ... @@ -111,25 +78,7 @@
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246">
<caret line="51" column="78" selection-start-line="51" selection-start-column="78" selection-end-line="51" selection-end-column="78" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/helpfunc/db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="145">
<caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-242">
<caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
<caret line="64" column="68" selection-start-line="64" selection-start-column="68" selection-end-line="64" selection-end-column="68" />
</state>
</provider>
</entry>
... ... @@ -153,39 +102,50 @@
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN002_list_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/m_login_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml" />
<option value="$PROJECT_DIR$/helpfunc/db_pg_func.py" />
<option value="$PROJECT_DIR$/debugtalk.py" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_list_api.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
<option value="$PROJECT_DIR$/helpfunc/db_func.py" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/m_partner_set-status_1_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" />
<option value="$PROJECT_DIR$/debugtalk.py" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/m_login_testcases.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
<option value="$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml" />
</list>
</option>
</component>
... ... @@ -224,7 +184,7 @@
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="m_api" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="actual" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -247,7 +207,7 @@
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="testcases" type="462c0819:PsiDirectoryNode" />
<item name="partners" type="462c0819:PsiDirectoryNode" />
<item name="actual" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -268,14 +228,16 @@
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\mmm_auto\partner_api\testcases\actual" />
<recent name="E:\mmm_auto\partner_api\api\m_api\actual" />
<recent name="E:\mmm_auto\partner_api\testcases\partners" />
<recent name="E:\mmm_auto\partner_api\api\m_api" />
<recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
... ... @@ -382,18 +344,19 @@
<workItem from="1594481917603" duration="2344000" />
<workItem from="1594540531041" duration="1200000" />
<workItem from="1594542274462" duration="237000" />
<workItem from="1594565757545" duration="4997000" />
<workItem from="1594565757545" duration="5110000" />
<workItem from="1594608711608" duration="14164000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="48413000" />
<option name="totallyTimeSpent" value="62690000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<layout>
<window_info id="Favorites" order="0" side_tool="true" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.28895614" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.2934947" />
<window_info id="Structure" order="2" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
<window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.42078364" />
... ... @@ -402,7 +365,7 @@
<window_info anchor="bottom" id="Find" order="4" weight="0.32879046" />
<window_info anchor="bottom" id="Python Console" order="5" weight="0.32879046" />
<window_info anchor="bottom" id="Database Changes" order="6" />
<window_info anchor="bottom" id="Run" order="7" weight="0.2879046" />
<window_info anchor="bottom" id="Run" order="7" weight="0.3270869" />
<window_info anchor="bottom" id="Version Control" order="8" weight="0.32879046" />
<window_info anchor="bottom" id="Debug" order="9" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="10" weight="0.25" />
... ... @@ -419,277 +382,327 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/api/m_api/m_admin_api.yml" />
<entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_api.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/m_order_purpose_add_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="32" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_login_api.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py" />
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="19" column="8" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
<state relative-caret-position="246">
<caret line="18" column="23" selection-start-line="10" selection-start-column="4" selection-end-line="18" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_partner_edit_api.yml" />
<entry file="file://$PROJECT_DIR$/api/demo_api.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/m_partners_login_testcases.yml" />
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/api.py">
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="99">
<caret line="64" selection-start-line="64" selection-end-line="64" />
<state relative-caret-position="88">
<caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="7" column="73" selection-start-line="7" selection-start-column="73" selection-end-line="7" selection-end-column="73" />
<caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_api.yml" />
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="129">
<caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
<state relative-caret-position="198">
<caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
<state relative-caret-position="220">
<caret line="10" column="22" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
<state>
<caret column="11" selection-start-column="11" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="15" selection-start-line="15" selection-end-line="15" />
<state>
<caret column="11" selection-start-column="11" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/m_order_purpose_add_api.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" column="32" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
<state relative-caret-position="264">
<caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_login_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="19" column="8" selection-start-line="19" selection-start-column="8" selection-end-line="19" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="38" selection-start-line="38" selection-end-line="38" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="44">
<caret line="14" selection-start-line="14" selection-end-line="17" selection-end-column="16" />
<caret line="2" selection-start-line="2" selection-end-line="8" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-32">
<caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
<state relative-caret-position="147">
<caret line="19" selection-start-line="19" selection-end-line="22" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_add_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
<caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_partner_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
<state>
<caret column="6" lean-forward="true" selection-start-column="6" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL002_edit_actual_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="12" column="20" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
<state relative-caret-position="88">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py" />
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL003_actual_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246">
<caret line="18" column="23" selection-start-line="10" selection-start-column="4" selection-end-line="18" selection-end-column="23" />
<state relative-caret-position="9">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml">
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="14" column="63" selection-start-line="14" selection-start-column="63" selection-end-line="14" selection-end-column="63" />
<state relative-caret-position="50">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml">
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-57">
<caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
<state relative-caret-position="88">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_partner_edit_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-66" />
<state relative-caret-position="88">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
<caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/demo_api.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
<state relative-caret-position="88">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
<state relative-caret-position="88">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
<state relative-caret-position="88">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" />
<state relative-caret-position="88">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
<state relative-caret-position="88">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret line="6" column="23" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="52" />
<state relative-caret-position="88">
<caret line="4" column="59" selection-start-line="4" selection-start-column="59" selection-end-line="4" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="52" />
<state relative-caret-position="88">
<caret line="4" column="59" selection-start-line="4" selection-start-column="59" selection-end-line="4" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="220">
<caret line="10" column="22" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
<state relative-caret-position="88">
<caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-198" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL001_add_actual_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222">
<caret line="131" column="40" selection-start-line="131" selection-start-column="28" selection-end-line="131" selection-end-column="40" />
<state relative-caret-position="176">
<caret line="8" column="10" lean-forward="true" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-242">
<caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
<state relative-caret-position="66">
<caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/db_func.py">
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="145">
<caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
<state relative-caret-position="66">
<caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_edit_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
<state relative-caret-position="176">
<caret line="8" column="13" lean-forward="true" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="13" selection-start-line="13" selection-end-line="16" selection-end-column="12" />
<state relative-caret-position="213">
<caret line="254" column="41" lean-forward="true" selection-start-line="254" selection-start-column="41" selection-end-line="254" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_searchText_list_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-66">
<caret column="11" selection-start-column="11" selection-end-column="11" />
<state relative-caret-position="44">
<caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL004_actual_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="11" selection-start-column="11" selection-end-column="11" />
<state relative-caret-position="242">
<caret line="14" column="65" selection-start-line="14" selection-start-column="65" selection-end-line="14" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246">
<caret line="51" column="78" selection-start-line="51" selection-start-column="78" selection-end-line="51" selection-end-column="78" />
<caret line="64" column="68" selection-start-line="64" selection-start-column="68" selection-end-line="64" selection-end-column="68" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml">
<entry file="file://$PROJECT_DIR$/testcases/actual/ACTUAL005_actual_detail_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" selection-start-line="3" selection-end-line="4" selection-end-column="48" />
<state relative-caret-position="246">
<caret line="20" column="27" selection-start-line="20" selection-start-column="27" selection-end-line="20" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="46" selection-start-line="4" selection-start-column="46" selection-end-line="4" selection-end-column="46" />
<state relative-caret-position="66">
<caret line="3" column="30" selection-start-line="3" selection-start-column="10" selection-end-line="3" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/actual/m_order_actual_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="46" selection-start-line="4" selection-start-column="46" selection-end-line="4" selection-end-column="46" />
<state relative-caret-position="22">
<caret line="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" />
</state>
</provider>
</entry>
... ...
... ... @@ -7,18 +7,20 @@ request:
Authorization: Bearer ${get_m_accesstoken()}
json:
buyer: 我是买家${get_second()}
buyerPhone: ${convert_to_string(13459147023)}
buyerPhone: ${convert_to_string($account)}
address: '福建省福州市收获地址1'
partner: 2
partnerRatio: 1.1
salesmanRatio: 2.2
partner: 29
partnerRatio: 10.1
salesmanRatio: 20.2
orderId: ${get_nowtime()}
orderName: ${get_nowtime()}
orderNum: 50
orderPrice: 100
orderDist: '福建一区'
orderStatue: 3
method: POST
url: /v1/order/actual/update
url: v1/order/actual/update
validate:
- eq:
- content.msg
- ok
... ...
name: 实际订单编辑
base_url: ${ENV(base_manager_url)}
variables:
address: ${get_address_from_database(order)}
id: ${get_id_from_database(order)}
buyer: ${get_buyer_from_database(order)}
buyerPhone: ${get_buyerPhone_from_database(order)}
orderDist: ${get_orderDist_from_database(order)}
orderId: ${get_orderId_from_database(order)}
orderName: ${get_orderName_from_database(order)}
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer ${get_m_accesstoken()}
json:
buyer: $buyer
buyerPhone: $buyerPhone
address: $address
partner: 29
partnerRatio: 10.1
salesmanRatio: 20.2
orderId: $orderId
orderName: $orderName
orderNum: 100
orderPrice: 100
orderDist: $orderDist
orderStatue: 2
id: $id
reason: 修改订单${get_nowtime()}
method: POST
url: v1/order/actual/update
validate:
- eq:
- content.msg
- ok
... ...
name: 查看实际订单详情
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_order_status_from_database(order)}
id: ${get_id_from_database(order)}
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer ${get_m_accesstoken()}
json:
id: ${convert_to_string($id)}
method: POST
url: v1/order/actual/detail
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.orderStatue
- $orderStatue
\ No newline at end of file
... ...
name: 合伙人搜索——实际订单列表
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_order_status_from_database(order)}
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer ${get_m_accesstoken()}
json:
pageNumber: 1
pageSize: 10
partner: 29
searchText: ''
method: POST
url: v1/order/actual/list
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.orderStatue
- $orderStatue
\ No newline at end of file
... ...
name: 搜索订单号——实际订单列表
base_url: ${ENV(base_manager_url)}
variables:
orderStatue: ${get_order_status_from_database(order)}
searchText: ${get_orderId_from_database(order)}
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer ${get_m_accesstoken()}
json:
pageNumber: 1
pageSize: 10
partner: 29
searchText: $searchText
method: POST
url: v1/order/actual/list
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.orderStatue
- $orderStatue
\ No newline at end of file
... ...
name: /v1/partners/detail
name: 合伙人查看
base_url: ${ENV(base_manager_url)}
variables:
id: ${get_id_from_database(partner_info)}
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ2MTQxNTQsImlhdCI6MTU5NDU3MDk1NCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDU3MDk1NCwidWlkIjoxOH0.kmi2wDld4RbqDn7HWsqejOtss9zSCqDtSvrR8-R9SY0
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ3MDAxOTIsImlhdCI6MTU5NDY1Njk5MiwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDY1Njk5MiwidWlkIjoxOH0.8G6kqdQYKgJPmLPGTgwLwXbjKWG5jqlEx5zG6vh1RlQ
\ No newline at end of file
... ...
... ... @@ -34,5 +34,5 @@ def create_phone_number(num):
phone_number = []
for i in range(num):
number = random.randint(0,9)
phone_number.append('18%d%08d'%(number,number+1))
phone_number.append('1%d%d%08d'%(number,number+1,number+2))
return phone_number
... ...
... ... @@ -17,11 +17,29 @@ def GetConnect():
except Exception as err:
print("连接数据库失败，%s" % err)
return conn
#获取超级管理员账号
def get_admin_account_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select account from \"{}\" where is_default ='t' '''.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_id_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql= "select id from " + tbl + ' ' + 'order by id desc '
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = 'select id from \"{}\" order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
... ... @@ -129,4 +147,109 @@ def get_partnername_from_database(tbl):
print(err)
db.rollback()
db.close()
print(get_id_from_database('partner_info'))
\ No newline at end of file
def get_order_status_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_status from \"{}\" order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_address_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select buyer from \"{}\" order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]['shippingAddress']
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_buyer_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select buyer from \"{}\" order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]['buyerName']
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_buyerPhone_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select buyer from \"{}\" order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]['contactInfo']
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_orderDist_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_region_info from \"{}\" order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]['regionName']
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_orderId_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_code from \"{}\" order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
def get_orderName_from_database(tbl):
db = GetConnect()
cursor = db.cursor()
sql = 'select order_name from \"{}\" order by id DESC'.format(tbl)
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return result[0]
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
print(get_orderId_from_database('order'))
\ No newline at end of file
... ...
{
"testcase":[
"testcases/partners/PARTNERS006_set-status_partner1_testcases.yml",
"testcases/partners/PARTNERS007_set-status_partner2_testcases.yml"
"testcases/actual/ACTUAL005_actual_detail_testcases.yml"
]
}
\ No newline at end of file
... ...
config:
name: 新增实际订单
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 新增实际订单
api: api/m_api/actual/m_add_order_actual_api.yml
validate:
- eq:
- content.msg
- ok
... ...
config:
name: 编辑实际订单
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 编辑实际订单
api: api/m_api/actual/m_edit_order_actual_api.yml
validate:
- eq:
- content.msg
- ok
... ...
config:
name: 合伙人搜索——实际订单列表
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_admin_account_from_database(admin_user)}
orderStatue: ${get_order_status_from_database(order)}
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 合伙人搜索——实际订单列表
api: api/m_api/actual/m_order_actual_partner_list_api.yml
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.orderStatue
- $orderStatue
... ...
config:
name: 搜索订单号——实际订单列表
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_admin_account_from_database(admin_user)}
orderStatue: ${get_order_status_from_database(order)}
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 搜索订单号——实际订单列表
api: api/m_api/actual/m_order_actual_searchText_list_api.yml
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.orderStatue
- $orderStatue
... ...
config:
name: 查看实际订单详情
base_url: ${ENV(base_manager_url)}
variables:
phone: ${get_admin_account_from_database(admin_user)}
orderStatue: ${get_order_status_from_database(order)}
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 查看实际订单详情
api: api/m_api/actual/m_order_actual_detail_api.yml
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.orderStatue
- $orderStatue
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 新增管理员
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 编辑管理员
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
... ...
... ... @@ -8,7 +8,7 @@ config:
teststeps:
- name: $phone 登录系统
testcase: testcases/m_admin_login_testcases.yml
testcase: testcases/m_login_testcases.yml
- name: $phone 管理员搜索
api: api/m_api/admin/m_admin_list_api.yml
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 查看管理员
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 禁用管理员
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 启用管理员
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
... ...
... ... @@ -2,7 +2,7 @@ config:
name: login_testcases
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
teststeps:
- name: $phone 登录系统
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 新增合伙人
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 合伙人编辑
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 搜索合伙类型
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
status: ${get_status_from_database(partner_info)}
teardown_hooks:
- ${sleep(2)}
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 搜索合伙人名称
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
status: ${get_status_from_database(partner_info)}
teardown_hooks:
- ${sleep(2)}
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 查看合伙人
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
status: ${get_status_from_database(partner_info)}
teardown_hooks:
- ${sleep(2)}
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 禁用合伙人
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
... ...
... ... @@ -2,7 +2,7 @@ config:
name: 启用合伙人
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
phone: ${get_admin_account_from_database(admin_user)}
teardown_hooks:
- ${sleep(2)}
... ...
config:
name: login_testcases
name: 合伙人测试集
testcases:
#- name: call demo_testcase with data 1
# testcase: testcases/login_testcases.yml
# parameters:
# channel: ${create_channel(10)}
#- name: ADMIN001：新增管理员
# testcase: testcases/admin/ADMIN001_add_admin_testcases.yml
... ... @@ -18,35 +14,52 @@ testcases:
#
#- name: ADMIN003：搜索管理员
# testcase: testcases/admin/ADMIN003_list_admin_testcases.yml
#
#- name: ADMIN004：查看管理员
# testcase: testcases/admin/ADMIN004_detail_admin_testcases.yml
#
#- name: ADMIN005：禁用管理员
# testcase: testcases/admin/ADMIN005_forbidden_admin_testcases.yml
#
#- name: ADMIN006：启用管理员
# testcase: testcases/admin/ADMIN006_forbidden_admin_testcases.yml
#
#- name: PARTNERS001：新增合伙人
# testcase: testcases/partners/PARTNERS001_add_partner_testcases.yml
# parameters:
# account: ${create_phone_number(1)}
#
#- name: PARTNERS002：编辑合伙人
# testcase: testcases/partners/PARTNERS002_edit_partner_testcases.yml
#
#- name: PARTNERS003：搜索合伙类型
# testcase: testcases/partners/PARTNERS003_list_partner_testcases.yml
#
#- name: PARTNERS004：搜索合伙人名称
# testcase: testcases/partners/PARTNERS004_list_partner_testcases.yml
#
#- name: PARTNERS005：查看合伙人
# testcase: testcases/partners/PARTNERS005_detail_partner_testcases.yml
#
#- name: PARTNERS006：禁用合伙人
# testcase: testcases/partners/PARTNERS006_set-status_partner1_testcases.yml
#
#- name: PARTNERS006：启用合伙人
# testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml
#- name: ACTUAL001：新增实际订单
# testcase: testcases/actual/ACTUAL001_add_actual_testcases.yml
# parameters:
# account: ${create_phone_number(1)}
#- name: ACTUAL002：编辑实际订单
# testcase: testcases/actual/ACTUAL002_edit_actual_testcases.yml
#- name: ACTUAL003：合伙人搜索——实际订单列表
# testcase: testcases/actual/ACTUAL003_actual_list_testcases.yml
- name: PARTNERS006：禁用合伙人
testcase: testcases/partners/PARTNERS006_set-status_partner1_testcases.yml
#- name: ACTUAL004：搜索订单号——实际订单列表
# testcase: testcases/actual/ACTUAL004_actual_list_testcases.yml
- name: PARTNERS006：启用合伙人
testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml
\ No newline at end of file
- name: ACTUAL005：查看实际订单详情
testcase: testcases/actual/ACTUAL005_actual_detail_testcases.yml
\ No newline at end of file
... ...