作者 bianxinhua

add README

... ... @@ -4,7 +4,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/venv" />
</content>
<orderEntry type="jdk" jdkName="Python 3.7 (ability_api)" jdkType="Python SDK" />
<orderEntry type="jdk" jdkName="Python 3.7 (task_api)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="PackageRequirementsSettings">
... ...
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (ability_api)" project-jdk-type="Python SDK" />
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (task_api)" project-jdk-type="Python SDK" />
<component name="PyCharmProfessionalAdvertiser">
<option name="shown" value="true" />
</component>
... ...
... ... @@ -2,10 +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/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/ability_api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/ability_api.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" 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_accept_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_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" />
... ... @@ -20,12 +20,8 @@
<change beforePath="$PROJECT_DIR$/config/task_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_accessToken.csv" afterDir="false" />
<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/login_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/login_func.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/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" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -35,13 +31,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="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/task_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1598074116879" 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/task_api$login_func.coverage" NAME="login_func Coverage Results" MODIFIED="1598073772998" 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$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$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$m_func.coverage" NAME="m_func Coverage Results" MODIFIED="1598109662315" 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">
... ... @@ -50,40 +47,43 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<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="381">
<caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
<state relative-caret-position="66">
<caret line="21" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="58" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/testcases/task/loot_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="114">
<caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
<state relative-caret-position="154">
<caret line="9" column="15" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="15" />
<folding>
<element signature="e#108#137#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<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="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 relative-caret-position="154">
<caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<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 relative-caret-position="6028">
<caret line="275" column="4" selection-start-line="275" selection-start-column="4" selection-end-line="275" selection-end-column="21" />
<folding>
<element signature="e#107#119#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -91,17 +91,17 @@
<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">
<state relative-caret-position="220">
<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">
<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="130">
<caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" />
<state relative-caret-position="176">
<caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
</state>
</provider>
</entry>
... ... @@ -109,8 +109,8 @@
<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="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" />
<state relative-caret-position="3124">
<caret line="143" selection-start-line="143" selection-end-line="143" />
<folding>
<element signature="e#117#128#0" expanded="true" />
</folding>
... ... @@ -118,15 +118,6 @@
</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">
... ... @@ -151,6 +142,8 @@
<find>teardown_hook_get_task_name</find>
<find>get_serialNo</find>
<find>teardown_hook_get_serialNo</find>
<find>get_resource_id()</find>
<find>get_resource_id_to_int</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -205,7 +198,6 @@
<option value="$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml" />
<option value="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml" />
<option value="$PROJECT_DIR$/api/m_api/task_resource_api.yml" />
<option value="$PROJECT_DIR$/helpfunc/login_func.py" />
<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" />
... ... @@ -217,19 +209,20 @@
<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$/debugtalk.py" />
<option value="$PROJECT_DIR$/helpfunc/login_func.py" />
<option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
<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>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="179" />
<option name="y" value="427" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1382" />
<option name="height" value="741" />
<option name="height" value="744" />
</component>
<component name="ProjectId" id="1RGy0cbJxXUqydJBLy6eKhLCtup" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
... ... @@ -238,7 +231,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -311,17 +303,25 @@
<path>
<item name="task_api" type="b2602c69:ProjectViewProjectNode" />
<item name="task_api" type="462c0819:PsiDirectoryNode" />
<item name="testcases" type="462c0819:PsiDirectoryNode" />
<item name="task" 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="testsuites" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../ability_api" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
</component>
<component name="RecentsManager">
... ... @@ -352,7 +352,7 @@
</list>
</option>
</component>
<component name="RunManager" selected="Python.debugtalk">
<component name="RunManager" selected="Python.m_func">
<configuration name="debugtalk" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="ability_api" />
<option name="INTERPRETER_OPTIONS" value="" />
... ... @@ -465,10 +465,10 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Python.debugtalk" />
<item itemvalue="Python.m_func" />
<item itemvalue="Python.pg_db_func" />
<item itemvalue="Python.login_func" />
<item itemvalue="Python.debugtalk" />
<item itemvalue="Python.run" />
</list>
</recent_temporary>
... ... @@ -578,6 +578,9 @@
<workItem from="1597886812090" duration="6866000" />
<workItem from="1597906408146" duration="2887000" />
<workItem from="1597973157365" duration="18949000" />
<workItem from="1598065887022" duration="4905000" />
<workItem from="1598108947857" duration="3526000" />
<workItem from="1598168398954" duration="3596000" />
</task>
<task id="LOCAL-00001" summary="优化测试用例">
<created>1571644787323</created>
... ... @@ -905,7 +908,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="353924000" />
<option name="totallyTimeSpent" value="365951000" />
</component>
<component name="TodoView" selected-index="3">
<todo-panel id="selected-file">
... ... @@ -916,14 +919,14 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
<layout>
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22371244" />
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22995462" />
<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" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32924107" />
<window_info anchor="bottom" id="Run" order="2" weight="0.3013393" />
<window_info anchor="bottom" id="Run" order="2" weight="0.29982963" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39863715" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
... ... @@ -932,7 +935,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.3872768" />
<window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" visible="true" weight="0.5519591" />
<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" />
... ... @@ -1105,16 +1108,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<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>
</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">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -1154,20 +1147,7 @@
</state>
</provider>
</entry>
<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="474">
<caret line="170" selection-start-line="170" selection-end-line="170" />
</state>
</provider>
</entry>
<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="471">
<caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py" />
<entry file="file://$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state>
... ... @@ -1182,20 +1162,6 @@
</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="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$/api/m_api/loot/loot_task_reject_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="702">
... ... @@ -1224,13 +1190,6 @@
</state>
</provider>
</entry>
<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>
<entry file="file://$PROJECT_DIR$/api/m_api/task_Details_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="26">
... ... @@ -1238,13 +1197,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="156">
<caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
</state>
</provider>
</entry>
<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="676">
... ... @@ -1259,70 +1211,115 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml">
<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" selection-start-line="5" selection-end-line="9" selection-end-column="41" />
<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$/api/m_api/loot/loot_update_0_api.yml">
<entry file="file://$PROJECT_DIR$/testsuites/task_suites.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 relative-caret-position="660">
<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$/helpfunc/m_func.py">
<entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">
<provider selected="true" editor-type-id="text-editor">
<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#117#128#0" expanded="true" />
</folding>
<state relative-caret-position="550">
<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$/testsuites/task_suites.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="381">
<caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
<state relative-caret-position="772">
<caret line="36" selection-start-line="36" selection-end-line="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
<entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
<state relative-caret-position="110">
<caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" />
</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="-299">
<caret line="7" selection-start-line="7" selection-end-line="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/debugtalk.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state relative-caret-position="132">
<caret line="17" column="21" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="21" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="154">
<caret line="9" column="15" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="15" />
<folding>
<element signature="e#108#137#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
<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 relative-caret-position="6028">
<caret line="275" column="4" selection-start-line="275" selection-start-column="4" selection-end-line="275" selection-end-column="21" />
<folding>
<element signature="e#107#119#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
<entry file="file://$PROJECT_DIR$/.env">
<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" />
<state relative-caret-position="220">
<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$/api/app_api/login_api/task/accessToken_api.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="176">
<caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3124">
<caret line="143" selection-start-line="143" selection-end-line="143" />
<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_task_finishTask_testcase.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="21" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="58" />
</state>
</provider>
</entry>
<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="154">
<caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -20,7 +20,6 @@ request:
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
... ... @@ -29,41 +28,43 @@ request:
participant:
- uid: $uid0
name: $name0
percent: 25
reward: 500
percent: ${convert_to_number(25)}
reward: ${convert_to_number(500)}
- uid: $uid1
name: $name1
percent: 25
reward: 500
percent: ${convert_to_number(25)}
reward: ${convert_to_number(500)}
- uid: $uid2
name: $name2
percent: 25
reward: 500
resourceType: ${convert_to_number(1)}
percent: ${convert_to_number(25)}
reward: ${convert_to_number(500)}
resourceType: 1
resourceList:
- id: ${convert_to_number($get_resource_id())}
- id: ${get_resource_id()}
solution:
total: 26
recevier:
total: ${convert_to_number(20)}
receiver:
uid: $uid15
name: $name15
percent: 25
score: 6.5
percent: ${convert_to_number(25)}
score: ${convert_to_number(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
- uid: $uid0
name: $name0
percent: ${convert_to_number(25)}
score: ${convert_to_number(5)}
- uid: $uid1
name: $name1
percent: ${convert_to_number(25)}
score: ${convert_to_number(5)}
- uid: $uid2
name: $name2
percent: ${convert_to_number(25)}
score: ${convert_to_number(5)}
remark: $remark
realityTime: "2020-08-20T16:00:00.000Z"
pictures:
realityTime: $realityTime
taskId: $taskId
method: POST
url: task/loot/accept
#validate:
... ...
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTc5OTQ1OTQsImV4cCI6MTU5ODAwNTM5NCwibmJmIjoxNTk3OTk0NTk0LCJqdGkiOiJMVUx3c05saVZFbzRWT1dxIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.6W6CjQYVfbCroldUAaGm3x-VgGL4P2-Ccg3XIb6ZK7U
\ No newline at end of file
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTgxNjg1MjIsImV4cCI6MTU5ODE3OTMyMiwibmJmIjoxNTk4MTY4NTIyLCJqdGkiOiJiZFZFbmExY1NXSlB1UnNLIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.04Ot6NVzdl0l2_JzaU_USkt2_I7S1xqDRAe1mgd5OMQ
\ No newline at end of file
... ...
Gh8SznkQkAGwcyFePyZaEzRtRiBjGf6r
\ No newline at end of file
N324MDwTM7CQBYeBiAYQF3XZn8JdApX5
\ No newline at end of file
... ...
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTc5OTQ1OTQsImV4cCI6MTU5ODAwNTM5NCwibmJmIjoxNTk3OTk0NTk0LCJqdGkiOiJWM0ZWNEJiSUgxSm5wNHhuIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.VYMt8TpiwaTDbXdCNS_QnPjTk6jSkx6TUkEjPU1l-R8
\ No newline at end of file
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTgxNjg1MjIsImV4cCI6MTU5ODE3OTMyMiwibmJmIjoxNTk4MTY4NTIyLCJqdGkiOiI0cks2YnZvY3NLNzdlSVVWIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.uhdyp3cjmtOB_wjYMhmmla58nXPp427gGXQplCZijPU
\ No newline at end of file
... ...
rv7f2l9333
\ No newline at end of file
yaxyx64gdgg
\ No newline at end of file
... ...
198271ab5e4be000a01629484af1736333b63c757d5e36850a5a91a3e5c3bcd8361fe39c
\ No newline at end of file
d57ab89805400c7d1b2afdeffa449ff85e409a66cc86270111326500f476199203f5852b
\ No newline at end of file
... ...
B34F2yFhTOHWa10B99/3c1nbcPnTP1mZuPmjPZOZZaFd05LH6hiAhSxL7/UmT7EXnj7dK9X1Q6zqJSJKEx+ufByotzgCSb+d5Fk13DXUKPCT0SvjbnsS7D+Bf31/7z5XjHl8e0fkAoGXNvR6ryQNSX37KSLW2WKRlDd25hh1Kx0=
\ No newline at end of file
iLq0Ho7hoEaQUOEqmcTc+rTn+0YEWe7G9BQQGNcPRamovbjWT5emh7Q3YbcvOnAdH9hHXCnb031ErVFVesRTYG6nVujzNYut9NEbJb+Xw8MV9pp9D8QfZB9wNF8rgwZU+g65dD6mlrCU0qsMywVqgrPAna9mci+qvQ5DIAqysFc=
\ No newline at end of file
... ...
мֵ12
\ No newline at end of file
мֵ1
\ No newline at end of file
... ...
3272692925319424
\ No newline at end of file
3273049130133760
\ No newline at end of file
... ...
мֵ12
\ No newline at end of file
мֵ1
\ No newline at end of file
... ...
10990
\ No newline at end of file
10996
\ No newline at end of file
... ...
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk3OTk0NTk0LCJleHAiOjE1OTgwMDUzOTQsIm5iZiI6MTU5Nzk5NDU5NCwianRpIjoiNFR3UG9tc2k1VGNxWHE4TyIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.sKByudD3jxI-9W-Dy65Mtw2Gfen94kOdNkRVt5kKSdM
\ No newline at end of file
eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk4MTY4NTIzLCJleHAiOjE1OTgxNzkzMjMsIm5iZiI6MTU5ODE2ODUyMywianRpIjoiOWRsVEJrYkF2VmZYOUk4ZCIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.4m41YB_OdtpsC6Ezg3-LeFki_ce9TMqnHBvtHvrPhTo
\ No newline at end of file
... ...
8xYKezzCm4JmNXZKaFER3fcBm6bkzS3D
\ No newline at end of file
jajwB87JfYZZ5QMDP2cHKsjRYfceBR7z
\ No newline at end of file
... ...
7vm9ofajxzl
\ No newline at end of file
nwqq1o9rmsb
\ No newline at end of file
... ...
3020853417054045184
\ No newline at end of file
3023771459492774912
\ No newline at end of file
... ...
... ... @@ -5,7 +5,8 @@
# @file: login_func.py
import json
import time,datetime
path = 'E:/task_api/'
# path = 'E:/task_api/'
path = 'E:/mmm_auto/task_api/'
def teardown_hook_sleep_N_secs(response,n_secs):
""" sleep n seconds after request """
if response.status_code == 200:
... ... @@ -150,6 +151,8 @@ def get_serialNo():
return serialno
def get_cuid():
global cuid
cuid = ''
try:
with open(path + "config/cuid.csv", 'r') as f:
cuid = f.read()
... ... @@ -160,16 +163,20 @@ def get_cuid():
return cuid
def get_credentials():
global credentials
credentials = ''
try:
with open(path + "config/credentials.csv", 'r') as f:
credentials = f.read()
print('读取成功,credentials:{}'.format(credentials))
except Exception as e:
print('读取失败', e)
credentials = str(credentials)
# credentials = str(credentials)
return credentials
def get_muid():
global muid
muid = ''
try:
with open(path + "config/muid.csv", 'r') as f:
muid = f.read()
... ... @@ -180,6 +187,8 @@ def get_muid():
return muid
def get_cid():
global cid
cid = ''
try:
with open(path + "config/cid.csv", 'r') as f:
cid = f.read()
... ... @@ -265,6 +274,8 @@ def teardown_hook_get_resource_id(response):
return resource_id
def get_resource_id():
global resource_id
resource_id =''
try:
with open(path + "config/resource_id.txt", 'r') as f:
resource_id = f.read()
... ... @@ -274,6 +285,9 @@ def get_resource_id():
resource_id = resource_id
return resource_id
def get_resource_id_to_int():
return int(get_resource_id())
def teardown_hook_get_resource_title(response):
if response.status_code ==200:
jsondata = json.loads(response.text)
... ... @@ -288,6 +302,8 @@ def teardown_hook_get_resource_title(response):
return resource_title
def get_resource_title():
global resource_title
resource_title = ''
try:
with open(path + "config/resource_title.txt", 'r') as f:
resource_title = f.read()
... ... @@ -311,6 +327,8 @@ def teardown_hook_get_resource_content(response):
return resource_content
def get_resource_content():
global resource_content
resource_content = ''
try:
with open(path + "config/resource_content.txt", 'r') as f:
resource_content = f.read()
... ...
... ... @@ -8,8 +8,8 @@ import json
from urllib.parse import *
path = 'E:/task_api/'
# path = 'E:/task_api/'
path = 'E:/mmm_auto/task_api/'
def teardown_hook_get_Authorization(response):
if response.status_code == 200:
jsondata = json.loads(response.text)
... ... @@ -157,13 +157,11 @@ def get_uid0():
# 保存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)
... ... @@ -183,7 +181,6 @@ def get_uid1():
# 保存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)
... ... @@ -209,7 +206,6 @@ def get_uid2():
# 保存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)
... ...