bianxinhua / task_api · 提交

转到一个项目

作者 bianxinhua
提交 fde1fd1986d2a499f89afed04a8815119c6e047a 1 个父辈 f2b86596

add README

内嵌 并排对比
正在显示 30 个修改的文件 包含 603 行增加 和 200 行删除
@@ -2,12 +2,10 @@ @@ -2,12 +2,10 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="b869bb6c-d2b2-46af-b73c-cd3237c48651" name="Default Changelist" comment="update 2020005122330"> 4 <list default="true" id="b869bb6c-d2b2-46af-b73c-cd3237c48651" name="Default Changelist" comment="update 2020005122330">
5 - <change afterPath="$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml" afterDir="false" />  
7 - <change afterPath="$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml" afterDir="false" />  
8 - <change afterPath="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" afterDir="false" /> 5 + <change afterPath="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" afterDir="false" />
  6 + <change afterPath="$PROJECT_DIR$/api/m_api/task_finishTask_api.yml" afterDir="false" />
  7 + <change afterPath="$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml" afterDir="false" />
9 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 8 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
10 - <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" />  
11 <change beforePath="$PROJECT_DIR$/config/Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/Authorization.txt" afterDir="false" /> 9 <change beforePath="$PROJECT_DIR$/config/Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/Authorization.txt" afterDir="false" />
12 <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" /> 10 <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" />
13 <change beforePath="$PROJECT_DIR$/config/access_token.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/access_token.txt" afterDir="false" /> 11 <change beforePath="$PROJECT_DIR$/config/access_token.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/access_token.txt" afterDir="false" />
@@ -23,8 +21,10 @@ @@ -23,8 +21,10 @@
23 <change beforePath="$PROJECT_DIR$/config/task_authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_authCode.csv" afterDir="false" /> 21 <change beforePath="$PROJECT_DIR$/config/task_authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_authCode.csv" afterDir="false" />
24 <change beforePath="$PROJECT_DIR$/config/task_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_id.txt" afterDir="false" /> 22 <change beforePath="$PROJECT_DIR$/config/task_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_id.txt" afterDir="false" />
25 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" /> 23 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" />
  24 + <change beforePath="$PROJECT_DIR$/helpfunc/m_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/m_func.py" afterDir="false" />
26 <change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" /> 25 <change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" />
27 - <change beforePath="$PROJECT_DIR$/testcases_excel/task_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/task_api.xlsx" afterDir="false" /> 26 + <change beforePath="$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml" beforeDir="false" />
  27 + <change beforePath="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" afterDir="false" />
28 <change beforePath="$PROJECT_DIR$/testsuites/task_suites.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/task_suites.yml" afterDir="false" /> 28 <change beforePath="$PROJECT_DIR$/testsuites/task_suites.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/task_suites.yml" afterDir="false" />
29 </list> 29 </list>
30 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 30 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -35,13 +35,14 @@ @@ -35,13 +35,14 @@
35 </component> 35 </component>
36 <component name="CoverageDataManager"> 36 <component name="CoverageDataManager">
37 <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" /> 37 <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" />
38 - <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" /> 38 + <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" />
39 <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" /> 39 <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" />
40 <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$" /> 40 <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$" />
41 <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" /> 41 <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" />
42 <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$" /> 42 <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$" />
43 <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" /> 43 <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" />
44 - <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$" /> 44 + <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" />
  45 + <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$" />
45 </component> 46 </component>
46 <component name="FavoritesManager"> 47 <component name="FavoritesManager">
47 <favorites_list name="ability_api" /> 48 <favorites_list name="ability_api" />
@@ -51,42 +52,81 @@ @@ -51,42 +52,81 @@
51 <file pinned="false" current-in-tab="false"> 52 <file pinned="false" current-in-tab="false">
52 <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml"> 53 <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml">
53 <provider selected="true" editor-type-id="text-editor"> 54 <provider selected="true" editor-type-id="text-editor">
54 - <state relative-caret-position="393">  
55 - <caret line="31" column="67" selection-start-line="31" selection-start-column="67" selection-end-line="31" selection-end-column="67" /> 55 + <state relative-caret-position="381">
  56 + <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
56 </state> 57 </state>
57 </provider> 58 </provider>
58 </entry> 59 </entry>
59 </file> 60 </file>
60 <file pinned="false" current-in-tab="false"> 61 <file pinned="false" current-in-tab="false">
61 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml"> 62 + <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
62 <provider selected="true" editor-type-id="text-editor"> 63 <provider selected="true" editor-type-id="text-editor">
63 - <state relative-caret-position="-127">  
64 - <caret line="5" selection-start-line="5" selection-start-column="1" selection-end-line="19" selection-end-column="21" /> 64 + <state relative-caret-position="114">
  65 + <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
65 </state> 66 </state>
66 </provider> 67 </provider>
67 </entry> 68 </entry>
68 </file> 69 </file>
69 <file pinned="false" current-in-tab="true"> 70 <file pinned="false" current-in-tab="true">
70 - <entry file="file://$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml"> 71 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
71 <provider selected="true" editor-type-id="text-editor"> 72 <provider selected="true" editor-type-id="text-editor">
72 - <state relative-caret-position="-52">  
73 - <caret line="1" column="10" lean-forward="true" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="14" /> 73 + <state relative-caret-position="234">
  74 + <caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />
  75 + <folding>
  76 + <element signature="e#108#137#0" expanded="true" />
  77 + </folding>
74 </state> 78 </state>
75 </provider> 79 </provider>
76 </entry> 80 </entry>
77 </file> 81 </file>
78 <file pinned="false" current-in-tab="false"> 82 <file pinned="false" current-in-tab="false">
79 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 83 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
  84 + <provider selected="true" editor-type-id="text-editor">
  85 + <state relative-caret-position="1638">
  86 + <caret line="66" column="16" selection-start-line="66" selection-start-column="16" selection-end-line="66" selection-end-column="16" />
  87 + </state>
  88 + </provider>
  89 + </entry>
  90 + </file>
  91 + <file pinned="false" current-in-tab="false">
  92 + <entry file="file://$PROJECT_DIR$/.env">
  93 + <provider selected="true" editor-type-id="text-editor">
  94 + <state relative-caret-position="260">
  95 + <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
  96 + </state>
  97 + </provider>
  98 + </entry>
  99 + </file>
  100 + <file pinned="false" current-in-tab="false">
  101 + <entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml">
  102 + <provider selected="true" editor-type-id="text-editor">
  103 + <state relative-caret-position="130">
  104 + <caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" />
  105 + </state>
  106 + </provider>
  107 + </entry>
  108 + </file>
  109 + <file pinned="false" current-in-tab="false">
  110 + <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
80 <provider selected="true" editor-type-id="text-editor"> 111 <provider selected="true" editor-type-id="text-editor">
81 - <state relative-caret-position="286">  
82 - <caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" /> 112 + <state relative-caret-position="140">
  113 + <caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" />
83 <folding> 114 <folding>
84 - <element signature="e#108#137#0" expanded="true" /> 115 + <element signature="e#117#128#0" expanded="true" />
85 </folding> 116 </folding>
86 </state> 117 </state>
87 </provider> 118 </provider>
88 </entry> 119 </entry>
89 </file> 120 </file>
  121 + <file pinned="false" current-in-tab="false">
  122 + <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
  123 + <provider selected="true" editor-type-id="text-editor">
  124 + <state relative-caret-position="156">
  125 + <caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
  126 + </state>
  127 + </provider>
  128 + </entry>
  129 + </file>
