bianxinhua / task_api · 提交

转到一个项目

作者 bianxinhua
提交 6743f281436ae9ca94f55c68ea730096ed469c5c 2 个父辈 5d063b2b 96082761

add README

内嵌 并排对比
正在显示 69 个修改的文件 包含 1174 行增加 和 690 行删除
@@ -3,7 +3,7 @@ pfphone=19990000011 @@ -3,7 +3,7 @@ pfphone=19990000011
3 pfphone1=19990000015 3 pfphone1=19990000015
4 ckotherdeptphone=19990000012 4 ckotherdeptphone=19990000012
5 pfphone2=18100000005 5 pfphone2=18100000005
6 -appphone=19990000000 6 +appphone=19990000015
7 password=123456 7 password=123456
8 base_url=https://ability-test.fjmaimaimai.com 8 base_url=https://ability-test.fjmaimaimai.com
9 base_public_url = http://public-interface-test.fjmaimaimai.com/ 9 base_public_url = http://public-interface-test.fjmaimaimai.com/
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
  4 +<<<<<<< HEAD
4 <list default="true" id="b869bb6c-d2b2-46af-b73c-cd3237c48651" name="Default Changelist" comment="update 2020005122330" /> 5 <list default="true" id="b869bb6c-d2b2-46af-b73c-cd3237c48651" name="Default Changelist" comment="update 2020005122330" />
  6 +=======
  7 + <list default="true" id="b869bb6c-d2b2-46af-b73c-cd3237c48651" name="Default Changelist" comment="update 2020005122330">
  8 +<<<<<<< HEAD
  9 + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  10 +=======
  11 + <change beforePath="$PROJECT_DIR$/.idea/ability_api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/ability_api.iml" afterDir="false" />
  12 + <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
  13 + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  14 + <change beforePath="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" afterDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/config/Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/Authorization.txt" afterDir="false" />
  16 + <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" />
  17 + <change beforePath="$PROJECT_DIR$/config/access_token.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/access_token.txt" afterDir="false" />
  18 + <change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" />
  19 + <change beforePath="$PROJECT_DIR$/config/credentials.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/credentials.csv" afterDir="false" />
  20 + <change beforePath="$PROJECT_DIR$/config/login_code.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/login_code.txt" afterDir="false" />
  21 + <change beforePath="$PROJECT_DIR$/config/resource_content.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_content.txt" afterDir="false" />
  22 + <change beforePath="$PROJECT_DIR$/config/resource_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_id.txt" afterDir="false" />
  23 + <change beforePath="$PROJECT_DIR$/config/resource_title.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_title.txt" afterDir="false" />
  24 + <change beforePath="$PROJECT_DIR$/config/serialNo.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/serialNo.txt" afterDir="false" />
  25 + <change beforePath="$PROJECT_DIR$/config/task_Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_Authorization.txt" afterDir="false" />
  26 + <change beforePath="$PROJECT_DIR$/config/task_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_accessToken.csv" afterDir="false" />
  27 + <change beforePath="$PROJECT_DIR$/config/task_authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_authCode.csv" afterDir="false" />
  28 + <change beforePath="$PROJECT_DIR$/config/task_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_id.txt" afterDir="false" />
  29 + <change beforePath="$PROJECT_DIR$/helpfunc/login_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/login_func.py" afterDir="false" />
  30 + <change beforePath="$PROJECT_DIR$/helpfunc/m_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/m_func.py" afterDir="false" />
  31 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
  32 + </list>
  33 +>>>>>>> 96082761b0292d913b472b4e3eaacb5cd2792fc6
5 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 34 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
6 <option name="SHOW_DIALOG" value="false" /> 35 <option name="SHOW_DIALOG" value="false" />
7 <option name="HIGHLIGHT_CONFLICTS" value="true" /> 36 <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -28,8 +57,17 @@ @@ -28,8 +57,17 @@
28 <file pinned="false" current-in-tab="false"> 57 <file pinned="false" current-in-tab="false">
29 <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml"> 58 <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
30 <provider selected="true" editor-type-id="text-editor"> 59 <provider selected="true" editor-type-id="text-editor">
  60 +<<<<<<< HEAD
31 <state relative-caret-position="462"> 61 <state relative-caret-position="462">
  62 +=======
  63 +<<<<<<< HEAD
  64 + <state relative-caret-position="780">
  65 + <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
  66 +=======
  67 + <state relative-caret-position="66">
  68 +>>>>>>> 96082761b0292d913b472b4e3eaacb5cd2792fc6
32 <caret line="21" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="58" /> 69 <caret line="21" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="58" />
  70 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
33 </state> 71 </state>
34 </provider> 72 </provider>
35 </entry> 73 </entry>
@@ -37,24 +75,47 @@ @@ -37,24 +75,47 @@
37 <file pinned="false" current-in-tab="false"> 75 <file pinned="false" current-in-tab="false">
38 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 76 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
39 <provider selected="true" editor-type-id="text-editor"> 77 <provider selected="true" editor-type-id="text-editor">
  78 +<<<<<<< HEAD
  79 + <state relative-caret-position="304">
  80 + <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
  81 +=======
40 <state relative-caret-position="154"> 82 <state relative-caret-position="154">
41 <caret line="9" column="15" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="15" /> 83 <caret line="9" column="15" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="15" />
42 <folding> 84 <folding>
43 <element signature="e#108#137#0" expanded="true" /> 85 <element signature="e#108#137#0" expanded="true" />
44 </folding> 86 </folding>
  87 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
45 </state> 88 </state>
46 </provider> 89 </provider>
47 </entry> 90 </entry>
48 </file> 91 </file>
  92 +<<<<<<< HEAD
  93 + <file pinned="false" current-in-tab="false">
  94 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
  95 + <provider selected="true" editor-type-id="text-editor">
  96 + <state relative-caret-position="3016">
  97 + <caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />
  98 + <folding>
  99 + <element signature="e#108#137#0" expanded="true" />
  100 + </folding>
  101 +=======
49 <file pinned="false" current-in-tab="true"> 102 <file pinned="false" current-in-tab="true">
50 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml"> 103 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
51 <provider selected="true" editor-type-id="text-editor"> 104 <provider selected="true" editor-type-id="text-editor">
52 <state relative-caret-position="154"> 105 <state relative-caret-position="154">
53 <caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" /> 106 <caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
  107 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
54 </state> 108 </state>
55 </provider> 109 </provider>
56 </entry> 110 </entry>
57 </file> 111 </file>
  112 +<<<<<<< HEAD
  113 + <file pinned="false" current-in-tab="true">
  114 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
  115 + <provider selected="true" editor-type-id="text-editor">
  116 + <state relative-caret-position="416">
  117 + <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
  118 +=======
58 <file pinned="false" current-in-tab="false"> 119 <file pinned="false" current-in-tab="false">
59 <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py"> 120 <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
60 <provider selected="true" editor-type-id="text-editor"> 121 <provider selected="true" editor-type-id="text-editor">
@@ -63,6 +124,7 @@ @@ -63,6 +124,7 @@
63 <folding> 124 <folding>
64 <element signature="e#107#119#0" expanded="true" /> 125 <element signature="e#107#119#0" expanded="true" />
65 </folding> 126 </folding>
  127 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
66 </state> 128 </state>
67 </provider> 129 </provider>
68 </entry> 130 </entry>
@@ -88,8 +150,13 @@ @@ -88,8 +150,13 @@
88 <file pinned="false" current-in-tab="false"> 150 <file pinned="false" current-in-tab="false">
89 <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py"> 151 <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
90 <provider selected="true" editor-type-id="text-editor"> 152 <provider selected="true" editor-type-id="text-editor">
  153 +<<<<<<< HEAD
  154 + <state relative-caret-position="6292">
  155 + <caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" />
  156 +=======
91 <state relative-caret-position="3124"> 157 <state relative-caret-position="3124">
92 <caret line="143" selection-start-line="143" selection-end-line="143" /> 158 <caret line="143" selection-start-line="143" selection-end-line="143" />
  159 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
93 <folding> 160 <folding>
94 <element signature="e#117#128#0" expanded="true" /> 161 <element signature="e#117#128#0" expanded="true" />
95 </folding> 162 </folding>
@@ -97,6 +164,18 @@ @@ -97,6 +164,18 @@
97 </provider> 164 </provider>
98 </entry> 165 </entry>
99 </file> 166 </file>
  167 +<<<<<<< HEAD
  168 + <file pinned="false" current-in-tab="false">
  169 + <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
  170 + <provider selected="true" editor-type-id="text-editor">
  171 + <state relative-caret-position="208">
  172 + <caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
  173 + </state>
  174 + </provider>
  175 + </entry>
  176 + </file>
  177 +=======
  178 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
100 </leaf> 179 </leaf>
101 </component> 180 </component>
102 <component name="FileTemplateManagerImpl"> 181 <component name="FileTemplateManagerImpl">
@@ -193,6 +272,11 @@ @@ -193,6 +272,11 @@
193 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" /> 272 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
194 <option value="$PROJECT_DIR$/helpfunc/m_func.py" /> 273 <option value="$PROJECT_DIR$/helpfunc/m_func.py" />
195 <option value="$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml" /> 274 <option value="$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml" />
  275 +<<<<<<< HEAD
  276 + <option value="$PROJECT_DIR$/debugtalk.py" />
  277 + <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
  278 +=======
  279 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
196 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" /> 280 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" />
197 </list> 281 </list>
198 </option> 282 </option>
@@ -556,11 +640,19 @@ @@ -556,11 +640,19 @@
556 <workItem from="1597801010469" duration="16146000" /> 640 <workItem from="1597801010469" duration="16146000" />
557 <workItem from="1597886812090" duration="6866000" /> 641 <workItem from="1597886812090" duration="6866000" />
558 <workItem from="1597906408146" duration="2887000" /> 642 <workItem from="1597906408146" duration="2887000" />
  643 +<<<<<<< HEAD
  644 + <workItem from="1597973157365" duration="19140000" />
  645 + <workItem from="1598337033172" duration="73000" />
  646 +=======
559 <workItem from="1597973157365" duration="18949000" /> 647 <workItem from="1597973157365" duration="18949000" />
560 <workItem from="1598065887022" duration="4905000" /> 648 <workItem from="1598065887022" duration="4905000" />
561 <workItem from="1598108947857" duration="3526000" /> 649 <workItem from="1598108947857" duration="3526000" />
562 <workItem from="1598168398954" duration="3596000" /> 650 <workItem from="1598168398954" duration="3596000" />
  651 +<<<<<<< HEAD
563 <workItem from="1599145650310" duration="64000" /> 652 <workItem from="1599145650310" duration="64000" />
  653 +=======
  654 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
  655 +>>>>>>> 96082761b0292d913b472b4e3eaacb5cd2792fc6
564 </task> 656 </task>
565 <task id="LOCAL-00001" summary="优化测试用例"> 657 <task id="LOCAL-00001" summary="优化测试用例">
566 <created>1571644787323</created> 658 <created>1571644787323</created>
@@ -888,7 +980,15 @@ @@ -888,7 +980,15 @@
888 <servers /> 980 <servers />
889 </component> 981 </component>
890 <component name="TimeTrackingManager"> 982 <component name="TimeTrackingManager">
  983 +<<<<<<< HEAD
891 <option name="totallyTimeSpent" value="366015000" /> 984 <option name="totallyTimeSpent" value="366015000" />
  985 +=======
  986 +<<<<<<< HEAD
  987 + <option name="totallyTimeSpent" value="354188000" />
  988 +=======
  989 + <option name="totallyTimeSpent" value="365951000" />
  990 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
  991 +>>>>>>> 96082761b0292d913b472b4e3eaacb5cd2792fc6
