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,7 +2,30 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b869bb6c-d2b2-46af-b73c-cd3237c48651" name="Default Changelist" comment="update 2020005122330">
+<<<<<<< HEAD
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
+      <change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/credentials.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/credentials.csv" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/login_code.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/login_code.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/resource_content.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_content.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/resource_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_id.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/resource_title.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_title.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/serialNo.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/serialNo.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/config/task_Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_Authorization.txt" afterDir="false" />
+      <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$/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" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -12,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="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">
@@ -27,23 +51,37 @@
   <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">
+<<<<<<< HEAD
             <state relative-caret-position="780">
               <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" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
             </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">
+<<<<<<< HEAD
             <state relative-caret-position="304">
               <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>
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -52,15 +90,33 @@
               <folding>
                 <element signature="e#108#137#0" expanded="true" />
               </folding>
+=======
+      <file pinned="false" current-in-tab="true">
+        <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" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="true">
         <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="416">
               <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
+=======
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <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>
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
             </state>
           </provider>
         </entry>
@@ -68,17 +124,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>
@@ -86,8 +142,13 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
           <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
             <state relative-caret-position="6292">
               <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" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
               <folding>
                 <element signature="e#117#128#0" expanded="true" />
               </folding>
@@ -95,6 +156,7 @@
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <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">
@@ -104,6 +166,8 @@
           </provider>
         </entry>
       </file>
+=======
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -128,6 +192,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">
@@ -182,7 +248,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" />
@@ -194,19 +259,25 @@
         <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" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/debugtalk.py" />
         <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
+=======
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
         <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" />
       </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" />
@@ -287,6 +358,13 @@
             <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>
@@ -298,7 +376,7 @@
   </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">
@@ -329,7 +407,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="" />
@@ -442,10 +520,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>
@@ -554,8 +632,15 @@
       <workItem from="1597801010469" duration="16146000" />
       <workItem from="1597886812090" duration="6866000" />
       <workItem from="1597906408146" duration="2887000" />
+<<<<<<< HEAD
       <workItem from="1597973157365" duration="19140000" />
       <workItem from="1598337033172" duration="73000" />
+=======
+      <workItem from="1597973157365" duration="18949000" />
+      <workItem from="1598065887022" duration="4905000" />
+      <workItem from="1598108947857" duration="3526000" />
+      <workItem from="1598168398954" duration="3596000" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
     </task>
     <task id="LOCAL-00001" summary="优化测试用例">
       <created>1571644787323</created>
@@ -883,7 +968,11 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
+<<<<<<< HEAD
     <option name="totallyTimeSpent" value="354188000" />
+=======
+    <option name="totallyTimeSpent" value="365951000" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
   </component>
   <component name="TodoView" selected-index="3">
     <todo-panel id="selected-file">
@@ -894,15 +983,21 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
+<<<<<<< HEAD
     <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.22693133" />
+=======
+    <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.22995462" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
       <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" />
@@ -911,7 +1006,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" />
@@ -1084,16 +1179,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">
@@ -1133,20 +1218,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>
@@ -1161,20 +1233,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">
@@ -1225,12 +1283,23 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml">
+<<<<<<< HEAD
+=======
       <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$/testsuites/task_suites.yml">
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
+      <provider selected="true" editor-type-id="text-editor">
+        <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>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/debugtalk.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="18">
@@ -1238,11 +1307,18 @@
           <folding>
             <element signature="e#0#11#0" expanded="true" />
           </folding>
+=======
+    <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <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" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
         </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">
+<<<<<<< HEAD
         <state relative-caret-position="780">
           <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
         </state>
@@ -1255,11 +1331,30 @@
           <folding>
             <element signature="e#108#137#0" expanded="true" />
           </folding>
+=======
+        <state relative-caret-position="772">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <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" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/.env">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="260">
           <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
         </state>
@@ -1276,12 +1371,61 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="6292">
           <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="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$/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="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$/.env">
+      <provider selected="true" editor-type-id="text-editor">
+        <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" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
           <folding>
             <element signature="e#117#128#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <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="208">
@@ -1293,13 +1437,24 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="304">
           <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
+=======
+    <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" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
         </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">
+<<<<<<< HEAD
         <state relative-caret-position="416">
           <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
+=======
+        <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" />
+>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
         </state>
       </provider>
     </entry>

@@ -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
+                          percent: ${convert_to_number(25)}
+                          score: ${convert_to_number(5)}
                        -  uid: $uid1
                           name: $name1
