bianxinhua / task_api · 提交

转到一个项目

作者 bianxinhua
提交 f2b86596c51f99c8c0ad84d8b79277804e672ebf 1 个父辈 f2d73183

add README

内嵌 并排对比
正在显示 24 个修改的文件 包含 316 行增加 和 248 行删除
@@ -2,70 +2,29 @@ @@ -2,70 +2,29 @@
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/loot/loot_task_confirm_api.yml" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/api/m_api/loot/task_loot_detail_api.yml" afterDir="false" />  
7 - <change afterPath="$PROJECT_DIR$/api/m_api/task_resource_api.yml" afterDir="false" /> 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" />
8 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 9 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
9 - <change beforePath="$PROJECT_DIR$/api/m_api/bidTask_api.yml" beforeDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/api/m_api/iPublishedTasks_3_api.yml" beforeDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/api/m_api/jb_fb_task/taskPublish_0_0_1_api.yml" beforeDir="false" />  
12 - <change beforePath="$PROJECT_DIR$/api/m_api/jb_fb_task/taskPublish_0_1_0_api.yml" beforeDir="false" />  
13 - <change beforePath="$PROJECT_DIR$/api/m_api/jb_fb_task/taskPublish_1_1_api.yml" beforeDir="false" />  
14 - <change beforePath="$PROJECT_DIR$/api/m_api/jb_fb_task/tasksearchResources_api.yml" beforeDir="false" />  
15 - <change beforePath="$PROJECT_DIR$/api/m_api/jb_fb_task/update_taskPublish_api.yml" beforeDir="false" />  
16 - <change beforePath="$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml" afterDir="false" />  
17 - <change beforePath="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" afterDir="false" />  
18 - <change beforePath="$PROJECT_DIR$/api/m_api/loot/tasksearchResources_api.yml" beforeDir="false" />  
19 - <change beforePath="$PROJECT_DIR$/api/m_api/rewards/currentTasks_0_api.yml" beforeDir="false" />  
20 - <change beforePath="$PROJECT_DIR$/api/m_api/rewards/currentTasks_1_api.yml" beforeDir="false" />  
21 - <change beforePath="$PROJECT_DIR$/api/m_api/rewards/rewards_api.yml" beforeDir="false" />  
22 - <change beforePath="$PROJECT_DIR$/api/m_api/rewards/submitCompete_0_api.yml" beforeDir="false" />  
23 - <change beforePath="$PROJECT_DIR$/api/m_api/rewards/submitCompete_1_api.yml" beforeDir="false" />  
24 - <change beforePath="$PROJECT_DIR$/api/m_api/taskStatistics.yml" beforeDir="false" />  
25 - <change beforePath="$PROJECT_DIR$/api/m_api/task_open_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/task_open_api.yml" afterDir="false" />  
26 - <change beforePath="$PROJECT_DIR$/api/m_api/taskcheckAccept_api.yml" beforeDir="false" />  
27 - <change beforePath="$PROJECT_DIR$/api/m_api/taskcloseTask_api.yml" beforeDir="false" />  
28 - <change beforePath="$PROJECT_DIR$/api/m_api/taskfinishTask_api.yml" beforeDir="false" />  
29 - <change beforePath="$PROJECT_DIR$/api/task_api/task/bidTask_api.yml" beforeDir="false" />  
30 - <change beforePath="$PROJECT_DIR$/api/task_api/task/dfb_task/iPublishedTasks_0_api.yml" beforeDir="false" />  
31 - <change beforePath="$PROJECT_DIR$/api/task_api/task/dfb_task/taskdeleteTask_api.yml" beforeDir="false" />  
32 - <change beforePath="$PROJECT_DIR$/api/task_api/task/employee/allEmployees_api.yml" beforeDir="false" />  
33 - <change beforePath="$PROJECT_DIR$/api/task_api/task/iPublishedTasks_3_api.yml" beforeDir="false" />  
34 - <change beforePath="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_0_0_1_api.yml" beforeDir="false" />  
35 - <change beforePath="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_0_1_0_api.yml" beforeDir="false" />  
36 - <change beforePath="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_1_1_api.yml" beforeDir="false" />  
37 - <change beforePath="$PROJECT_DIR$/api/task_api/task/jb_fb_task/tasksearchResources_api.yml" beforeDir="false" />  
38 - <change beforePath="$PROJECT_DIR$/api/task_api/task/jb_fb_task/update_taskPublish_api.yml" beforeDir="false" />  
39 - <change beforePath="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_0_0_api.yml" beforeDir="false" />  
40 - <change beforePath="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_1_0_api.yml" beforeDir="false" />  
41 - <change beforePath="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_1_api.yml" beforeDir="false" />  
42 - <change beforePath="$PROJECT_DIR$/api/task_api/task/qd_fb_task/tasksearchResources_api.yml" beforeDir="false" />  
43 - <change beforePath="$PROJECT_DIR$/api/task_api/task/qd_fb_task/update_taskPublish_api.yml" beforeDir="false" />  
44 - <change beforePath="$PROJECT_DIR$/api/task_api/task/rewards/currentTasks_0_api.yml" beforeDir="false" />  
45 - <change beforePath="$PROJECT_DIR$/api/task_api/task/rewards/currentTasks_1_api.yml" beforeDir="false" />  
46 - <change beforePath="$PROJECT_DIR$/api/task_api/task/rewards/rewards_api.yml" beforeDir="false" />  
47 - <change beforePath="$PROJECT_DIR$/api/task_api/task/rewards/submitCompete_1_api.yml" beforeDir="false" />  
48 - <change beforePath="$PROJECT_DIR$/api/task_api/task/taskDetails_api.yml" beforeDir="false" />  
49 - <change beforePath="$PROJECT_DIR$/api/task_api/task/taskStatistics.yml" beforeDir="false" />  
50 - <change beforePath="$PROJECT_DIR$/api/task_api/task/taskcheckAccept_api.yml" beforeDir="false" />  
51 - <change beforePath="$PROJECT_DIR$/api/task_api/task/taskcloseTask_api.yml" beforeDir="false" />  
52 - <change beforePath="$PROJECT_DIR$/api/task_api/task/taskfinishTask_api.yml" beforeDir="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" />
53 <change beforePath="$PROJECT_DIR$/config/Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/Authorization.txt" afterDir="false" /> 11 <change beforePath="$PROJECT_DIR$/config/Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/Authorization.txt" afterDir="false" />
54 <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" /> 12 <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" />
55 <change beforePath="$PROJECT_DIR$/config/access_token.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/access_token.txt" afterDir="false" /> 13 <change beforePath="$PROJECT_DIR$/config/access_token.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/access_token.txt" afterDir="false" />
56 <change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" /> 14 <change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" />
57 <change beforePath="$PROJECT_DIR$/config/credentials.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/credentials.csv" afterDir="false" /> 15 <change beforePath="$PROJECT_DIR$/config/credentials.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/credentials.csv" afterDir="false" />
58 <change beforePath="$PROJECT_DIR$/config/login_code.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/login_code.txt" afterDir="false" /> 16 <change beforePath="$PROJECT_DIR$/config/login_code.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/login_code.txt" afterDir="false" />
  17 + <change beforePath="$PROJECT_DIR$/config/resource_content.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_content.txt" afterDir="false" />
  18 + <change beforePath="$PROJECT_DIR$/config/resource_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_id.txt" afterDir="false" />
  19 + <change beforePath="$PROJECT_DIR$/config/resource_title.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_title.txt" afterDir="false" />
  20 + <change beforePath="$PROJECT_DIR$/config/serialNo.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/serialNo.txt" afterDir="false" />
