bianxinhua / task_api · 提交

转到一个项目

作者 bianxinhua
提交 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f 1 个父辈 fde1fd19

add README

内嵌 并排对比
正在显示 20 个修改的文件 包含 190 行增加 和 178 行删除
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <content url="file://$MODULE_DIR$"> 4 <content url="file://$MODULE_DIR$">
5 <excludeFolder url="file://$MODULE_DIR$/venv" /> 5 <excludeFolder url="file://$MODULE_DIR$/venv" />
6 </content> 6 </content>
7 - <orderEntry type="jdk" jdkName="Python 3.7 (ability_api)" jdkType="Python SDK" /> 7 + <orderEntry type="jdk" jdkName="Python 3.7 (task_api)" jdkType="Python SDK" />
8 <orderEntry type="sourceFolder" forTests="false" /> 8 <orderEntry type="sourceFolder" forTests="false" />
9 </component> 9 </component>
10 <component name="PackageRequirementsSettings"> 10 <component name="PackageRequirementsSettings">
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="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (ability_api)" project-jdk-type="Python SDK" /> 3 + <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (task_api)" project-jdk-type="Python SDK" />
4 <component name="PyCharmProfessionalAdvertiser"> 4 <component name="PyCharmProfessionalAdvertiser">
5 <option name="shown" value="true" /> 5 <option name="shown" value="true" />
6 </component> 6 </component>
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="b869bb6c-d2b2-46af-b73c-cd3237c48651" name="Default Changelist" comment="update 2020005122330"> 4 <list default="true" id="b869bb6c-d2b2-46af-b73c-cd3237c48651" name="Default Changelist" comment="update 2020005122330">
5 - <change afterPath="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" afterDir="false" />  
6 - <change afterPath="$PROJECT_DIR$/api/m_api/task_finishTask_api.yml" afterDir="false" />  
7 - <change afterPath="$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml" afterDir="false" /> 5 + <change beforePath="$PROJECT_DIR$/.idea/ability_api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/ability_api.iml" afterDir="false" />
  6 + <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
8 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 7 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  8 + <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" />
9 <change beforePath="$PROJECT_DIR$/config/Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/Authorization.txt" afterDir="false" /> 9 <change beforePath="$PROJECT_DIR$/config/Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/Authorization.txt" afterDir="false" />
10 <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" /> 10 <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" />
11 <change beforePath="$PROJECT_DIR$/config/access_token.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/access_token.txt" afterDir="false" /> 11 <change beforePath="$PROJECT_DIR$/config/access_token.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/access_token.txt" afterDir="false" />
@@ -20,12 +20,8 @@ @@ -20,12 +20,8 @@
20 <change beforePath="$PROJECT_DIR$/config/task_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_accessToken.csv" afterDir="false" /> 20 <change beforePath="$PROJECT_DIR$/config/task_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_accessToken.csv" afterDir="false" />
21 <change beforePath="$PROJECT_DIR$/config/task_authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_authCode.csv" afterDir="false" /> 21 <change beforePath="$PROJECT_DIR$/config/task_authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_authCode.csv" afterDir="false" />
22 <change beforePath="$PROJECT_DIR$/config/task_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_id.txt" afterDir="false" /> 22 <change beforePath="$PROJECT_DIR$/config/task_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_id.txt" afterDir="false" />
23 - <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" /> 23 + <change beforePath="$PROJECT_DIR$/helpfunc/login_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/login_func.py" afterDir="false" />
24 <change beforePath="$PROJECT_DIR$/helpfunc/m_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/m_func.py" afterDir="false" /> 24 <change beforePath="$PROJECT_DIR$/helpfunc/m_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/m_func.py" afterDir="false" />
25 - <change beforePath="$PROJECT_DIR$/helpfunc/pg_db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" />  
26 - <change beforePath="$PROJECT_DIR$/testcases/task/loot/loot_task_finishTask_testcase.yml" beforeDir="false" />  
27 - <change beforePath="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" afterDir="false" />  
28 - <change beforePath="$PROJECT_DIR$/testsuites/task_suites.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/task_suites.yml" afterDir="false" />  
29 </list> 25 </list>
30 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 26 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
31 <option name="SHOW_DIALOG" value="false" /> 27 <option name="SHOW_DIALOG" value="false" />
@@ -35,13 +31,14 @@ @@ -35,13 +31,14 @@
35 </component> 31 </component>
36 <component name="CoverageDataManager"> 32 <component name="CoverageDataManager">
37 <SUITE FILE_PATH="coverage/ability_api$login_func.coverage" NAME="login_func Coverage Results" MODIFIED="1593587330616" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 33 <SUITE FILE_PATH="coverage/ability_api$login_func.coverage" NAME="login_func Coverage Results" MODIFIED="1593587330616" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
38 - <SUITE FILE_PATH="coverage/task_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1597989839968" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 34 + <SUITE FILE_PATH="coverage/task_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1598074116879" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
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" /> 35 <SUITE FILE_PATH="coverage/ability_api$ucenter_loginAggregate_func.coverage" NAME="ucenter_loginAggregate_func Coverage Results" MODIFIED="1586524233572" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
40 <SUITE FILE_PATH="coverage/ability_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1593587381209" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> 36 <SUITE FILE_PATH="coverage/ability_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1593587381209" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
41 <SUITE FILE_PATH="coverage/ability_api$header_func.coverage" NAME="header_func Coverage Results" MODIFIED="1586653408797" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 37 <SUITE FILE_PATH="coverage/ability_api$header_func.coverage" NAME="header_func Coverage Results" MODIFIED="1586653408797" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
42 <SUITE FILE_PATH="coverage/ability_api$run.coverage" NAME="run Coverage Results" MODIFIED="1587223202115" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> 38 <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$" />
  39 + <SUITE FILE_PATH="coverage/task_api$login_func.coverage" NAME="login_func Coverage Results" MODIFIED="1598073772998" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
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" /> 40 <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$m_func.coverage" NAME="m_func Coverage Results" MODIFIED="1598002429345" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 41 + <SUITE FILE_PATH="coverage/task_api$m_func.coverage" NAME="m_func Coverage Results" MODIFIED="1598109662315" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
45 <SUITE FILE_PATH="coverage/task_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1598002809227" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> 42 <SUITE FILE_PATH="coverage/task_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1598002809227" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
46 </component> 43 </component>
47 <component name="FavoritesManager"> 44 <component name="FavoritesManager">
@@ -50,40 +47,43 @@ @@ -50,40 +47,43 @@
50 <component name="FileEditorManager"> 47 <component name="FileEditorManager">
51 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 48 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
52 <file pinned="false" current-in-tab="false"> 49 <file pinned="false" current-in-tab="false">
53 - <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml"> 50 + <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
54 <provider selected="true" editor-type-id="text-editor"> 51 <provider selected="true" editor-type-id="text-editor">
55 - <state relative-caret-position="381">  
56 - <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" /> 52 + <state relative-caret-position="66">
  53 + <caret line="21" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="58" />