-                         percent: 6.5
-                         score: 500
+                          percent: ${convert_to_number(25)}
+                          score: ${convert_to_number(5)}
                        -  uid: $uid2
                           name: $name2
-                         percent: 25
-                         score: 6.5
+                          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.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTgzMzc4NzAsImV4cCI6MTU5ODM0ODY3MCwibmJmIjoxNTk4MzM3ODcwLCJqdGkiOiJPc1FMQUd6QmdxNUFiNDBhIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.nu8EwnYA9PwYHVBzuB6OfnacLD-V3LeyDLiPoeqIo54
\ No newline at end of file

-Gh8SznkQkAGwcyFePyZaEzRtRiBjGf6r
\ No newline at end of file
+C54raNPNzRzKT77XDBxkCeJTZpGBCPHQ
\ No newline at end of file

-eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTc5OTQ1OTQsImV4cCI6MTU5ODAwNTM5NCwibmJmIjoxNTk3OTk0NTk0LCJqdGkiOiJWM0ZWNEJiSUgxSm5wNHhuIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.VYMt8TpiwaTDbXdCNS_QnPjTk6jSkx6TUkEjPU1l-R8
\ No newline at end of file
+eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTgzMzc4NzEsImV4cCI6MTU5ODM0ODY3MSwibmJmIjoxNTk4MzM3ODcxLCJqdGkiOiJRTDRiZFJ5T25EZ0xpOVdhIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.x0itN9vEYO6wPFXxf3OyV_Etljtry3OwWktlpAyZr80
\ No newline at end of file

-rv7f2l9333
\ No newline at end of file
+oqlaho6q4k
\ No newline at end of file

-198271ab5e4be000a01629484af1736333b63c757d5e36850a5a91a3e5c3bcd8361fe39c
\ No newline at end of file
+84d2004bf28a2095230e8e14993d398d40aa7bd061b6ad48cb6f7a7cfdb84569d7d0ca57
\ No newline at end of file

-B34F2yFhTOHWa10B99/3c1nbcPnTP1mZuPmjPZOZZaFd05LH6hiAhSxL7/UmT7EXnj7dK9X1Q6zqJSJKEx+ufByotzgCSb+d5Fk13DXUKPCT0SvjbnsS7D+Bf31/7z5XjHl8e0fkAoGXNvR6ryQNSX37KSLW2WKRlDd25hh1Kx0=
\ No newline at end of file
+mYGaGzm/2A8LNNjaJG2iyFolUo9vPkYDkeIDBW8rSZeAtTiDMc6MYX+DjBpMKR1wPzyMSaaQgTIxqPA8EKx1GYwgOEdN2b7+/W6r6ZCP+g5MwWEbQj1VHmZwF+5A+ik2X9q6abD9yR48ShP96jKH+yTilDaG5nSmrYY6A0u46PE=
\ No newline at end of file

-мֵ12
\ No newline at end of file
+мֵ27
\ No newline at end of file

-3272692925319424
\ No newline at end of file
+3273395953934592
\ No newline at end of file

-мֵ12
\ No newline at end of file
+мֵ27
\ No newline at end of file

-10990
\ No newline at end of file
+10997
\ No newline at end of file

-eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk3OTk0NTk0LCJleHAiOjE1OTgwMDUzOTQsIm5iZiI6MTU5Nzk5NDU5NCwianRpIjoiNFR3UG9tc2k1VGNxWHE4TyIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.sKByudD3jxI-9W-Dy65Mtw2Gfen94kOdNkRVt5kKSdM
\ No newline at end of file
+eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk4MzM3ODcxLCJleHAiOjE1OTgzNDg2NzEsIm5iZiI6MTU5ODMzNzg3MSwianRpIjoiZ1pMN21pMmFycEhNYlRyaiIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.vaTxIhdCUnfG0CksphY0YGDqxr-iM_DOTmMX8NF_6UI
\ No newline at end of file

-8xYKezzCm4JmNXZKaFER3fcBm6bkzS3D
\ No newline at end of file
+QZJjDhX22fX4aJTT32s5BChPXJ8CJ2jG
\ No newline at end of file

-7vm9ofajxzl
\ No newline at end of file
+o213scwfkxo
\ No newline at end of file

-3020853417054045184
\ No newline at end of file
+3026612655420343296
\ No newline at end of file

@@ -6,6 +6,7 @@
 import  json
 import  time,datetime
 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()

@@ -9,7 +9,7 @@ from urllib.parse import *
 
 
 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)