bianxinhua / task_api · 提交

转到一个项目

作者 bianxinhua
提交 fde1fd1986d2a499f89afed04a8815119c6e047a 1 个父辈 f2b86596

add README

内嵌 并排对比
正在显示 30 个修改的文件 包含 603 行增加 和 200 行删除
... ... @@ -2,12 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="b869bb6c-d2b2-46af-b73c-cd3237c48651" name="Default Changelist" comment="update 2020005122330">
<change afterPath="$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/m_api/task_finishTask_api.yml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.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/m_api/loot/loot_task_confirm_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/Authorization.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/access_token.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/access_token.txt" afterDir="false" />
... ... @@ -23,8 +21,10 @@
<change beforePath="$PROJECT_DIR$/config/task_authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_authCode.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/task_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_id.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/helpfunc/m_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/m_func.py" afterDir="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$/testcases_excel/task_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/task_api.xlsx" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/testsuites/task_suites.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/task_suites.yml" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -35,13 +35,14 @@
</component>
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/ability_api$login_func.coverage" NAME="login_func Coverage Results" MODIFIED="1593587330616" 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/task_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1597915923131" 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/task_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1597989839968" 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/ability_api$ucenter_loginAggregate_func.coverage" NAME="ucenter_loginAggregate_func Coverage Results" MODIFIED="1586524233572" 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/ability_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1593587381209" 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/ability_api$header_func.coverage" NAME="header_func Coverage Results" MODIFIED="1586653408797" 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/ability_api$run.coverage" NAME="run Coverage Results" MODIFIED="1587223202115" 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/ability_api$test.coverage" NAME="test Coverage Results" MODIFIED="1586509371608" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="F:/untitled1" />
<SUITE FILE_PATH="coverage/task_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1597915905489" 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/task_api$m_func.coverage" NAME="m_func Coverage Results" MODIFIED="1598002429345" 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/task_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1598002809227" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component>
<component name="FavoritesManager">
<favorites_list name="ability_api" />
... ... @@ -51,42 +52,81 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="393">
<caret line="31" column="67" selection-start-line="31" selection-start-column="67" selection-end-line="31" selection-end-column="67" />
<state relative-caret-position="381">
<caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml">
<entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-127">
<caret line="5" selection-start-line="5" selection-start-column="1" selection-end-line="19" selection-end-column="21" />
<state relative-caret-position="114">
<caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-52">
<caret line="1" column="10" lean-forward="true" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="14" />
<state relative-caret-position="234">
<caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />
<folding>
<element signature="e#108#137#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1638">
<caret line="66" column="16" selection-start-line="66" selection-start-column="16" selection-end-line="66" selection-end-column="16" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
<state relative-caret-position="140">
<caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" />
<folding>
<element signature="e#108#137#0" expanded="true" />
<element signature="e#117#128#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -131,11 +171,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_1_api.yml" />
<option value="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_0_1_0_api.yml" />
<option value="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_1_1_api.yml" />
<option value="$PROJECT_DIR$/testcases/task/taskPublish_1_1_api.yml" />
<option value="$PROJECT_DIR$/testcases/task/taskPublish_QD/QDRW003.yml" />
<option value="$PROJECT_DIR$/testcases/task/taskPublish_JB/JBRW003.yml" />
<option value="$PROJECT_DIR$/api/task_api/task/rewards/submitCompete_1_api.yml" />
<option value="$PROJECT_DIR$/api/task_api/task/bidTask_api.yml" />
... ... @@ -164,7 +199,6 @@
<option value="$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml" />
<option value="$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/task_open_api.yml" />
<option value="$PROJECT_DIR$/helpfunc/m_func.py" />
<option value="$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/loot/task_loot_detail_api.yml" />
<option value="$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml" />
... ... @@ -175,13 +209,19 @@
<option value="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml" />
<option value="$PROJECT_DIR$/debugtalk.py" />
<option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
<option value="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml" />
<option value="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" />
<option value="$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml" />
<option value="$PROJECT_DIR$/testsuites/task_suites.yml" />
<option value="$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml" />
<option value="$PROJECT_DIR$/api/m_api/loot/loot_task_finishTask_api.yml" />
<option value="$PROJECT_DIR$/api/m_api/task_finishTask_api.yml" />
<option value="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" />
<option value="$PROJECT_DIR$/testsuites/task_suites.yml" />
<option value="$PROJECT_DIR$/api/m_api/common/user_api.yml" />
<option value="$PROJECT_DIR$/helpfunc/m_func.py" />
<option value="$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml" />
<option value="$PROJECT_DIR$/debugtalk.py" />
<option value="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" />
<option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
</list>
</option>
</component>
... ... @@ -209,6 +249,52 @@
<path>
<item name="task_api" type="b2602c69:ProjectViewProjectNode" />
<item name="task_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="task_api" type="b2602c69:ProjectViewProjectNode" />
<item name="task_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="app_api" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="task_api" type="b2602c69:ProjectViewProjectNode" />
<item name="task_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="app_api" type="462c0819:PsiDirectoryNode" />
<item name="login_api" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="task_api" type="b2602c69:ProjectViewProjectNode" />
<item name="task_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="app_api" type="462c0819:PsiDirectoryNode" />
<item name="login_api" type="462c0819:PsiDirectoryNode" />
<item name="task" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="task_api" type="b2602c69:ProjectViewProjectNode" />
<item name="task_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="m_api" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="task_api" type="b2602c69:ProjectViewProjectNode" />
<item name="task_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="m_api" type="462c0819:PsiDirectoryNode" />
<item name="common" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="task_api" type="b2602c69:ProjectViewProjectNode" />
<item name="task_api" type="462c0819:PsiDirectoryNode" />
<item name="api" type="462c0819:PsiDirectoryNode" />
<item name="m_api" type="462c0819:PsiDirectoryNode" />
<item name="loot" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="task_api" type="b2602c69:ProjectViewProjectNode" />
<item name="task_api" type="462c0819:PsiDirectoryNode" />
<item name="helpfunc" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -239,20 +325,20 @@
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\task_api\api\m_api\loot" />
<recent name="E:\task_api\testcases\task\loot" />
<recent name="E:\mmm-auto\ability_api\api\login_api\auth" />
<recent name="F:\PycharmProjects\ability_api\data" />
<recent name="F:\PycharmProjects\ability_api\common" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="E:\task_api\api\m_api\loot" />
<recent name="E:\task_api\testcases\task\loot" />
<recent name="E:\task_api\testcases\task" />
<recent name="E:\task_api\api\m_api" />
<recent name="E:\task_api\api\m_api\loot" />
<recent name="E:\task_api\testcases" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="E:\task_api\api\m_api" />
<recent name="E:\task_api\testcases\task" />
<recent name="E:\task_api\api\m_api\loot" />
<recent name="E:\task_api\testcases\task\loot" />
<recent name="E:\mmm-auto\ability_api\api\login_api\auth" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
... ... @@ -266,7 +352,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Python.pg_db_func">
<component name="RunManager" selected="Python.debugtalk">
<configuration name="debugtalk" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="ability_api" />
<option name="INTERPRETER_OPTIONS" value="" />
... ... @@ -289,7 +375,7 @@
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="header_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
<configuration name="login_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="ability_api" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
... ... @@ -302,7 +388,7 @@
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/helpfunc/header_func.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/helpfunc/login_func.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
... ... @@ -311,7 +397,7 @@
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="login_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
<configuration name="m_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="ability_api" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
... ... @@ -324,7 +410,7 @@
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/helpfunc/login_func.py" />
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/helpfunc/m_func.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
... ... @@ -379,11 +465,11 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Python.pg_db_func" />
<item itemvalue="Python.debugtalk" />
<item itemvalue="Python.m_func" />
<item itemvalue="Python.pg_db_func" />
<item itemvalue="Python.login_func" />
<item itemvalue="Python.run" />
<item itemvalue="Python.header_func" />
</list>
</recent_temporary>
</component>
... ... @@ -491,6 +577,7 @@
<workItem from="1597801010469" duration="16146000" />
<workItem from="1597886812090" duration="6866000" />
<workItem from="1597906408146" duration="2887000" />
<workItem from="1597973157365" duration="18949000" />
</task>
<task id="LOCAL-00001" summary="优化测试用例">
<created>1571644787323</created>
... ... @@ -818,7 +905,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="334975000" />
<option name="totallyTimeSpent" value="353924000" />
</component>
<component name="TodoView" selected-index="3">
<todo-panel id="selected-file">
... ... @@ -830,9 +917,8 @@
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22049356" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22371244" />
<window_info id="Structure" order="1" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
<window_info id="Favorites" order="2" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
<window_info anchor="bottom" id="Message" order="0" />
... ... @@ -846,7 +932,7 @@
<window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49848714" weight="0.328125" />
<window_info anchor="bottom" id="Database Changes" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50226927" side_tool="true" weight="0.32879046" />
<window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" visible="true" weight="0.40401787" />
<window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" visible="true" weight="0.3872768" />
<window_info anchor="bottom" id="Python Console" order="12" weight="0.328125" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
... ... @@ -929,15 +1015,6 @@
<option name="LAST_COMMIT_MESSAGE" value="update 2020005122330" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/testcases/task/member/member_list_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/loot/update_taskPublish_api.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/loot/taskPublish_0_1_api.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/loot/task_delete_api.yml" />
<entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_testcase.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/task_delete_api.yml">
... ... @@ -982,13 +1059,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-312">
<caret line="9" column="40" selection-start-line="9" selection-start-column="40" selection-end-line="9" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/task_login_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
... ... @@ -1021,205 +1091,236 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/task_Details_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/task/taskPublish_QD/QDRW001.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="364">
<caret line="14" column="33" lean-forward="true" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" />
<state relative-caret-position="234">
<caret line="12" selection-start-line="12" selection-end-line="13" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/task_open_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="24" />
<caret line="4" selection-start-line="4" selection-end-line="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-542">
<caret line="7" selection-start-line="7" selection-end-line="11" selection-end-column="45" />
<state relative-caret-position="133">
<caret line="141" column="4" selection-start-line="141" selection-start-column="4" selection-end-line="141" selection-end-column="18" />
<folding>
<element signature="e#107#119#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/loot/task_loot_detail_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/loot/tasksearchResources_api.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="26" selection-start-line="26" selection-end-line="28" selection-end-column="17" />
<state relative-caret-position="156">
<caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/task/taskPublish_QD/QDRW001.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/task_rewards_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="12" selection-start-line="12" selection-end-line="13" selection-end-column="35" />
<state>
<caret column="12" selection-start-column="12" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="27" column="14" selection-start-line="27" selection-start-column="14" selection-end-line="27" selection-end-column="14" />
<state relative-caret-position="130">
<caret line="5" column="15" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml">
<entry file="file://$PROJECT_DIR$/api/app_api/question_api/questiondetail_api.yml">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="4" selection-start-line="4" selection-end-line="4" />
<state relative-caret-position="381">
<caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="141" column="4" selection-start-line="141" selection-start-column="4" selection-end-line="141" selection-end-column="18" />
<folding>
<element signature="e#107#119#0" expanded="true" />
</folding>
<state relative-caret-position="367">
<caret line="26" column="35" selection-start-line="26" selection-start-column="35" selection-end-line="26" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml">
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="25" column="36" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="36" />
<state relative-caret-position="474">
<caret line="170" selection-start-line="170" selection-end-line="170" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/loot/tasksearchResources_api.yml" />
<entry file="file://$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml">
<entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="156">
<caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
<state relative-caret-position="471">
<caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/task_resource_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
<state>
<caret column="6" selection-start-column="6" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/task_rewards_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/task_finishTask_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="12" selection-start-column="12" selection-end-column="12" />
<state relative-caret-position="156">
<caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-309">
<caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<state relative-caret-position="604">
<caret line="25" column="50" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="5" column="8" selection-start-line="5" selection-end-line="5" selection-end-column="8" />
<state relative-caret-position="702">
<caret line="27" selection-start-line="27" selection-end-line="27" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/task_open_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="5" column="15" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" />
<state relative-caret-position="104">
<caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/app_api/question_api/questiondetail_api.yml">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/api/m_api/task_resource_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml">
<entry file="file://$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="381">
<caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" />
<state relative-caret-position="384">
<caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="21" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="84" selection-start-line="84" selection-end-line="84" />
<folding>
<element signature="e#117#128#0" expanded="true" />
</folding>
<state relative-caret-position="260">
<caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<entry file="file://$PROJECT_DIR$/api/m_api/task_Details_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" />
<state relative-caret-position="26">
<caret line="1" selection-start-line="1" selection-end-line="19" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml">
<entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="884">
<caret line="40" column="16" selection-start-line="8" selection-end-line="40" selection-end-column="16" />
<state relative-caret-position="156">
<caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/loot/task_loot_detail_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367">
<caret line="26" column="35" selection-start-line="26" selection-start-column="35" selection-end-line="26" selection-end-column="35" />
<state relative-caret-position="676">
<caret line="26" selection-start-line="26" selection-end-line="28" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py">
<entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="474">
<caret line="170" selection-start-line="170" selection-end-line="170" />
<state relative-caret-position="182">
<caret line="7" selection-start-line="7" selection-end-line="11" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="6" selection-start-column="6" selection-end-column="19" />
<state relative-caret-position="130">
<caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="5" column="50" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="286">
<caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" />
<state relative-caret-position="140">
<caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" />
<folding>
<element signature="e#108#137#0" expanded="true" />
<element signature="e#117#128#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml">
<entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="471">
<caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" />
<state relative-caret-position="381">
<caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml">
<entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="393">
<caret line="31" column="67" selection-start-line="31" selection-start-column="67" selection-end-line="31" selection-end-column="67" />
<state relative-caret-position="114">
<caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml">
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-127">
<caret line="5" selection-start-line="5" selection-start-column="1" selection-end-line="19" selection-end-column="21" />
<state relative-caret-position="18">
<caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-52">
<caret line="1" column="10" lean-forward="true" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="14" />
<state relative-caret-position="1638">
<caret line="66" column="16" selection-start-line="66" selection-start-column="16" selection-end-line="66" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />
<folding>
<element signature="e#108#137#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ...
name: 用户列表
base_url: ${ENV(base_worth_url)}
verify: False
variables:
msg: ok
teardown_hooks:
- ${teardown_hook_get_uid0($response)}
- ${teardown_hook_get_uid1($response)}
- ${teardown_hook_get_uid2($response)}
- ${teardown_hook_get_uid15($response)}
request:
headers:
Content-Type: application/json; charset=UTF-8
Authorization: Bearer ${get_task_Authorization()}
Origin: https://value-test.fjmaimaimai.com
Referer: https://value-test.fjmaimaimai.com/
User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
X-Requested-With: XMLHttpRequest
json:
method: POST
url: common/user
validate:
- eq:
- content.code
- 0
- eq:
- content.msg
- $msg
\ No newline at end of file
... ...
name: 抢单任务验收
base_url: ${ENV(base_worth_url)}
verify: False
variables:
taskId: ${get_task_status_4_from_database()}
remark: 上传报告${get_nowtime()}
realityTime: ${get_today()}
uid0: ${get_uid0()}
uid1: ${get_uid1()}
uid2: ${get_uid2()}
uid15: ${get_uid15()}
msg: ok
request:
headers:
Content-Type: application/json; charset=UTF-8
Authorization: Bearer ${get_task_Authorization()}
Origin: https://value-test.fjmaimaimai.com
Host: suplus-worth-web-gateway-test.fjmaimaimai.com
Referer: https://value-test.fjmaimaimai.com/
User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
X-Requested-With: XMLHttpRequest
json:
taskId: $taskId
receiver:
uid: $uid15
name: $name15
percent: 25
reward: 500
participant:
- uid: $uid0
name: $name0
percent: 25
reward: 500
- uid: $uid1
name: $name1
percent: 25
reward: 500
- uid: $uid2
name: $name2
percent: 25
reward: 500
resourceType: ${convert_to_number(1)}
resourceList:
- id: ${convert_to_number($get_resource_id())}
solution:
total: 26
recevier:
uid: $uid15
name: $name15
percent: 25
score: 6.5
participant:
- uid: $uid0
name: $name0
percent: 25
score: 6.5
- uid: $uid1
name: $name1
percent: 6.5
score: 500
- uid: $uid2
name: $name2
percent: 25
score: 6.5
remark: $remark
realityTime: "2020-08-20T16:00:00.000Z"
method: POST
url: task/loot/accept
#validate:
## - eq:
## - content.code
## - 0
## - eq:
## - content.msg
## - $msg
\ No newline at end of file
... ...
name: 完成任务
base_url: ${ENV(base_url)}
verify: False
variables:
currtime: ${make_time()}
uuid: ${make_uuid()}
access_token: ${get_task_accesstoken()}
sign: ${make_sign($currtime, $uuid, $access_token)}
request:
headers:
Content-Type: application/json;charset=utf-8
User-Agent: okhttp/3.12.3
X-MMM-AccessToken: $access_token
X-MMM-AppName: com.mmm.ability
X-MMM-AppProject: ability
X-MMM-DeviceType: '0'
X-MMM-Sign: $sign
X-MMM-Timestamp: $currtime
X-MMM-Uuid: $uuid
X-MMM-Version: 1.0.0
json:
id: $id
method: POST
url: v1/task/finishTask
validate:
- eq:
- content.code
- 0
- eq:
- content.msg
- 完成成功
\ No newline at end of file
... ...
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTc5MTYwNTEsImV4cCI6MTU5NzkyNjg1MSwibmJmIjoxNTk3OTE2MDUxLCJqdGkiOiJpU1c5dW52d1hhQnhaZ1lBIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.m8ej2VXl8TmpRT0-TCRdEg-pEfEF3TSD96y8n6mcVrE
\ No newline at end of file
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTc5OTQ1OTQsImV4cCI6MTU5ODAwNTM5NCwibmJmIjoxNTk3OTk0NTk0LCJqdGkiOiJMVUx3c05saVZFbzRWT1dxIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.6W6CjQYVfbCroldUAaGm3x-VgGL4P2-Ccg3XIb6ZK7U
\ No newline at end of file
... ...
zj5RjNXnzpzM7wHfSQyP8b8347WR3sap
\ No newline at end of file
Gh8SznkQkAGwcyFePyZaEzRtRiBjGf6r
\ No newline at end of file
... ...
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTc5MTYwNTIsImV4cCI6MTU5NzkyNjg1MiwibmJmIjoxNTk3OTE2MDUyLCJqdGkiOiI1d0pueldNUW5IYXpkMmd0Iiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.gcPynh0oEinoVzOss8Gt09cMeEIVFJYKnUFkkfGO9mM
\ No newline at end of file
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTc5OTQ1OTQsImV4cCI6MTU5ODAwNTM5NCwibmJmIjoxNTk3OTk0NTk0LCJqdGkiOiJWM0ZWNEJiSUgxSm5wNHhuIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.VYMt8TpiwaTDbXdCNS_QnPjTk6jSkx6TUkEjPU1l-R8
\ No newline at end of file
... ...
1j29edawio6
\ No newline at end of file
rv7f2l9333
\ No newline at end of file
... ...
92c16a3e3e8e2c0820af09d176d793dbf3680ba1cc1b0d35fcd5b6b502e3c895ce7b325a
\ No newline at end of file
198271ab5e4be000a01629484af1736333b63c757d5e36850a5a91a3e5c3bcd8361fe39c
\ No newline at end of file
... ...
JLlEz5kkIaIJB2Ym4ckrrZKNO7SSRznghzlK1COfZQfpw9aZQhr4p5dxQa5TwvdZF1x7Hfc70z5qPCbjAcGAPR6CAtghq1gqu56yJvJQUNVfGHwqvqHAUEZyBp9U+7ROtzF12Y5ZnIkmS/1/Po9FjrKW1T+XRXF4wk2lbYW5SD4=
\ No newline at end of file
B34F2yFhTOHWa10B99/3c1nbcPnTP1mZuPmjPZOZZaFd05LH6hiAhSxL7/UmT7EXnj7dK9X1Q6zqJSJKEx+ufByotzgCSb+d5Fk13DXUKPCT0SvjbnsS7D+Bf31/7z5XjHl8e0fkAoGXNvR6ryQNSX37KSLW2WKRlDd25hh1Kx0=
\ No newline at end of file
... ...
мֵ9
\ No newline at end of file
мֵ12
\ No newline at end of file
... ...
3272532058847488
\ No newline at end of file
3272692925319424
\ No newline at end of file
... ...
мֵ9
\ No newline at end of file
мֵ12
\ No newline at end of file
... ...
10989
\ No newline at end of file
10990
\ No newline at end of file
... ...
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk3OTE2MDUyLCJleHAiOjE1OTc5MjY4NTIsIm5iZiI6MTU5NzkxNjA1MiwianRpIjoibnlEcDYzSUh1RHllMzlkMyIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.ZpkSYlD7HLSl3jqj_J182uTxYgJx4FODK7Ecj21aPzQ
\ No newline at end of file
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk3OTk0NTk0LCJleHAiOjE1OTgwMDUzOTQsIm5iZiI6MTU5Nzk5NDU5NCwianRpIjoiNFR3UG9tc2k1VGNxWHE4TyIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.sKByudD3jxI-9W-Dy65Mtw2Gfen94kOdNkRVt5kKSdM
\ No newline at end of file
... ...
6GsDEBNjCAyR42YkRGQZbf8DhD7thHcm
\ No newline at end of file
8xYKezzCm4JmNXZKaFER3fcBm6bkzS3D
\ No newline at end of file
... ...
7p52o7jok6t
\ No newline at end of file
7vm9ofajxzl
\ No newline at end of file
... ...
3019535699008816128
\ No newline at end of file
3020853417054045184
\ No newline at end of file
... ...
3248817613892608
\ No newline at end of file
... ...
3248817613863936
\ No newline at end of file
... ...
3247366011913216
\ No newline at end of file
... ...
3248817613835264
\ No newline at end of file
... ...
... ... @@ -18,6 +18,8 @@ def sleep(n_secs):
def convert_to_string(value):
return str(value)
def convert_to_number(value):
return int(value)
# def get_base_url(env_type="test"):
# """
... ... @@ -37,7 +39,3 @@ def get_nowtime():
def get_second():
curr_time = datetime.datetime.now()
return curr_time.second
print(get_second())
\ No newline at end of file
... ...
... ... @@ -137,4 +137,108 @@ def get_login_code():
print('读取失败', e)
# Authorization = str(Authorization)
return login_code
#----------------------------获取公共用户id-------------------------
def teardown_hook_get_uid0(response):
if response.status_code == 200:
jsondata = json.loads(response.text)
uid0 =jsondata['data']['list'][0]['uid']
try:
# 保存token到文件
with open(path + 'config/uid0.txt','w+') as f:
f.write(uid0)
print('写入成功，uid0：{}'.format(uid0))
f.close()
except Exception as e:
print('写入失败', e)
return uid0
def get_uid0():
try:
# 保存token到文件
with open(path + "config/uid0.txt", 'r') as f:
uid0 = f.read()
uid0 = int(uid0)
print('读取成功，uid0：{}'.format(uid0))
except Exception as e:
print('读取失败', e)
# Authorization = str(Authorization)
return uid0
def teardown_hook_get_uid1(response):
if response.status_code == 200:
jsondata = json.loads(response.text)
uid1 =jsondata['data']['list'][1]['uid']
try:
# 保存token到文件
with open(path + 'config/uid1.txt','w+') as f:
f.write(uid1)
print('写入成功，uid1：{}'.format(uid1))
f.close()
except Exception as e:
print('写入失败', e)
return uid1
def get_uid1():
try:
# 保存token到文件
with open(path + "config/uid1.txt", 'r') as f:
uid1 = f.read()
uid1 = int(uid1)
print('读取成功，uid1：{}'.format(uid1))
except Exception as e:
print('读取失败', e)
# Authorization = str(Authorization)
return uid1
def teardown_hook_get_uid2(response):
if response.status_code == 200:
jsondata = json.loads(response.text)
uid2 = jsondata['data']['list'][2]['uid']
try:
# 保存token到文件
with open(path + 'config/uid2.txt','w+') as f:
f.write(uid2)
print('写入成功，uid2：{}'.format(uid2))
f.close()
except Exception as e:
print('写入失败', e)
return uid2
def get_uid2():
try:
# 保存token到文件
with open(path + "config/uid2.txt", 'r') as f:
uid2 = f.read()
uid2 = int(uid2)
print('读取成功，uid2：{}'.format(uid2))
except Exception as e:
print('读取失败', e)
# Authorization = str(Authorization)
return uid2
def teardown_hook_get_uid15(response):
if response.status_code == 200:
jsondata = json.loads(response.text)
uid15 =jsondata['data']['list'][15]['uid']
try:
# 保存token到文件
with open(path + 'config/uid15.txt','w+') as f:
f.write(uid15)
print('写入成功，uid15：{}'.format(uid15))
f.close()
except Exception as e:
print('写入失败', e)
return uid15
def get_uid15():
try:
# 保存token到文件
with open(path + "config/uid15.txt", 'r') as f:
uid15 = f.read()
uid15 = int(uid15)
print('读取成功，uid15：{}'.format(uid15))
except Exception as e:
print('读取失败', e)
# Authorization = str(Authorization)
return uid15
\ No newline at end of file
... ...
... ... @@ -105,3 +105,21 @@ def get_task_status_7_from_database():
print(err)
db.rollback()
db.close()
#获取任务单的状态:待验收
def get_task_status_4_from_database():
db = GetConnect()
cursor = db.cursor()
# sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
sql = '''select id from tasks t where t.company_id = 366 and t.task_status = 4 and t.receiver_uid = '3247366011913216' order by id desc'''
# print(sql)
try:
cursor.execute(sql)
result = cursor.fetchone()
return str(result[0])
except Exception as err:
# 发生错误时回滚
print(err)
db.rollback()
db.close()
# print(get_task_status_4_from_database())
\ No newline at end of file
... ...
config:
name: 保存抢单任务-发布任务-确认领取人
teststeps:
#- name: 登录系统
# testcase: testcases/task/loot/save_loot_update_0_open_testcase.yml
#
#- name: app端点击立即抢单
# testcase: testcases/task/task_rewards_taskDetails_testcase.yml
#
#- name: 确认领取人
# api: api/m_api/loot/loot_task_confirm_api.yml
## variables:
## id: ${get_task_id()}
# varidate:
# validate:
# - eq:
# - content.msg
# - ok
- name: 任务完成
testcases: testcases/task/task_finishTask_testcase.yml
\ No newline at end of file
config:
name: 保存抢单任务-发布任务-确认领取人
#
teststeps:
#- name: 登录系统
# testcase: testcases/task/loot/save_loot_update_0_open_testcase.yml
#
#- name: app端点击立即抢单
# testcase: testcases/task/task_rewards_taskDetails_testcase.yml
#
#- name: 确认领取人
# api: api/m_api/loot/loot_task_confirm_api.yml
## variables:
## id: ${get_task_id()}
# varidate:
# validate:
# - eq:
# - content.msg
# - ok
##-------------------------APP端完成抢单任务------------------------------
#- name: 完成任务
# testcase: testcases/task/task_finishTask_testcase.yml
#-------------------------web端验收抢单任务------------------------------
- name: 获取用户信息
output:
- uid0
- name0
- uid1
- name1
- uid2
- name2
- uid15
- name15
api: api/m_api/common/user_api.yml
teardown_hooks:
- ${teardown_hook_get_uid0($response)}
- ${teardown_hook_get_uid1($response)}
- ${teardown_hook_get_uid2($response)}
- ${teardown_hook_get_uid15($response)}
extract:
# uid0: content.data.list.0.uid
name0: content.data.list.0.name
# uid1: content.data.list.1.uid
name1: content.data.list.1.name
# uid2: content.data.list.2.uid
name2: content.data.list.2.name
# uid15: content.data.list.15.uid
name15: content.data.list.15.name
validate:
- eq:
- content.data.list.0.name
- $name0
- eq:
- content.data.list.1.name
- $name1
- eq:
- content.data.list.2.name
- $name2
- eq:
- content.data.list.15.name
- $name15
#- name: 验收任务
# api: api/m_api/loot/loot_task_accept_api.yml
- name: 验收任务
api: api/m_api/loot/loot_task_accept_api.yml
\ No newline at end of file
... ...
... ... @@ -2,7 +2,6 @@ config:
name: 任务完成
teststeps:
- name: 19990000008登录系统
variables:
phone: ${ENV(appphone)}
... ... @@ -21,6 +20,6 @@ teststeps:
- eq:
- content.data.tasks.0.id
- $id
#
#- name: 19990000008抢单
# api: api/m_api/loot/submitCompete_loot_api.yml
- name: 完成任务
api: api/m_api/task_finishTask_api.yml
\ No newline at end of file
... ...
... ... @@ -28,5 +28,5 @@ testcases:
#- name: loot_task_confirm 抢单模式-确认领取人-查看详情
# testcase: testcases/task/loot/loot_task_confirm_testcase.yml
- name: loot_task_confirm 抢单模式-完成任务-查看详情
testcase: testcases/task/loot/loot_task_finishTask_testcase.yml
\ No newline at end of file
- name: loot_task_confirm 抢单模式-完成任务-验收任务
testcase: testcases/task/loot_task_finishTask_testcase.yml
\ No newline at end of file
... ...