59 <change beforePath="$PROJECT_DIR$/config/task_Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_Authorization.txt" afterDir="false" /> 21 <change beforePath="$PROJECT_DIR$/config/task_Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_Authorization.txt" afterDir="false" />
60 <change beforePath="$PROJECT_DIR$/config/task_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_accessToken.csv" afterDir="false" /> 22 <change beforePath="$PROJECT_DIR$/config/task_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_accessToken.csv" afterDir="false" />
61 <change beforePath="$PROJECT_DIR$/config/task_authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_authCode.csv" afterDir="false" /> 23 <change beforePath="$PROJECT_DIR$/config/task_authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_authCode.csv" afterDir="false" />
62 - <change beforePath="$PROJECT_DIR$/helpfunc/login_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/login_func.py" afterDir="false" />  
63 - <change beforePath="$PROJECT_DIR$/helpfunc/m_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/m_func.py" afterDir="false" /> 24 + <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" />
64 <change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_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" />
65 - <change beforePath="$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml" afterDir="false" />  
66 - <change beforePath="$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml" afterDir="false" />  
67 - <change beforePath="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml" afterDir="false" />  
68 - <change beforePath="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml" afterDir="false" /> 27 + <change beforePath="$PROJECT_DIR$/testcases_excel/task_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/task_api.xlsx" afterDir="false" />
69 <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" />
70 </list> 29 </list>
71 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 30 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -76,12 +35,13 @@ @@ -76,12 +35,13 @@
76 </component> 35 </component>
77 <component name="CoverageDataManager"> 36 <component name="CoverageDataManager">
78 <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" />
79 - <SUITE FILE_PATH="coverage/task_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1597823863182" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 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" />
80 <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" />
81 <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$" />
82 <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" />
83 <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$" />
84 <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$" />
85 </component> 45 </component>
86 <component name="FavoritesManager"> 46 <component name="FavoritesManager">
87 <favorites_list name="ability_api" /> 47 <favorites_list name="ability_api" />
@@ -91,53 +51,38 @@ @@ -91,53 +51,38 @@
91 <file pinned="false" current-in-tab="false"> 51 <file pinned="false" current-in-tab="false">
92 <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml"> 52 <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml">
93 <provider selected="true" editor-type-id="text-editor"> 53 <provider selected="true" editor-type-id="text-editor">
94 - <state relative-caret-position="30">  
95 - <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" /> 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" />
96 </state> 56 </state>
97 </provider> 57 </provider>
98 </entry> 58 </entry>
99 </file> 59 </file>
100 <file pinned="false" current-in-tab="false"> 60 <file pinned="false" current-in-tab="false">
101 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml"> 61 + <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml">
102 <provider selected="true" editor-type-id="text-editor"> 62 <provider selected="true" editor-type-id="text-editor">
103 - <state relative-caret-position="442">  
104 - <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" />  
105 - </state>  
106 - </provider>  
107 - </entry>  
108 - </file>  
109 - <file pinned="false" current-in-tab="false">  
110 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml">  
111 - <provider selected="true" editor-type-id="text-editor">  
112 - <state relative-caret-position="-360">  
113 - <caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />  
114 - </state>  
115 - </provider>  
116 - </entry>  
117 - </file>  
118 - <file pinned="false" current-in-tab="false">  
119 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml">  
120 - <provider selected="true" editor-type-id="text-editor">  
121 - <state relative-caret-position="676">  
122 - <caret line="26" column="35" selection-start-line="26" selection-start-column="35" selection-end-line="26" selection-end-column="35" /> 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" />
123 </state> 65 </state>
124 </provider> 66 </provider>
125 </entry> 67 </entry>
126 </file> 68 </file>
127 <file pinned="false" current-in-tab="true"> 69 <file pinned="false" current-in-tab="true">
128 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 70 + <entry file="file://$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml">
129 <provider selected="true" editor-type-id="text-editor"> 71 <provider selected="true" editor-type-id="text-editor">
130 - <state relative-caret-position="555">  
131 - <caret line="82" column="17" lean-forward="true" selection-start-line="82" selection-start-column="17" selection-end-line="82" selection-end-column="17" /> 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" />
132 </state> 74 </state>
133 </provider> 75 </provider>
134 </entry> 76 </entry>
135 </file> 77 </file>
136 <file pinned="false" current-in-tab="false"> 78 <file pinned="false" current-in-tab="false">
137 - <entry file="file://$PROJECT_DIR$/api/m_api/task_resource_api.yml"> 79 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
138 <provider selected="true" editor-type-id="text-editor"> 80 <provider selected="true" editor-type-id="text-editor">
139 - <state>  
140 - <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" /> 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" />
  83 + <folding>
  84 + <element signature="e#108#137#0" expanded="true" />
  85 + </folding>
