add README

@@ -2,70 +2,29 @@
 <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_confirm_api.yml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/api/m_api/loot/task_loot_detail_api.yml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/api/m_api/task_resource_api.yml" afterDir="false" />
+      <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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/bidTask_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/iPublishedTasks_3_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/jb_fb_task/taskPublish_0_0_1_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/jb_fb_task/taskPublish_0_1_0_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/jb_fb_task/taskPublish_1_1_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/jb_fb_task/tasksearchResources_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/jb_fb_task/update_taskPublish_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/loot/tasksearchResources_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/rewards/currentTasks_0_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/rewards/currentTasks_1_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/rewards/rewards_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/rewards/submitCompete_0_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/rewards/submitCompete_1_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/taskStatistics.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/task_open_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/task_open_api.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/taskcheckAccept_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/taskcloseTask_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/m_api/taskfinishTask_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/bidTask_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/dfb_task/iPublishedTasks_0_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/dfb_task/taskdeleteTask_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/employee/allEmployees_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/iPublishedTasks_3_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_0_0_1_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_0_1_0_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_1_1_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/jb_fb_task/tasksearchResources_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/jb_fb_task/update_taskPublish_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_0_0_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_1_0_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_1_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/qd_fb_task/tasksearchResources_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/qd_fb_task/update_taskPublish_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/rewards/currentTasks_0_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/rewards/currentTasks_1_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/rewards/rewards_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/rewards/submitCompete_1_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/taskDetails_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/taskStatistics.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/taskcheckAccept_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/taskcloseTask_api.yml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/api/task_api/task/taskfinishTask_api.yml" beforeDir="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" />
       <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$/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$/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/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml" 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$/testsuites/task_suites.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/task_suites.yml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -76,12 +35,13 @@
   </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="1597823863182" 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/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$" />
   </component>
   <component name="FavoritesManager">
     <favorites_list name="ability_api" />
@@ -91,53 +51,38 @@
       <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="30">
-              <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
+            <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>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml">
+        <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="442">
-              <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="-360">
-              <caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="676">
-              <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="-127">
+              <caret line="5" selection-start-line="5" selection-start-column="1" selection-end-line="19" selection-end-column="21" />
             </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$/testcases/task/task_finishTask_testcase.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="555">
-              <caret line="82" column="17" lean-forward="true" selection-start-line="82" selection-start-column="17" selection-end-line="82" selection-end-column="17" />
+            <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>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/api/m_api/task_resource_api.yml">
+        <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
+            <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" />
+              <folding>
+                <element signature="e#108#137#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -186,10 +131,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/testcases/task/taskPublish_JB/JBRW005.yml" />
-        <option value="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_0_0_1_api.yml" />
-        <option value="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_0_0_api.yml" />
-        <option value="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_1_0_api.yml" />
         <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" />
@@ -201,7 +142,6 @@
         <option value="$PROJECT_DIR$/testcases/task/jxz/JB/jxz_wc.yml" />
         <option value="$PROJECT_DIR$/api/app_api/firstpage_api/addquestion_api.yml" />
         <option value="$PROJECT_DIR$/api/m_api/login_api/auth/login_api.yml" />
-        <option value="$PROJECT_DIR$/debugtalk.py" />
         <option value="$PROJECT_DIR$/testcases/task/member/member_set_permission_testcases.yml" />
         <option value="$PROJECT_DIR$/api/m_api/member/member_set_permission_api.yml" />
         <option value="$PROJECT_DIR$/testcases/task/member/member_list_testcases.yml" />
@@ -233,14 +173,19 @@
         <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$/testcases/task/loot/save_loot_update_0_open_testcase.yml" />
-        <option value="$PROJECT_DIR$/testsuites/task_suites.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" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="179" />
     <option name="y" value="427" />
     <option name="width" value="1382" />
@@ -264,24 +209,6 @@
             <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="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="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>
@@ -293,24 +220,11 @@
               <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
               <item name="task_api" type="462c0819:PsiDirectoryNode" />
               <item name="testcases" type="462c0819:PsiDirectoryNode" />
-              <item name="permission" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <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" />
             </path>
             <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>
@@ -333,11 +247,11 @@
       <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\api\m_api" />
       <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" />
-      <recent name="E:\task_api\testcases\task\member" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -575,6 +489,8 @@
       <workItem from="1597719772484" duration="2591000" />
       <workItem from="1597729715453" duration="13232000" />
       <workItem from="1597801010469" duration="16146000" />