57 </state> 54 </state>
58 </provider> 55 </provider>
59 </entry> 56 </entry>
60 </file> 57 </file>
61 <file pinned="false" current-in-tab="false"> 58 <file pinned="false" current-in-tab="false">
62 - <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml"> 59 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
63 <provider selected="true" editor-type-id="text-editor"> 60 <provider selected="true" editor-type-id="text-editor">
64 - <state relative-caret-position="114">  
65 - <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" /> 61 + <state relative-caret-position="154">
  62 + <caret line="9" column="15" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="15" />
  63 + <folding>
  64 + <element signature="e#108#137#0" expanded="true" />
  65 + </folding>
66 </state> 66 </state>
67 </provider> 67 </provider>
68 </entry> 68 </entry>
69 </file> 69 </file>
70 <file pinned="false" current-in-tab="true"> 70 <file pinned="false" current-in-tab="true">
71 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 71 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
72 <provider selected="true" editor-type-id="text-editor"> 72 <provider selected="true" editor-type-id="text-editor">
73 - <state relative-caret-position="234">  
74 - <caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" />  
75 - <folding>  
76 - <element signature="e#108#137#0" expanded="true" />  
77 - </folding> 73 + <state relative-caret-position="154">
  74 + <caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
78 </state> 75 </state>
79 </provider> 76 </provider>
80 </entry> 77 </entry>
81 </file> 78 </file>
82 <file pinned="false" current-in-tab="false"> 79 <file pinned="false" current-in-tab="false">
83 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml"> 80 + <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
84 <provider selected="true" editor-type-id="text-editor"> 81 <provider selected="true" editor-type-id="text-editor">
85 - <state relative-caret-position="1638">  
86 - <caret line="66" column="16" selection-start-line="66" selection-start-column="16" selection-end-line="66" selection-end-column="16" /> 82 + <state relative-caret-position="6028">
  83 + <caret line="275" column="4" selection-start-line="275" selection-start-column="4" selection-end-line="275" selection-end-column="21" />
  84 + <folding>
  85 + <element signature="e#107#119#0" expanded="true" />
  86 + </folding>
87 </state> 87 </state>
88 </provider> 88 </provider>
89 </entry> 89 </entry>
@@ -91,17 +91,17 @@ @@ -91,17 +91,17 @@
91 <file pinned="false" current-in-tab="false"> 91 <file pinned="false" current-in-tab="false">
92 <entry file="file://$PROJECT_DIR$/.env"> 92 <entry file="file://$PROJECT_DIR$/.env">
93 <provider selected="true" editor-type-id="text-editor"> 93 <provider selected="true" editor-type-id="text-editor">
94 - <state relative-caret-position="260"> 94 + <state relative-caret-position="220">
95 <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" /> 95 <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
96 </state> 96 </state>
97 </provider> 97 </provider>
98 </entry> 98 </entry>
99 </file> 99 </file>
100 <file pinned="false" current-in-tab="false"> 100 <file pinned="false" current-in-tab="false">
101 - <entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml"> 101 + <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
102 <provider selected="true" editor-type-id="text-editor"> 102 <provider selected="true" editor-type-id="text-editor">
103 - <state relative-caret-position="130">  
104 - <caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" /> 103 + <state relative-caret-position="176">
  104 + <caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
105 </state> 105 </state>
106 </provider> 106 </provider>
107 </entry> 107 </entry>
@@ -109,8 +109,8 @@ @@ -109,8 +109,8 @@
109 <file pinned="false" current-in-tab="false"> 109 <file pinned="false" current-in-tab="false">
110 <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py"> 110 <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
111 <provider selected="true" editor-type-id="text-editor"> 111 <provider selected="true" editor-type-id="text-editor">
112 - <state relative-caret-position="140">  
113 - <caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" /> 112 + <state relative-caret-position="3124">
  113 + <caret line="143" selection-start-line="143" selection-end-line="143" />
114 <folding> 114 <folding>
115 <element signature="e#117#128#0" expanded="true" /> 115 <element signature="e#117#128#0" expanded="true" />
116 </folding> 116 </folding>
@@ -118,15 +118,6 @@ @@ -118,15 +118,6 @@
118 </provider> 118 </provider>
119 </entry> 119 </entry>
120 </file> 120 </file>
121 - <file pinned="false" current-in-tab="false">  
122 - <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">  
123 - <provider selected="true" editor-type-id="text-editor">  
124 - <state relative-caret-position="156">  
125 - <caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />  
126 - </state>  
127 - </provider>  
128 - </entry>  
129 - </file>  
130 </leaf> 121 </leaf>
131 </component> 122 </component>
132 <component name="FileTemplateManagerImpl"> 123 <component name="FileTemplateManagerImpl">
@@ -151,6 +142,8 @@ @@ -151,6 +142,8 @@
151 <find>teardown_hook_get_task_name</find> 142 <find>teardown_hook_get_task_name</find>
152 <find>get_serialNo</find> 143 <find>get_serialNo</find>
153 <find>teardown_hook_get_serialNo</find> 144 <find>teardown_hook_get_serialNo</find>
  145 + <find>get_resource_id()</find>
  146 + <find>get_resource_id_to_int</find>