892 </component> 992 </component>
893 <component name="TodoView" selected-index="3"> 993 <component name="TodoView" selected-index="3">
894 <todo-panel id="selected-file"> 994 <todo-panel id="selected-file">
@@ -899,9 +999,22 @@ @@ -899,9 +999,22 @@
899 </todo-panel> 999 </todo-panel>
900 </component> 1000 </component>
901 <component name="ToolWindowManager"> 1001 <component name="ToolWindowManager">
  1002 +<<<<<<< HEAD
902 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 1003 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
903 <layout> 1004 <layout>
904 <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.23373677" /> 1005 <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.23373677" />
  1006 +=======
  1007 +<<<<<<< HEAD
  1008 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
  1009 + <editor active="true" />
  1010 + <layout>
  1011 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22693133" />
  1012 +=======
  1013 + <frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
  1014 + <layout>
  1015 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22995462" />
  1016 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
  1017 +>>>>>>> 96082761b0292d913b472b4e3eaacb5cd2792fc6
905 <window_info id="Structure" order="1" sideWeight="0.50238097" side_tool="true" weight="0.30711043" /> 1018 <window_info id="Structure" order="1" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
906 <window_info id="Favorites" order="2" sideWeight="0.50238097" side_tool="true" weight="0.30711043" /> 1019 <window_info id="Favorites" order="2" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
907 <window_info anchor="bottom" id="Message" order="0" /> 1020 <window_info anchor="bottom" id="Message" order="0" />
@@ -1192,6 +1305,8 @@ @@ -1192,6 +1305,8 @@
1192 </provider> 1305 </provider>
1193 </entry> 1306 </entry>
1194 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml"> 1307 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml">
  1308 +<<<<<<< HEAD
  1309 +=======
1195 <provider selected="true" editor-type-id="text-editor"> 1310 <provider selected="true" editor-type-id="text-editor">
1196 <state relative-caret-position="130"> 1311 <state relative-caret-position="130">
1197 <caret line="5" column="50" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="50" /> 1312 <caret line="5" column="50" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="50" />
@@ -1199,21 +1314,46 @@ @@ -1199,21 +1314,46 @@
1199 </provider> 1314 </provider>
1200 </entry> 1315 </entry>
1201 <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml"> 1316 <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml">
  1317 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
1202 <provider selected="true" editor-type-id="text-editor"> 1318 <provider selected="true" editor-type-id="text-editor">
1203 <state relative-caret-position="660"> 1319 <state relative-caret-position="660">
1204 <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" /> 1320 <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
1205 </state> 1321 </state>
1206 </provider> 1322 </provider>
1207 </entry> 1323 </entry>
  1324 +<<<<<<< HEAD
  1325 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
  1326 + <provider selected="true" editor-type-id="text-editor">
  1327 + <state relative-caret-position="18">
  1328 + <caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
  1329 + <folding>
  1330 + <element signature="e#0#11#0" expanded="true" />
  1331 + </folding>
  1332 +=======
1208 <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml"> 1333 <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">
1209 <provider selected="true" editor-type-id="text-editor"> 1334 <provider selected="true" editor-type-id="text-editor">
1210 <state relative-caret-position="550"> 1335 <state relative-caret-position="550">
1211 <caret line="25" column="50" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" /> 1336 <caret line="25" column="50" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" />
  1337 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
1212 </state> 1338 </state>
1213 </provider> 1339 </provider>
1214 </entry> 1340 </entry>
1215 <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml"> 1341 <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml">
1216 <provider selected="true" editor-type-id="text-editor"> 1342 <provider selected="true" editor-type-id="text-editor">
  1343 +<<<<<<< HEAD
  1344 + <state relative-caret-position="780">
  1345 + <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
  1346 + </state>
  1347 + </provider>
  1348 + </entry>
  1349 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
  1350 + <provider selected="true" editor-type-id="text-editor">
  1351 + <state relative-caret-position="3016">
  1352 + <caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />
  1353 + <folding>
  1354 + <element signature="e#108#137#0" expanded="true" />
  1355 + </folding>
  1356 +=======
1217 <state relative-caret-position="772"> 1357 <state relative-caret-position="772">
1218 <caret line="36" selection-start-line="36" selection-end-line="36" /> 1358 <caret line="36" selection-start-line="36" selection-end-line="36" />
1219 </state> 1359 </state>
@@ -1230,11 +1370,30 @@ @@ -1230,11 +1370,30 @@
1230 <provider selected="true" editor-type-id="text-editor"> 1370 <provider selected="true" editor-type-id="text-editor">
1231 <state relative-caret-position="-299"> 1371 <state relative-caret-position="-299">
1232 <caret line="7" selection-start-line="7" selection-end-line="7" /> 1372 <caret line="7" selection-start-line="7" selection-end-line="7" />
  1373 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
1233 </state> 1374 </state>
1234 </provider> 1375 </provider>
1235 </entry> 1376 </entry>
1236 - <entry file="file://$PROJECT_DIR$/debugtalk.py"> 1377 + <entry file="file://$PROJECT_DIR$/.env">
1237 <provider selected="true" editor-type-id="text-editor"> 1378 <provider selected="true" editor-type-id="text-editor">
  1379 +<<<<<<< HEAD
  1380 + <state relative-caret-position="260">
  1381 + <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
  1382 + </state>
  1383 + </provider>
  1384 + </entry>
  1385 + <entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml">
  1386 + <provider selected="true" editor-type-id="text-editor">
  1387 + <state relative-caret-position="130">
  1388 + <caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" />
  1389 + </state>
  1390 + </provider>
  1391 + </entry>
  1392 + <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
  1393 + <provider selected="true" editor-type-id="text-editor">
  1394 + <state relative-caret-position="6292">
  1395 + <caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" />
  1396 +=======
1238 <state relative-caret-position="132"> 1397 <state relative-caret-position="132">
1239 <caret line="17" column="21" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="21" /> 1398 <caret line="17" column="21" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="21" />
1240 <folding> 1399 <folding>
@@ -1288,16 +1447,46 @@ @@ -1288,16 +1447,46 @@
1288 <provider selected="true" editor-type-id="text-editor"> 1447 <provider selected="true" editor-type-id="text-editor">
1289 <state relative-caret-position="3124"> 1448 <state relative-caret-position="3124">
1290 <caret line="143" selection-start-line="143" selection-end-line="143" /> 1449 <caret line="143" selection-start-line="143" selection-end-line="143" />
  1450 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
1291 <folding> 1451 <folding>
1292 <element signature="e#117#128#0" expanded="true" /> 1452 <element signature="e#117#128#0" expanded="true" />
1293 </folding> 1453 </folding>
1294 </state> 1454 </state>
1295 </provider> 1455 </provider>
1296 </entry> 1456 </entry>
  1457 +<<<<<<< HEAD
  1458 +=======
  1459 +<<<<<<< HEAD
  1460 + <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
  1461 + <provider selected="true" editor-type-id="text-editor">
  1462 + <state relative-caret-position="208">
  1463 + <caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
  1464 + </state>
  1465 + </provider>
  1466 + </entry>
  1467 + <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
  1468 + <provider selected="true" editor-type-id="text-editor">
  1469 + <state relative-caret-position="304">
  1470 + <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
  1471 +=======
  1472 + <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
  1473 + <provider selected="true" editor-type-id="text-editor">
  1474 + <state relative-caret-position="66">
  1475 + <caret line="21" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="58" />
  1476 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
  1477 + </state>
  1478 + </provider>
  1479 + </entry>
  1480 +>>>>>>> 96082761b0292d913b472b4e3eaacb5cd2792fc6
1297 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml"> 1481 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
1298 <provider selected="true" editor-type-id="text-editor"> 1482 <provider selected="true" editor-type-id="text-editor">
  1483 +<<<<<<< HEAD
  1484 + <state relative-caret-position="416">
  1485 + <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
  1486 +=======
1299 <state relative-caret-position="154"> 1487 <state relative-caret-position="154">
1300 <caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" /> 1488 <caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
  1489 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
1301 </state> 1490 </state>
1302 </provider> 1491 </provider>
1303 </entry> 1492 </entry>
@@ -2,7 +2,7 @@ name: 发布任务 @@ -2,7 +2,7 @@ name: 发布任务
2 base_url: ${ENV(base_worth_url)} 2 base_url: ${ENV(base_worth_url)}
3 verify: False 3 verify: False
4 variables: 4 variables:
5 - id: ${get_task_id()} 5 + id: ${get_appoint_task_id()}
6 msg: ok 6 msg: ok
7 request: 7 request:
8 headers: 8 headers:
  1 +name: 保存指派任务
  2 +base_url: ${ENV(base_worth_url)}
  3 +verify: False
  4 +variables:
  5 + name: 测试指派任务名称${get_nowtime()}
  6 + acceptanceCriteria: 测试指派任务的验收标准${get_nowtime()}
  7 + description: 测试指派任务的任务描述${get_nowtime()}
  8 + planTime: ${get_today()}
  9 + msg: ok
  10 +teardown_hooks:
  11 + - ${teardown_hook_get_appoint_task_id($response)}
  12 +request:
  13 + headers:
  14 + Content-Type: application/json; charset=UTF-8
  15 + Authorization: Bearer ${get_task_Authorization()}
  16 + Origin: https://value-test.fjmaimaimai.com
  17 + Referer: https://value-test.fjmaimaimai.com/
  18 + 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
  19 + X-Requested-With: XMLHttpRequest
  20 + json:
  21 + appointTo: 3245096039079680
  22 + planTime: $planTime
  23 + name: $name
  24 + resourceType: 1
  25 + resourceList:
  26 + - id: ${get_resource_id()}
  27 + title: ${get_resource_title()}
  28 + content: ${get_resource_content()}
  29 + serial: ${get_serialNo()}
  30 + customerValue:
  31 + - 31
  32 + taskCharacter: 12
  33 + reward: 2000
  34 + acceptanceCriteria: $acceptanceCriteria
  35 + description: $description
  36 + taskBelong: 13
  37 +# pictures:
  38 + method: POST
  39 + url: task/appoint/update
  40 +validate:
  41 + - eq:
  42 + - content.code
  43 + - 0
  44 + - eq:
  45 + - content.msg
  46 + - $msg
1 -name: 删除任务 1 +name: 发布任务
2 base_url: ${ENV(base_worth_url)} 2 base_url: ${ENV(base_worth_url)}
3 verify: False 3 verify: False
4 variables: 4 variables:
  5 + id: ${get_bid_task_id()}
