bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 8ce396a2b6d143614ce2c45a63871a7cac9ec68b 1 个父辈 eefeea75

add README

内嵌 并排对比
正在显示 20 个修改的文件 包含 343 行增加 和 130 行删除
... ... @@ -2,10 +2,20 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_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_api.yml" beforeDir="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/m_partner_add_api.yml" beforeDir="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_pg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/db_pg_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$/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/m_admin_login_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/m_login_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>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -15,7 +25,7 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1594290010731" 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$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1594396508244" 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="1594287508392" 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">
... ... @@ -23,8 +33,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
<state relative-caret-position="123">
<caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
... ... @@ -33,29 +43,25 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py">
<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="63">
<caret line="21" column="53" selection-start-line="21" selection-start-column="53" selection-end-line="21" selection-end-column="53" />
<state relative-caret-position="295">
<caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/m_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="24" column="8" selection-start-line="24" selection-start-column="8" selection-end-line="24" selection-end-column="8" />
</state>
<state relative-caret-position="-264" />
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml">
<file pinned="false" current-in-tab="false">
<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="22">
<caret line="13" column="46" selection-start-line="13" selection-start-column="46" selection-end-line="13" selection-end-column="46" />
</state>
<state relative-caret-position="-289" />
</provider>
</entry>
</file>
... ... @@ -68,11 +74,29 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<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="198">
<caret line="9" column="45" selection-start-line="9" selection-start-column="37" selection-end-line="9" selection-end-column="45" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="107">
<caret line="19" column="63" selection-start-line="19" selection-start-column="63" selection-end-line="19" selection-end-column="63" />
<state relative-caret-position="129">
<caret line="31" column="70" selection-start-line="31" selection-start-column="70" selection-end-line="31" selection-end-column="70" />
</state>
</provider>
</entry>
... ... @@ -88,15 +112,25 @@
<option value="$PROJECT_DIR$/testcases/m_admin_login_testcases.yml" />
<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/ADMIN001_add_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" />
<option value="$PROJECT_DIR$/debugtalk.py" />
<option value="$PROJECT_DIR$/helpfunc/db_pg_func.py" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN002_list_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" />
<option value="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.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_forbidden_0_api.yml" />
<option value="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_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/admin/ADMIN001_add_admin_testcases.yml" />
<option value="$PROJECT_DIR$/testcases/m_login_testcases.yml" />
<option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
<option value="$PROJECT_DIR$/debugtalk.py" />
<option value="$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml" />
</list>
</option>
</component>
... ... @@ -139,6 +173,13 @@
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="m_api" type="462c0819:PsiDirectoryNode" />
<item name="partners" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="helpfunc" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -155,6 +196,12 @@
<path>
<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" />
</path>
<path>
<item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
<item name="partner_api" type="462c0819:PsiDirectoryNode" />
<item name="testsuites" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
... ... @@ -247,22 +294,23 @@
<updated>1594200816252</updated>
<workItem from="1594200819333" duration="5002000" />
<workItem from="1594223232686" duration="1195000" />
<workItem from="1594261507053" duration="21390000" />
<workItem from="1594261507053" duration="21762000" />
<workItem from="1594352160255" duration="8702000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="27587000" />
<option name="totallyTimeSpent" value="36661000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Favorites" order="0" side_tool="true" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.24962178" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.2677761" />
<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.39523" />
<window_info anchor="bottom" id="Terminal" order="1" visible="true" weight="0.39523" />
<window_info anchor="bottom" id="Message" order="2" />
<window_info anchor="bottom" id="Event Log" order="3" side_tool="true" />
<window_info anchor="bottom" id="Find" order="4" />
... ... @@ -285,9 +333,7 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/api/m_api/m_admin_api.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_admin_api.yml" />
<entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -298,107 +344,181 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/m_partners_login_testcases.yml">
<provider selected="true" editor-type-id="text-editor" />
<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">
<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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/m_admin_login_testcases.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="23" selection-start-line="23" selection-start-column="1" selection-end-line="25" selection-end-column="42" />
<state relative-caret-position="145">
<caret line="15" column="32" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="15" lean-forward="true" selection-start-line="15" selection-end-line="15" />
<state relative-caret-position="396">
<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/admin/m_admin_update(new)_api.yml">
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="9" column="45" selection-start-line="9" selection-start-column="37" selection-end-line="9" selection-end-column="45" />
<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" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/httprunner/api.py">
<entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py">
<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="-135">
<caret line="21" column="53" selection-start-line="21" selection-start-column="53" selection-end-line="21" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/db_func.py">
<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="145">
<caret line="15" column="32" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="32" />
<state relative-caret-position="66">
<caret line="15" selection-start-line="15" selection-end-line="21" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<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="41">
<caret line="13" selection-start-line="13" selection-end-line="16" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/debugtalk.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="273">
<caret line="31" column="32" selection-start-line="31" selection-start-column="32" selection-end-line="31" selection-end-column="32" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
<state relative-caret-position="173">
<caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<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="-132">
<caret column="12" selection-start-column="12" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.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="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.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>
</provider>
</entry>
<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="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="9">
<caret line="1" column="12" selection-start-line="1" selection-start-column="12" selection-end-line="1" selection-end-column="12" />
<state relative-caret-position="220">
<caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="17" selection-start-line="17" selection-end-line="20" selection-end-column="8" />
<state relative-caret-position="330">
<caret line="15" selection-start-line="15" selection-end-line="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py">
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="63">
<caret line="21" column="53" selection-start-line="21" selection-start-column="53" selection-end-line="21" selection-end-column="53" />
<state relative-caret-position="132">
<caret line="12" column="22" selection-start-line="12" selection-start-column="22" selection-end-line="12" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="10" column="25" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="107">
<caret line="19" column="63" selection-start-line="19" selection-start-column="63" selection-end-line="19" selection-end-column="63" />
<state relative-caret-position="129">
<caret line="31" column="70" selection-start-line="31" selection-start-column="70" selection-end-line="31" selection-end-column="70" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml">
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="24" column="8" selection-start-line="24" selection-start-column="8" selection-end-line="24" selection-end-column="8" />
<state relative-caret-position="123">
<caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN003_list_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="22">
<caret line="13" column="46" selection-start-line="13" selection-start-column="46" selection-end-line="13" selection-end-column="46" />
<state relative-caret-position="295">
<caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/m_order_actual_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-264" />
</provider>
</entry>
<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="-289" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-132">
<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_update(edit)_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="17" selection-start-line="17" selection-end-line="20" selection-end-column="8" />
</state>
</provider>
</entry>
<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="198">
<caret line="9" column="45" selection-start-line="9" selection-start-column="37" selection-end-line="9" selection-end-column="45" />
</state>
</provider>
</entry>
... ...
name: 管理员详情：/v1/admin/detail
name: 管理员详情
base_url: ${ENV(base_manager_url)}
variables:
# phone: 15005046165
# password: d033e22ae348aeb5660fc2140aec35850c4da997
id: ${get_admin_id_from_database(admin_user)}
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1ODc0NTg0MjgsImlhdCI6MTU4NzQzNjgyNywiaXNzIjoibW1tX29wcG1nIiwibmJmIjoxNTg3NDM2ODI3LCJ1aWQiOjMyNDQ3NDc3Mjg1MzMyNDgsImNvbXBhbnlfaWQiOjM2MCwidXNlcl9jb21wYW55X2lkIjozMjQ0NzQ3NzI4NTMzMjQ4fQ.5t4HO5gbAXT_WXHGNf8ZsbXpPHrzsFhnuXWBtPZ4tWs
Authorization: Bearer ${get_m_accesstoken()}
json:
id: 16
id: $id
method: POST
url: /v1/admin/detail
url: v1/admin/detail
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.status
- 1
\ No newline at end of file
... ...
name: 管理员禁用
base_url: ${ENV(base_manager_url)}
variables:
id: ${get_admin_id_from_database(admin_user)}
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer ${get_m_accesstoken()}
json:
id: $id
statue: 0
method: POST
url: v1/admin/forbidden
validate:
- eq:
- content.msg
- ok
\ No newline at end of file
... ...
name: 管理员禁用和启用：/v1/admin/forbidden
name: 管理员禁启用
base_url: ${ENV(base_manager_url)}
variables:
phone: 15005046165
password: d033e22ae348aeb5660fc2140aec35850c4da997
id: ${get_admin_id_from_database(admin_user)}
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1ODc0NTg0MjgsImlhdCI6MTU4NzQzNjgyNywiaXNzIjoibW1tX29wcG1nIiwibmJmIjoxNTg3NDM2ODI3LCJ1aWQiOjMyNDQ3NDc3Mjg1MzMyNDgsImNvbXBhbnlfaWQiOjM2MCwidXNlcl9jb21wYW55X2lkIjozMjQ0NzQ3NzI4NTMzMjQ4fQ.5t4HO5gbAXT_WXHGNf8ZsbXpPHrzsFhnuXWBtPZ4tWs
Authorization: Bearer ${get_m_accesstoken()}
json:
id: 6
id: $id
statue: 1
method: POST
url: /v1/admin/forbidden
url: v1/admin/forbidden
validate:
- eq:
- content.msg
- ok
\ No newline at end of file
... ...
... ... @@ -18,8 +18,5 @@ validate:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.account
- $searchText
- eq:
- content.data.gridResult.lists.0.statue
- 1
\ No newline at end of file
... ...
... ... @@ -5,6 +5,7 @@ request:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
Authorization: Bearer ${get_m_accesstoken()}
#
json:
partnerName: '卞信华'
partnerType: 3
... ... @@ -12,7 +13,7 @@ request:
account: ${convert_to_string($account)}
state: 1
cooperationTime: '2020-07-30'
salesmanName: '小屁孩'
salesmanName: '小小'
phone: ${convert_to_string($account)}
method: POST
url: v1/partners/add
... ...
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQzNTQyMzAsImlhdCI6MTU5NDMxMTAzMCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDMxMTAzMCwidWlkIjoxOH0.9r2J8CDgqpHRdAfMh9IAl4Hjr67MPoewgUEywQAiVo0
\ No newline at end of file
eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ0NDA5MzAsImlhdCI6MTU5NDM5NzczMCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDM5NzczMCwidWlkIjoxOH0.ntMqxX3LGGsMEm4LxmBi5wjcIFZ47B_FcfUBDKp3-JY
\ No newline at end of file
... ...
... ... @@ -16,6 +16,10 @@ def convert_to_string(value):
def get_nowtime():
return time.strftime("%Y%m%d%H%M%S",time.localtime(time.time()))
def get_today():
now_today = datetime.datetime.now()
str_time = now_today.strftime(" %Y-%m-%d ")
return str_time
def get_second():
curr_time = datetime.datetime.now()
return curr_time.second
... ... @@ -29,9 +33,5 @@ def create_channel(num):
def create_phone_number(num):
phone_number = []
for i in range(num):
phone_number.append('182%08d'%i)
# print(phone_number)
return phone_number
phone_number.append('18%d%08d'%(i,i))
return phone_number
\ No newline at end of file
... ...
{
"testcase":[
"testcases/admin/ADMIN002_edit_admin_testcases.yml"
"testcases/partners/PARTNERS001_add_partner_testcases.yml"
]
}
\ No newline at end of file
... ...
... ... @@ -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_update(new)_api.yml
... ...
... ... @@ -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_update(edit)_api.yml
... ...
config:
name: 编辑管理员
name: 搜索管理员
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
... ... @@ -17,8 +17,5 @@ teststeps:
- content.msg
- ok
- eq:
- content.data.gridResult.lists.0.account
- $searchText
- eq:
- content.data.gridResult.lists.0.statue
- 1
... ...
config:
name: 查看管理员
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 管理员查看
api: api/m_api/admin/m_admin_detail_api.yml
validate:
- eq:
- content.msg
- ok
- eq:
- content.data.status
- 1
... ...
config:
name: 禁用管理员
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 管理员禁用
api: api/m_api/admin/m_admin_forbidden_0_api.yml
validate:
- eq:
- content.msg
- ok
... ...
config:
name: 启用管理员
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 管理员启用
api: api/m_api/admin/m_admin_forbidden_1_api.yml
validate:
- eq:
- content.msg
- ok
... ...
... ... @@ -9,22 +9,7 @@ teststeps:
api: api/m_api/m_login_api.yml
teardown_hooks:
- ${teardown_hook_get_m_accesstoken($response)}
# validate:
# - eq:
# - content.msg
# - ok
#- name: $phone 管理员新增
# api: api/m_api/m_admin_update(new)_api.yml
#- name: $phone 管理员修改
# api: api/m_api/m_admin_update(edit)_api.yml
#- name: $phone 合伙人添加
# api: api/m_api/m_partner_add_api.yml
#
#- name: $phone 新增实际订单
### times: 2
# api: api/m_api/m_order_actual_api.yml
#- name: $phone 新增意向订单
# # times: 2
# api: api/m_api/m_order_purpose_add_api.yml
\ No newline at end of file
validate:
- eq:
- content.msg
- ok
... ...
config:
name: 新增合伙人
base_url: ${ENV(base_manager_url)}
variables:
phone: ${convert_to_string(10000000001)}
teardown_hooks:
- ${sleep(2)}
teststeps:
- name: $phone 登录系统
testcase: testcases/m_login_testcases.yml
- name: $phone 管理员新增
api: api/m_api/partners/m_partner_add_api.yml
... ...
... ... @@ -8,13 +8,27 @@ testcases:
# parameters:
# channel: ${create_channel(10)}
- name: ADMIN001：新增管理员
testcase: testcases/admin/ADMIN001_add_admin_testcases.yml
parameters:
account: ${create_phone_number(1)}
#- name: ADMIN001：新增管理员
# testcase: testcases/admin/ADMIN001_add_admin_testcases.yml
# parameters:
# account: ${create_phone_number(1)}
#
#- name: ADMIN002：修改管理员
# testcase: testcases/admin/ADMIN002_edit_admin_testcases.yml
#
#- name: ADMIN003：搜索管理员
# testcase: testcases/admin/ADMIN003_list_admin_testcases.yml
- name: ADMIN002：修改管理员
testcase: testcases/admin/ADMIN002_edit_admin_testcases.yml
#- name: ADMIN004：查看管理员
# testcase: testcases/admin/ADMIN004_detail_admin_testcases.yml
- name: ADMIN003：搜索管理员
testcase: testcases/admin/ADMIN003_list_admin_testcases.yml
\ No newline at end of file
#- 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)}
\ No newline at end of file
... ...