154 </findStrings> 147 </findStrings>
155 </component> 148 </component>
156 <component name="Git.Settings"> 149 <component name="Git.Settings">
@@ -205,7 +198,6 @@ @@ -205,7 +198,6 @@
205 <option value="$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml" /> 198 <option value="$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml" />
206 <option value="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml" /> 199 <option value="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml" />
207 <option value="$PROJECT_DIR$/api/m_api/task_resource_api.yml" /> 200 <option value="$PROJECT_DIR$/api/m_api/task_resource_api.yml" />
208 - <option value="$PROJECT_DIR$/helpfunc/login_func.py" />  
209 <option value="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" /> 201 <option value="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" />
210 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml" /> 202 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml" />
211 <option value="$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml" /> 203 <option value="$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml" />
@@ -217,19 +209,20 @@ @@ -217,19 +209,20 @@
217 <option value="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" /> 209 <option value="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" />
218 <option value="$PROJECT_DIR$/testsuites/task_suites.yml" /> 210 <option value="$PROJECT_DIR$/testsuites/task_suites.yml" />
219 <option value="$PROJECT_DIR$/api/m_api/common/user_api.yml" /> 211 <option value="$PROJECT_DIR$/api/m_api/common/user_api.yml" />
  212 + <option value="$PROJECT_DIR$/debugtalk.py" />
  213 + <option value="$PROJECT_DIR$/helpfunc/login_func.py" />
  214 + <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
220 <option value="$PROJECT_DIR$/helpfunc/m_func.py" /> 215 <option value="$PROJECT_DIR$/helpfunc/m_func.py" />
221 <option value="$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml" /> 216 <option value="$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml" />
222 - <option value="$PROJECT_DIR$/debugtalk.py" />  
223 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" /> 217 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" />
224 - <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />  
225 </list> 218 </list>
226 </option> 219 </option>
227 </component> 220 </component>
228 - <component name="ProjectFrameBounds" extendedState="6">  
229 - <option name="x" value="179" />  
230 - <option name="y" value="427" /> 221 + <component name="ProjectFrameBounds" extendedState="7">
  222 + <option name="x" value="-8" />
  223 + <option name="y" value="-8" />
231 <option name="width" value="1382" /> 224 <option name="width" value="1382" />
232 - <option name="height" value="741" /> 225 + <option name="height" value="744" />
233 </component> 226 </component>
234 <component name="ProjectId" id="1RGy0cbJxXUqydJBLy6eKhLCtup" /> 227 <component name="ProjectId" id="1RGy0cbJxXUqydJBLy6eKhLCtup" />
235 <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> 228 <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -238,7 +231,6 @@ @@ -238,7 +231,6 @@
238 <foldersAlwaysOnTop value="true" /> 231 <foldersAlwaysOnTop value="true" />
239 </navigator> 232 </navigator>
240 <panes> 233 <panes>
241 - <pane id="Scope" />  
242 <pane id="ProjectPane"> 234 <pane id="ProjectPane">
243 <subPane> 235 <subPane>
244 <expand> 236 <expand>
@@ -311,17 +303,25 @@ @@ -311,17 +303,25 @@
311 <path> 303 <path>
312 <item name="task_api" type="b2602c69:ProjectViewProjectNode" /> 304 <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
313 <item name="task_api" type="462c0819:PsiDirectoryNode" /> 305 <item name="task_api" type="462c0819:PsiDirectoryNode" />
  306 + <item name="testcases" type="462c0819:PsiDirectoryNode" />
  307 + <item name="task" type="462c0819:PsiDirectoryNode" />
  308 + <item name="loot" type="462c0819:PsiDirectoryNode" />
  309 + </path>
  310 + <path>
  311 + <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
  312 + <item name="task_api" type="462c0819:PsiDirectoryNode" />
314 <item name="testsuites" type="462c0819:PsiDirectoryNode" /> 313 <item name="testsuites" type="462c0819:PsiDirectoryNode" />
315 </path> 314 </path>
316 </expand> 315 </expand>
317 <select /> 316 <select />
318 </subPane> 317 </subPane>
319 </pane> 318 </pane>
  319 + <pane id="Scope" />
320 </panes> 320 </panes>
321 </component> 321 </component>
322 <component name="PropertiesComponent"> 322 <component name="PropertiesComponent">
323 <property name="WebServerToolWindowFactoryState" value="false" /> 323 <property name="WebServerToolWindowFactoryState" value="false" />
324 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../ability_api" /> 324 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
325 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> 325 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
326 </component> 326 </component>
327 <component name="RecentsManager"> 327 <component name="RecentsManager">
@@ -352,7 +352,7 @@ @@ -352,7 +352,7 @@
352 </list> 352 </list>
353 </option> 353 </option>
354 </component> 354 </component>
355 - <component name="RunManager" selected="Python.debugtalk"> 355 + <component name="RunManager" selected="Python.m_func">
356 <configuration name="debugtalk" type="PythonConfigurationType" factoryName="Python" temporary="true"> 356 <configuration name="debugtalk" type="PythonConfigurationType" factoryName="Python" temporary="true">
357 <module name="ability_api" /> 357 <module name="ability_api" />
358 <option name="INTERPRETER_OPTIONS" value="" /> 358 <option name="INTERPRETER_OPTIONS" value="" />
@@ -465,10 +465,10 @@ @@ -465,10 +465,10 @@
465 </configuration> 465 </configuration>
466 <recent_temporary> 466 <recent_temporary>
467 <list> 467 <list>
468 - <item itemvalue="Python.debugtalk" />  
469 <item itemvalue="Python.m_func" /> 468 <item itemvalue="Python.m_func" />
470 <item itemvalue="Python.pg_db_func" /> 469 <item itemvalue="Python.pg_db_func" />
471 <item itemvalue="Python.login_func" /> 470 <item itemvalue="Python.login_func" />
  471 + <item itemvalue="Python.debugtalk" />