90 </leaf> 130 </leaf>
91 </component> 131 </component>
92 <component name="FileTemplateManagerImpl"> 132 <component name="FileTemplateManagerImpl">
@@ -131,11 +171,6 @@ @@ -131,11 +171,6 @@
131 <component name="IdeDocumentHistory"> 171 <component name="IdeDocumentHistory">
132 <option name="CHANGED_PATHS"> 172 <option name="CHANGED_PATHS">
133 <list> 173 <list>
134 - <option value="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_1_api.yml" />  
135 - <option value="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_0_1_0_api.yml" />  
136 - <option value="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_1_1_api.yml" />  
137 - <option value="$PROJECT_DIR$/testcases/task/taskPublish_1_1_api.yml" />  
138 - <option value="$PROJECT_DIR$/testcases/task/taskPublish_QD/QDRW003.yml" />  
139 <option value="$PROJECT_DIR$/testcases/task/taskPublish_JB/JBRW003.yml" /> 174 <option value="$PROJECT_DIR$/testcases/task/taskPublish_JB/JBRW003.yml" />
140 <option value="$PROJECT_DIR$/api/task_api/task/rewards/submitCompete_1_api.yml" /> 175 <option value="$PROJECT_DIR$/api/task_api/task/rewards/submitCompete_1_api.yml" />
141 <option value="$PROJECT_DIR$/api/task_api/task/bidTask_api.yml" /> 176 <option value="$PROJECT_DIR$/api/task_api/task/bidTask_api.yml" />
@@ -164,7 +199,6 @@ @@ -164,7 +199,6 @@
164 <option value="$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml" /> 199 <option value="$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml" />
165 <option value="$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml" /> 200 <option value="$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml" />
166 <option value="$PROJECT_DIR$/api/m_api/task_open_api.yml" /> 201 <option value="$PROJECT_DIR$/api/m_api/task_open_api.yml" />
167 - <option value="$PROJECT_DIR$/helpfunc/m_func.py" />  
168 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml" /> 202 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml" />
169 <option value="$PROJECT_DIR$/api/m_api/loot/task_loot_detail_api.yml" /> 203 <option value="$PROJECT_DIR$/api/m_api/loot/task_loot_detail_api.yml" />
170 <option value="$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml" /> 204 <option value="$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml" />
@@ -175,13 +209,19 @@ @@ -175,13 +209,19 @@
175 <option value="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" /> 209 <option value="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" />
176 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml" /> 210 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml" />
177 <option value="$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml" /> 211 <option value="$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml" />
178 - <option value="$PROJECT_DIR$/debugtalk.py" />  
179 - <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />  
180 <option value="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml" /> 212 <option value="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml" />
181 - <option value="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" />  
182 <option value="$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml" /> 213 <option value="$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml" />
183 - <option value="$PROJECT_DIR$/testsuites/task_suites.yml" />  
184 <option value="$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml" /> 214 <option value="$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml" />
  215 + <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_finishTask_api.yml" />
  216 + <option value="$PROJECT_DIR$/api/m_api/task_finishTask_api.yml" />
  217 + <option value="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" />
  218 + <option value="$PROJECT_DIR$/testsuites/task_suites.yml" />
  219 + <option value="$PROJECT_DIR$/api/m_api/common/user_api.yml" />
  220 + <option value="$PROJECT_DIR$/helpfunc/m_func.py" />
  221 + <option value="$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml" />
  222 + <option value="$PROJECT_DIR$/debugtalk.py" />
  223 + <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" />
  224 + <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
185 </list> 225 </list>
186 </option> 226 </option>
187 </component> 227 </component>
@@ -209,6 +249,52 @@ @@ -209,6 +249,52 @@
209 <path> 249 <path>
210 <item name="task_api" type="b2602c69:ProjectViewProjectNode" /> 250 <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
211 <item name="task_api" type="462c0819:PsiDirectoryNode" /> 251 <item name="task_api" type="462c0819:PsiDirectoryNode" />
  252 + <item name="api" type="462c0819:PsiDirectoryNode" />
  253 + </path>
  254 + <path>
  255 + <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
  256 + <item name="task_api" type="462c0819:PsiDirectoryNode" />
  257 + <item name="api" type="462c0819:PsiDirectoryNode" />
  258 + <item name="app_api" type="462c0819:PsiDirectoryNode" />
  259 + </path>
  260 + <path>
  261 + <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
  262 + <item name="task_api" type="462c0819:PsiDirectoryNode" />
  263 + <item name="api" type="462c0819:PsiDirectoryNode" />
  264 + <item name="app_api" type="462c0819:PsiDirectoryNode" />
  265 + <item name="login_api" type="462c0819:PsiDirectoryNode" />
  266 + </path>
  267 + <path>
  268 + <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
  269 + <item name="task_api" type="462c0819:PsiDirectoryNode" />
  270 + <item name="api" type="462c0819:PsiDirectoryNode" />
  271 + <item name="app_api" type="462c0819:PsiDirectoryNode" />
  272 + <item name="login_api" type="462c0819:PsiDirectoryNode" />
  273 + <item name="task" type="462c0819:PsiDirectoryNode" />
  274 + </path>
  275 + <path>
  276 + <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
  277 + <item name="task_api" type="462c0819:PsiDirectoryNode" />
  278 + <item name="api" type="462c0819:PsiDirectoryNode" />
  279 + <item name="m_api" type="462c0819:PsiDirectoryNode" />
  280 + </path>
  281 + <path>
  282 + <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
  283 + <item name="task_api" type="462c0819:PsiDirectoryNode" />
  284 + <item name="api" type="462c0819:PsiDirectoryNode" />
  285 + <item name="m_api" type="462c0819:PsiDirectoryNode" />
  286 + <item name="common" type="462c0819:PsiDirectoryNode" />
  287 + </path>
  288 + <path>
  289 + <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
  290 + <item name="task_api" type="462c0819:PsiDirectoryNode" />
  291 + <item name="api" type="462c0819:PsiDirectoryNode" />
  292 + <item name="m_api" type="462c0819:PsiDirectoryNode" />
  293 + <item name="loot" type="462c0819:PsiDirectoryNode" />
  294 + </path>
  295 + <path>
  296 + <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
  297 + <item name="task_api" type="462c0819:PsiDirectoryNode" />
212 <item name="helpfunc" type="462c0819:PsiDirectoryNode" /> 298 <item name="helpfunc" type="462c0819:PsiDirectoryNode" />
213 </path> 299 </path>
214 <path> 300 <path>
@@ -239,20 +325,20 @@ @@ -239,20 +325,20 @@
239 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> 325 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
240 </component> 326 </component>
241 <component name="RecentsManager"> 327 <component name="RecentsManager">
242 - <key name="MoveFile.RECENT_KEYS">  
243 - <recent name="E:\task_api\api\m_api\loot" />  
244 - <recent name="E:\task_api\testcases\task\loot" />  
245 - <recent name="E:\mmm-auto\ability_api\api\login_api\auth" />  
246 - <recent name="F:\PycharmProjects\ability_api\data" />  
247 - <recent name="F:\PycharmProjects\ability_api\common" />  
248 - </key>  
249 <key name="CopyFile.RECENT_KEYS"> 328 <key name="CopyFile.RECENT_KEYS">
  329 + <recent name="E:\task_api\api\m_api\loot" />
250 <recent name="E:\task_api\testcases\task\loot" /> 330 <recent name="E:\task_api\testcases\task\loot" />
251 <recent name="E:\task_api\testcases\task" /> 331 <recent name="E:\task_api\testcases\task" />
252 <recent name="E:\task_api\api\m_api" /> 332 <recent name="E:\task_api\api\m_api" />
253 - <recent name="E:\task_api\api\m_api\loot" />  
254 <recent name="E:\task_api\testcases" /> 333 <recent name="E:\task_api\testcases" />
255 </key> 334 </key>
  335 + <key name="MoveFile.RECENT_KEYS">
  336 + <recent name="E:\task_api\api\m_api" />
  337 + <recent name="E:\task_api\testcases\task" />
  338 + <recent name="E:\task_api\api\m_api\loot" />
  339 + <recent name="E:\task_api\testcases\task\loot" />
  340 + <recent name="E:\mmm-auto\ability_api\api\login_api\auth" />
  341 + </key>