5 msg: ok 6 msg: ok
6 request: 7 request:
7 headers: 8 headers:
@@ -13,9 +14,8 @@ request: @@ -13,9 +14,8 @@ request:
13 X-Requested-With: XMLHttpRequest 14 X-Requested-With: XMLHttpRequest
14 json: 15 json:
15 id: $id 16 id: $id
16 -  
17 method: POST 17 method: POST
18 - url: task/delete 18 + url: task/open
19 validate: 19 validate:
20 - eq: 20 - eq:
21 - content.code 21 - content.code
  1 +name: 保存竞标任务
  2 +base_url: ${ENV(base_worth_url)}
  3 +verify: False
  4 +variables:
  5 + name: 测试竞标任务名称${get_nowtime()}
  6 + acceptanceCriteria: 测试竞标任务的验收标准${get_nowtime()}
  7 + description: 测试竞标任务的任务描述${get_nowtime()}
  8 + bidStartTime: ${get_today1()}
  9 + bidEndTime: ${get_tomorrow()}
  10 + id: ${get_resource_id()}
  11 + serial: ${get_serialNo()}
  12 + msg: ok
  13 +teardown_hooks:
  14 + - ${teardown_hook_get_bid_task_id($response)}
  15 +request:
  16 + headers:
  17 + Content-Type: application/json; charset=UTF-8
  18 + Authorization: Bearer ${get_task_Authorization()}
  19 + Origin: https://value-test.fjmaimaimai.com
  20 + Referer: https://value-test.fjmaimaimai.com/
  21 + 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
  22 + X-Requested-With: XMLHttpRequest
  23 + json:
  24 + bidStartTime: $bidStartTime
  25 + bidEndTime: $bidEndTime
  26 + name: $name
  27 + resourceType: 1
  28 + resourceList:
  29 + - id: ${convert_to_number($id)}
  30 + title: ${get_resource_title()}
  31 + content: ${get_resource_content()}
  32 + serial: ${convert_to_number($serial)}
  33 + customerValue:
  34 + - 31
  35 + taskCharactor: 12
  36 + reward: 2000
  37 + acceptanceCriteria: $acceptanceCriteria
  38 + description: $description
  39 + isImportant: true
  40 + taskBelong: 13
  41 + isRemind: true
  42 + pictures:
  43 + method: POST
  44 + url: task/bid/update
  45 +validate:
  46 + - eq:
  47 + - content.code
  48 + - 0
  49 + - eq:
  50 + - content.msg
  51 + - $msg
1 -name: 公司悬赏任务 1 +name: 公司任务（抢单任务）
2 base_url: ${ENV(base_url)} 2 base_url: ${ENV(base_url)}
3 verify: False 3 verify: False
4 variables: 4 variables:
@@ -19,10 +19,12 @@ request: @@ -19,10 +19,12 @@ request:
19 X-MMM-Uuid: $uuid 19 X-MMM-Uuid: $uuid
20 X-MMM-Version: 1.0.0 20 X-MMM-Version: 1.0.0
21 json: 21 json:
  22 + action: 0
  23 + newest: 1
22 pageIndex: 0 24 pageIndex: 0
23 pageSize: 20 25 pageSize: 20
24 method: POST 26 method: POST
25 - url: v1/task/rewards 27 + url: v1/task/contendTasks
26 validate: 28 validate:
27 - eq: 29 - eq:
28 - content.code 30 - content.code
1 -name: 公司任务（进行中、已完成） 1 +name: 公司任务（进行中）
2 base_url: ${ENV(base_url)} 2 base_url: ${ENV(base_url)}
3 verify: False 3 verify: False
4 variables: 4 variables:
@@ -19,10 +19,10 @@ request: @@ -19,10 +19,10 @@ request:
19 X-MMM-Uuid: $uuid 19 X-MMM-Uuid: $uuid
20 X-MMM-Version: 1.0.0 20 X-MMM-Version: 1.0.0
21 json: 21 json:
  22 + action: 0
  23 + newest: 1
22 pageIndex: 0 24 pageIndex: 0
23 pageSize: 20 25 pageSize: 20
24 - action: 0  
25 - newest: 0  
26 method: POST 26 method: POST
27 url: v1/task/currentTasks 27 url: v1/task/currentTasks
28 validate: 28 validate:
@@ -2,8 +2,7 @@ name: 抢单任务详情 @@ -2,8 +2,7 @@ name: 抢单任务详情
2 base_url: ${ENV(base_worth_url)} 2 base_url: ${ENV(base_worth_url)}
3 verify: False 3 verify: False
4 variables: 4 variables:
5 - id: ${get_task_id()}  
6 - status: ${get_task_status_from_database()} 5 + id: ${get_loot_task_id()}
7 msg: ok 6 msg: ok
8 request: 7 request:
9 headers: 8 headers:
  1 +name: 发布任务
  2 +base_url: ${ENV(base_worth_url)}
  3 +verify: False
  4 +variables:
  5 + id: ${get_loot_task_id()}
  6 + msg: ok
  7 +request:
  8 + headers:
  9 + Content-Type: application/json; charset=UTF-8
  10 + Authorization: Bearer ${get_task_Authorization()}
  11 + Origin: https://value-test.fjmaimaimai.com
  12 + Referer: https://value-test.fjmaimaimai.com/
  13 + 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
  14 + X-Requested-With: XMLHttpRequest
  15 + json:
  16 + id: $id
  17 + method: POST
  18 + url: task/open
  19 +validate:
  20 + - eq:
  21 + - content.code
  22 + - 0
  23 + - eq:
  24 + - content.msg
  25 + - $msg
@@ -4,7 +4,7 @@ verify: False @@ -4,7 +4,7 @@ verify: False
4 variables: 4 variables:
5 currtime: ${make_time()} 5 currtime: ${make_time()}
6 uuid: ${make_uuid()} 6 uuid: ${make_uuid()}
7 - access_token: ${get_accesstoken()} 7 + access_token: ${get_task_accesstoken()}
8 sign: ${make_sign($currtime, $uuid, $access_token)} 8 sign: ${make_sign($currtime, $uuid, $access_token)}
9 request: 9 request:
10 headers: 10 headers:
@@ -2,7 +2,7 @@ name: 抢单任务验收 @@ -2,7 +2,7 @@ name: 抢单任务验收
2 base_url: ${ENV(base_worth_url)} 2 base_url: ${ENV(base_worth_url)}
3 verify: False 3 verify: False
4 variables: 4 variables:
5 - taskId: ${get_task_status_4_from_database()} 5 + taskId: ${get_loot_task_id()}
6 remark: 上传报告${get_nowtime()} 6 remark: 上传报告${get_nowtime()}
7 realityTime: ${get_today()} 7 realityTime: ${get_today()}
8 uid0: ${get_uid0()} 8 uid0: ${get_uid0()}
@@ -21,13 +21,13 @@ request: @@ -21,13 +21,13 @@ request:
21 X-Requested-With: XMLHttpRequest 21 X-Requested-With: XMLHttpRequest
22 json: 22 json:
23 receiver: 23 receiver:
24 - uid: $uid15  
25 - name: $name15 24 + uid: $uid0
  25 + name: $name0
26 percent: 25 26 percent: 25
27 reward: 500 27 reward: 500
28 participant: 28 participant:
29 - - uid: $uid0  
30 - name: $name0 29 + - uid: $uid15
  30 + name: $name15
31 percent: ${convert_to_number(25)} 31 percent: ${convert_to_number(25)}
32 reward: ${convert_to_number(500)} 32 reward: ${convert_to_number(500)}
33 - uid: $uid1 33 - uid: $uid1
@@ -44,13 +44,13 @@ request: @@ -44,13 +44,13 @@ request:
44 solution: 44 solution:
45 total: ${convert_to_number(20)} 45 total: ${convert_to_number(20)}
46 receiver: 46 receiver:
47 - uid: $uid15  
48 - name: $name15 47 + uid: $uid0
  48 + name: $name0
49 percent: ${convert_to_number(25)} 49 percent: ${convert_to_number(25)}
50 score: ${convert_to_number(5)} 50 score: ${convert_to_number(5)}
51 participant: 51 participant:
52 - - uid: $uid0  
53 - name: $name0 52 + - uid: $uid15
  53 + name: $name15
54 percent: ${convert_to_number(25)} 54 percent: ${convert_to_number(25)}
55 score: ${convert_to_number(5)} 55 score: ${convert_to_number(5)}
56 - uid: $uid1 56 - uid: $uid1
@@ -67,10 +67,10 @@ request: @@ -67,10 +67,10 @@ request:
67 taskId: $taskId 67 taskId: $taskId
68 method: POST 68 method: POST
69 url: task/loot/accept 69 url: task/loot/accept
70 -#validate:  
71 - ## - eq:  
72 - ## - content.code  
73 - ## - 0  
74 - ## - eq:  
75 - ## - content.msg  
76 - ## - $msg  
  70 +validate:
  71 + - eq:
  72 + - content.code
  73 + - 0
  74 + - eq:
  75 + - content.msg
  76 + - $msg
  1 +name: 关闭任务
  2 +base_url: ${ENV(base_worth_url)}
  3 +verify: False
  4 +variables:
  5 + id: ${get_loot_task_id()}
  6 + reason: 测试关闭任务${get_nowtime()}
  7 + msg: ok
  8 +request:
  9 + headers:
  10 + Content-Type: application/json; charset=UTF-8
  11 + Authorization: Bearer ${get_task_Authorization()}
  12 + Origin: https://value-test.fjmaimaimai.com
  13 + Referer: https://value-test.fjmaimaimai.com/
  14 + 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
  15 + X-Requested-With: XMLHttpRequest
  16 + json:
  17 + id: $id
  18 + reason: $reason
  19 + method: POST
  20 + url: task/close
  21 +validate:
  22 + - eq:
  23 + - content.code
  24 + - 0
  25 + - eq:
  26 + - content.msg
  27 + - $msg