141 </state> 86 </state>
142 </provider> 87 </provider>
143 </entry> 88 </entry>
@@ -186,10 +131,6 @@ @@ -186,10 +131,6 @@
186 <component name="IdeDocumentHistory"> 131 <component name="IdeDocumentHistory">
187 <option name="CHANGED_PATHS"> 132 <option name="CHANGED_PATHS">
188 <list> 133 <list>
189 - <option value="$PROJECT_DIR$/testcases/task/taskPublish_JB/JBRW005.yml" />  
190 - <option value="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_0_0_1_api.yml" />  
191 - <option value="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_0_0_api.yml" />  
192 - <option value="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_1_0_api.yml" />  
193 <option value="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_1_api.yml" /> 134 <option value="$PROJECT_DIR$/api/task_api/task/qd_fb_task/taskPublish_0_1_api.yml" />
194 <option value="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_0_1_0_api.yml" /> 135 <option value="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_0_1_0_api.yml" />
195 <option value="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_1_1_api.yml" /> 136 <option value="$PROJECT_DIR$/api/task_api/task/jb_fb_task/taskPublish_1_1_api.yml" />
@@ -201,7 +142,6 @@ @@ -201,7 +142,6 @@
201 <option value="$PROJECT_DIR$/testcases/task/jxz/JB/jxz_wc.yml" /> 142 <option value="$PROJECT_DIR$/testcases/task/jxz/JB/jxz_wc.yml" />
202 <option value="$PROJECT_DIR$/api/app_api/firstpage_api/addquestion_api.yml" /> 143 <option value="$PROJECT_DIR$/api/app_api/firstpage_api/addquestion_api.yml" />
203 <option value="$PROJECT_DIR$/api/m_api/login_api/auth/login_api.yml" /> 144 <option value="$PROJECT_DIR$/api/m_api/login_api/auth/login_api.yml" />
204 - <option value="$PROJECT_DIR$/debugtalk.py" />  
205 <option value="$PROJECT_DIR$/testcases/task/member/member_set_permission_testcases.yml" /> 145 <option value="$PROJECT_DIR$/testcases/task/member/member_set_permission_testcases.yml" />
206 <option value="$PROJECT_DIR$/api/m_api/member/member_set_permission_api.yml" /> 146 <option value="$PROJECT_DIR$/api/m_api/member/member_set_permission_api.yml" />
207 <option value="$PROJECT_DIR$/testcases/task/member/member_list_testcases.yml" /> 147 <option value="$PROJECT_DIR$/testcases/task/member/member_list_testcases.yml" />
@@ -233,14 +173,19 @@ @@ -233,14 +173,19 @@
233 <option value="$PROJECT_DIR$/api/m_api/task_resource_api.yml" /> 173 <option value="$PROJECT_DIR$/api/m_api/task_resource_api.yml" />
234 <option value="$PROJECT_DIR$/helpfunc/login_func.py" /> 174 <option value="$PROJECT_DIR$/helpfunc/login_func.py" />
235 <option value="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" /> 175 <option value="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" />
236 - <option value="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml" />  
237 - <option value="$PROJECT_DIR$/testsuites/task_suites.yml" />  
238 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml" /> 176 <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" />
  178 + <option value="$PROJECT_DIR$/debugtalk.py" />
239 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.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" />
  181 + <option value="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" />
  182 + <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" />