472 <item itemvalue="Python.run" /> 472 <item itemvalue="Python.run" />
473 </list> 473 </list>
474 </recent_temporary> 474 </recent_temporary>
@@ -578,6 +578,9 @@ @@ -578,6 +578,9 @@
578 <workItem from="1597886812090" duration="6866000" /> 578 <workItem from="1597886812090" duration="6866000" />
579 <workItem from="1597906408146" duration="2887000" /> 579 <workItem from="1597906408146" duration="2887000" />
580 <workItem from="1597973157365" duration="18949000" /> 580 <workItem from="1597973157365" duration="18949000" />
  581 + <workItem from="1598065887022" duration="4905000" />
  582 + <workItem from="1598108947857" duration="3526000" />
  583 + <workItem from="1598168398954" duration="3596000" />
581 </task> 584 </task>
582 <task id="LOCAL-00001" summary="优化测试用例"> 585 <task id="LOCAL-00001" summary="优化测试用例">
583 <created>1571644787323</created> 586 <created>1571644787323</created>
@@ -905,7 +908,7 @@ @@ -905,7 +908,7 @@
905 <servers /> 908 <servers />
906 </component> 909 </component>
907 <component name="TimeTrackingManager"> 910 <component name="TimeTrackingManager">
908 - <option name="totallyTimeSpent" value="353924000" /> 911 + <option name="totallyTimeSpent" value="365951000" />
909 </component> 912 </component>
910 <component name="TodoView" selected-index="3"> 913 <component name="TodoView" selected-index="3">
911 <todo-panel id="selected-file"> 914 <todo-panel id="selected-file">
@@ -916,14 +919,14 @@ @@ -916,14 +919,14 @@
916 </todo-panel> 919 </todo-panel>
917 </component> 920 </component>
918 <component name="ToolWindowManager"> 921 <component name="ToolWindowManager">
919 - <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 922 + <frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
920 <layout> 923 <layout>
921 - <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22371244" /> 924 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22995462" />
922 <window_info id="Structure" order="1" sideWeight="0.50238097" side_tool="true" weight="0.30711043" /> 925 <window_info id="Structure" order="1" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
923 <window_info id="Favorites" order="2" sideWeight="0.50238097" side_tool="true" weight="0.30711043" /> 926 <window_info id="Favorites" order="2" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
924 <window_info anchor="bottom" id="Message" order="0" /> 927 <window_info anchor="bottom" id="Message" order="0" />
925 <window_info anchor="bottom" id="Find" order="1" weight="0.32924107" /> 928 <window_info anchor="bottom" id="Find" order="1" weight="0.32924107" />
926 - <window_info anchor="bottom" id="Run" order="2" weight="0.3013393" /> 929 + <window_info anchor="bottom" id="Run" order="2" weight="0.29982963" />
927 <window_info anchor="bottom" id="Debug" order="3" weight="0.39863715" /> 930 <window_info anchor="bottom" id="Debug" order="3" weight="0.39863715" />
928 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> 931 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
929 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> 932 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -932,7 +935,7 @@ @@ -932,7 +935,7 @@
932 <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49848714" weight="0.328125" /> 935 <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49848714" weight="0.328125" />
933 <window_info anchor="bottom" id="Database Changes" order="9" /> 936 <window_info anchor="bottom" id="Database Changes" order="9" />
934 <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50226927" side_tool="true" weight="0.32879046" /> 937 <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50226927" side_tool="true" weight="0.32879046" />
935 - <window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" visible="true" weight="0.3872768" /> 938 + <window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" visible="true" weight="0.5519591" />
936 <window_info anchor="bottom" id="Python Console" order="12" weight="0.328125" /> 939 <window_info anchor="bottom" id="Python Console" order="12" weight="0.328125" />
937 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 940 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
938 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 941 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -1105,16 +1108,6 @@ @@ -1105,16 +1108,6 @@
1105 </state> 1108 </state>
1106 </provider> 1109 </provider>
1107 </entry> 1110 </entry>
1108 - <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">  
1109 - <provider selected="true" editor-type-id="text-editor">  
1110 - <state relative-caret-position="133">  
1111 - <caret line="141" column="4" selection-start-line="141" selection-start-column="4" selection-end-line="141" selection-end-column="18" />  
1112 - <folding>  
1113 - <element signature="e#107#119#0" expanded="true" />  
1114 - </folding>  
1115 - </state>  
1116 - </provider>  
1117 - </entry>  
1118 <entry file="file://$PROJECT_DIR$/api/m_api/loot/tasksearchResources_api.yml" /> 1111 <entry file="file://$PROJECT_DIR$/api/m_api/loot/tasksearchResources_api.yml" />
1119 <entry file="file://$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml"> 1112 <entry file="file://$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml">
1120 <provider selected="true" editor-type-id="text-editor"> 1113 <provider selected="true" editor-type-id="text-editor">
@@ -1154,20 +1147,7 @@ @@ -1154,20 +1147,7 @@
1154 </state> 1147 </state>
1155 </provider> 1148 </provider>
1156 </entry> 1149 </entry>
1157 - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py">  
1158 - <provider selected="true" editor-type-id="text-editor">  
1159 - <state relative-caret-position="474">  
1160 - <caret line="170" selection-start-line="170" selection-end-line="170" />  
1161 - </state>  
1162 - </provider>  
1163 - </entry>  
1164 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml">  
1165 - <provider selected="true" editor-type-id="text-editor">  
1166 - <state relative-caret-position="471">  
1167 - <caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" />  
1168 - </state>  
1169 - </provider>  
1170 - </entry> 1150 + <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py" />
1171 <entry file="file://$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml"> 1151 <entry file="file://$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml">
1172 <provider selected="true" editor-type-id="text-editor"> 1152 <provider selected="true" editor-type-id="text-editor">
1173 <state> 1153 <state>
@@ -1182,20 +1162,6 @@ @@ -1182,20 +1162,6 @@
1182 </state> 1162 </state>
1183 </provider> 1163 </provider>
1184 </entry> 1164 </entry>
1185 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml">  
1186 - <provider selected="true" editor-type-id="text-editor">  
1187 - <state relative-caret-position="-309">  
1188 - <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />  
1189 - </state>  
1190 - </provider>  
1191 - </entry>  
1192 - <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">  
1193 - <provider selected="true" editor-type-id="text-editor">  
1194 - <state relative-caret-position="604">  
1195 - <caret line="25" column="50" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" />  
1196 - </state>  
1197 - </provider>  
1198 - </entry>  
1199 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml"> 1165 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml">
1200 <provider selected="true" editor-type-id="text-editor"> 1166 <provider selected="true" editor-type-id="text-editor">
1201 <state relative-caret-position="702"> 1167 <state relative-caret-position="702">
@@ -1224,13 +1190,6 @@ @@ -1224,13 +1190,6 @@
1224 </state> 1190 </state>
1225 </provider> 1191 </provider>
1226 </entry> 1192 </entry>
1227 - <entry file="file://$PROJECT_DIR$/.env">  
1228 - <provider selected="true" editor-type-id="text-editor">  
1229 - <state relative-caret-position="260">  
1230 - <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />  
1231 - </state>  
1232 - </provider>  
1233 - </entry>  
1234 <entry file="file://$PROJECT_DIR$/api/m_api/task_Details_api.yml"> 1193 <entry file="file://$PROJECT_DIR$/api/m_api/task_Details_api.yml">
1235 <provider selected="true" editor-type-id="text-editor"> 1194 <provider selected="true" editor-type-id="text-editor">
1236 <state relative-caret-position="26"> 1195 <state relative-caret-position="26">
@@ -1238,13 +1197,6 @@ @@ -1238,13 +1197,6 @@
1238 </state> 1197 </state>
1239 </provider> 1198 </provider>
1240 </entry> 1199 </entry>
1241 - <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">  
1242 - <provider selected="true" editor-type-id="text-editor">  
1243 - <state relative-caret-position="156">  
1244 - <caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />  
1245 - </state>  
1246 - </provider>  
1247 - </entry>  
1248 <entry file="file://$PROJECT_DIR$/api/m_api/loot/task_loot_detail_api.yml"> 1200 <entry file="file://$PROJECT_DIR$/api/m_api/loot/task_loot_detail_api.yml">
1249 <provider selected="true" editor-type-id="text-editor"> 1201 <provider selected="true" editor-type-id="text-editor">
1250 <state relative-caret-position="676"> 1202 <state relative-caret-position="676">
@@ -1259,70 +1211,115 @@ @@ -1259,70 +1211,115 @@
1259 </state> 1211 </state>
1260 </provider> 1212 </provider>
1261 </entry> 1213 </entry>
1262 - <entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml"> 1214 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml">
1263 <provider selected="true" editor-type-id="text-editor"> 1215 <provider selected="true" editor-type-id="text-editor">
1264 <state relative-caret-position="130"> 1216 <state relative-caret-position="130">
1265 - <caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" /> 1217 + <caret line="5" column="50" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="50" />
1266 </state> 1218 </state>
1267 </provider> 1219 </provider>
1268 </entry> 1220 </entry>
1269 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml"> 1221 + <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml">
1270 <provider selected="true" editor-type-id="text-editor"> 1222 <provider selected="true" editor-type-id="text-editor">
1271 - <state relative-caret-position="130">  
1272 - <caret line="5" column="50" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="50" /> 1223 + <state relative-caret-position="660">
  1224 + <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