256 </component> 342 </component>
257 <component name="RunDashboard"> 343 <component name="RunDashboard">
258 <option name="ruleStates"> 344 <option name="ruleStates">
@@ -266,7 +352,7 @@ @@ -266,7 +352,7 @@
266 </list> 352 </list>
267 </option> 353 </option>
268 </component> 354 </component>
269 - <component name="RunManager" selected="Python.pg_db_func"> 355 + <component name="RunManager" selected="Python.debugtalk">
270 <configuration name="debugtalk" type="PythonConfigurationType" factoryName="Python" temporary="true"> 356 <configuration name="debugtalk" type="PythonConfigurationType" factoryName="Python" temporary="true">
271 <module name="ability_api" /> 357 <module name="ability_api" />
272 <option name="INTERPRETER_OPTIONS" value="" /> 358 <option name="INTERPRETER_OPTIONS" value="" />
@@ -289,7 +375,7 @@ @@ -289,7 +375,7 @@
289 <option name="INPUT_FILE" value="" /> 375 <option name="INPUT_FILE" value="" />
290 <method v="2" /> 376 <method v="2" />
291 </configuration> 377 </configuration>
292 - <configuration name="header_func" type="PythonConfigurationType" factoryName="Python" temporary="true"> 378 + <configuration name="login_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
293 <module name="ability_api" /> 379 <module name="ability_api" />
294 <option name="INTERPRETER_OPTIONS" value="" /> 380 <option name="INTERPRETER_OPTIONS" value="" />
295 <option name="PARENT_ENVS" value="true" /> 381 <option name="PARENT_ENVS" value="true" />
@@ -302,7 +388,7 @@ @@ -302,7 +388,7 @@
302 <option name="ADD_CONTENT_ROOTS" value="true" /> 388 <option name="ADD_CONTENT_ROOTS" value="true" />
303 <option name="ADD_SOURCE_ROOTS" value="true" /> 389 <option name="ADD_SOURCE_ROOTS" value="true" />
304 <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" /> 390 <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
305 - <option name="SCRIPT_NAME" value="$PROJECT_DIR$/helpfunc/header_func.py" /> 391 + <option name="SCRIPT_NAME" value="$PROJECT_DIR$/helpfunc/login_func.py" />
306 <option name="PARAMETERS" value="" /> 392 <option name="PARAMETERS" value="" />
307 <option name="SHOW_COMMAND_LINE" value="false" /> 393 <option name="SHOW_COMMAND_LINE" value="false" />
308 <option name="EMULATE_TERMINAL" value="false" /> 394 <option name="EMULATE_TERMINAL" value="false" />
@@ -311,7 +397,7 @@ @@ -311,7 +397,7 @@
311 <option name="INPUT_FILE" value="" /> 397 <option name="INPUT_FILE" value="" />
312 <method v="2" /> 398 <method v="2" />
313 </configuration> 399 </configuration>
314 - <configuration name="login_func" type="PythonConfigurationType" factoryName="Python" temporary="true"> 400 + <configuration name="m_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
315 <module name="ability_api" /> 401 <module name="ability_api" />
316 <option name="INTERPRETER_OPTIONS" value="" /> 402 <option name="INTERPRETER_OPTIONS" value="" />
317 <option name="PARENT_ENVS" value="true" /> 403 <option name="PARENT_ENVS" value="true" />
@@ -324,7 +410,7 @@ @@ -324,7 +410,7 @@
324 <option name="ADD_CONTENT_ROOTS" value="true" /> 410 <option name="ADD_CONTENT_ROOTS" value="true" />
325 <option name="ADD_SOURCE_ROOTS" value="true" /> 411 <option name="ADD_SOURCE_ROOTS" value="true" />
326 <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" /> 412 <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
327 - <option name="SCRIPT_NAME" value="$PROJECT_DIR$/helpfunc/login_func.py" /> 413 + <option name="SCRIPT_NAME" value="$PROJECT_DIR$/helpfunc/m_func.py" />
328 <option name="PARAMETERS" value="" /> 414 <option name="PARAMETERS" value="" />
329 <option name="SHOW_COMMAND_LINE" value="false" /> 415 <option name="SHOW_COMMAND_LINE" value="false" />
330 <option name="EMULATE_TERMINAL" value="false" /> 416 <option name="EMULATE_TERMINAL" value="false" />
@@ -379,11 +465,11 @@ @@ -379,11 +465,11 @@
379 </configuration> 465 </configuration>
380 <recent_temporary> 466 <recent_temporary>
381 <list> 467 <list>
382 - <item itemvalue="Python.pg_db_func" />  
383 <item itemvalue="Python.debugtalk" /> 468 <item itemvalue="Python.debugtalk" />
  469 + <item itemvalue="Python.m_func" />
  470 + <item itemvalue="Python.pg_db_func" />
384 <item itemvalue="Python.login_func" /> 471 <item itemvalue="Python.login_func" />
385 <item itemvalue="Python.run" /> 472 <item itemvalue="Python.run" />
386 - <item itemvalue="Python.header_func" />  
387 </list> 473 </list>
388 </recent_temporary> 474 </recent_temporary>
389 </component> 475 </component>
@@ -491,6 +577,7 @@ @@ -491,6 +577,7 @@
491 <workItem from="1597801010469" duration="16146000" /> 577 <workItem from="1597801010469" duration="16146000" />
492 <workItem from="1597886812090" duration="6866000" /> 578 <workItem from="1597886812090" duration="6866000" />
493 <workItem from="1597906408146" duration="2887000" /> 579 <workItem from="1597906408146" duration="2887000" />
  580 + <workItem from="1597973157365" duration="18949000" />