240 </list> 185 </list>
241 </option> 186 </option>
242 </component> 187 </component>
243 - <component name="ProjectFrameBounds" extendedState="7"> 188 + <component name="ProjectFrameBounds" extendedState="6">
244 <option name="x" value="179" /> 189 <option name="x" value="179" />
245 <option name="y" value="427" /> 190 <option name="y" value="427" />
246 <option name="width" value="1382" /> 191 <option name="width" value="1382" />
@@ -264,24 +209,6 @@ @@ -264,24 +209,6 @@
264 <path> 209 <path>
265 <item name="task_api" type="b2602c69:ProjectViewProjectNode" /> 210 <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
266 <item name="task_api" type="462c0819:PsiDirectoryNode" /> 211 <item name="task_api" type="462c0819:PsiDirectoryNode" />
267 - <item name="api" type="462c0819:PsiDirectoryNode" />  
268 - </path>  
269 - <path>  
270 - <item name="task_api" type="b2602c69:ProjectViewProjectNode" />  
271 - <item name="task_api" type="462c0819:PsiDirectoryNode" />  
272 - <item name="api" type="462c0819:PsiDirectoryNode" />  
273 - <item name="m_api" 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 - <item name="loot" type="462c0819:PsiDirectoryNode" />  
281 - </path>  
282 - <path>  
283 - <item name="task_api" type="b2602c69:ProjectViewProjectNode" />  
284 - <item name="task_api" type="462c0819:PsiDirectoryNode" />  
285 <item name="helpfunc" type="462c0819:PsiDirectoryNode" /> 212 <item name="helpfunc" type="462c0819:PsiDirectoryNode" />
286 </path> 213 </path>
287 <path> 214 <path>
@@ -293,24 +220,11 @@ @@ -293,24 +220,11 @@
293 <item name="task_api" type="b2602c69:ProjectViewProjectNode" /> 220 <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
294 <item name="task_api" type="462c0819:PsiDirectoryNode" /> 221 <item name="task_api" type="462c0819:PsiDirectoryNode" />
295 <item name="testcases" type="462c0819:PsiDirectoryNode" /> 222 <item name="testcases" type="462c0819:PsiDirectoryNode" />
296 - <item name="permission" type="462c0819:PsiDirectoryNode" />  
297 - </path>  
298 - <path>  
299 - <item name="task_api" type="b2602c69:ProjectViewProjectNode" />  
300 - <item name="task_api" type="462c0819:PsiDirectoryNode" />  
301 - <item name="testcases" type="462c0819:PsiDirectoryNode" />  
302 <item name="task" type="462c0819:PsiDirectoryNode" /> 223 <item name="task" type="462c0819:PsiDirectoryNode" />
303 </path> 224 </path>
304 <path> 225 <path>
305 <item name="task_api" type="b2602c69:ProjectViewProjectNode" /> 226 <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
306 <item name="task_api" type="462c0819:PsiDirectoryNode" /> 227 <item name="task_api" type="462c0819:PsiDirectoryNode" />
307 - <item name="testcases" type="462c0819:PsiDirectoryNode" />  
308 - <item name="task" type="462c0819:PsiDirectoryNode" />  
309 - <item name="loot" type="462c0819:PsiDirectoryNode" />  
310 - </path>  
311 - <path>  
312 - <item name="task_api" type="b2602c69:ProjectViewProjectNode" />  
313 - <item name="task_api" type="462c0819:PsiDirectoryNode" />  
314 <item name="testsuites" type="462c0819:PsiDirectoryNode" /> 228 <item name="testsuites" type="462c0819:PsiDirectoryNode" />
315 </path> 229 </path>
316 </expand> 230 </expand>
@@ -333,11 +247,11 @@ @@ -333,11 +247,11 @@
333 <recent name="F:\PycharmProjects\ability_api\common" /> 247 <recent name="F:\PycharmProjects\ability_api\common" />
334 </key> 248 </key>
335 <key name="CopyFile.RECENT_KEYS"> 249 <key name="CopyFile.RECENT_KEYS">
336 - <recent name="E:\task_api\api\m_api\loot" />  
337 - <recent name="E:\task_api\api\m_api" />  
338 <recent name="E:\task_api\testcases\task\loot" /> 250 <recent name="E:\task_api\testcases\task\loot" />
  251 + <recent name="E:\task_api\testcases\task" />
  252 + <recent name="E:\task_api\api\m_api" />
  253 + <recent name="E:\task_api\api\m_api\loot" />
339 <recent name="E:\task_api\testcases" /> 254 <recent name="E:\task_api\testcases" />
340 - <recent name="E:\task_api\testcases\task\member" />  
341 </key> 255 </key>
342 </component> 256 </component>
343 <component name="RunDashboard"> 257 <component name="RunDashboard">
@@ -575,6 +489,8 @@ @@ -575,6 +489,8 @@
575 <workItem from="1597719772484" duration="2591000" /> 489 <workItem from="1597719772484" duration="2591000" />
576 <workItem from="1597729715453" duration="13232000" /> 490 <workItem from="1597729715453" duration="13232000" />
577 <workItem from="1597801010469" duration="16146000" /> 491 <workItem from="1597801010469" duration="16146000" />
  492 + <workItem from="1597886812090" duration="6866000" />
  493 + <workItem from="1597906408146" duration="2887000" />
578 </task> 494 </task>
579 <task id="LOCAL-00001" summary="优化测试用例"> 495 <task id="LOCAL-00001" summary="优化测试用例">
580 <created>1571644787323</created> 496 <created>1571644787323</created>
@@ -902,7 +818,7 @@ @@ -902,7 +818,7 @@
902 <servers /> 818 <servers />
903 </component> 819 </component>
904 <component name="TimeTrackingManager"> 820 <component name="TimeTrackingManager">
905 - <option name="totallyTimeSpent" value="325222000" /> 821 + <option name="totallyTimeSpent" value="334975000" />
906 </component> 822 </component>
907 <component name="TodoView" selected-index="3"> 823 <component name="TodoView" selected-index="3">
908 <todo-panel id="selected-file"> 824 <todo-panel id="selected-file">
@@ -914,8 +830,9 @@ @@ -914,8 +830,9 @@
914 </component> 830 </component>
915 <component name="ToolWindowManager"> 831 <component name="ToolWindowManager">
916 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 832 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
  833 + <editor active="true" />