@@ -2,7 +2,7 @@ name: 确认领取人 @@ -2,7 +2,7 @@ name: 确认领取人
2 base_url: ${ENV(base_worth_url)} 2 base_url: ${ENV(base_worth_url)}
3 verify: False 3 verify: False
4 variables: 4 variables:
5 - id: ${get_task_status_7_from_database()} 5 + id: ${get_loot_task_id()}
6 planTime: ${get_today()} 6 planTime: ${get_today()}
7 msg: ok 7 msg: ok
8 request: 8 request:
  1 +name: 保存抢单任务
  2 +base_url: ${ENV(base_worth_url)}
  3 +verify: False
  4 +variables:
  5 + name: 测试抢单任务名称${get_nowtime()}
  6 + acceptanceCriteria: 测试抢单任务的验收标准${get_nowtime()}
  7 + description: 测试抢单任务的任务描述${get_nowtime()}
  8 + msg: ok
  9 +teardown_hooks:
  10 + - ${teardown_hook_get_loot_task_id($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 + name: $name
  21 + resourceType: 1
  22 + resourceList:
  23 + - id: ${get_resource_id()}
  24 + title: ${get_resource_title()}
  25 + content: ${get_resource_content()}
  26 + serial: ${get_serialNo()}
  27 + customerValue:
  28 + - 31
  29 + taskCharacter: 12
  30 + reward: 2000
  31 + acceptanceCriteria: $acceptanceCriteria
  32 + description: $description
  33 + isImportant: false
  34 + taskBelong: 13
  35 +# pictures:
  36 + method: POST
  37 + url: task/loot/update
  38 +validate:
  39 + - eq:
  40 + - content.code
  41 + - 0
  42 + - eq:
  43 + - content.msg
  44 + - $msg
1 -name: 保存任务 1 +name: 保存抢单任务
2 base_url: ${ENV(base_worth_url)} 2 base_url: ${ENV(base_worth_url)}
3 verify: False 3 verify: False
4 variables: 4 variables:
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTgxNjg1MjIsImV4cCI6MTU5ODE3OTMyMiwibmJmIjoxNTk4MTY4NTIyLCJqdGkiOiJiZFZFbmExY1NXSlB1UnNLIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.04Ot6NVzdl0l2_JzaU_USkt2_I7S1xqDRAe1mgd5OMQ  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTkyMzU3NjAsImV4cCI6MTU5OTI0NjU2MCwibmJmIjoxNTk5MjM1NzYwLCJqdGkiOiJaZHQwbDg1cW92YVFVUzB4Iiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.7v8LblyAi2iynP4FscB6g0lI6qUfnja8rDTpAmNrX0I
1 -N324MDwTM7CQBYeBiAYQF3XZn8JdApX5  
  1 +4EQRksNcQrr7jD4RKDQeQcSehbskxWbe
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTgxNjg1MjIsImV4cCI6MTU5ODE3OTMyMiwibmJmIjoxNTk4MTY4NTIyLCJqdGkiOiI0cks2YnZvY3NLNzdlSVVWIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.uhdyp3cjmtOB_wjYMhmmla58nXPp427gGXQplCZijPU  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTkyMzU3NjEsImV4cCI6MTU5OTI0NjU2MSwibmJmIjoxNTk5MjM1NzYxLCJqdGkiOiJHOXB5UW9WOXB5UlZ3anRYIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.JZyzltMQWNLWObfdrE2HzAo_0HPn9c_ZmWtbVyM_48s
1 -yaxyx64gdgg  
  1 +m3sr3hxwlkn
  1 +3041676743955448832
1 -d57ab89805400c7d1b2afdeffa449ff85e409a66cc86270111326500f476199203f5852b  
  1 +65d8a312aa904690f1485c475da3def2f225a4c2362d303b21c09ee07e46748bcf9648a2
1 -3667592490893312  
  1 +3679205371953152
1 -iLq0Ho7hoEaQUOEqmcTc+rTn+0YEWe7G9BQQGNcPRamovbjWT5emh7Q3YbcvOnAdH9hHXCnb031ErVFVesRTYG6nVujzNYut9NEbJb+Xw8MV9pp9D8QfZB9wNF8rgwZU+g65dD6mlrCU0qsMywVqgrPAna9mci+qvQ5DIAqysFc=  
  1 +IN4bWAJAI2RERL3FgFxWwhRuSDVdefyUwKKBqZ8DoqmrUXV/P0fqAY8QliDl4B8XvWFGJgy7GdvBpIVKToNPD8pV4oaO6r4pELpxvd84awJEQbJvbU0jx+Tzo5vhC5ys9spO+YZIrR6Fu6RvMxY8wlEbEXZRYSMd7QEp4Gw9kJQ=
  1 +3039395831662248960
1 -3247366011913216  
  1 +3248817613779968
1 -3273049130133760  
  1 +3275234834850048
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk4MTY4NTIzLCJleHAiOjE1OTgxNzkzMjMsIm5iZiI6MTU5ODE2ODUyMywianRpIjoiOWRsVEJrYkF2VmZYOUk4ZCIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.4m41YB_OdtpsC6Ezg3-LeFki_ce9TMqnHBvtHvrPhTo  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk5MjM1NzYxLCJleHAiOjE1OTkyNDY1NjEsIm5iZiI6MTU5OTIzNTc2MSwianRpIjoiSXBGQzJ0THlwdHQzSUhSMiIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.CcUAcnQcG193_6UIVknngrTGqC4aG6ADorsSfgg4eNQ
1 -jajwB87JfYZZ5QMDP2cHKsjRYfceBR7z  
  1 +NGQDN5sFaCTCK3y5xmhFBJWpiQxD8pKJ
1 -nwqq1o9rmsb  
  1 +tovgw90nveo
1 -3023771459492774912  
  1 +3026612655420343296
@@ -4,11 +4,13 @@ import time @@ -4,11 +4,13 @@ import time
4 from helpfunc.header_func import * 4 from helpfunc.header_func import *
5 from helpfunc.login_func import * 5 from helpfunc.login_func import *
6 from helpfunc.m_func import * 6 from helpfunc.m_func import *
7 -from helpfunc.pg_db_func import * 7 +from helpfunc.pg_db_loot_func import *
  8 +from helpfunc.pg_db_bid_func import *
8 # from helpfunc.time_func import * 9 # from helpfunc.time_func import *
9 10
10 import time,datetime,re 11 import time,datetime,re
11 12
  13 +
12 from urllib.parse import * 14 from urllib.parse import *
13 15
14 16
@@ -20,7 +22,7 @@ def convert_to_string(value): @@ -20,7 +22,7 @@ def convert_to_string(value):
20 22
21 def convert_to_number(value): 23 def convert_to_number(value):
22 return int(value) 24 return int(value)
23 - 25 +# print(type(convert_to_number(get_resource_id())))
24 # def get_base_url(env_type="test"): 26 # def get_base_url(env_type="test"):
25 # """ 27 # """
26 # 根据配置选择运行环境 28 # 根据配置选择运行环境
@@ -39,3 +41,14 @@ def get_nowtime(): @@ -39,3 +41,14 @@ def get_nowtime():
39 def get_second(): 41 def get_second():
40 curr_time = datetime.datetime.now() 42 curr_time = datetime.datetime.now()
41 return curr_time.second 43 return curr_time.second
  44 +
  45 +def get_tomorrow():
  46 + td = datetime.timedelta(days=1)
  47 + tomorrow = (datetime.datetime.utcnow() + td).strftime("%Y-%m-%dT%H:%M:%SZ")
  48 + return tomorrow
  49 +def get_today1():
  50 + td = datetime.timedelta(days=0)
  51 + tomorrow = (datetime.datetime.utcnow() + td).strftime("%Y-%m-%dT%H:%M:%SZ")
  52 + return tomorrow
  53 +
  54 +# print(get_today1())
@@ -261,11 +261,12 @@ def teardown_hook_get_cid(response): @@ -261,11 +261,12 @@ def teardown_hook_get_cid(response):
261 #———————————————————————————————————————————————————————————————————————————————————————————————————————————— 261 #————————————————————————————————————————————————————————————————————————————————————————————————————————————
262 #引用资源模块 262 #引用资源模块
263 def teardown_hook_get_resource_id(response): 263 def teardown_hook_get_resource_id(response):
  264 + global resource_id
  265 + resource_id = ''
264 if response.status_code ==200: 266 if response.status_code ==200:
265 jsondata = json.loads(response.text) 267 jsondata = json.loads(response.text)
266 resource_id = str(jsondata['data']['list'][0]['id']) 268 resource_id = str(jsondata['data']['list'][0]['id'])
267 try: 269 try:
268 -  
269 with open(path + "config/resource_id.txt", 'w+') as f: 270 with open(path + "config/resource_id.txt", 'w+') as f:
270 f.write(resource_id) 271 f.write(resource_id)
271 print('写入成功，resource_id：{}'.format(resource_id)) 272 print('写入成功，resource_id：{}'.format(resource_id))
@@ -289,6 +290,8 @@ def get_resource_id_to_int(): @@ -289,6 +290,8 @@ def get_resource_id_to_int():
289 return int(get_resource_id()) 290 return int(get_resource_id())
290 291
291 def teardown_hook_get_resource_title(response): 292 def teardown_hook_get_resource_title(response):
  293 + global resource_title
  294 + resource_title = ''
292 if response.status_code ==200: 295 if response.status_code ==200:
293 jsondata = json.loads(response.text) 296 jsondata = json.loads(response.text)
294 resource_title = jsondata['data']['list'][0]['title'] 297 resource_title = jsondata['data']['list'][0]['title']
@@ -314,6 +317,8 @@ def get_resource_title(): @@ -314,6 +317,8 @@ def get_resource_title():
314 return resource_title 317 return resource_title
315 318
316 def teardown_hook_get_resource_content(response): 319 def teardown_hook_get_resource_content(response):
  320 + global resource_content
  321 + resource_content = ''
317 if response.status_code ==200: 322 if response.status_code ==200:
318 jsondata = json.loads(response.text) 323 jsondata = json.loads(response.text)
319 resource_content = jsondata['data']['list'][0]['content'] 324 resource_content = jsondata['data']['list'][0]['content']
@@ -7,7 +7,6 @@ @@ -7,7 +7,6 @@
7 import json 7 import json
8 from urllib.parse import * 8 from urllib.parse import *
9 9
10 -  
11 # path = 'E:/task_api/' 10 # path = 'E:/task_api/'
12 path = 'E:/mmm_auto/task_api/' 11 path = 'E:/mmm_auto/task_api/'
13 def teardown_hook_get_Authorization(response): 12 def teardown_hook_get_Authorization(response):
@@ -68,25 +67,76 @@ def teardown_hook_get_login_code(response): @@ -68,25 +67,76 @@ def teardown_hook_get_login_code(response):
68 except Exception as e: 67 except Exception as e:
69 print('写入失败', e) 68 print('写入失败', e)
70 return res 69 return res
71 -  
72 -def teardown_hook_get_task_id(response): 70 +#写入抢单任务id
  71 +def teardown_hook_get_loot_task_id(response):
  72 + if response.status_code == 200:
  73 + jsondata = json.loads(response.text)
  74 + task_id =jsondata['data']['id']
  75 + try:
  76 + # 保存token到文件
  77 + with open(path + 'config/loot_task_id.txt','w+') as f:
  78 + f.write(task_id)
  79 + print('写入成功，task_id：{}'.format(task_id))
  80 + f.close()
  81 + except Exception as e:
  82 + print('写入失败', e)
  83 + return task_id
  84 +#获取抢单任务id
  85 +def get_loot_task_id():
  86 + try:
  87 + # 保存token到文件
  88 + with open(path + "config/loot_task_id.txt", 'r') as f:
  89 + task_id = f.read()
  90 + print('读取成功，task_id：{}'.format(task_id))
  91 + except Exception as e:
  92 + print('读取失败', e)
  93 + # Authorization = str(Authorization)
  94 + return task_id
  95 +#写入竞标任务id
  96 +def teardown_hook_get_bid_task_id(response):
73 if response.status_code == 200: 97 if response.status_code == 200:
74 jsondata = json.loads(response.text) 98 jsondata = json.loads(response.text)
75 task_id =jsondata['data']['id'] 99 task_id =jsondata['data']['id']
76 try: 100 try:
77 # 保存token到文件 101 # 保存token到文件
78 - with open(path + 'config/task_id.txt','w+') as f: 102 + with open(path + 'config/bid_task_id.txt','w+') as f:
79 f.write(task_id) 103 f.write(task_id)
80 print('写入成功，task_id：{}'.format(task_id)) 104 print('写入成功，task_id：{}'.format(task_id))
81 f.close() 105 f.close()
82 except Exception as e: 106 except Exception as e:
83 print('写入失败', e) 107 print('写入失败', e)
84 return task_id 108 return task_id
  109 +#获取竞标任务id
  110 +def get_bid_task_id():
  111 + try:
  112 + # 保存token到文件
  113 + with open(path + "config/bid_task_id.txt", 'r') as f:
  114 + task_id = f.read()
  115 + print('读取成功，task_id：{}'.format(task_id))
  116 + except Exception as e:
  117 + print('读取失败', e)
  118 + # Authorization = str(Authorization)
  119 + return task_id
85 120
86 -def get_task_id(): 121 +#写入指派任务id
  122 +def teardown_hook_get_appoint_task_id(response):
  123 + if response.status_code == 200:
  124 + jsondata = json.loads(response.text)
  125 + task_id =jsondata['data']['id']
  126 + try:
  127 + # 保存token到文件
  128 + with open(path + 'config/appoint_task_id.txt','w+') as f:
  129 + f.write(task_id)
  130 + print('写入成功，task_id：{}'.format(task_id))
  131 + f.close()
  132 + except Exception as e:
  133 + print('写入失败', e)
  134 + return task_id
  135 +#获取指派任务id
  136 +def get_appoint_task_id():
87 try: 137 try:
88 # 保存token到文件 138 # 保存token到文件
89 - with open(path + "config/task_id.txt", 'r') as f: 139 + with open(path + "config/appoint_task_id.txt", 'r') as f:
90 task_id = f.read() 140 task_id = f.read()
91 print('读取成功，task_id：{}'.format(task_id)) 141 print('读取成功，task_id：{}'.format(task_id))
92 except Exception as e: 142 except Exception as e:
  1 +#! /usr/bin/env python
  2 +# -*- coding: utf-8 -*-
  3 +# Date: 2020/7/12 16:27
  4 +# @Author:bxh
  5 +# @file: pg_db_func.py
  6 +from helpfunc.m_func import *
  7 +import psycopg2
  8 +from datetime import *
  9 +
  10 +# 获得连接
  11 +def GetConnect():
  12 + conn = False
  13 + try:
  14 + conn = psycopg2.connect(database="mmmworthtest",
  15 + user="bianxinhua",
  16 + password="bianxinhua_123",
  17 + host="114.55.200.59",
  18 + port="31543")
  19 + except Exception as err:
  20 + print("连接数据库失败，%s" % err)
  21 + return conn
  22 +
  23 +#获取抢单任务单的状态:待发布
  24 +def get_bid_task_status_1_from_database():
  25 + db = GetConnect()
  26 + cursor = db.cursor()
  27 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  28 + sql = '''select task_status from tasks where company_id = 366 and task_type = 2 and task_status = 1 and id = {} '''.format(get_bid_task_id())
  29 + # print(sql)
  30 + try:
  31 + cursor.execute(sql)
  32 + result = cursor.fetchone()
  33 + return result[0]
  34 + except Exception as err:
  35 + # 发生错误时回滚
  36 + print(err)
  37 + db.rollback()
  38 + db.close()
  39 +
  40 +#获取抢单任务单的状态:待领取
  41 +def get_task_status_2_from_database():
  42 + db = GetConnect()
  43 + cursor = db.cursor()
  44 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  45 + sql = '''select task_status from tasks where company_id = 366 and task_type = 2 and task_status = 2 and id = {} '''.format(get_bid_task_id())
  46 + print(sql)
  47 + try:
  48 + cursor.execute(sql)
  49 + result = cursor.fetchone()
  50 + return result[0]
  51 + except Exception as err:
  52 + # 发生错误时回滚
  53 + print(err)
  54 + db.rollback()
  55 + db.close()
  56 +#获取抢单任务单的状态:进行中
  57 +def get_task_status_3_from_database():
  58 + db = GetConnect()
  59 + cursor = db.cursor()
  60 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  61 + sql = '''select task_status from tasks where company_id = 366 and task_type = 2 and task_status = 3 and id = {} '''.format(get_bid_task_id())
  62 + # print(sql)
  63 + try:
  64 + cursor.execute(sql)
  65 + result = cursor.fetchone()
  66 + return result[0]
  67 + except Exception as err:
  68 + # 发生错误时回滚
  69 + print(err)
  70 + db.rollback()
  71 + db.close()
  72 +# #获取抢单任务单的状态:待确认
  73 +def get_task_status_7_from_database():
  74 + db = GetConnect()
  75 + cursor = db.cursor()
  76 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  77 + sql = '''select task_status from tasks where company_id = 366 and task_status = 7 and id = {}'''.format(get_bid_task_id())
  78 + print(sql)
  79 + try:
  80 + cursor.execute(sql)
  81 + result = cursor.fetchone()
  82 + return result[0]
  83 + except Exception as err:
  84 + # 发生错误时回滚
  85 + print(err)
  86 + db.rollback()
  87 + db.close()
  88 +
  89 +#获取任务单的状态:待验收
  90 +def get_task_status_4_from_database():
  91 + db = GetConnect()
  92 + cursor = db.cursor()
  93 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  94 + sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 4 and t.receiver_uid = '3248817613892608' and id = {}'''.format(get_bid_task_id())
  95 + # print(sql)
  96 + try:
  97 + cursor.execute(sql)
  98 + result = cursor.fetchone()
  99 + return result[0]
  100 + except Exception as err:
  101 + # 发生错误时回滚
  102 + print(err)
  103 + db.rollback()
  104 + db.close()
  105 +
  106 +#获取任务单的状态:已完成
  107 +def get_task_status_5_from_database():
  108 + db = GetConnect()
  109 + cursor = db.cursor()
  110 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  111 + sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 5 and id = {}'''.format(get_bid_task_id())
  112 + # print(sql)
  113 + try:
  114 + cursor.execute(sql)
  115 + result = cursor.fetchone()
  116 + return result[0]
  117 + except Exception as err:
  118 + # 发生错误时回滚
  119 + print(err)
  120 + db.rollback()
  121 + db.close()
  122 +
  123 +#获取任务单的状态:已关闭
  124 +def get_task_status_6_from_database():
  125 + db = GetConnect()
  126 + cursor = db.cursor()
  127 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  128 + sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 6 and id = {}'''.format(get_bid_task_id())
  129 + # print(sql)
  130 + try:
  131 + cursor.execute(sql)
  132 + result = cursor.fetchone()
  133 + return result[0]
  134 + except Exception as err:
  135 + # 发生错误时回滚
  136 + print(err)
  137 + db.rollback()
  138 + db.close()
@@ -7,9 +7,12 @@ from helpfunc.m_func import * @@ -7,9 +7,12 @@ from helpfunc.m_func import *
7 import psycopg2 7 import psycopg2
8 from datetime import * 8 from datetime import *
9 9
  10 +
  11 +
10 def get_today(): 12 def get_today():
11 today = datetime.now(timezone.utc).astimezone().isoformat() 13 today = datetime.now(timezone.utc).astimezone().isoformat()
12 return today 14 return today
  15 +
13 # 获得连接 16 # 获得连接
14 def GetConnect(): 17 def GetConnect():
15 conn = False 18 conn = False
@@ -72,12 +75,12 @@ def get_employee_account_from_database(): @@ -72,12 +75,12 @@ def get_employee_account_from_database():
72 db.rollback() 75 db.rollback()
73 db.close() 76 db.close()
74 77
75 -#获取任务单的状态  
76 -def get_task_status_from_database(): 78 +#获取抢单任务单的状态:待发布
  79 +def get_task_status_1_from_database():
77 db = GetConnect() 80 db = GetConnect()
78 cursor = db.cursor() 81 cursor = db.cursor()
79 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' 82 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
80 - sql = '''select task_status from tasks where company_id = 366 and task_type = 1 and id = {} '''.format(get_task_id()) 83 + sql = '''select task_status from tasks where company_id = 366 and task_type = 1 and task_status = 1 and id = {} '''.format(get_loot_task_id())
81 # print(sql) 84 # print(sql)
82 try: 85 try:
83 cursor.execute(sql) 86 cursor.execute(sql)
@@ -89,12 +92,28 @@ def get_task_status_from_database(): @@ -89,12 +92,28 @@ def get_task_status_from_database():
89 db.rollback() 92 db.rollback()
90 db.close() 93 db.close()
91 94
92 -#获取任务单的状态:待确认  
93 -def get_task_status_7_from_database(): 95 +#获取抢单任务单的状态:待领取
  96 +def get_task_status_2_from_database():
94 db = GetConnect() 97 db = GetConnect()
95 cursor = db.cursor() 98 cursor = db.cursor()
96 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' 99 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
97 - sql = '''select id from tasks where company_id = 366 and task_status = 7 order by id desc''' 100 + sql = '''select task_status from tasks where company_id = 366 and task_type = 1 and task_status = 2 and id = {} '''.format(get_loot_task_id())
  101 + print(sql)
  102 + try:
  103 + cursor.execute(sql)
  104 + result = cursor.fetchone()
  105 + return result[0]
  106 + except Exception as err:
  107 + # 发生错误时回滚
  108 + print(err)
  109 + db.rollback()
  110 + db.close()
  111 +#获取抢单任务单的状态:进行中
  112 +def get_task_status_3_from_database():
  113 + db = GetConnect()
  114 + cursor = db.cursor()
  115 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  116 + sql = '''select task_status from tasks where company_id = 366 and task_type = 1 and task_status = 3 and id = {} '''.format(get_loot_task_id())
98 # print(sql) 117 # print(sql)
99 try: 118 try:
100 cursor.execute(sql) 119 cursor.execute(sql)
@@ -105,21 +124,70 @@ def get_task_status_7_from_database(): @@ -105,21 +124,70 @@ def get_task_status_7_from_database():
105 print(err) 124 print(err)
106 db.rollback() 125 db.rollback()
107 db.close() 126 db.close()
  127 +# #获取抢单任务单的状态:待确认
  128 +def get_task_status_7_from_database():
  129 + db = GetConnect()
  130 + cursor = db.cursor()
  131 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  132 + sql = '''select task_status from tasks where company_id = 366 and task_status = 7 and id = {}'''.format(get_loot_task_id())
  133 + print(sql)
  134 + try:
  135 + cursor.execute(sql)
  136 + result = cursor.fetchone()
  137 + return result[0]
  138 + except Exception as err:
  139 + # 发生错误时回滚
  140 + print(err)
  141 + db.rollback()
  142 + db.close()
108 143
109 #获取任务单的状态:待验收 144 #获取任务单的状态:待验收
110 def get_task_status_4_from_database(): 145 def get_task_status_4_from_database():
111 db = GetConnect() 146 db = GetConnect()
112 cursor = db.cursor() 147 cursor = db.cursor()
113 # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc ' 148 # 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''' 149 + sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 4 and t.receiver_uid = '3248817613892608' and id = {}'''.format(get_loot_task_id())
115 # print(sql) 150 # print(sql)
116 try: 151 try:
117 cursor.execute(sql) 152 cursor.execute(sql)
118 result = cursor.fetchone() 153 result = cursor.fetchone()
119 - return str(result[0]) 154 + return result[0]
  155 + except Exception as err:
  156 + # 发生错误时回滚
  157 + print(err)
  158 + db.rollback()
  159 + db.close()
  160 +
  161 +#获取任务单的状态:已完成
  162 +def get_task_status_5_from_database():
  163 + db = GetConnect()
  164 + cursor = db.cursor()
  165 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  166 + sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 5 and id = {}'''.format(get_loot_task_id())
  167 + # print(sql)
  168 + try:
  169 + cursor.execute(sql)
  170 + result = cursor.fetchone()
  171 + return result[0]
  172 + except Exception as err:
  173 + # 发生错误时回滚
  174 + print(err)
  175 + db.rollback()
  176 + db.close()
  177 +
  178 +#获取任务单的状态:已关闭
  179 +def get_task_status_6_from_database():
  180 + db = GetConnect()
  181 + cursor = db.cursor()
  182 + # sql= "select id from " + '''"''' + tbl + '''"'''+ ' ' + 'order by id desc '
  183 + sql = '''select task_status from tasks t where t.company_id = 366 and t.task_status = 6 and id = {}'''.format(get_loot_task_id())
  184 + # print(sql)
  185 + try:
  186 + cursor.execute(sql)
  187 + result = cursor.fetchone()
  188 + return result[0]
120 except Exception as err: 189 except Exception as err:
121 # 发生错误时回滚 190 # 发生错误时回滚
122 print(err) 191 print(err)
123 db.rollback() 192 db.rollback()
124 db.close() 193 db.close()
125 -# print(get_task_status_4_from_database())  
1 config: 1 config:
2 - name: 价值系统登录 2 + name: 用户登录APP
3 base_url: ${ENV(base_url)} 3 base_url: ${ENV(base_url)}
4 4
5 teststeps: 5 teststeps:
1 config: 1 config:
2 - name: 账号登录测试 2 + name: 用户登录管理后台
3 base_url: ${ENV(base_business_url)} 3 base_url: ${ENV(base_business_url)}
4 4
5 teststeps: 5 teststeps:
  1 +config:
  2 + name: 用户新增抢单任务
  3 +
  4 +teststeps:
  5 +
  6 +- name: 提问问题-审核问题-获取资源
  7 + testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
  8 +
  9 +- name: 登录系统
  10 + variables:
  11 + phone: ${ENV(wpftwphone)}
  12 + testcase: testcases/common/COM002_m_login_testcases.yml
  13 +
  14 +- name: 引用资源
  15 + api: api/m_api/task_resource_api.yml
  16 + teardown_hooks:
  17 + - ${teardown_hook_get_resource_id($response)}
  18 + - ${teardown_hook_get_resource_title($response)}
  19 + - ${teardown_hook_get_resource_content($response)}
  20 + varidate:
  21 + validate:
  22 + - eq:
  23 + - content.msg
  24 + - ok
  25 +
  26 +- name: 保存任务
  27 + api: api/m_api/loot/loot_update_0_false_api.yml
  28 + teardown_hooks:
  29 + - ${teardown_hook_get_loot_task_id($response)}
  30 + varidate:
  31 + validate:
  32 + - eq:
  33 + - content.msg
  34 + - ok
  35 +#- name: 发布任务
  36 +# api: api/m_api/loot/loot_open_api.yml
  37 +# varidate:
  38 +# validate:
  39 +# - eq:
  40 +# - content.msg
  41 +# - ok
1 config: 1 config:
2 - name: 19990000008保存抢单任务-发布任务 2 + name: 用户新增抢单任务-公司重要悬赏
3 3
4 teststeps: 4 teststeps:
5 5
6 - name: 提问问题-审核问题-获取资源 6 - name: 提问问题-审核问题-获取资源
7 testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml 7 testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
8 8
9 -- name: 19990000008登录系统 9 +- name: 登录系统
10 variables: 10 variables:
11 phone: ${ENV(wpftwphone)} 11 phone: ${ENV(wpftwphone)}
12 - testcase: testcases/m_login_testcases.yml 12 + testcase: testcases/common/COM002_m_login_testcases.yml
13 13
14 - name: 引用资源 14 - name: 引用资源
15 api: api/m_api/task_resource_api.yml 15 api: api/m_api/task_resource_api.yml
@@ -23,17 +23,17 @@ teststeps: @@ -23,17 +23,17 @@ teststeps:
23 - content.msg 23 - content.msg
24 - ok 24 - ok
25 25
26 -- name: 19990000000保存任务  
27 - api: api/m_api/loot/loot_update_0_api.yml 26 +- name: 保存任务
  27 + api: api/m_api/loot/loot_update_true_api.yml
28 teardown_hooks: 28 teardown_hooks:
29 - - ${teardown_hook_get_task_id($response)} 29 + - ${teardown_hook_get_loot_task_id($response)}
30 varidate: 30 varidate:
31 validate: 31 validate:
32 - eq: 32 - eq:
33 - content.msg 33 - content.msg
34 - ok 34 - ok
35 -- name: 19990000000发布任务  
36 - api: api/m_api/task_open_api.yml 35 +- name: 发布任务
  36 + api: api/m_api/loot/loot_open_api.yml
37 varidate: 37 varidate:
38 validate: 38 validate:
39 - eq: 39 - eq:
1 config: 1 config:
2 - name: 19990000008保存抢单任务-删除任务 2 + name: 用户新增竞标任务
3 3
4 teststeps: 4 teststeps:
5 5
  6 +- name: 提问问题-审核问题-获取资源
  7 + testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
  8 +
6 - name: 登录系统 9 - name: 登录系统
7 variables: 10 variables:
8 phone: ${ENV(wpftwphone)} 11 phone: ${ENV(wpftwphone)}
9 - testcase: testcases/m_login_testcases.yml 12 + testcase: testcases/common/COM002_m_login_testcases.yml
10 13
11 -- name: 保存任务  
12 - output:  
13 - - id  
14 - api: api/m_api/loot/loot_update_0_api.yml  
15 - extract:  
16 - id: content.data.id 14 +- name: 引用资源
  15 + api: api/m_api/task_resource_api.yml
  16 + teardown_hooks:
  17 + - ${teardown_hook_get_resource_id($response)}
  18 + - ${teardown_hook_get_resource_title($response)}
  19 + - ${teardown_hook_get_resource_content($response)}
17 varidate: 20 varidate:
18 validate: 21 validate:
19 - eq: 22 - eq:
20 - content.msg 23 - content.msg
21 - ok 24 - ok
  25 +
  26 +- name: 保存任务
  27 + api: api/m_api/bid/bid_update_api.yml
  28 + teardown_hooks:
  29 + - ${teardown_hook_get_bid_task_id($response)}
  30 + varidate:
  31 + validate:
22 - eq: 32 - eq:
23 - - content.data.id  
24 - - $id  
25 -- name: 删除任务  
26 - api: api/m_api/task_delete_api.yml 33 + - content.msg
  34 + - ok
  35 +- name: 发布任务
  36 + api: api/m_api/bid/bid_open_api.yml
27 varidate: 37 varidate:
28 validate: 38 validate:
29 - eq: 39 - eq:
  1 +config:
  2 + name: 用户新增指派任务
  3 +
  4 +teststeps:
  5 +
  6 +- name: 提问问题-审核问题-获取资源
  7 + testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
  8 +
  9 +- name: 登录系统
  10 + variables:
  11 + phone: ${ENV(wpftwphone)}
  12 + testcase: testcases/common/COM002_m_login_testcases.yml
  13 +
  14 +- name: 引用资源
  15 + api: api/m_api/task_resource_api.yml
  16 + teardown_hooks:
  17 + - ${teardown_hook_get_resource_id($response)}
  18 + - ${teardown_hook_get_resource_title($response)}
  19 + - ${teardown_hook_get_resource_content($response)}
  20 + varidate:
  21 + validate:
  22 + - eq:
  23 + - content.msg
  24 + - ok
  25 +
  26 +- name: 保存任务
  27 + api: api/m_api/appoint/appoint_update_api.yml
  28 + teardown_hooks:
  29 + - ${teardown_hook_get_bid_task_id($response)}
  30 + varidate:
  31 + validate:
  32 + - eq:
  33 + - content.msg
  34 + - ok
  35 +- name: 发布任务
  36 + api: api/m_api/appoint/appoint_open_api.yml
  37 + varidate:
  38 + validate:
  39 + - eq:
  40 + - content.msg
  41 + - ok
  1 +config:
  2 + name: 抢单任务状态验证-待发布
  3 +
  4 +teststeps:
  5 +
  6 +- name: 提问问题-审核问题-获取资源
  7 + testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
  8 +
  9 +- name: 登录系统
  10 + variables:
  11 + phone: ${ENV(wpftwphone)}
  12 + testcase: testcases/common/COM002_m_login_testcases.yml
  13 +
  14 +- name: 引用资源
  15 + api: api/m_api/task_resource_api.yml
  16 + teardown_hooks:
  17 + - ${teardown_hook_get_resource_id($response)}
  18 + - ${teardown_hook_get_resource_title($response)}
  19 + - ${teardown_hook_get_resource_content($response)}
  20 + varidate:
  21 + validate:
  22 + - eq:
  23 + - content.msg
  24 + - ok
  25 +
  26 +- name: 保存任务
  27 + api: api/m_api/loot/loot_update_false_api.yml
  28 + teardown_hooks:
  29 + - ${teardown_hook_get_loot_task_id($response)}
  30 + varidate:
  31 + validate:
  32 + - eq:
  33 + - content.msg
  34 + - ok
  35 +
  36 +- name: 查看详情
  37 + api: api/m_api/loot/loot_detail_api.yml
  38 + variables:
  39 + status: ${get_task_status_1_from_database()}
  40 + msg: ok
  41 + varidate:
  42 + validate:
  43 + - eq:
  44 + - content.msg
  45 + - $msg
  46 + - eq:
  47 + - content.data.status
  48 + - $status
  1 +config:
  2 + name: 抢单任务状态验证-已发布，待领取
  3 +
  4 +teststeps:
  5 +
  6 +- name: 提问问题-审核问题-获取资源
  7 + testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
  8 +
  9 +- name: 登录系统
  10 + variables:
  11 + phone: ${ENV(wpftwphone)}
  12 + testcase: testcases/common/COM002_m_login_testcases.yml
  13 +
  14 +- name: 引用资源
  15 + api: api/m_api/task_resource_api.yml
  16 + teardown_hooks:
  17 + - ${teardown_hook_get_resource_id($response)}
  18 + - ${teardown_hook_get_resource_title($response)}
  19 + - ${teardown_hook_get_resource_content($response)}
  20 + varidate:
  21 + validate:
  22 + - eq:
  23 + - content.msg
  24 + - ok
  25 +#
  26 +- name: 保存任务
  27 + api: api/m_api/loot/loot_update_false_api.yml
  28 + teardown_hooks:
  29 + - ${teardown_hook_get_loot_task_id($response)}
  30 + varidate:
  31 + validate:
  32 + - eq:
  33 + - content.msg
  34 + - ok
  35 +- name: 发布任务
  36 + api: api/m_api/loot/loot_open_api.yml
  37 + varidate:
  38 + validate:
  39 + - eq:
  40 + - content.msg
  41 + - ok
  42 +
  43 +- name: 查看详情
  44 + api: api/m_api/loot/loot_detail_api.yml
  45 + variables:
  46 + status: ${get_task_status_2_from_database()}
  47 + msg: ok
  48 + varidate:
  49 + validate:
  50 + - eq:
  51 + - content.msg
  52 + - $msg
  53 + - eq:
  54 + - content.data.status
  55 + - $status
  1 +config:
  2 + name: 抢单任务状态验证-已领取，待确认
  3 +
  4 +teststeps:
  5 +
  6 +- name: 抢单任务状态验证-已发布，待领取
  7 + testcase: testcases/common/COM008_loot_open_status_2_testcase.yml
  8 +
  9 +- name: app端点击立即抢单
  10 + testcase: testcases/task/loot/loot_rewards_taskDetails_testcase.yml
  11 +
  12 +- name: 查看详情
  13 + api: api/m_api/loot/loot_detail_api.yml
  14 + variables:
  15 + status: ${get_task_status_7_from_database()}
  16 + msg: ok
  17 + varidate:
  18 + validate:
  19 + - eq:
  20 + - content.msg
  21 + - $msg
  22 + - eq:
  23 + - content.data.status
  24 + - $status
  1 +config:
  2 + name: 抢单任务状态验证-进行中
  3 +
  4 +teststeps:
  5 +
  6 +- name: 抢单任务状态验证-已领取，待确认
  7 + testcase: testcases/common/COM009_loot_open_status_7_testcase.yml
  8 +
  9 +- name: 确认领取人
  10 + api: api/m_api/loot/loot_task_confirm_api.yml
  11 + varidate:
  12 + validate:
  13 + - eq:
  14 + - content.msg
  15 + - ok
  16 +- name: 查看详情中的状态
  17 + api: api/m_api/loot/loot_detail_api.yml
  18 + variables:
  19 + status: ${get_task_status_3_from_database()}
  20 + msg: ok
  21 + varidate:
  22 + validate:
  23 + - eq:
  24 + - content.msg
  25 + - $msg
  26 + - eq:
  27 + - content.data.status
  28 + - $status
  1 +config:
  2 + name: 抢单任务状态验证-已完成，待验收
  3 +
  4 +teststeps:
  5 +
  6 +- name: 抢单任务状态验证-进行中
  7 + testcase: testcases/common/COM010_loot_open_status_3_testcase.yml
  8 +
  9 +##-------------------------APP端完成抢单任务------------------------------
  10 +- name: 完成任务
  11 + testcase: testcases/task/loot/loot_task_finishTask_testcase.yml
  12 +
  13 +- name: 查看详情中的状态
  14 + api: api/m_api/loot/loot_detail_api.yml
  15 + variables:
  16 + status: ${get_task_status_4_from_database()}
  17 + msg: ok
  18 + varidate:
  19 + validate:
  20 + - eq:
  21 + - content.msg
  22 + - $msg
  23 + - eq:
  24 + - content.data.status
  25 + - $status
  1 +config:
  2 + name: 抢单任务状态验证-已验收，已完成
  3 +
  4 +teststeps:
  5 +
  6 +- name: 抢单任务状态验证-已完成，待验收
  7 + testcase: testcases/common/COM011_loot_open_status_4_testcase.yml
  8 +
  9 +- name: 用户列表
  10 + output:
  11 + - uid0
  12 + - name0
  13 + - uid1
  14 + - name1
  15 + - uid2
  16 + - name2
  17 + - uid15
  18 + - name15
  19 + api: api/m_api/common/user_api.yml
  20 + extract:
  21 + uid0: content.data.list.0.uid
  22 + name0: content.data.list.0.name
  23 + uid1: content.data.list.1.uid
  24 + name1: content.data.list.1.name
  25 + uid2: content.data.list.2.uid
  26 + name2: content.data.list.2.name
  27 + uid15: content.data.list.15.uid
  28 + name15: content.data.list.15.name
  29 +
  30 +- name: 抢单任务验收
  31 + api: api/m_api/loot/loot_task_accept_api.yml
  32 + validate:
  33 + - eq:
  34 + - content.code
  35 + - 0
  36 + - eq:
  37 + - content.msg
  38 + - ok
  39 +
  40 +- name: 查看详情中的状态
  41 + api: api/m_api/loot/loot_detail_api.yml
  42 + variables:
  43 + status: ${get_task_status_5_from_database()}
  44 + msg: ok
  45 + varidate:
  46 + validate:
  47 + - eq:
  48 + - content.msg
  49 + - $msg
  50 + - eq:
  51 + - content.data.status
  52 + - $status
  1 +config:
  2 + name: 抢单任务状态验证-已验收，已完成
  3 +
  4 +teststeps:
  5 +
  6 +- name: 抢单任务状态验证-已发布，待领取
  7 + testcase: testcases/common/COM008_loot_open_status_2_testcase.yml
  8 +
  9 +
  10 +- name: 关闭任务
  11 + api: api/m_api/loot/loot_task_close_api.yml
  12 + validate:
  13 + - eq:
  14 + - content.code
  15 + - 0
  16 + - eq:
  17 + - content.msg
  18 + - ok
  19 +
  20 +- name: 查看详情中的状态
  21 + api: api/m_api/loot/loot_detail_api.yml
  22 + variables:
  23 + status: ${get_task_status_6_from_database()}
  24 + msg: ok
  25 + varidate:
  26 + validate:
  27 + - eq:
  28 + - content.msg
  29 + - $msg
  30 + - eq:
  31 + - content.data.status
  32 + - $status
  1 +config:
  2 + name: 竞标任务状态验证-待发布
  3 +
  4 +teststeps:
  5 +
  6 +- name: 提问问题-审核问题-获取资源
  7 + testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml
  8 +
  9 +- name: 登录系统
  10 + variables:
  11 + phone: ${ENV(wpftwphone)}
  12 + testcase: testcases/common/COM002_m_login_testcases.yml
  13 +
  14 +- name: 引用资源
  15 + api: api/m_api/task_resource_api.yml
  16 + teardown_hooks:
  17 + - ${teardown_hook_get_resource_id($response)}
  18 + - ${teardown_hook_get_resource_title($response)}
  19 + - ${teardown_hook_get_resource_content($response)}
  20 + varidate:
  21 + validate:
  22 + - eq:
  23 + - content.msg
  24 + - ok
  25 +
  26 +- name: 保存任务
  27 + api: api/m_api/bid/bid_update_api.yml
  28 + teardown_hooks:
  29 + - ${teardown_hook_get_bid_task_id($response)}
  30 + varidate:
  31 + validate:
  32 + - eq:
  33 + - content.msg
  34 + - ok
  35 +
  36 +#- name: 查看详情
  37 +# api: api/m_api/loot/loot_detail_api.yml
  38 +# variables:
  39 +# status: ${get_bid_task_status_1_from_database()}
  40 +# msg: ok
  41 +# varidate:
  42 +# validate:
  43 +# - eq:
  44 +# - content.msg
  45 +# - $msg
  46 +# - eq:
  47 +# - content.data.status
  48 +# - $status
@@ -10,7 +10,7 @@ teststeps: @@ -10,7 +10,7 @@ teststeps:
10 - name: 有评分权限19990000011登录系统 10 - name: 有评分权限19990000011登录系统
11 variables: 11 variables:
12 phone: ${ENV(pfphone)} 12 phone: ${ENV(pfphone)}
13 - testcase: testcases/login_testcases.yml 13 + testcase: testcases/common/login_testcases.yml
14 14
15 - name: 19990000011查看待我审核 15 - name: 19990000011查看待我审核
16 output: 16 output:
1 -config:  
2 - name: QX002:同级别评分权限人员-查看问题-权限校验21  
3 -# #清理数据  
4 -# teardown_hooks:  
5 -# - ${teardown_hook_clean_db()}  
6 -# - ${teardown_hook_sleep_N_secs($response,2)}  
7 -  
8 -teststeps:  
9 -  
10 -- name: 19990000008提出问题  
11 - testcase: testcases/question/add_question.yml  
12 -  
13 -- name: 有评分权限19990000011登录系统  
14 - variables:  
15 - phone: ${ENV(pfphone)}  
16 - testcase: testcases/login_testcases.yml  
17 -  
18 -- name: 有评分权限19990000011查看待我审核  
19 - output:  
20 - - qid  
21 - api: api/app_api/question_api/audits_ireview_api.yml  
22 - extract:  
23 - qid: content.data.questions.0.id  
24 - validate:  
25 - - eq:  
26 - - content.data.questions.0.id  
27 - - $qid  
28 -#  
29 -#- name: 有评分权限18200000005审核问题  
30 -# api: api/question_api/auditquestion_api.yml  
31 -#  
32 -#- name: 同级别有评分权限18200000007登录系统  
33 -# variables:  
34 -# currtime: ${make_time()}  
35 -# uuid: ${make_uuid()}  
36 -# access_token: ''  
37 -# sign: ${make_sign($currtime, $uuid,$access_token)}  
38 -# phone: ${ENV(pfphone1)}  
39 -# testcase: testcases/login_testcases.yml  
40 -#  
41 -#- name: 同级别评分权限18200000007查看问题详情  
42 -# api: api/question_api/questiondetail_api.yml  
43 -# validate:  
44 -# - eq:  
45 -# - content.data.question.permission  
46 -# - 21  
47 -  
48 -  
@@ -7,7 +7,7 @@ teststeps: @@ -7,7 +7,7 @@ teststeps:
7 - name: 无评分权限的提问人员19990000008登录系统 7 - name: 无评分权限的提问人员19990000008登录系统
8 variables: 8 variables:
9 phone: ${ENV(wpftwphone)} 9 phone: ${ENV(wpftwphone)}
10 - testcase: testcases/login_testcases.yml 10 + testcase: testcases/common/login_testcases.yml
11 11
12 - name: 19990000008发布提问 12 - name: 19990000008发布提问
13 api: api/app_api/firstpage_api/addquestion_api.yml 13 api: api/app_api/firstpage_api/addquestion_api.yml
1 -config:  
2 - name: jxz:登录系统-查看公司悬赏任务-点击抢单  
3 -  
4 -teststeps:  
5 -  
6 -- name: 19990000011登录系统  
7 - variables:  
8 - phone: ${ENV(pfphone)}  
9 - testcase: testcases/login_testcases.yml  
10 -  
11 -- name: 19990000011查看公司悬赏任务  
12 - output:  
13 - - id  
14 - api: api/task_api/task/rewards/rewards_api.yml  
15 - extract:  
16 - id: content.data.tasks.0.id  
17 - validate:  
18 - - eq:  
19 - - content.data.tasks.0.id  
20 - - $id  
21 - - eq:  
22 - - content.code  
23 - - 0  
24 - - eq:  
25 - - content.msg  
26 - - 获取成功  
27 -  
28 -- name: 19990000011任务详情  
29 - api: api/task_api/task/taskDetails_api.yml  
30 - validate:  
31 - - eq:  
32 - - content.code  
33 - - 0  
34 - - eq:  
35 - - content.msg  
36 - - 获取详情成功  
37 -  
38 -- name: 19990000011点击抢单  
39 - api: api/task_api/task/rewards/submitCompete_0_api.yml  
40 - validate:  
41 - - eq:  
42 - - content.code  
43 - - 0  
44 - - eq:  
45 - - content.msg  
46 - - 抢单成功！  
47 -  
48 -- name: 19990000011查看进行中的任务  
49 - api: api/task_api/task/rewards/currentTasks_0_api.yml  
50 - validate:  
51 - - eq:  
52 - - content.code  
53 - - 0  
54 - - eq:  
55 - - content.msg  
56 - - 获取成功  
57 -  
58 -- name: 19990000011任务详情  
59 - api: api/task_api/task/taskDetails_api.yml  
60 - validate:  
61 - - eq:  
62 - - content.code  
63 - - 0  
64 - - eq:  
65 - - content.data.task.status  
66 - - 3  
67 - - eq:  
68 - - content.msg  
69 - - 获取详情成功  
70 -  
1 -config:  
2 - name: jxz:登录系统-查看公司悬赏任务-点击竞标  
3 -  
4 -teststeps:  
5 -  
6 -- name: 19990000011登录系统  
7 - variables:  
8 - phone: ${ENV(pfphone)}  
9 - testcase: testcases/login_testcases.yml  
10 -  
11 -- name: 19990000011查看公司悬赏任务  
12 - output:  
13 - - id  
14 - api: api/task_api/task/rewards/rewards_api.yml  
15 - extract:  
16 - id: content.data.tasks.0.id  
17 - validate:  
18 - - eq:  
19 - - content.data.tasks.0.id  
20 - - $id  
21 - - eq:  
22 - - content.code  
23 - - 0  
24 - - eq:  
25 - - content.msg  
26 - - 获取成功  
27 -  
28 -- name: 19990000011任务详情  
29 - api: api/task_api/task/taskDetails_api.yml  
30 - validate:  
31 - - eq:  
32 - - content.code  
33 - - 0  
34 - - eq:  
35 - - content.msg  
36 - - 获取详情成功  
37 -  
38 -- name: 19990000011点击竞标  
39 - api: api/task_api/task/rewards/submitCompete_1_api.yml  
40 - validate:  
41 - - eq:  
42 - - content.code  
43 - - 0  
44 - - eq:  
45 - - content.msg  
46 - - 已成功参与竞标，等待中标！！  
47 -  
48 -- name: 19990000008登录系统  
49 - variables:  
50 - phone: ${ENV(wpftwphone)}  
51 - testcase: testcases/login_testcases.yml  
52 -  
53 -- name: 19990000008查看公司悬赏任务  
54 - output:  
55 - - id  
56 - api: api/task_api/task/rewards/rewards_api.yml  
57 - extract:  
58 - id: content.data.tasks.0.id  
59 - validate:  
60 - - eq:  
61 - - content.data.tasks.0.id  
62 - - $id  
63 - - eq:  
64 - - content.code  
65 - - 0  
66 - - eq:  
67 - - content.msg  
68 - - 获取成功  
69 -  
70 -- name: 19990000008任务详情  
71 - output:  
72 - - uid  
73 - api: api/task_api/task/taskDetails_api.yml  
74 - extract:  
75 - uid: content.data.tasks.bidders.0.uid  
76 - validate:  
77 - - eq:  
78 - - content.code  
79 - - 0  
80 - - eq:  
81 - - content.msg  
82 - - 获取详情成功  
83 -  
84 -- name: 19990000008中标  
85 - api: api/task_api/task/bidTask_api.yml  
86 - validate:  
87 - - eq:  
88 - - content.code  
89 - - 0  
90 - - eq:  
91 - - content.msg  
92 - - 中标成功  
93 -  
94 -- name: 19990000011登录系统  
95 - variables:  
96 - phone: ${ENV(pfphone)}  
97 - testcase: testcases/login_testcases.yml  
98 -  
99 -- name: 19990000011查看公司悬赏任务  
100 - output:  
101 - - id  
102 - api: api/task_api/task/rewards/rewards_api.yml  
103 - extract:  
104 - id: content.data.tasks.0.id  
105 - validate:  
106 - - eq:  
107 - - content.data.tasks.0.id  
108 - - $id  
109 - - eq:  
110 - - content.code  
111 - - 0  
112 - - eq:  
113 - - content.msg  
114 - - 获取成功  
115 -  
116 -- name: 19990000011任务详情  
117 - api: api/task_api/task/taskDetails_api.yml  
118 - validate:  
119 - - eq:  
120 - - content.code  
121 - - 0  
122 - - eq:  
123 - - content.msg  
124 - - 获取详情成功  
125 -  
126 -- name: 19990000011查看进行中的任务  
127 - api: api/task_api/task/rewards/currentTasks_0_api.yml  
128 - validate:  
129 - - eq:  
130 - - content.code  
131 - - 0  
132 - - eq:  
133 - - content.msg  
134 - - 获取成功  
135 -  
136 -- name: 19990000011任务详情  
137 - api: api/task_api/task/taskDetails_api.yml  
138 - validate:  
139 - - eq:  
140 - - content.code  
141 - - 0  
142 - - eq:  
143 - - content.data.task.status  
144 - - 3  
145 - - eq:  
146 - - content.msg  
147 - - 获取详情成功  
148 -  
149 -- name: 19990000011完成任务  
150 - api: api/task_api/task/taskfinishTask_api.yml  
151 - validate:  
152 - - eq:  
153 - - content.code  
154 - - 0  
155 - - eq:  
156 - - content.msg  
157 - - 完成成功  
1 -config:  
2 - name: jxz:登录系统-查看公司悬赏任务-点击抢单  
3 -  
4 -teststeps:  
5 -  
6 -- name: 19990000011登录系统  
7 - variables:  
8 - phone: ${ENV(pfphone)}  
9 - testcase: testcases/login_testcases.yml  
10 -  
11 -- name: 19990000011查看公司悬赏任务  
12 - output:  
13 - - id  
14 - api: api/task_api/task/rewards/rewards_api.yml  
15 - extract:  
16 - id: content.data.tasks.0.id  
17 - validate:  
18 - - eq:  
19 - - content.data.tasks.0.id  
20 - - $id  
21 - - eq:  
22 - - content.code  
23 - - 0  
24 - - eq:  
25 - - content.msg  
26 - - 获取成功  
27 -  
28 -- name: 19990000011任务详情  
29 - api: api/task_api/task/taskDetails_api.yml  
30 - validate:  
31 - - eq:  
32 - - content.code  
33 - - 0  
34 - - eq:  
35 - - content.msg  
36 - - 获取详情成功  
37 -  
38 -- name: 19990000011点击抢单  
39 - api: api/task_api/task/rewards/submitCompete_0_api.yml  
40 - validate:  
41 - - eq:  
42 - - content.code  
43 - - 0  
44 - - eq:  
45 - - content.msg  
46 - - 抢单成功！  
47 -  
48 -- name: 19990000011查看进行中的任务  
49 - api: api/task_api/task/rewards/currentTasks_0_api.yml  
50 - validate:  
51 - - eq:  
52 - - content.code  
53 - - 0  
54 - - eq:  
55 - - content.msg  
56 - - 获取成功  
57 -  
58 -- name: 19990000011任务详情  
59 - api: api/task_api/task/taskDetails_api.yml  
60 - validate:  
61 - - eq:  
62 - - content.code  
63 - - 0  
64 - - eq:  
65 - - content.data.task.status  
66 - - 3  
67 - - eq:  
68 - - content.msg  
69 - - 获取详情成功  
70 -  
1 -config:  
2 - name: jxz:登录系统-查看公司悬赏任务-点击抢单  
3 -  
4 -teststeps:  
5 -  
6 -- name: 19990000011登录系统  
7 - variables:  
8 - phone: ${ENV(pfphone)}  
9 - testcase: testcases/login_testcases.yml  
10 -  
11 -- name: 19990000011查看公司悬赏任务  
12 - output:  
13 - - id  
14 - api: api/task_api/task/rewards/rewards_api.yml  
15 - extract:  
16 - id: content.data.tasks.0.id  
17 - validate:  
18 - - eq:  
19 - - content.data.tasks.0.id  
20 - - $id  
21 - - eq:  
22 - - content.code  
23 - - 0  
24 - - eq:  
25 - - content.msg  
26 - - 获取成功  
27 -  
28 -- name: 19990000011任务详情  
29 - api: api/task_api/task/taskDetails_api.yml  
30 - validate:  
31 - - eq:  
32 - - content.code  
33 - - 0  
34 - - eq:  
35 - - content.msg  
36 - - 获取详情成功  
37 -  
38 -- name: 19990000011点击抢单  
39 - api: api/task_api/task/rewards/submitCompete_0_api.yml  
40 - validate:  
41 - - eq:  
42 - - content.code  
43 - - 0  
44 - - eq:  
45 - - content.msg  
46 - - 抢单成功！  
47 -  
48 -- name: 19990000011查看进行中的任务  
49 - api: api/task_api/task/rewards/currentTasks_0_api.yml  
50 - validate:  
51 - - eq:  
52 - - content.code  
53 - - 0  
54 - - eq:  
55 - - content.msg  
56 - - 获取成功  
57 -  
58 -- name: 19990000011任务详情  
59 - api: api/task_api/task/taskDetails_api.yml  
60 - validate:  
61 - - eq:  
62 - - content.code  
63 - - 0  
64 - - eq:  
65 - - content.data.task.status  
66 - - 3  
67 - - eq:  
68 - - content.msg  
69 - - 获取详情成功  
70 -  
71 -- name: 19990000011完成任务  
72 - api: api/task_api/task/taskfinishTask_api.yml  
73 - validate:  
74 - - eq:  
75 - - content.code  
76 - - 0  
77 - - eq:  
78 - - content.msg  
79 - - 完成成功  
1 config: 1 config:
2 name: 首页-立即抢单 2 name: 首页-立即抢单
  3 + variables:
  4 + phone: ${ENV(appphone)}
3 5
4 teststeps: 6 teststeps:
5 7
6 -- name: 19990000008登录系统  
7 - variables:  
8 - phone: ${ENV(appphone)}  
9 - testcase: testcases/login_testcases.yml 8 +- name: 登录系统
  9 + testcase: testcases/common/login_testcases.yml
10 10
11 -- name: 19990000008登录价值系统  
12 - testcase: testcases/task_login_testcases.yml 11 +- name: 登录价值系统
  12 + testcase: testcases/common/COM001_task_login_testcases.yml
13 13
14 -- name: 19990000000查看公司悬赏任务列表 14 +- name: 公司任务（抢单任务）
15 output: 15 output:
16 - id 16 - id
17 - api: api/m_api/task_rewards_api.yml 17 + api: api/m_api/loot/loot_contendTasks_api.yml
18 extract: 18 extract:
19 id: content.data.tasks.0.id 19 id: content.data.tasks.0.id
20 validate: 20 validate:
21 - eq: 21 - eq:
22 - content.data.tasks.0.id 22 - content.data.tasks.0.id
23 - $id 23 - $id
24 -#  
25 -- name: 19990000008抢单 24 +- name: 抢单
26 api: api/m_api/loot/submitCompete_loot_api.yml 25 api: api/m_api/loot/submitCompete_loot_api.yml
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 - output:  
24 - - status  
25 - api: api/m_api/loot/task_loot_detail_api.yml  
26 - extract:  
27 - status: content.data.status  
28 -# variables:  
29 -# id: ${get_task_id()}  
30 - varidate:  
31 - validate:  
32 - - eq:  
33 - - content.msg  
34 - - ok  
35 - - eq:  
36 - - content.data.status  
37 - - $status  
@@ -2,18 +2,18 @@ config: @@ -2,18 +2,18 @@ config:
2 name: 任务完成 2 name: 任务完成
3 3
4 teststeps: 4 teststeps:
5 -- name: 19990000008登录系统 5 +- name: 登录系统
6 variables: 6 variables:
7 phone: ${ENV(appphone)} 7 phone: ${ENV(appphone)}
8 - testcase: testcases/login_testcases.yml 8 + testcase: testcases/common/login_testcases.yml
9 9
10 -- name: 19990000008登录价值系统  
11 - testcase: testcases/task_login_testcases.yml 10 +- name: 登录价值系统
  11 + testcase: testcases/common/COM001_task_login_testcases.yml
12 12
13 -- name: 公司任务（进行中、已完成） 13 +- name: 公司任务（进行中）
14 output: 14 output:
15 - id 15 - id
16 - api: api/m_api/task_currentTasks_api.yml 16 + api: api/m_api/loot/loot_currentTasks_api.yml
17 extract: 17 extract:
18 id: content.data.tasks.0.id 18 id: content.data.tasks.0.id
19 validate: 19 validate:
@@ -21,5 +21,8 @@ teststeps: @@ -21,5 +21,8 @@ teststeps:
21 - content.data.tasks.0.id 21 - content.data.tasks.0.id
22 - $id 22 - $id
23 23
  24 +- name: 查看抢单任务详情
  25 + api: api/m_api/loot/loot_task_Details_api.yml
  26 +
24 - name: 完成任务 27 - name: 完成任务
25 - api: api/m_api/task_finishTask_api.yml  
  28 + api: api/m_api/loot/loot_task_finishTask_api.yml
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_reject_api.yml  
14 - variables:  
15 - id: ${get_task_id()}  
16 - varidate:  
17 - validate:  
18 - - eq:  
19 - - content.msg  
20 - - ok  
21 -  
22 -- name: 抢单任务详情  
23 - output:  
24 - - status  
25 - api: api/m_api/loot/task_loot_detail_api.yml  
26 - extract:  
27 - status: content.data.status  
28 - variables:  
29 - id: ${get_task_id()}  
30 - varidate:  
31 - validate:  
32 - - eq:  
33 - - content.msg  
34 - - ok  
35 - - eq:  
36 - - content.data.status  
37 - - $status  
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  
@@ -13,20 +13,5 @@ testcases: @@ -13,20 +13,5 @@ testcases:
13 #- name: member_set_permission 成员管理设置权限 13 #- name: member_set_permission 成员管理设置权限
14 # testcase: testcases/task/member/member_set_permission_testcases.yml 14 # testcase: testcases/task/member/member_set_permission_testcases.yml
15 15
16 -#- name: 引用资源  
17 -# testcase: testcases/permission/ques_pf_permission/QX001_pf_permission.yml  
18 -  
19 -#- name: loot_update_0 抢单任务-保存任务-删除任务  
20 -# testcase: testcases/task/loot/save_loot_update_0_delete_testcase.yml  
21 -  
22 -#- name: app端点击立即抢单  
23 -# testcase: testcases/task/task_rewards_taskDetails_testcase.yml  
24 -  
25 -#- name: loot_task_reject 抢单模式-驳回领取人-查看详情  
26 -# testcase: testcases/task/loot/loot_task_reject_testcase.yml  
27 -  
28 -#- name: loot_task_confirm 抢单模式-确认领取人-查看详情  
29 -# testcase: testcases/task/loot/loot_task_confirm_testcase.yml  
30 -  
31 -- name: loot_task_confirm 抢单模式-完成任务-验收任务  
32 - testcase: testcases/task/loot_task_finishTask_testcase.yml  
  16 +- name: 任务状态验证-已关闭
  17 + testcase: testcases/common/COM014_bid_update_status_1_testcase.yml