+      <workItem from="1597886812090" duration="6866000" />
+      <workItem from="1597906408146" duration="2887000" />
     </task>
     <task id="LOCAL-00001" summary="优化测试用例">
       <created>1571644787323</created>
@@ -902,7 +818,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="325222000" />
+    <option name="totallyTimeSpent" value="334975000" />
   </component>
   <component name="TodoView" selected-index="3">
     <todo-panel id="selected-file">
@@ -914,8 +830,9 @@
   </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.24195279" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22049356" />
       <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" />
@@ -929,7 +846,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 anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" weight="0.43191963" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" visible="true" weight="0.40401787" />
       <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" />
@@ -1012,29 +929,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="update 2020005122330" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/api/app_api/question_api/audits_ireview_api.yml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/debugtalk.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="156">
-          <caret line="16" column="21" selection-start-line="16" selection-start-column="4" selection-end-line="16" 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/taskPublish_0_0_0_api.yml" />
-    <entry file="file://$PROJECT_DIR$/testcases/task/save_taskPublish_0_1_api.yml" />
-    <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_taskPublish_0_0_api.yml" />
-    <entry file="file://$PROJECT_DIR$/api/m_api/member/member_list_api.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="13" column="40" lean-forward="true" selection-start-line="8" selection-end-line="13" selection-end-column="40" />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -1061,24 +955,9 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.env">
-      <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>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/api/m_api/taskStatistics.yml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/api/task_api/task/rewards/rewards_api.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-312" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/api/task_api/task/taskStatistics.yml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/api/m_api/taskStatistics.yml" />
+    <entry file="file://$PROJECT_DIR$/api/task_api/task/rewards/rewards_api.yml" />
+    <entry file="file://$PROJECT_DIR$/api/task_api/task/taskStatistics.yml" />
     <entry file="file://$PROJECT_DIR$/api/app_api/login_api/auth/accessToken_api.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="364">
@@ -1117,20 +996,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/api/m_api/rewards/submitCompete_0_api.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-line="31" selection-end-column="15" />
-        </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="371">
-          <caret line="170" selection-start-line="170" selection-end-line="170" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/api/m_api/rewards/submitCompete_0_api.yml" />
     <entry file="file://$PROJECT_DIR$/api/m_api/login_api/auth/login_api.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="130">
@@ -1138,13 +1004,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/api/m_api/task_rewards_api.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-78">
-          <caret column="12" selection-start-column="12" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-754">
@@ -1152,13 +1011,6 @@
         </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="264">
-          <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/login_api/auth/userCompamies_api.yml">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -1211,13 +1063,6 @@
         </state>
       </provider>
     </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="264">
-          <caret line="31" column="36" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
     <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">
@@ -1225,13 +1070,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/api/m_api/task_resource_api.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <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$/helpfunc/login_func.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="133">
@@ -1249,36 +1087,56 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/api/m_api/loot/tasksearchResources_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="-468" />
+        <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">
+    <entry file="file://$PROJECT_DIR$/api/m_api/task_resource_api.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="134">
-          <caret line="34" selection-start-line="34" selection-end-line="40" selection-end-column="16" />
+        <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$/api/m_api/loot/submitCompete_loot_api.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="-360">
-          <caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
+        <state>
+          <caret column="12" selection-start-column="12" selection-end-column="12" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml">
+    <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
+        <state relative-caret-position="567">
+          <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">
+      <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>
       </provider>
     </entry>
     <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="442">
-          <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />
+        <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$/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="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>
@@ -1292,17 +1150,76 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/debugtalk.py">
+      <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>
+      </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="884">
+          <caret line="40" column="16" selection-start-line="8" selection-end-line="40" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
     <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="676">
+        <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://$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$/api/m_api/task_currentTasks_api.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="6" selection-start-column="6" selection-end-column="19" />
+        </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="555">
-          <caret line="82" column="17" lean-forward="true" selection-start-line="82" selection-start-column="17" selection-end-line="82" selection-end-column="17" />
+        <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" />
+          <folding>
+            <element signature="e#108#137#0" expanded="true" />
+          </folding>
+        </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://$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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/testcases/task/loot/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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/testcases/task/task_finishTask_testcase.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>
       </provider>
     </entry>