917 <layout> 834 <layout>
918 - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.24195279" /> 835 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22049356" />
919 <window_info id="Structure" order="1" sideWeight="0.50238097" side_tool="true" weight="0.30711043" /> 836 <window_info id="Structure" order="1" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
920 <window_info id="Favorites" order="2" 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" />
921 <window_info anchor="bottom" id="Message" order="0" /> 838 <window_info anchor="bottom" id="Message" order="0" />
@@ -929,7 +846,7 @@ @@ -929,7 +846,7 @@
929 <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49848714" weight="0.328125" /> 846 <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49848714" weight="0.328125" />
930 <window_info anchor="bottom" id="Database Changes" order="9" /> 847 <window_info anchor="bottom" id="Database Changes" order="9" />
931 <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50226927" side_tool="true" weight="0.32879046" /> 848 <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50226927" side_tool="true" weight="0.32879046" />
932 - <window_info anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" weight="0.43191963" /> 849 + <window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" visible="true" weight="0.40401787" />
933 <window_info anchor="bottom" id="Python Console" order="12" weight="0.328125" /> 850 <window_info anchor="bottom" id="Python Console" order="12" weight="0.328125" />
934 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 851 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
935 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 852 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -1012,29 +929,6 @@ @@ -1012,29 +929,6 @@
1012 <option name="LAST_COMMIT_MESSAGE" value="update 2020005122330" /> 929 <option name="LAST_COMMIT_MESSAGE" value="update 2020005122330" />
1013 </component> 930 </component>
1014 <component name="editorHistoryManager"> 931 <component name="editorHistoryManager">
1015 - <entry file="file://$PROJECT_DIR$/api/app_api/question_api/audits_ireview_api.yml">  
1016 - <provider selected="true" editor-type-id="text-editor" />  
1017 - </entry>  
1018 - <entry file="file://$PROJECT_DIR$/debugtalk.py">  
1019 - <provider selected="true" editor-type-id="text-editor">  
1020 - <state relative-caret-position="156">  
1021 - <caret line="16" column="21" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="21" />  
1022 - <folding>  
1023 - <element signature="e#0#11#0" expanded="true" />  
1024 - </folding>  
1025 - </state>  
1026 - </provider>  
1027 - </entry>  
1028 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/taskPublish_0_0_0_api.yml" />  
1029 - <entry file="file://$PROJECT_DIR$/testcases/task/save_taskPublish_0_1_api.yml" />  
1030 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_taskPublish_0_0_api.yml" />  
1031 - <entry file="file://$PROJECT_DIR$/api/m_api/member/member_list_api.yml">  
1032 - <provider selected="true" editor-type-id="text-editor">  
1033 - <state relative-caret-position="197">  
1034 - <caret line="13" column="40" lean-forward="true" selection-start-line="8" selection-end-line="13" selection-end-column="40" />  
1035 - </state>  
1036 - </provider>  
1037 - </entry>  
1038 <entry file="file://$PROJECT_DIR$/testcases/task/member/member_list_testcases.yml"> 932 <entry file="file://$PROJECT_DIR$/testcases/task/member/member_list_testcases.yml">
1039 <provider selected="true" editor-type-id="text-editor"> 933 <provider selected="true" editor-type-id="text-editor">
1040 <state relative-caret-position="163"> 934 <state relative-caret-position="163">
@@ -1061,24 +955,9 @@ @@ -1061,24 +955,9 @@
1061 </state> 955 </state>
1062 </provider> 956 </provider>
1063 </entry> 957 </entry>
1064 - <entry file="file://$PROJECT_DIR$/.env">  
1065 - <provider selected="true" editor-type-id="text-editor">  
1066 - <state relative-caret-position="130">  
1067 - <caret line="5" column="8" selection-start-line="5" selection-end-line="5" selection-end-column="8" />  
1068 - </state>  
1069 - </provider>  
1070 - </entry>  
1071 - <entry file="file://$PROJECT_DIR$/api/m_api/taskStatistics.yml">  
1072 - <provider selected="true" editor-type-id="text-editor" />  
1073 - </entry>  
1074 - <entry file="file://$PROJECT_DIR$/api/task_api/task/rewards/rewards_api.yml">  
1075 - <provider selected="true" editor-type-id="text-editor">  
1076 - <state relative-caret-position="-312" />  
1077 - </provider>  
1078 - </entry>  
1079 - <entry file="file://$PROJECT_DIR$/api/task_api/task/taskStatistics.yml">  
1080 - <provider selected="true" editor-type-id="text-editor" />  
1081 - </entry> 958 + <entry file="file://$PROJECT_DIR$/api/m_api/taskStatistics.yml" />
  959 + <entry file="file://$PROJECT_DIR$/api/task_api/task/rewards/rewards_api.yml" />
  960 + <entry file="file://$PROJECT_DIR$/api/task_api/task/taskStatistics.yml" />