494 </task> 581 </task>
495 <task id="LOCAL-00001" summary="优化测试用例"> 582 <task id="LOCAL-00001" summary="优化测试用例">
496 <created>1571644787323</created> 583 <created>1571644787323</created>
@@ -818,7 +905,7 @@ @@ -818,7 +905,7 @@
818 <servers /> 905 <servers />
819 </component> 906 </component>
820 <component name="TimeTrackingManager"> 907 <component name="TimeTrackingManager">
821 - <option name="totallyTimeSpent" value="334975000" /> 908 + <option name="totallyTimeSpent" value="353924000" />
822 </component> 909 </component>
823 <component name="TodoView" selected-index="3"> 910 <component name="TodoView" selected-index="3">
824 <todo-panel id="selected-file"> 911 <todo-panel id="selected-file">
@@ -830,9 +917,8 @@ @@ -830,9 +917,8 @@
830 </component> 917 </component>
831 <component name="ToolWindowManager"> 918 <component name="ToolWindowManager">
832 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 919 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
833 - <editor active="true" />  
834 <layout> 920 <layout>
835 - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22049356" /> 921 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22371244" />
836 <window_info id="Structure" order="1" sideWeight="0.50238097" side_tool="true" weight="0.30711043" /> 922 <window_info id="Structure" order="1" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
837 <window_info id="Favorites" order="2" sideWeight="0.50238097" side_tool="true" weight="0.30711043" /> 923 <window_info id="Favorites" order="2" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
838 <window_info anchor="bottom" id="Message" order="0" /> 924 <window_info anchor="bottom" id="Message" order="0" />
@@ -846,7 +932,7 @@ @@ -846,7 +932,7 @@
846 <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49848714" weight="0.328125" /> 932 <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49848714" weight="0.328125" />
847 <window_info anchor="bottom" id="Database Changes" order="9" /> 933 <window_info anchor="bottom" id="Database Changes" order="9" />
848 <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50226927" side_tool="true" weight="0.32879046" /> 934 <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50226927" side_tool="true" weight="0.32879046" />
849 - <window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" visible="true" weight="0.40401787" /> 935 + <window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" visible="true" weight="0.3872768" />
850 <window_info anchor="bottom" id="Python Console" order="12" weight="0.328125" /> 936 <window_info anchor="bottom" id="Python Console" order="12" weight="0.328125" />
851 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 937 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
852 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 938 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -929,15 +1015,6 @@ @@ -929,15 +1015,6 @@
929 <option name="LAST_COMMIT_MESSAGE" value="update 2020005122330" /> 1015 <option name="LAST_COMMIT_MESSAGE" value="update 2020005122330" />
930 </component> 1016 </component>
931 <component name="editorHistoryManager"> 1017 <component name="editorHistoryManager">
932 - <entry file="file://$PROJECT_DIR$/testcases/task/member/member_list_testcases.yml">  
933 - <provider selected="true" editor-type-id="text-editor">  
934 - <state relative-caret-position="163">  
935 - <caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="45" />  
936 - </state>  
937 - </provider>  
938 - </entry>  
939 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/update_taskPublish_api.yml" />  
940 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/taskPublish_0_1_api.yml" />  
941 <entry file="file://$PROJECT_DIR$/api/m_api/loot/task_delete_api.yml" /> 1018 <entry file="file://$PROJECT_DIR$/api/m_api/loot/task_delete_api.yml" />
942 <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_testcase.yml" /> 1019 <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_testcase.yml" />
943 <entry file="file://$PROJECT_DIR$/api/m_api/task_delete_api.yml"> 1020 <entry file="file://$PROJECT_DIR$/api/m_api/task_delete_api.yml">
@@ -982,13 +1059,6 @@ @@ -982,13 +1059,6 @@
982 </state> 1059 </state>
983 </provider> 1060 </provider>
984 </entry> 1061 </entry>
985 - <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">  
986 - <provider selected="true" editor-type-id="text-editor">  
987 - <state relative-caret-position="-312">  
988 - <caret line="9" column="40" selection-start-line="9" selection-start-column="40" selection-end-line="9" selection-end-column="40" />  
989 - </state>  
990 - </provider>  
991 - </entry>  
992 <entry file="file://$PROJECT_DIR$/testcases/task_login_testcases.yml"> 1062 <entry file="file://$PROJECT_DIR$/testcases/task_login_testcases.yml">
993 <provider selected="true" editor-type-id="text-editor"> 1063 <provider selected="true" editor-type-id="text-editor">
994 <state relative-caret-position="442"> 1064 <state relative-caret-position="442">
@@ -1021,205 +1091,236 @@ @@ -1021,205 +1091,236 @@
1021 </state> 1091 </state>
1022 </provider> 1092 </provider>
1023 </entry> 1093 </entry>
1024 - <entry file="file://$PROJECT_DIR$/api/m_api/task_Details_api.yml"> 1094 + <entry file="file://$PROJECT_DIR$/testcases/task/taskPublish_QD/QDRW001.yml">
1025 <provider selected="true" editor-type-id="text-editor"> 1095 <provider selected="true" editor-type-id="text-editor">
1026 - <state relative-caret-position="364">  
1027 - <caret line="14" column="33" lean-forward="true" selection-start-line="14" selection-start-column="33" selection-end-line="14" selection-end-column="33" /> 1096 + <state relative-caret-position="234">
  1097 + <caret line="12" selection-start-line="12" selection-end-line="13" selection-end-column="35" />
1028 </state> 1098 </state>
1029 </provider> 1099 </provider>
1030 </entry> 1100 </entry>
1031 - <entry file="file://$PROJECT_DIR$/api/m_api/task_open_api.yml"> 1101 + <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml">
1032 <provider selected="true" editor-type-id="text-editor"> 1102 <provider selected="true" editor-type-id="text-editor">
1033 <state relative-caret-position="104"> 1103 <state relative-caret-position="104">
1034 - <caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="24" /> 1104 + <caret line="4" selection-start-line="4" selection-end-line="4" />
1035 </state> 1105 </state>
1036 </provider> 1106 </provider>
1037 </entry> 1107 </entry>
1038 - <entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml"> 1108 + <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
1039 <provider selected="true" editor-type-id="text-editor"> 1109 <provider selected="true" editor-type-id="text-editor">
1040 - <state relative-caret-position="-542">  
1041 - <caret line="7" selection-start-line="7" selection-end-line="11" selection-end-column="45" /> 1110 + <state relative-caret-position="133">
  1111 + <caret line="141" column="4" selection-start-line="141" selection-start-column="4" selection-end-line="141" selection-end-column="18" />
  1112 + <folding>
  1113 + <element signature="e#107#119#0" expanded="true" />
  1114 + </folding>
1042 </state> 1115 </state>
1043 </provider> 1116 </provider>
1044 </entry> 1117 </entry>
1045 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/task_loot_detail_api.yml"> 1118 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/tasksearchResources_api.yml" />
  1119 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml">
1046 <provider selected="true" editor-type-id="text-editor"> 1120 <provider selected="true" editor-type-id="text-editor">
1047 - <state relative-caret-position="238">  
1048 - <caret line="26" selection-start-line="26" selection-end-line="28" selection-end-column="17" /> 1121 + <state relative-caret-position="156">
  1122 + <caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
1049 </state> 1123 </state>
1050 </provider> 1124 </provider>
1051 </entry> 1125 </entry>
1052 - <entry file="file://$PROJECT_DIR$/testcases/task/taskPublish_QD/QDRW001.yml"> 1126 + <entry file="file://$PROJECT_DIR$/api/m_api/task_rewards_api.yml">
1053 <provider selected="true" editor-type-id="text-editor"> 1127 <provider selected="true" editor-type-id="text-editor">
1054 - <state relative-caret-position="234">  
1055 - <caret line="12" selection-start-line="12" selection-end-line="13" selection-end-column="35" /> 1128 + <state>
  1129 + <caret column="12" selection-start-column="12" selection-end-column="12" />
1056 </state> 1130 </state>
1057 </provider> 1131 </provider>
1058 </entry> 1132 </entry>
1059 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml"> 1133 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml">
1060 <provider selected="true" editor-type-id="text-editor"> 1134 <provider selected="true" editor-type-id="text-editor">
1061 - <state relative-caret-position="272">  
1062 - <caret line="27" column="14" selection-start-line="27" selection-start-column="14" selection-end-line="27" selection-end-column="14" /> 1135 + <state relative-caret-position="130">
  1136 + <caret line="5" column="15" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" />
1063 </state> 1137 </state>
1064 </provider> 1138 </provider>
1065 </entry> 1139 </entry>
1066 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml"> 1140 + <entry file="file://$PROJECT_DIR$/api/app_api/question_api/questiondetail_api.yml">
  1141 + <provider selected="true" editor-type-id="text-editor" />
  1142 + </entry>
  1143 + <entry file="file://$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml">
1067 <provider selected="true" editor-type-id="text-editor"> 1144 <provider selected="true" editor-type-id="text-editor">
1068 - <state relative-caret-position="104">  
1069 - <caret line="4" selection-start-line="4" selection-end-line="4" /> 1145 + <state relative-caret-position="381">
  1146 + <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" />
1070 </state> 1147 </state>
1071 </provider> 1148 </provider>
1072 </entry> 1149 </entry>
1073 - <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py"> 1150 + <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml">
1074 <provider selected="true" editor-type-id="text-editor"> 1151 <provider selected="true" editor-type-id="text-editor">
1075 - <state relative-caret-position="133">  
1076 - <caret line="141" column="4" selection-start-line="141" selection-start-column="4" selection-end-line="141" selection-end-column="18" />  
1077 - <folding>  
1078 - <element signature="e#107#119#0" expanded="true" />  
1079 - </folding> 1152 + <state relative-caret-position="367">
  1153 + <caret line="26" column="35" selection-start-line="26" selection-start-column="35" selection-end-line="26" selection-end-column="35" />