@@ -2,8 +2,8 @@ name: 确认领取人
 base_url: ${ENV(base_worth_url)}
 verify: False
 variables:
-    id: ${get_task_id()}
-    reason: 驳回理由${get_nowtime()}
+    id: ${get_task_status_7_from_database()}
+    planTime: ${get_today()}
     msg: ok
 request:
     headers:
@@ -15,8 +15,7 @@ request:
         X-Requested-With: XMLHttpRequest
     json:
         taskId: $id
-        planTime: $reason
-        type: 1
+        planTime: $planTime
     method: POST
     url: task/loot/confirm
 validate:

+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:
+        pageIndex: 0
+        pageSize: 20
+        action: 0
+        newest: 0
+    method: POST
+    url: v1/task/currentTasks
+validate:
+    -   eq:
+        - content.code
+        - 0
+    -   eq:
+        - content.msg
+        - 获取成功
+#        - $msg
\ No newline at end of file

-eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTc4MjA0NzgsImV4cCI6MTU5NzgzMTI3OCwibmJmIjoxNTk3ODIwNDc4LCJqdGkiOiJLMHVGaE90b0h3QjVaUTNVIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.IY339vAQZJhww-BgP30gMZi8pGGKGlCOAzdXBCGetyI
\ No newline at end of file
+eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTc5MTYwNTEsImV4cCI6MTU5NzkyNjg1MSwibmJmIjoxNTk3OTE2MDUxLCJqdGkiOiJpU1c5dW52d1hhQnhaZ1lBIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.m8ej2VXl8TmpRT0-TCRdEg-pEfEF3TSD96y8n6mcVrE
\ No newline at end of file

-AZJBnJMH3yWiM2ZmztrjRjHTEWx8wBmw
\ No newline at end of file
+zj5RjNXnzpzM7wHfSQyP8b8347WR3sap
\ No newline at end of file

-eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTc4MjA0NzksImV4cCI6MTU5NzgzMTI3OSwibmJmIjoxNTk3ODIwNDc5LCJqdGkiOiJjVmY3cXh0eTc0NnlpTU9PIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.X3IBf-zJCf-x45TuwFcNBfjQTfRtHM45JYtsJ2TJkiw
\ No newline at end of file
+eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTc5MTYwNTIsImV4cCI6MTU5NzkyNjg1MiwibmJmIjoxNTk3OTE2MDUyLCJqdGkiOiI1d0pueldNUW5IYXpkMmd0Iiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.gcPynh0oEinoVzOss8Gt09cMeEIVFJYKnUFkkfGO9mM
\ No newline at end of file

-fb2822ppp7
\ No newline at end of file
+1j29edawio6
\ No newline at end of file

-8f467f8e6ead3f721536a7cb0da991b08d29ea359844e2ced0209828ea5afa11bd0a89ce
\ No newline at end of file
+92c16a3e3e8e2c0820af09d176d793dbf3680ba1cc1b0d35fcd5b6b502e3c895ce7b325a
\ No newline at end of file

-MJ3xHfRi1TbGye32qnBz8wfM7QIPqtAw3XZ01ATnarloQsoWh42jNhkrSiCvPmpwwvv5IJLOlzVO/tXEgBgWyxApTQzbE+ez2UfF80JaUdab1S4CmDkYWh02XQcW3mT2Q4VYCRQ3/M141kWF9dRRe/suLqlTo5HOkO8MHYxNsQ4=
\ No newline at end of file
+JLlEz5kkIaIJB2Ym4ckrrZKNO7SSRznghzlK1COfZQfpw9aZQhr4p5dxQa5TwvdZF1x7Hfc70z5qPCbjAcGAPR6CAtghq1gqu56yJvJQUNVfGHwqvqHAUEZyBp9U+7ROtzF12Y5ZnIkmS/1/Po9FjrKW1T+XRXF4wk2lbYW5SD4=
\ No newline at end of file

-мֵ16
\ No newline at end of file
+мֵ9
\ No newline at end of file

-3272336326492416
\ No newline at end of file
+3272532058847488
\ No newline at end of file

-мֵ16
\ No newline at end of file
+мֵ9
\ No newline at end of file

-10984
\ No newline at end of file
+10989
\ No newline at end of file

-eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk3ODIwNDc5LCJleHAiOjE1OTc4MzEyNzksIm5iZiI6MTU5NzgyMDQ3OSwianRpIjoiU1JxT0FCWHhqTkNUa2pZNyIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.A0Iz4gYyXNW463hZQb8WK0hnbSAg2CgGzciBaZ5h81g
\ No newline at end of file
+eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk3OTE2MDUyLCJleHAiOjE1OTc5MjY4NTIsIm5iZiI6MTU5NzkxNjA1MiwianRpIjoibnlEcDYzSUh1RHllMzlkMyIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.ZpkSYlD7HLSl3jqj_J182uTxYgJx4FODK7Ecj21aPzQ
\ No newline at end of file

-cfs2fyK6eJc7kQFB3RQb7zdmbrrH6r8p
\ No newline at end of file
+6GsDEBNjCAyR42YkRGQZbf8DhD7thHcm
\ No newline at end of file

-27jikz1cyjh
\ No newline at end of file
+7p52o7jok6t
\ No newline at end of file

-3017932248315331584
\ No newline at end of file
+3019535699008816128
\ No newline at end of file

@@ -8,6 +8,7 @@ from helpfunc.pg_db_func import *
 # from helpfunc.time_func import *
 
 import time,datetime,re
+
 from urllib.parse import *
 
 
@@ -32,7 +33,11 @@ def convert_to_string(value):
 def get_nowtime():
     return time.strftime("%Y%m%d%H%M%S",time.localtime(time.time()))
 
+
 def get_second():
     curr_time = datetime.datetime.now()
     return  curr_time.second
 
+
+
+print(get_second())
\ No newline at end of file

@@ -5,7 +5,11 @@
 # @file: pg_db_func.py
 from helpfunc.m_func import *
 import psycopg2
+from datetime import *
 
+def get_today():
+    today = datetime.now(timezone.utc).astimezone().isoformat()
+    return today
 # 获得连接
 def GetConnect():
     conn = False
@@ -84,4 +88,20 @@ def get_task_status_from_database():
         print(err)
         db.rollback()
     db.close()
-print(get_task_status_from_database())
\ No newline at end of file
+
+#获取任务单的状态:待确认
+def get_task_status_7_from_database():
+    db = GetConnect()
+    cursor = db.cursor()
+    # sql= "select id from " + '''"''' +  tbl + '''"'''+ ' ' + 'order by id desc '
+    sql = '''select id from tasks  where company_id = 366 and task_status = 7 order by id desc'''
+    # print(sql)
+    try:
+        cursor.execute(sql)
+        result = cursor.fetchone()
+        return result[0]
+    except Exception as err:
+        # 发生错误时回滚
+        print(err)
+        db.rollback()
+    db.close()

+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: 抢单任务详情
+    output:
+        - status
+    api: api/m_api/loot/task_loot_detail_api.yml
+    extract:
+        status: content.data.status
+#    variables:
+#        id: ${get_task_id()}
+    varidate:
+        validate:
+            -   eq:
+                - content.msg
+                - ok
+            -   eq:
+                - content.data.status
+                - $status
\ 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: 19990000008登录系统
+    variables:
+        phone: ${ENV(appphone)}
+    testcase: testcases/login_testcases.yml
+
+-   name: 19990000008登录价值系统
+    testcase: testcases/task_login_testcases.yml
+
+-   name: 公司任务（进行中、已完成）
+    output:
+        - id
+    api: api/m_api/task_currentTasks_api.yml
+    extract:
+        id: content.data.tasks.0.id
+    validate:
+        - eq:
+            - content.data.tasks.0.id
+            - $id
+#
+#-   name: 19990000008抢单
+#    api: api/m_api/loot/submitCompete_loot_api.yml

@@ -19,8 +19,14 @@ testcases:
 #-   name: loot_update_0 抢单任务-保存任务-删除任务
 #    testcase: testcases/task/loot/save_loot_update_0_delete_testcase.yml
 
--   name: app端点击立即抢单
-    testcase: testcases/task/task_rewards_taskDetails_testcase.yml
+#-   name: app端点击立即抢单
+#    testcase: testcases/task/task_rewards_taskDetails_testcase.yml
 
 #-   name: loot_task_reject 抢单模式-驳回领取人-查看详情
-#    testcase: testcases/task/loot/loot_task_reject_testcase.yml
\ No newline at end of file
+#    testcase: testcases/task/loot/loot_task_reject_testcase.yml
+
+#-   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