1273 </state> 1225 </state>
1274 </provider> 1226 </provider>
1275 </entry> 1227 </entry>
1276 - <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py"> 1228 + <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">
1277 <provider selected="true" editor-type-id="text-editor"> 1229 <provider selected="true" editor-type-id="text-editor">
1278 - <state relative-caret-position="140">  
1279 - <caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" />  
1280 - <folding>  
1281 - <element signature="e#117#128#0" expanded="true" />  
1282 - </folding> 1230 + <state relative-caret-position="550">
  1231 + <caret line="25" column="50" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" />
1283 </state> 1232 </state>
1284 </provider> 1233 </provider>
1285 </entry> 1234 </entry>
1286 - <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml"> 1235 + <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml">
1287 <provider selected="true" editor-type-id="text-editor"> 1236 <provider selected="true" editor-type-id="text-editor">
1288 - <state relative-caret-position="381">  
1289 - <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" /> 1237 + <state relative-caret-position="772">
  1238 + <caret line="36" selection-start-line="36" selection-end-line="36" />
1290 </state> 1239 </state>
1291 </provider> 1240 </provider>
1292 </entry> 1241 </entry>
1293 - <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml"> 1242 + <entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml">
  1243 + <provider selected="true" editor-type-id="text-editor">
  1244 + <state relative-caret-position="110">
  1245 + <caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" />
  1246 + </state>
  1247 + </provider>
  1248 + </entry>
  1249 + <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml">
1294 <provider selected="true" editor-type-id="text-editor"> 1250 <provider selected="true" editor-type-id="text-editor">
1295 - <state relative-caret-position="114">  
1296 - <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" /> 1251 + <state relative-caret-position="-299">
  1252 + <caret line="7" selection-start-line="7" selection-end-line="7" />