1080 </state> 1154 </state>
1081 </provider> 1155 </provider>
1082 </entry> 1156 </entry>
1083 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml"> 1157 + <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py">
1084 <provider selected="true" editor-type-id="text-editor"> 1158 <provider selected="true" editor-type-id="text-editor">
1085 - <state relative-caret-position="260">  
1086 - <caret line="25" column="36" selection-start-line="25" selection-start-column="36" selection-end-line="25" selection-end-column="36" /> 1159 + <state relative-caret-position="474">
  1160 + <caret line="170" selection-start-line="170" selection-end-line="170" />
1087 </state> 1161 </state>
1088 </provider> 1162 </provider>
1089 </entry> 1163 </entry>
1090 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/tasksearchResources_api.yml" />  
1091 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml"> 1164 + <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml">
1092 <provider selected="true" editor-type-id="text-editor"> 1165 <provider selected="true" editor-type-id="text-editor">
1093 - <state relative-caret-position="156">  
1094 - <caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" /> 1166 + <state relative-caret-position="471">
  1167 + <caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" />
1095 </state> 1168 </state>
1096 </provider> 1169 </provider>
1097 </entry> 1170 </entry>
1098 - <entry file="file://$PROJECT_DIR$/api/m_api/task_resource_api.yml"> 1171 + <entry file="file://$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml">
1099 <provider selected="true" editor-type-id="text-editor"> 1172 <provider selected="true" editor-type-id="text-editor">
1100 - <state relative-caret-position="234">  
1101 - <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" /> 1173 + <state>
  1174 + <caret column="6" selection-start-column="6" selection-end-column="19" />
1102 </state> 1175 </state>
1103 </provider> 1176 </provider>
1104 </entry> 1177 </entry>
1105 - <entry file="file://$PROJECT_DIR$/api/m_api/task_rewards_api.yml"> 1178 + <entry file="file://$PROJECT_DIR$/api/m_api/task_finishTask_api.yml">
1106 <provider selected="true" editor-type-id="text-editor"> 1179 <provider selected="true" editor-type-id="text-editor">
1107 - <state>  
1108 - <caret column="12" selection-start-column="12" selection-end-column="12" /> 1180 + <state relative-caret-position="156">
  1181 + <caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
  1182 + </state>
  1183 + </provider>
  1184 + </entry>
  1185 + <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml">
  1186 + <provider selected="true" editor-type-id="text-editor">
  1187 + <state relative-caret-position="-309">
  1188 + <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
1109 </state> 1189 </state>
1110 </provider> 1190 </provider>
1111 </entry> 1191 </entry>
1112 <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml"> 1192 <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">
1113 <provider selected="true" editor-type-id="text-editor"> 1193 <provider selected="true" editor-type-id="text-editor">
1114 - <state relative-caret-position="567"> 1194 + <state relative-caret-position="604">
1115 <caret line="25" column="50" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" /> 1195 <caret line="25" column="50" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" />
1116 </state> 1196 </state>
1117 </provider> 1197 </provider>
1118 </entry> 1198 </entry>
1119 - <entry file="file://$PROJECT_DIR$/.env"> 1199 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml">
1120 <provider selected="true" editor-type-id="text-editor"> 1200 <provider selected="true" editor-type-id="text-editor">
1121 - <state relative-caret-position="130">  
1122 - <caret line="5" column="8" selection-start-line="5" selection-end-line="5" selection-end-column="8" /> 1201 + <state relative-caret-position="702">
  1202 + <caret line="27" selection-start-line="27" selection-end-line="27" selection-end-column="14" />
1123 </state> 1203 </state>
1124 </provider> 1204 </provider>
1125 </entry> 1205 </entry>
1126 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml"> 1206 + <entry file="file://$PROJECT_DIR$/api/m_api/task_open_api.yml">
1127 <provider selected="true" editor-type-id="text-editor"> 1207 <provider selected="true" editor-type-id="text-editor">
1128 - <state relative-caret-position="130">  
1129 - <caret line="5" column="15" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" /> 1208 + <state relative-caret-position="104">
  1209 + <caret line="4" column="8" selection-start-line="4" selection-start-column="8" selection-end-line="4" selection-end-column="24" />
1130 </state> 1210 </state>
1131 </provider> 1211 </provider>
1132 </entry> 1212 </entry>
1133 - <entry file="file://$PROJECT_DIR$/api/app_api/question_api/questiondetail_api.yml">  
1134 - <provider selected="true" editor-type-id="text-editor" /> 1213 + <entry file="file://$PROJECT_DIR$/api/m_api/task_resource_api.yml">
  1214 + <provider selected="true" editor-type-id="text-editor">
  1215 + <state relative-caret-position="234">
  1216 + <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />
  1217 + </state>
  1218 + </provider>
1135 </entry> 1219 </entry>
1136 - <entry file="file://$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml"> 1220 + <entry file="file://$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml">
1137 <provider selected="true" editor-type-id="text-editor"> 1221 <provider selected="true" editor-type-id="text-editor">
1138 - <state relative-caret-position="381">  
1139 - <caret line="29" column="23" selection-start-line="29" selection-start-column="23" selection-end-line="29" selection-end-column="23" /> 1222 + <state relative-caret-position="384">
  1223 + <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="21" selection-end-column="17" />
1140 </state> 1224 </state>
1141 </provider> 1225 </provider>
1142 </entry> 1226 </entry>
1143 - <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py"> 1227 + <entry file="file://$PROJECT_DIR$/.env">
1144 <provider selected="true" editor-type-id="text-editor"> 1228 <provider selected="true" editor-type-id="text-editor">
1145 - <state relative-caret-position="136">  
1146 - <caret line="84" selection-start-line="84" selection-end-line="84" />  
1147 - <folding>  
1148 - <element signature="e#117#128#0" expanded="true" />  
1149 - </folding> 1229 + <state relative-caret-position="260">
  1230 + <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
1150 </state> 1231 </state>
1151 </provider> 1232 </provider>
1152 </entry> 1233 </entry>
1153 - <entry file="file://$PROJECT_DIR$/debugtalk.py"> 1234 + <entry file="file://$PROJECT_DIR$/api/m_api/task_Details_api.yml">
1154 <provider selected="true" editor-type-id="text-editor"> 1235 <provider selected="true" editor-type-id="text-editor">
1155 - <state relative-caret-position="234">  
1156 - <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="23" /> 1236 + <state relative-caret-position="26">
  1237 + <caret line="1" selection-start-line="1" selection-end-line="19" selection-end-column="28" />
1157 </state> 1238 </state>
1158 </provider> 1239 </provider>
1159 </entry> 1240 </entry>
1160 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml"> 1241 + <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
1161 <provider selected="true" editor-type-id="text-editor"> 1242 <provider selected="true" editor-type-id="text-editor">
1162 - <state relative-caret-position="884">  
1163 - <caret line="40" column="16" selection-start-line="8" selection-end-line="40" selection-end-column="16" /> 1243 + <state relative-caret-position="156">
  1244 + <caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
1164 </state> 1245 </state>
1165 </provider> 1246 </provider>
1166 </entry> 1247 </entry>
1167 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml"> 1248 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/task_loot_detail_api.yml">
1168 <provider selected="true" editor-type-id="text-editor"> 1249 <provider selected="true" editor-type-id="text-editor">
1169 - <state relative-caret-position="367">  
1170 - <caret line="26" column="35" selection-start-line="26" selection-start-column="35" selection-end-line="26" selection-end-column="35" /> 1250 + <state relative-caret-position="676">
  1251 + <caret line="26" selection-start-line="26" selection-end-line="28" selection-end-column="17" />