1082 <entry file="file://$PROJECT_DIR$/api/app_api/login_api/auth/accessToken_api.yml"> 961 <entry file="file://$PROJECT_DIR$/api/app_api/login_api/auth/accessToken_api.yml">
1083 <provider selected="true" editor-type-id="text-editor"> 962 <provider selected="true" editor-type-id="text-editor">
1084 <state relative-caret-position="364"> 963 <state relative-caret-position="364">
@@ -1117,20 +996,7 @@ @@ -1117,20 +996,7 @@
1117 </state> 996 </state>
1118 </provider> 997 </provider>
1119 </entry> 998 </entry>
1120 - <entry file="file://$PROJECT_DIR$/api/m_api/rewards/submitCompete_0_api.yml">  
1121 - <provider selected="true" editor-type-id="text-editor">  
1122 - <state>  
1123 - <caret selection-end-line="31" selection-end-column="15" />  
1124 - </state>  
1125 - </provider>  
1126 - </entry>  
1127 - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py">  
1128 - <provider selected="true" editor-type-id="text-editor">  
1129 - <state relative-caret-position="371">  
1130 - <caret line="170" selection-start-line="170" selection-end-line="170" />  
1131 - </state>  
1132 - </provider>  
1133 - </entry> 999 + <entry file="file://$PROJECT_DIR$/api/m_api/rewards/submitCompete_0_api.yml" />
1134 <entry file="file://$PROJECT_DIR$/api/m_api/login_api/auth/login_api.yml"> 1000 <entry file="file://$PROJECT_DIR$/api/m_api/login_api/auth/login_api.yml">
1135 <provider selected="true" editor-type-id="text-editor"> 1001 <provider selected="true" editor-type-id="text-editor">
1136 <state relative-caret-position="130"> 1002 <state relative-caret-position="130">
@@ -1138,13 +1004,6 @@ @@ -1138,13 +1004,6 @@
1138 </state> 1004 </state>
1139 </provider> 1005 </provider>
1140 </entry> 1006 </entry>
1141 - <entry file="file://$PROJECT_DIR$/api/m_api/task_rewards_api.yml">  
1142 - <provider selected="true" editor-type-id="text-editor">  
1143 - <state relative-caret-position="-78">  
1144 - <caret column="12" selection-start-column="12" selection-end-column="12" />  
1145 - </state>  
1146 - </provider>  
1147 - </entry>  
1148 <entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml"> 1007 <entry file="file://$PROJECT_DIR$/testcases/m_login_testcases.yml">
1149 <provider selected="true" editor-type-id="text-editor"> 1008 <provider selected="true" editor-type-id="text-editor">
1150 <state relative-caret-position="-754"> 1009 <state relative-caret-position="-754">
@@ -1152,13 +1011,6 @@ @@ -1152,13 +1011,6 @@
1152 </state> 1011 </state>
1153 </provider> 1012 </provider>
1154 </entry> 1013 </entry>
1155 - <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">  
1156 - <provider selected="true" editor-type-id="text-editor">  
1157 - <state relative-caret-position="264">  
1158 - <caret line="25" column="50" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" />  
1159 - </state>  
1160 - </provider>  
1161 - </entry>  
1162 <entry file="file://$PROJECT_DIR$/api/m_api/login_api/auth/userCompamies_api.yml"> 1014 <entry file="file://$PROJECT_DIR$/api/m_api/login_api/auth/userCompamies_api.yml">
1163 <provider selected="true" editor-type-id="text-editor" /> 1015 <provider selected="true" editor-type-id="text-editor" />
1164 </entry> 1016 </entry>
@@ -1211,13 +1063,6 @@ @@ -1211,13 +1063,6 @@
1211 </state> 1063 </state>
1212 </provider> 1064 </provider>
1213 </entry> 1065 </entry>
1214 - <entry file="file://$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml">  
1215 - <provider selected="true" editor-type-id="text-editor">  
1216 - <state relative-caret-position="264">  
1217 - <caret line="31" column="36" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="36" />  
1218 - </state>  
1219 - </provider>  
1220 - </entry>  
1221 <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml"> 1066 <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml">
1222 <provider selected="true" editor-type-id="text-editor"> 1067 <provider selected="true" editor-type-id="text-editor">
1223 <state relative-caret-position="104"> 1068 <state relative-caret-position="104">
@@ -1225,13 +1070,6 @@ @@ -1225,13 +1070,6 @@
1225 </state> 1070 </state>
1226 </provider> 1071 </provider>
1227 </entry> 1072 </entry>
1228 - <entry file="file://$PROJECT_DIR$/api/m_api/task_resource_api.yml">  
1229 - <provider selected="true" editor-type-id="text-editor">  
1230 - <state>  
1231 - <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="4" />  
1232 - </state>  
1233 - </provider>  
1234 - </entry>  
1235 <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py"> 1073 <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
1236 <provider selected="true" editor-type-id="text-editor"> 1074 <provider selected="true" editor-type-id="text-editor">
1237 <state relative-caret-position="133"> 1075 <state relative-caret-position="133">
@@ -1249,36 +1087,56 @@ @@ -1249,36 +1087,56 @@
1249 </state> 1087 </state>
1250 </provider> 1088 </provider>
1251 </entry> 1089 </entry>
1252 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/tasksearchResources_api.yml"> 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">
1253 <provider selected="true" editor-type-id="text-editor"> 1092 <provider selected="true" editor-type-id="text-editor">
1254 - <state relative-caret-position="-468" /> 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" />
  1095 + </state>
1255 </provider> 1096 </provider>
1256 </entry> 1097 </entry>
1257 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml"> 1098 + <entry file="file://$PROJECT_DIR$/api/m_api/task_resource_api.yml">
1258 <provider selected="true" editor-type-id="text-editor"> 1099 <provider selected="true" editor-type-id="text-editor">
1259 - <state relative-caret-position="134">  
1260 - <caret line="34" selection-start-line="34" selection-end-line="40" selection-end-column="16" /> 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" />
1261 </state> 1102 </state>
1262 </provider> 1103 </provider>
1263 </entry> 1104 </entry>
1264 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml"> 1105 + <entry file="file://$PROJECT_DIR$/api/m_api/task_rewards_api.yml">
1265 <provider selected="true" editor-type-id="text-editor"> 1106 <provider selected="true" editor-type-id="text-editor">
1266 - <state relative-caret-position="-360">  
1267 - <caret line="6" column="29" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" /> 1107 + <state>
  1108 + <caret column="12" selection-start-column="12" selection-end-column="12" />
1268 </state> 1109 </state>
1269 </provider> 1110 </provider>
1270 </entry> 1111 </entry>
1271 - <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml"> 1112 + <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">
  1113 + <provider selected="true" editor-type-id="text-editor">
  1114 + <state relative-caret-position="567">
  1115 + <caret line="25" column="50" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" />
  1116 + </state>
  1117 + </provider>
  1118 + </entry>
  1119 + <entry file="file://$PROJECT_DIR$/.env">
1272 <provider selected="true" editor-type-id="text-editor"> 1120 <provider selected="true" editor-type-id="text-editor">
1273 - <state relative-caret-position="30">  
1274 - <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" /> 1121 + <state relative-caret-position="130">
  1122 + <caret line="5" column="8" selection-start-line="5" selection-end-line="5" selection-end-column="8" />
1275 </state> 1123 </state>
1276 </provider> 1124 </provider>
1277 </entry> 1125 </entry>
1278 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml"> 1126 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml">
1279 <provider selected="true" editor-type-id="text-editor"> 1127 <provider selected="true" editor-type-id="text-editor">
1280 - <state relative-caret-position="442">  
1281 - <caret line="17" column="25" selection-start-line="17" selection-start-column="25" selection-end-line="17" selection-end-column="25" /> 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" />
  1130 + </state>
  1131 + </provider>
  1132 + </entry>
  1133 + <entry file="file://$PROJECT_DIR$/api/app_api/question_api/questiondetail_api.yml">
  1134 + <provider selected="true" editor-type-id="text-editor" />
  1135 + </entry>
  1136 + <entry file="file://$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml">
  1137 + <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" />