1297 </state> 1253 </state>
1298 </provider> 1254 </provider>
1299 </entry> 1255 </entry>
1300 <entry file="file://$PROJECT_DIR$/debugtalk.py"> 1256 <entry file="file://$PROJECT_DIR$/debugtalk.py">
1301 <provider selected="true" editor-type-id="text-editor"> 1257 <provider selected="true" editor-type-id="text-editor">
1302 - <state relative-caret-position="18">  
1303 - <caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" /> 1258 + <state relative-caret-position="132">
  1259 + <caret line="17" column="21" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="21" />
1304 <folding> 1260 <folding>
1305 <element signature="e#0#11#0" expanded="true" /> 1261 <element signature="e#0#11#0" expanded="true" />
1306 </folding> 1262 </folding>
1307 </state> 1263 </state>
1308 </provider> 1264 </provider>
1309 </entry> 1265 </entry>
1310 - <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml"> 1266 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
1311 <provider selected="true" editor-type-id="text-editor"> 1267 <provider selected="true" editor-type-id="text-editor">
1312 - <state relative-caret-position="1638">  
1313 - <caret line="66" column="16" selection-start-line="66" selection-start-column="16" selection-end-line="66" selection-end-column="16" /> 1268 + <state relative-caret-position="154">
  1269 + <caret line="9" column="15" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="15" />
  1270 + <folding>
  1271 + <element signature="e#108#137#0" expanded="true" />
  1272 + </folding>
1314 </state> 1273 </state>
1315 </provider> 1274 </provider>
1316 </entry> 1275 </entry>
1317 - <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 1276 + <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
1318 <provider selected="true" editor-type-id="text-editor"> 1277 <provider selected="true" editor-type-id="text-editor">
1319 - <state relative-caret-position="234">  
1320 - <caret line="118" column="28" selection-start-line="118" selection-start-column="28" selection-end-line="118" selection-end-column="28" /> 1278 + <state relative-caret-position="6028">
  1279 + <caret line="275" column="4" selection-start-line="275" selection-start-column="4" selection-end-line="275" selection-end-column="21" />
1321 <folding> 1280 <folding>
1322 - <element signature="e#108#137#0" expanded="true" /> 1281 + <element signature="e#107#119#0" expanded="true" />
1323 </folding> 1282 </folding>
1324 </state> 1283 </state>
1325 </provider> 1284 </provider>
1326 </entry> 1285 </entry>
  1286 + <entry file="file://$PROJECT_DIR$/.env">
  1287 + <provider selected="true" editor-type-id="text-editor">
  1288 + <state relative-caret-position="220">
  1289 + <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
  1290 + </state>
  1291 + </provider>
  1292 + </entry>
  1293 + <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
  1294 + <provider selected="true" editor-type-id="text-editor">
  1295 + <state relative-caret-position="176">
  1296 + <caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
  1297 + </state>
  1298 + </provider>
  1299 + </entry>
  1300 + <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
  1301 + <provider selected="true" editor-type-id="text-editor">
  1302 + <state relative-caret-position="3124">
  1303 + <caret line="143" selection-start-line="143" selection-end-line="143" />
  1304 + <folding>
  1305 + <element signature="e#117#128#0" expanded="true" />
  1306 + </folding>
  1307 + </state>
  1308 + </provider>
  1309 + </entry>
  1310 + <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
  1311 + <provider selected="true" editor-type-id="text-editor">
  1312 + <state relative-caret-position="66">
  1313 + <caret line="21" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="58" />
  1314 + </state>
  1315 + </provider>
  1316 + </entry>
  1317 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
  1318 + <provider selected="true" editor-type-id="text-editor">
  1319 + <state relative-caret-position="154">
  1320 + <caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
  1321 + </state>
  1322 + </provider>
  1323 + </entry>
1327 </component> 1324 </component>
1328 </project> 1325 </project>
@@ -20,7 +20,6 @@ request: @@ -20,7 +20,6 @@ request:
20 User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36 20 User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36
21 X-Requested-With: XMLHttpRequest 21 X-Requested-With: XMLHttpRequest
22 json: 22 json:
23 - taskId: $taskId  
24 receiver: 23 receiver:
25 uid: $uid15 24 uid: $uid15
26 name: $name15 25 name: $name15
@@ -29,41 +28,43 @@ request: @@ -29,41 +28,43 @@ request:
29 participant: 28 participant:
30 - uid: $uid0 29 - uid: $uid0
31 name: $name0 30 name: $name0
32 - percent: 25  
33 - reward: 500 31 + percent: ${convert_to_number(25)}
  32 + reward: ${convert_to_number(500)}
34 - uid: $uid1 33 - uid: $uid1
35 name: $name1 34 name: $name1
36 - percent: 25  
37 - reward: 500 35 + percent: ${convert_to_number(25)}
  36 + reward: ${convert_to_number(500)}
38 - uid: $uid2 37 - uid: $uid2
39 name: $name2 38 name: $name2
40 - percent: 25  
41 - reward: 500  
42 - resourceType: ${convert_to_number(1)} 39 + percent: ${convert_to_number(25)}
  40 + reward: ${convert_to_number(500)}
  41 + resourceType: 1
43 resourceList: 42 resourceList:
44 - - id: ${convert_to_number($get_resource_id())} 43 + - id: ${get_resource_id()}
45 solution: 44 solution:
46 - total: 26  
47 - recevier: 45 + total: ${convert_to_number(20)}
  46 + receiver:
48 uid: $uid15 47 uid: $uid15
49 name: $name15 48 name: $name15
50 - percent: 25  
51 - score: 6.5 49 + percent: ${convert_to_number(25)}
  50 + score: ${convert_to_number(5)}
52 participant: 51 participant:
53 - uid: $uid0 52 - uid: $uid0
54 name: $name0 53 name: $name0
55 - percent: 25  
56 - score: 6.5 54 + percent: ${convert_to_number(25)}
  55 + score: ${convert_to_number(5)}
57 - uid: $uid1 56 - uid: $uid1
58 name: $name1 57 name: $name1
59 - percent: 6.5  
60 - score: 500 58 + percent: ${convert_to_number(25)}
  59 + score: ${convert_to_number(5)}