1171 </state> 1252 </state>
1172 </provider> 1253 </provider>
1173 </entry> 1254 </entry>
1174 - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py"> 1255 + <entry file="file://$PROJECT_DIR$/testcases/login_testcases.yml">
1175 <provider selected="true" editor-type-id="text-editor"> 1256 <provider selected="true" editor-type-id="text-editor">
1176 - <state relative-caret-position="474">  
1177 - <caret line="170" selection-start-line="170" selection-end-line="170" /> 1257 + <state relative-caret-position="182">
  1258 + <caret line="7" selection-start-line="7" selection-end-line="11" selection-end-column="45" />
1178 </state> 1259 </state>
1179 </provider> 1260 </provider>
1180 </entry> 1261 </entry>
1181 - <entry file="file://$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml"> 1262 + <entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml">
1182 <provider selected="true" editor-type-id="text-editor"> 1263 <provider selected="true" editor-type-id="text-editor">
1183 - <state>  
1184 - <caret column="6" selection-start-column="6" selection-end-column="19" /> 1264 + <state relative-caret-position="130">
  1265 + <caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" />
1185 </state> 1266 </state>
1186 </provider> 1267 </provider>
1187 </entry> 1268 </entry>
1188 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 1269 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml">
  1270 + <provider selected="true" editor-type-id="text-editor">
  1271 + <state relative-caret-position="130">
  1272 + <caret line="5" column="50" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="50" />
  1273 + </state>
  1274 + </provider>
  1275 + </entry>
  1276 + <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
1189 <provider selected="true" editor-type-id="text-editor"> 1277 <provider selected="true" editor-type-id="text-editor">
1190 - <state relative-caret-position="286">  
1191 - <caret line="11" column="16" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="16" /> 1278 + <state relative-caret-position="140">
  1279 + <caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" />
1192 <folding> 1280 <folding>
1193 - <element signature="e#108#137#0" expanded="true" /> 1281 + <element signature="e#117#128#0" expanded="true" />
1194 </folding> 1282 </folding>
1195 </state> 1283 </state>
1196 </provider> 1284 </provider>
1197 </entry> 1285 </entry>
1198 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml"> 1286 + <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml">
1199 <provider selected="true" editor-type-id="text-editor"> 1287 <provider selected="true" editor-type-id="text-editor">
1200 - <state relative-caret-position="471">  
1201 - <caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" /> 1288 + <state relative-caret-position="381">
  1289 + <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
1202 </state> 1290 </state>
1203 </provider> 1291 </provider>
1204 </entry> 1292 </entry>
1205 - <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml"> 1293 + <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
1206 <provider selected="true" editor-type-id="text-editor"> 1294 <provider selected="true" editor-type-id="text-editor">
1207 - <state relative-caret-position="393">  
1208 - <caret line="31" column="67" selection-start-line="31" selection-start-column="67" selection-end-line="31" selection-end-column="67" /> 1295 + <state relative-caret-position="114">
  1296 + <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
1209 </state> 1297 </state>
1210 </provider> 1298 </provider>
1211 </entry> 1299 </entry>
1212 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml"> 1300 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
1213 <provider selected="true" editor-type-id="text-editor"> 1301 <provider selected="true" editor-type-id="text-editor">
1214 - <state relative-caret-position="-127">  
1215 - <caret line="5" selection-start-line="5" selection-start-column="1" selection-end-line="19" selection-end-column="21" /> 1302 + <state relative-caret-position="18">
  1303 + <caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
  1304 + <folding>
  1305 + <element signature="e#0#11#0" expanded="true" />
  1306 + </folding>
1216 </state> 1307 </state>
1217 </provider> 1308 </provider>
1218 </entry> 1309 </entry>
1219 - <entry file="file://$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml"> 1310 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
1220 <provider selected="true" editor-type-id="text-editor"> 1311 <provider selected="true" editor-type-id="text-editor">
1221 - <state relative-caret-position="-52">  
1222 - <caret line="1" column="10" lean-forward="true" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="14" /> 1312 + <state relative-caret-position="1638">
  1313 + <caret line="66" column="16" selection-start-line="66" selection-start-column="16" selection-end-line="66" selection-end-column="16" />
  1314 + </state>
  1315 + </provider>
  1316 + </entry>
  1317 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
  1318 + <provider selected="true" editor-type-id="text-editor">
  1319 + <state relative-caret-position="234">
  1320 + <caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />
  1321 + <folding>
  1322 + <element signature="e#108#137#0" expanded="true" />
  1323 + </folding>
1223 </state> 1324 </state>
1224 </provider> 1325 </provider>
1225 </entry> 1326 </entry>
  1 +name: 用户列表
  2 +base_url: ${ENV(base_worth_url)}
  3 +verify: False
  4 +variables:
  5 + msg: ok
  6 +teardown_hooks:
  7 + - ${teardown_hook_get_uid0($response)}
  8 + - ${teardown_hook_get_uid1($response)}
  9 + - ${teardown_hook_get_uid2($response)}
  10 + - ${teardown_hook_get_uid15($response)}
  11 +request:
  12 + headers:
  13 + Content-Type: application/json; charset=UTF-8
  14 + Authorization: Bearer ${get_task_Authorization()}
  15 + Origin: https://value-test.fjmaimaimai.com
  16 + Referer: https://value-test.fjmaimaimai.com/
  17 + 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
  18 + X-Requested-With: XMLHttpRequest
  19 + json:
  20 + method: POST
  21 + url: common/user
  22 +validate:
  23 + - eq:
  24 + - content.code
  25 + - 0
  26 + - eq:
  27 + - content.msg
  28 + - $msg
  1 +name: 抢单任务验收
  2 +base_url: ${ENV(base_worth_url)}
  3 +verify: False
  4 +variables:
  5 + taskId: ${get_task_status_4_from_database()}
  6 + remark: 上传报告${get_nowtime()}
  7 + realityTime: ${get_today()}
  8 + uid0: ${get_uid0()}
  9 + uid1: ${get_uid1()}
  10 + uid2: ${get_uid2()}
  11 + uid15: ${get_uid15()}
  12 + msg: ok
  13 +request:
  14 + headers:
  15 + Content-Type: application/json; charset=UTF-8
  16 + Authorization: Bearer ${get_task_Authorization()}
  17 + Origin: https://value-test.fjmaimaimai.com
  18 + Host: suplus-worth-web-gateway-test.fjmaimaimai.com
  19 + Referer: https://value-test.fjmaimaimai.com/
  20 + 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
  21 + X-Requested-With: XMLHttpRequest
  22 + json:
  23 + taskId: $taskId
  24 + receiver:
  25 + uid: $uid15
  26 + name: $name15
  27 + percent: 25
  28 + reward: 500
  29 + participant:
  30 + - uid: $uid0
  31 + name: $name0
  32 + percent: 25
  33 + reward: 500
  34 + - uid: $uid1
  35 + name: $name1
  36 + percent: 25
  37 + reward: 500
  38 + - uid: $uid2
  39 + name: $name2
  40 + percent: 25
  41 + reward: 500
  42 + resourceType: ${convert_to_number(1)}
  43 + resourceList:
  44 + - id: ${convert_to_number($get_resource_id())}
  45 + solution:
  46 + total: 26
  47 + recevier:
  48 + uid: $uid15
  49 + name: $name15
  50 + percent: 25
  51 + score: 6.5
  52 + participant:
  53 + - uid: $uid0
  54 + name: $name0
  55 + percent: 25
  56 + score: 6.5
  57 + - uid: $uid1
  58 + name: $name1
  59 + percent: 6.5
  60 + score: 500
  61 + - uid: $uid2
  62 + name: $name2
  63 + percent: 25
  64 + score: 6.5
  65 + remark: $remark
  66 + realityTime: "2020-08-20T16:00:00.000Z"
  67 + method: POST
  68 + url: task/loot/accept
  69 +#validate:
  70 + ## - eq:
  71 + ## - content.code
  72 + ## - 0
  73 + ## - eq:
  74 + ## - content.msg
  75 + ## - $msg
  1 +name: 完成任务
  2 +base_url: ${ENV(base_url)}
  3 +verify: False
  4 +variables:
  5 + currtime: ${make_time()}
  6 + uuid: ${make_uuid()}
  7 + access_token: ${get_task_accesstoken()}
  8 + sign: ${make_sign($currtime, $uuid, $access_token)}
  9 +request:
  10 + headers:
  11 + Content-Type: application/json;charset=utf-8
  12 + User-Agent: okhttp/3.12.3
  13 + X-MMM-AccessToken: $access_token
  14 + X-MMM-AppName: com.mmm.ability
  15 + X-MMM-AppProject: ability
  16 + X-MMM-DeviceType: '0'
  17 + X-MMM-Sign: $sign
  18 + X-MMM-Timestamp: $currtime
  19 + X-MMM-Uuid: $uuid
  20 + X-MMM-Version: 1.0.0
  21 + json:
  22 + id: $id
  23 + method: POST
  24 + url: v1/task/finishTask
  25 +validate:
  26 + - eq:
  27 + - content.code
  28 + - 0
  29 + - eq:
  30 + - content.msg
  31 + - 完成成功
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTc5MTYwNTEsImV4cCI6MTU5NzkyNjg1MSwibmJmIjoxNTk3OTE2MDUxLCJqdGkiOiJpU1c5dW52d1hhQnhaZ1lBIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.m8ej2VXl8TmpRT0-TCRdEg-pEfEF3TSD96y8n6mcVrE  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTc5OTQ1OTQsImV4cCI6MTU5ODAwNTM5NCwibmJmIjoxNTk3OTk0NTk0LCJqdGkiOiJMVUx3c05saVZFbzRWT1dxIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.6W6CjQYVfbCroldUAaGm3x-VgGL4P2-Ccg3XIb6ZK7U
1 -zj5RjNXnzpzM7wHfSQyP8b8347WR3sap  
  1 +Gh8SznkQkAGwcyFePyZaEzRtRiBjGf6r
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTc5MTYwNTIsImV4cCI6MTU5NzkyNjg1MiwibmJmIjoxNTk3OTE2MDUyLCJqdGkiOiI1d0pueldNUW5IYXpkMmd0Iiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.gcPynh0oEinoVzOss8Gt09cMeEIVFJYKnUFkkfGO9mM  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTc5OTQ1OTQsImV4cCI6MTU5ODAwNTM5NCwibmJmIjoxNTk3OTk0NTk0LCJqdGkiOiJWM0ZWNEJiSUgxSm5wNHhuIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.VYMt8TpiwaTDbXdCNS_QnPjTk6jSkx6TUkEjPU1l-R8
1 -1j29edawio6  
  1 +rv7f2l9333