1282 </state> 1140 </state>
1283 </provider> 1141 </provider>
1284 </entry> 1142 </entry>
@@ -1292,17 +1150,76 @@ @@ -1292,17 +1150,76 @@
1292 </state> 1150 </state>
1293 </provider> 1151 </provider>
1294 </entry> 1152 </entry>
  1153 + <entry file="file://$PROJECT_DIR$/debugtalk.py">
  1154 + <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" />
  1157 + </state>
  1158 + </provider>
  1159 + </entry>
  1160 + <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml">
  1161 + <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" />
  1164 + </state>
  1165 + </provider>
  1166 + </entry>
1295 <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml"> 1167 <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_reject_testcase.yml">
1296 <provider selected="true" editor-type-id="text-editor"> 1168 <provider selected="true" editor-type-id="text-editor">
1297 - <state relative-caret-position="676"> 1169 + <state relative-caret-position="367">
1298 <caret line="26" column="35" selection-start-line="26" selection-start-column="35" selection-end-line="26" selection-end-column="35" /> 1170 <caret line="26" column="35" selection-start-line="26" selection-start-column="35" selection-end-line="26" selection-end-column="35" />
1299 </state> 1171 </state>
1300 </provider> 1172 </provider>
1301 </entry> 1173 </entry>
  1174 + <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py">
  1175 + <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" />
  1178 + </state>
  1179 + </provider>
  1180 + </entry>
  1181 + <entry file="file://$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml">
  1182 + <provider selected="true" editor-type-id="text-editor">
  1183 + <state>
  1184 + <caret column="6" selection-start-column="6" selection-end-column="19" />
  1185 + </state>
  1186 + </provider>
  1187 + </entry>
1302 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 1188 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
1303 <provider selected="true" editor-type-id="text-editor"> 1189 <provider selected="true" editor-type-id="text-editor">
1304 - <state relative-caret-position="555">  
1305 - <caret line="82" column="17" lean-forward="true" selection-start-line="82" selection-start-column="17" selection-end-line="82" selection-end-column="17" /> 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" />
  1192 + <folding>
  1193 + <element signature="e#108#137#0" expanded="true" />
  1194 + </folding>
  1195 + </state>
  1196 + </provider>
  1197 + </entry>
  1198 + <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml">
  1199 + <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" />
  1202 + </state>
  1203 + </provider>
  1204 + </entry>
  1205 + <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml">
  1206 + <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" />
  1209 + </state>
  1210 + </provider>
  1211 + </entry>
  1212 + <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml">
  1213 + <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" />
  1216 + </state>
  1217 + </provider>
  1218 + </entry>
  1219 + <entry file="file://$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml">
  1220 + <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" />
1306 </state> 1223 </state>
1307 </provider> 1224 </provider>
1308 </entry> 1225 </entry>
@@ -2,8 +2,8 @@ name: 确认领取人 @@ -2,8 +2,8 @@ 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 - reason: 驳回理由${get_nowtime()} 5 + id: ${get_task_status_7_from_database()}
  6 + planTime: ${get_today()}
7 msg: ok 7 msg: ok
8 request: 8 request:
9 headers: 9 headers:
@@ -15,8 +15,7 @@ request: @@ -15,8 +15,7 @@ request:
15 X-Requested-With: XMLHttpRequest 15 X-Requested-With: XMLHttpRequest
16 json: 16 json:
17 taskId: $id 17 taskId: $id
18 - planTime: $reason  
19 - type: 1 18 + planTime: $planTime
20 method: POST 19 method: POST
21 url: task/loot/confirm 20 url: task/loot/confirm
22 validate: 21 validate:
  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 + pageIndex: 0
  23 + pageSize: 20
  24 + action: 0
  25 + newest: 0
  26 + method: POST
  27 + url: v1/task/currentTasks
  28 +validate:
  29 + - eq:
  30 + - content.code
  31 + - 0
  32 + - eq:
  33 + - content.msg
  34 + - 获取成功
  35 +# - $msg
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTc4MjA0NzgsImV4cCI6MTU5NzgzMTI3OCwibmJmIjoxNTk3ODIwNDc4LCJqdGkiOiJLMHVGaE90b0h3QjVaUTNVIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.IY339vAQZJhww-BgP30gMZi8pGGKGlCOAzdXBCGetyI  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTc5MTYwNTEsImV4cCI6MTU5NzkyNjg1MSwibmJmIjoxNTk3OTE2MDUxLCJqdGkiOiJpU1c5dW52d1hhQnhaZ1lBIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.m8ej2VXl8TmpRT0-TCRdEg-pEfEF3TSD96y8n6mcVrE
1 -AZJBnJMH3yWiM2ZmztrjRjHTEWx8wBmw  
  1 +zj5RjNXnzpzM7wHfSQyP8b8347WR3sap
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTc4MjA0NzksImV4cCI6MTU5NzgzMTI3OSwibmJmIjoxNTk3ODIwNDc5LCJqdGkiOiJjVmY3cXh0eTc0NnlpTU9PIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.X3IBf-zJCf-x45TuwFcNBfjQTfRtHM45JYtsJ2TJkiw  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTc5MTYwNTIsImV4cCI6MTU5NzkyNjg1MiwibmJmIjoxNTk3OTE2MDUyLCJqdGkiOiI1d0pueldNUW5IYXpkMmd0Iiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.gcPynh0oEinoVzOss8Gt09cMeEIVFJYKnUFkkfGO9mM
1 -fb2822ppp7  
  1 +1j29edawio6
1 -8f467f8e6ead3f721536a7cb0da991b08d29ea359844e2ced0209828ea5afa11bd0a89ce  
  1 +92c16a3e3e8e2c0820af09d176d793dbf3680ba1cc1b0d35fcd5b6b502e3c895ce7b325a