61 - uid: $uid2 60 - uid: $uid2
62 name: $name2 61 name: $name2
63 - percent: 25  
64 - score: 6.5 62 + percent: ${convert_to_number(25)}
  63 + score: ${convert_to_number(5)}
65 remark: $remark 64 remark: $remark
66 - realityTime: "2020-08-20T16:00:00.000Z" 65 + pictures:
  66 + realityTime: $realityTime
  67 + taskId: $taskId
67 method: POST 68 method: POST
68 url: task/loot/accept 69 url: task/loot/accept
69 #validate: 70 #validate:
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTc5OTQ1OTQsImV4cCI6MTU5ODAwNTM5NCwibmJmIjoxNTk3OTk0NTk0LCJqdGkiOiJMVUx3c05saVZFbzRWT1dxIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.6W6CjQYVfbCroldUAaGm3x-VgGL4P2-Ccg3XIb6ZK7U  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTgxNjg1MjIsImV4cCI6MTU5ODE3OTMyMiwibmJmIjoxNTk4MTY4NTIyLCJqdGkiOiJiZFZFbmExY1NXSlB1UnNLIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.04Ot6NVzdl0l2_JzaU_USkt2_I7S1xqDRAe1mgd5OMQ
1 -Gh8SznkQkAGwcyFePyZaEzRtRiBjGf6r  
  1 +N324MDwTM7CQBYeBiAYQF3XZn8JdApX5
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTc5OTQ1OTQsImV4cCI6MTU5ODAwNTM5NCwibmJmIjoxNTk3OTk0NTk0LCJqdGkiOiJWM0ZWNEJiSUgxSm5wNHhuIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.VYMt8TpiwaTDbXdCNS_QnPjTk6jSkx6TUkEjPU1l-R8  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTgxNjg1MjIsImV4cCI6MTU5ODE3OTMyMiwibmJmIjoxNTk4MTY4NTIyLCJqdGkiOiI0cks2YnZvY3NLNzdlSVVWIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.uhdyp3cjmtOB_wjYMhmmla58nXPp427gGXQplCZijPU
1 -rv7f2l9333  
  1 +yaxyx64gdgg
1 -198271ab5e4be000a01629484af1736333b63c757d5e36850a5a91a3e5c3bcd8361fe39c  
  1 +d57ab89805400c7d1b2afdeffa449ff85e409a66cc86270111326500f476199203f5852b
1 -B34F2yFhTOHWa10B99/3c1nbcPnTP1mZuPmjPZOZZaFd05LH6hiAhSxL7/UmT7EXnj7dK9X1Q6zqJSJKEx+ufByotzgCSb+d5Fk13DXUKPCT0SvjbnsS7D+Bf31/7z5XjHl8e0fkAoGXNvR6ryQNSX37KSLW2WKRlDd25hh1Kx0=  
  1 +iLq0Ho7hoEaQUOEqmcTc+rTn+0YEWe7G9BQQGNcPRamovbjWT5emh7Q3YbcvOnAdH9hHXCnb031ErVFVesRTYG6nVujzNYut9NEbJb+Xw8MV9pp9D8QfZB9wNF8rgwZU+g65dD6mlrCU0qsMywVqgrPAna9mci+qvQ5DIAqysFc=
1 -3272692925319424  
  1 +3273049130133760
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk3OTk0NTk0LCJleHAiOjE1OTgwMDUzOTQsIm5iZiI6MTU5Nzk5NDU5NCwianRpIjoiNFR3UG9tc2k1VGNxWHE4TyIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.sKByudD3jxI-9W-Dy65Mtw2Gfen94kOdNkRVt5kKSdM  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk4MTY4NTIzLCJleHAiOjE1OTgxNzkzMjMsIm5iZiI6MTU5ODE2ODUyMywianRpIjoiOWRsVEJrYkF2VmZYOUk4ZCIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.4m41YB_OdtpsC6Ezg3-LeFki_ce9TMqnHBvtHvrPhTo
1 -8xYKezzCm4JmNXZKaFER3fcBm6bkzS3D  
  1 +jajwB87JfYZZ5QMDP2cHKsjRYfceBR7z
1 -7vm9ofajxzl  
  1 +nwqq1o9rmsb
1 -3020853417054045184  
  1 +3023771459492774912
@@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@
5 # @file: login_func.py 5 # @file: login_func.py
6 import json 6 import json
7 import time,datetime 7 import time,datetime
8 -path = 'E:/task_api/' 8 +# path = 'E:/task_api/'
  9 +path = 'E:/mmm_auto/task_api/'
9 def teardown_hook_sleep_N_secs(response,n_secs): 10 def teardown_hook_sleep_N_secs(response,n_secs):
10 """ sleep n seconds after request """ 11 """ sleep n seconds after request """
11 if response.status_code == 200: 12 if response.status_code == 200:
@@ -150,6 +151,8 @@ def get_serialNo(): @@ -150,6 +151,8 @@ def get_serialNo():
150 return serialno 151 return serialno
151 152
152 def get_cuid(): 153 def get_cuid():
  154 + global cuid
  155 + cuid = ''
153 try: 156 try:
154 with open(path + "config/cuid.csv", 'r') as f: 157 with open(path + "config/cuid.csv", 'r') as f:
155 cuid = f.read() 158 cuid = f.read()
@@ -160,16 +163,20 @@ def get_cuid(): @@ -160,16 +163,20 @@ def get_cuid():
160 return cuid 163 return cuid
161 164
162 def get_credentials(): 165 def get_credentials():
  166 + global credentials
  167 + credentials = ''
163 try: 168 try:
164 with open(path + "config/credentials.csv", 'r') as f: 169 with open(path + "config/credentials.csv", 'r') as f:
165 credentials = f.read() 170 credentials = f.read()
166 print('读取成功，credentials：{}'.format(credentials)) 171 print('读取成功，credentials：{}'.format(credentials))
167 except Exception as e: 172 except Exception as e:
168 print('读取失败', e) 173 print('读取失败', e)
169 - credentials = str(credentials) 174 + # credentials = str(credentials)
170 return credentials 175 return credentials
171 176
172 def get_muid(): 177 def get_muid():
  178 + global muid
  179 + muid = ''