1 -92c16a3e3e8e2c0820af09d176d793dbf3680ba1cc1b0d35fcd5b6b502e3c895ce7b325a  
  1 +198271ab5e4be000a01629484af1736333b63c757d5e36850a5a91a3e5c3bcd8361fe39c
1 -JLlEz5kkIaIJB2Ym4ckrrZKNO7SSRznghzlK1COfZQfpw9aZQhr4p5dxQa5TwvdZF1x7Hfc70z5qPCbjAcGAPR6CAtghq1gqu56yJvJQUNVfGHwqvqHAUEZyBp9U+7ROtzF12Y5ZnIkmS/1/Po9FjrKW1T+XRXF4wk2lbYW5SD4=  
  1 +B34F2yFhTOHWa10B99/3c1nbcPnTP1mZuPmjPZOZZaFd05LH6hiAhSxL7/UmT7EXnj7dK9X1Q6zqJSJKEx+ufByotzgCSb+d5Fk13DXUKPCT0SvjbnsS7D+Bf31/7z5XjHl8e0fkAoGXNvR6ryQNSX37KSLW2WKRlDd25hh1Kx0=
1 -3272532058847488  
  1 +3272692925319424
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk3OTE2MDUyLCJleHAiOjE1OTc5MjY4NTIsIm5iZiI6MTU5NzkxNjA1MiwianRpIjoibnlEcDYzSUh1RHllMzlkMyIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.ZpkSYlD7HLSl3jqj_J182uTxYgJx4FODK7Ecj21aPzQ  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk3OTk0NTk0LCJleHAiOjE1OTgwMDUzOTQsIm5iZiI6MTU5Nzk5NDU5NCwianRpIjoiNFR3UG9tc2k1VGNxWHE4TyIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.sKByudD3jxI-9W-Dy65Mtw2Gfen94kOdNkRVt5kKSdM
1 -6GsDEBNjCAyR42YkRGQZbf8DhD7thHcm  
  1 +8xYKezzCm4JmNXZKaFER3fcBm6bkzS3D
1 -7p52o7jok6t  
  1 +7vm9ofajxzl
1 -3019535699008816128  
  1 +3020853417054045184
  1 +3248817613892608
  1 +3248817613863936
  1 +3247366011913216
  1 +3248817613835264
@@ -18,6 +18,8 @@ def sleep(n_secs): @@ -18,6 +18,8 @@ def sleep(n_secs):
18 def convert_to_string(value): 18 def convert_to_string(value):
19 return str(value) 19 return str(value)
20 20
  21 +def convert_to_number(value):
  22 + return int(value)
21 23
22 # def get_base_url(env_type="test"): 24 # def get_base_url(env_type="test"):
23 # """ 25 # """
@@ -37,7 +39,3 @@ def get_nowtime(): @@ -37,7 +39,3 @@ def get_nowtime():
37 def get_second(): 39 def get_second():
38 curr_time = datetime.datetime.now() 40 curr_time = datetime.datetime.now()
39 return curr_time.second 41 return curr_time.second
40 -  
41 -  
42 -  
43 -print(get_second())  
@@ -137,4 +137,108 @@ def get_login_code(): @@ -137,4 +137,108 @@ def get_login_code():
137 print('读取失败', e) 137 print('读取失败', e)
138 # Authorization = str(Authorization) 138 # Authorization = str(Authorization)
139 return login_code 139 return login_code
  140 +#----------------------------获取公共用户id-------------------------
  141 +def teardown_hook_get_uid0(response):
  142 + if response.status_code == 200:
  143 + jsondata = json.loads(response.text)
  144 + uid0 =jsondata['data']['list'][0]['uid']
  145 + try:
  146 + # 保存token到文件
  147 + with open(path + 'config/uid0.txt','w+') as f:
  148 + f.write(uid0)
  149 + print('写入成功，uid0：{}'.format(uid0))
  150 + f.close()
  151 + except Exception as e:
  152 + print('写入失败', e)
  153 + return uid0
  154 +
  155 +def get_uid0():
  156 + try:
  157 + # 保存token到文件
  158 + with open(path + "config/uid0.txt", 'r') as f:
  159 + uid0 = f.read()
  160 + uid0 = int(uid0)
  161 + print('读取成功，uid0：{}'.format(uid0))
  162 + except Exception as e:
  163 + print('读取失败', e)
  164 + # Authorization = str(Authorization)
  165 + return uid0
  166 +
  167 +def teardown_hook_get_uid1(response):
  168 + if response.status_code == 200:
  169 + jsondata = json.loads(response.text)
  170 + uid1 =jsondata['data']['list'][1]['uid']
  171 + try:
  172 + # 保存token到文件
  173 + with open(path + 'config/uid1.txt','w+') as f:
  174 + f.write(uid1)
  175 + print('写入成功，uid1：{}'.format(uid1))
  176 + f.close()
  177 + except Exception as e:
  178 + print('写入失败', e)
  179 + return uid1