1 -MJ3xHfRi1TbGye32qnBz8wfM7QIPqtAw3XZ01ATnarloQsoWh42jNhkrSiCvPmpwwvv5IJLOlzVO/tXEgBgWyxApTQzbE+ez2UfF80JaUdab1S4CmDkYWh02XQcW3mT2Q4VYCRQ3/M141kWF9dRRe/suLqlTo5HOkO8MHYxNsQ4=  
  1 +JLlEz5kkIaIJB2Ym4ckrrZKNO7SSRznghzlK1COfZQfpw9aZQhr4p5dxQa5TwvdZF1x7Hfc70z5qPCbjAcGAPR6CAtghq1gqu56yJvJQUNVfGHwqvqHAUEZyBp9U+7ROtzF12Y5ZnIkmS/1/Po9FjrKW1T+XRXF4wk2lbYW5SD4=
1 -3272336326492416  
  1 +3272532058847488
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk3ODIwNDc5LCJleHAiOjE1OTc4MzEyNzksIm5iZiI6MTU5NzgyMDQ3OSwianRpIjoiU1JxT0FCWHhqTkNUa2pZNyIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.A0Iz4gYyXNW463hZQb8WK0hnbSAg2CgGzciBaZ5h81g  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk3OTE2MDUyLCJleHAiOjE1OTc5MjY4NTIsIm5iZiI6MTU5NzkxNjA1MiwianRpIjoibnlEcDYzSUh1RHllMzlkMyIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.ZpkSYlD7HLSl3jqj_J182uTxYgJx4FODK7Ecj21aPzQ
1 -cfs2fyK6eJc7kQFB3RQb7zdmbrrH6r8p  
  1 +6GsDEBNjCAyR42YkRGQZbf8DhD7thHcm
1 -27jikz1cyjh  
  1 +7p52o7jok6t
1 -3017932248315331584  
  1 +3019535699008816128
@@ -8,6 +8,7 @@ from helpfunc.pg_db_func import * @@ -8,6 +8,7 @@ from helpfunc.pg_db_func import *
8 # from helpfunc.time_func import * 8 # from helpfunc.time_func import *
9 9
10 import time,datetime,re 10 import time,datetime,re
  11 +
11 from urllib.parse import * 12 from urllib.parse import *
12 13
13 14
@@ -32,7 +33,11 @@ def convert_to_string(value): @@ -32,7 +33,11 @@ def convert_to_string(value):
32 def get_nowtime(): 33 def get_nowtime():
33 return time.strftime("%Y%m%d%H%M%S",time.localtime(time.time())) 34 return time.strftime("%Y%m%d%H%M%S",time.localtime(time.time()))
34 35
  36 +
35 def get_second(): 37 def get_second():
36 curr_time = datetime.datetime.now() 38 curr_time = datetime.datetime.now()
37 return curr_time.second 39 return curr_time.second
38 40
  41 +
  42 +
  43 +print(get_second())
@@ -5,7 +5,11 @@ @@ -5,7 +5,11 @@
5 # @file: pg_db_func.py 5 # @file: pg_db_func.py
6 from helpfunc.m_func import * 6 from helpfunc.m_func import *
7 import psycopg2 7 import psycopg2
  8 +from datetime import *
8 9
  10 +def get_today():
  11 + today = datetime.now(timezone.utc).astimezone().isoformat()
  12 + return today
9 # 获得连接 13 # 获得连接
10 def GetConnect(): 14 def GetConnect():
11 conn = False 15 conn = False
@@ -84,4 +88,20 @@ def get_task_status_from_database(): @@ -84,4 +88,20 @@ def get_task_status_from_database():
84 print(err) 88 print(err)
85 db.rollback() 89 db.rollback()
86 db.close() 90 db.close()
87 -print(get_task_status_from_database())  
  91 +
  92 +#获取任务单的状态:待确认
  93 +def get_task_status_7_from_database():
  94 + db = GetConnect()
  95 + cursor = db.cursor()
  96 + # 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'''
  98 + # print(sql)
  99 + try:
  100 + cursor.execute(sql)
  101 + result = cursor.fetchone()
  102 + return result[0]
  103 + except Exception as err:
  104 + # 发生错误时回滚
  105 + print(err)
  106 + db.rollback()
  107 + db.close()
  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
  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 +
  6 +- name: 19990000008登录系统
  7 + variables:
  8 + phone: ${ENV(appphone)}
  9 + testcase: testcases/login_testcases.yml
  10 +
  11 +- name: 19990000008登录价值系统
  12 + testcase: testcases/task_login_testcases.yml
  13 +
  14 +- name: 公司任务（进行中、已完成）
  15 + output:
  16 + - id
  17 + api: api/m_api/task_currentTasks_api.yml
  18 + extract:
  19 + id: content.data.tasks.0.id
  20 + validate:
  21 + - eq:
  22 + - content.data.tasks.0.id
  23 + - $id
  24 +#
  25 +#- name: 19990000008抢单
  26 +# api: api/m_api/loot/submitCompete_loot_api.yml
@@ -19,8 +19,14 @@ testcases: @@ -19,8 +19,14 @@ testcases:
19 #- name: loot_update_0 抢单任务-保存任务-删除任务 19 #- name: loot_update_0 抢单任务-保存任务-删除任务
20 # testcase: testcases/task/loot/save_loot_update_0_delete_testcase.yml 20 # testcase: testcases/task/loot/save_loot_update_0_delete_testcase.yml
21 21
22 -- name: app端点击立即抢单  
23 - testcase: testcases/task/task_rewards_taskDetails_testcase.yml 22 +#- name: app端点击立即抢单
  23 +# testcase: testcases/task/task_rewards_taskDetails_testcase.yml
24 24
25 #- name: loot_task_reject 抢单模式-驳回领取人-查看详情 25 #- name: loot_task_reject 抢单模式-驳回领取人-查看详情
26 # testcase: testcases/task/loot/loot_task_reject_testcase.yml 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/loot_task_finishTask_testcase.yml