173 try: 180 try:
174 with open(path + "config/muid.csv", 'r') as f: 181 with open(path + "config/muid.csv", 'r') as f:
175 muid = f.read() 182 muid = f.read()
@@ -180,6 +187,8 @@ def get_muid(): @@ -180,6 +187,8 @@ def get_muid():
180 return muid 187 return muid
181 188
182 def get_cid(): 189 def get_cid():
  190 + global cid
  191 + cid = ''
183 try: 192 try:
184 with open(path + "config/cid.csv", 'r') as f: 193 with open(path + "config/cid.csv", 'r') as f:
185 cid = f.read() 194 cid = f.read()
@@ -265,6 +274,8 @@ def teardown_hook_get_resource_id(response): @@ -265,6 +274,8 @@ def teardown_hook_get_resource_id(response):
265 return resource_id 274 return resource_id
266 275
267 def get_resource_id(): 276 def get_resource_id():
  277 + global resource_id
  278 + resource_id =''
268 try: 279 try:
269 with open(path + "config/resource_id.txt", 'r') as f: 280 with open(path + "config/resource_id.txt", 'r') as f:
270 resource_id = f.read() 281 resource_id = f.read()
@@ -274,6 +285,9 @@ def get_resource_id(): @@ -274,6 +285,9 @@ def get_resource_id():
274 resource_id = resource_id 285 resource_id = resource_id
275 return resource_id 286 return resource_id
276 287
  288 +def get_resource_id_to_int():
  289 + return int(get_resource_id())
  290 +
277 def teardown_hook_get_resource_title(response): 291 def teardown_hook_get_resource_title(response):
278 if response.status_code ==200: 292 if response.status_code ==200:
279 jsondata = json.loads(response.text) 293 jsondata = json.loads(response.text)
@@ -288,6 +302,8 @@ def teardown_hook_get_resource_title(response): @@ -288,6 +302,8 @@ def teardown_hook_get_resource_title(response):
288 return resource_title 302 return resource_title
289 303
290 def get_resource_title(): 304 def get_resource_title():
  305 + global resource_title
  306 + resource_title = ''
291 try: 307 try:
292 with open(path + "config/resource_title.txt", 'r') as f: 308 with open(path + "config/resource_title.txt", 'r') as f:
293 resource_title = f.read() 309 resource_title = f.read()
@@ -311,6 +327,8 @@ def teardown_hook_get_resource_content(response): @@ -311,6 +327,8 @@ def teardown_hook_get_resource_content(response):
311 return resource_content 327 return resource_content
312 328
313 def get_resource_content(): 329 def get_resource_content():
  330 + global resource_content
  331 + resource_content = ''
314 try: 332 try:
315 with open(path + "config/resource_content.txt", 'r') as f: 333 with open(path + "config/resource_content.txt", 'r') as f:
316 resource_content = f.read() 334 resource_content = f.read()
@@ -8,8 +8,8 @@ import json @@ -8,8 +8,8 @@ import json
8 from urllib.parse import * 8 from urllib.parse import *
9 9
10 10
11 -path = 'E:/task_api/'  
12 - 11 +# path = 'E:/task_api/'
  12 +path = 'E:/mmm_auto/task_api/'
13 def teardown_hook_get_Authorization(response): 13 def teardown_hook_get_Authorization(response):
14 if response.status_code == 200: 14 if response.status_code == 200:
15 jsondata = json.loads(response.text) 15 jsondata = json.loads(response.text)
@@ -157,13 +157,11 @@ def get_uid0(): @@ -157,13 +157,11 @@ def get_uid0():
157 # 保存token到文件 157 # 保存token到文件
158 with open(path + "config/uid0.txt", 'r') as f: 158 with open(path + "config/uid0.txt", 'r') as f:
159 uid0 = f.read() 159 uid0 = f.read()
160 - uid0 = int(uid0)  
161 print('读取成功，uid0：{}'.format(uid0)) 160 print('读取成功，uid0：{}'.format(uid0))
162 except Exception as e: 161 except Exception as e:
163 print('读取失败', e) 162 print('读取失败', e)
164 # Authorization = str(Authorization) 163 # Authorization = str(Authorization)
165 return uid0 164 return uid0
166 -  
167 def teardown_hook_get_uid1(response): 165 def teardown_hook_get_uid1(response):
168 if response.status_code == 200: 166 if response.status_code == 200:
169 jsondata = json.loads(response.text) 167 jsondata = json.loads(response.text)
@@ -183,7 +181,6 @@ def get_uid1(): @@ -183,7 +181,6 @@ def get_uid1():
183 # 保存token到文件 181 # 保存token到文件
184 with open(path + "config/uid1.txt", 'r') as f: 182 with open(path + "config/uid1.txt", 'r') as f:
185 uid1 = f.read() 183 uid1 = f.read()
186 - uid1 = int(uid1)  
187 print('读取成功，uid1：{}'.format(uid1)) 184 print('读取成功，uid1：{}'.format(uid1))
188 except Exception as e: 185 except Exception as e:
189 print('读取失败', e) 186 print('读取失败', e)
@@ -209,7 +206,6 @@ def get_uid2(): @@ -209,7 +206,6 @@ def get_uid2():
209 # 保存token到文件 206 # 保存token到文件
210 with open(path + "config/uid2.txt", 'r') as f: 207 with open(path + "config/uid2.txt", 'r') as f:
211 uid2 = f.read() 208 uid2 = f.read()
212 - uid2 = int(uid2)  
213 print('读取成功，uid2：{}'.format(uid2)) 209 print('读取成功，uid2：{}'.format(uid2))
214 except Exception as e: 210 except Exception as e:
215 print('读取失败', e) 211 print('读取失败', e)