140 180
  181 +def get_uid1():
  182 + try:
  183 + # 保存token到文件
  184 + with open(path + "config/uid1.txt", 'r') as f:
  185 + uid1 = f.read()
  186 + uid1 = int(uid1)
  187 + print('读取成功，uid1：{}'.format(uid1))
  188 + except Exception as e:
  189 + print('读取失败', e)
  190 + # Authorization = str(Authorization)
  191 + return uid1
  192 +
  193 +def teardown_hook_get_uid2(response):
  194 + if response.status_code == 200:
  195 + jsondata = json.loads(response.text)
  196 + uid2 = jsondata['data']['list'][2]['uid']
  197 + try:
  198 + # 保存token到文件
  199 + with open(path + 'config/uid2.txt','w+') as f:
  200 + f.write(uid2)
  201 + print('写入成功，uid2：{}'.format(uid2))
  202 + f.close()
  203 + except Exception as e:
  204 + print('写入失败', e)
  205 + return uid2
  206 +
  207 +def get_uid2():
  208 + try:
  209 + # 保存token到文件
  210 + with open(path + "config/uid2.txt", 'r') as f:
  211 + uid2 = f.read()
  212 + uid2 = int(uid2)
  213 + print('读取成功，uid2：{}'.format(uid2))
  214 + except Exception as e:
  215 + print('读取失败', e)
  216 + # Authorization = str(Authorization)
  217 + return uid2
  218 +
  219 +
  220 +def teardown_hook_get_uid15(response):
  221 + if response.status_code == 200:
  222 + jsondata = json.loads(response.text)
  223 + uid15 =jsondata['data']['list'][15]['uid']
  224 + try:
  225 + # 保存token到文件
  226 + with open(path + 'config/uid15.txt','w+') as f:
  227 + f.write(uid15)
  228 + print('写入成功，uid15：{}'.format(uid15))
  229 + f.close()
  230 + except Exception as e:
  231 + print('写入失败', e)
  232 + return uid15
  233 +
  234 +def get_uid15():
  235 + try:
  236 + # 保存token到文件
  237 + with open(path + "config/uid15.txt", 'r') as f:
  238 + uid15 = f.read()
  239 + uid15 = int(uid15)
  240 + print('读取成功，uid15：{}'.format(uid15))
  241 + except Exception as e:
  242 + print('读取失败', e)
  243 + # Authorization = str(Authorization)
  244 + return uid15
@@ -105,3 +105,21 @@ def get_task_status_7_from_database(): @@ -105,3 +105,21 @@ def get_task_status_7_from_database():
105 print(err) 105 print(err)
106 db.rollback() 106 db.rollback()
107 db.close() 107 db.close()
  108 +
  109 +#获取任务单的状态:待验收
  110 +def get_task_status_4_from_database():
  111 + db = GetConnect()
  112 + cursor = db.cursor()
  113 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  114 + sql = '''select id from tasks t where t.company_id = 366 and t.task_status = 4 and t.receiver_uid = '3247366011913216' order by id desc'''
  115 + # print(sql)
  116 + try:
  117 + cursor.execute(sql)
  118 + result = cursor.fetchone()
  119 + return str(result[0])
  120 + except Exception as err:
  121 + # 发生错误时回滚
  122 + print(err)
  123 + db.rollback()
  124 + db.close()
  125 +# print(get_task_status_4_from_database())
1 -config:  
2 - name: 保存抢单任务-发布任务-确认领取人  
3 -  
4 -teststeps:  
5 -  
6 -#- name: 登录系统  
7 -# testcase: testcases/task/loot/save_loot_update_0_open_testcase.yml  
8 -#  
9 -#- name: app端点击立即抢单  
10 -# testcase: testcases/task/task_rewards_taskDetails_testcase.yml  
11 -#  
12 -#- name: 确认领取人  
13 -# api: api/m_api/loot/loot_task_confirm_api.yml  
14 -## variables:  
15 -## id: ${get_task_id()}  
16 -# varidate:  
17 -# validate:  
18 -# - eq:  
19 -# - content.msg  
20 -# - ok  
21 -  
22 -- name: 任务完成  
23 - testcases: testcases/task/task_finishTask_testcase.yml  
  1 +config:
  2 + name: 保存抢单任务-发布任务-确认领取人
  3 +#
  4 +teststeps:
  5 +#- name: 登录系统
  6 +# testcase: testcases/task/loot/save_loot_update_0_open_testcase.yml
  7 +#
  8 +#- name: app端点击立即抢单
  9 +# testcase: testcases/task/task_rewards_taskDetails_testcase.yml
  10 +#
  11 +#- name: 确认领取人
  12 +# api: api/m_api/loot/loot_task_confirm_api.yml
  13 +## variables:
  14 +## id: ${get_task_id()}
  15 +# varidate:
  16 +# validate:
  17 +# - eq:
  18 +# - content.msg
  19 +# - ok
  20 +##-------------------------APP端完成抢单任务------------------------------
  21 +#- name: 完成任务
  22 +# testcase: testcases/task/task_finishTask_testcase.yml
  23 +
  24 +#-------------------------web端验收抢单任务------------------------------
  25 +- name: 获取用户信息
  26 + output:
  27 + - uid0
  28 + - name0
  29 + - uid1
  30 + - name1
  31 + - uid2
  32 + - name2
  33 + - uid15
  34 + - name15
  35 + api: api/m_api/common/user_api.yml
  36 + teardown_hooks:
  37 + - ${teardown_hook_get_uid0($response)}
  38 + - ${teardown_hook_get_uid1($response)}
  39 + - ${teardown_hook_get_uid2($response)}
  40 + - ${teardown_hook_get_uid15($response)}
  41 + extract:
  42 +# uid0: content.data.list.0.uid
  43 + name0: content.data.list.0.name
  44 +# uid1: content.data.list.1.uid
  45 + name1: content.data.list.1.name
  46 +# uid2: content.data.list.2.uid
  47 + name2: content.data.list.2.name
  48 +# uid15: content.data.list.15.uid
  49 + name15: content.data.list.15.name
  50 + validate:
  51 + - eq:
  52 + - content.data.list.0.name
  53 + - $name0
  54 + - eq:
  55 + - content.data.list.1.name
  56 + - $name1
  57 + - eq:
  58 + - content.data.list.2.name
  59 + - $name2
  60 + - eq:
  61 + - content.data.list.15.name
  62 + - $name15
  63 +
  64 +#- name: 验收任务
  65 +# api: api/m_api/loot/loot_task_accept_api.yml
  66 +
  67 +- name: 验收任务
  68 + api: api/m_api/loot/loot_task_accept_api.yml
@@ -2,7 +2,6 @@ config: @@ -2,7 +2,6 @@ config:
2 name: 任务完成 2 name: 任务完成
3 3
4 teststeps: 4 teststeps:
5 -  
6 - name: 19990000008登录系统 5 - name: 19990000008登录系统
7 variables: 6 variables:
8 phone: ${ENV(appphone)} 7 phone: ${ENV(appphone)}
@@ -21,6 +20,6 @@ teststeps: @@ -21,6 +20,6 @@ teststeps:
21 - eq: 20 - eq:
22 - content.data.tasks.0.id 21 - content.data.tasks.0.id
23 - $id 22 - $id
24 -#  
25 -#- name: 19990000008抢单  
26 -# api: api/m_api/loot/submitCompete_loot_api.yml 23 +
  24 +- name: 完成任务
  25 + api: api/m_api/task_finishTask_api.yml
@@ -28,5 +28,5 @@ testcases: @@ -28,5 +28,5 @@ testcases:
28 #- name: loot_task_confirm 抢单模式-确认领取人-查看详情 28 #- name: loot_task_confirm 抢单模式-确认领取人-查看详情
29 # testcase: testcases/task/loot/loot_task_confirm_testcase.yml 29 # testcase: testcases/task/loot/loot_task_confirm_testcase.yml
30 30
31 -- name: loot_task_confirm 抢单模式-完成任务-查看详情  
32 - testcase: testcases/task/loot/loot_task_finishTask_testcase.yml  
  31 +- name: loot_task_confirm 抢单模式-完成任务-验收任务
  32 + testcase: testcases/task/loot_task_finishTask_testcase.yml