bianxinhua / task_api · 提交

转到一个项目

作者 bianxinhua
提交 79200d617b686c99ab88f0aa905dbd54e06ab3cd 2 个父辈 e8360060 9e058e5d

add README

内嵌 并排对比
正在显示 20 个修改的文件 包含 275 行增加 和 105 行删除
@@ -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,7 +2,30 @@ @@ -2,7 +2,30 @@
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 +<<<<<<< HEAD
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  7 +=======
  8 + <change beforePath="$PROJECT_DIR$/.idea/ability_api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/ability_api.iml" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  11 + <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" />
  12 + <change beforePath="$PROJECT_DIR$/config/Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/Authorization.txt" afterDir="false" />
  13 + <change beforePath="$PROJECT_DIR$/config/accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/accessToken.csv" afterDir="false" />
  14 + <change beforePath="$PROJECT_DIR$/config/access_token.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/access_token.txt" afterDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/config/authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/authCode.csv" afterDir="false" />
  16 + <change beforePath="$PROJECT_DIR$/config/credentials.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/credentials.csv" afterDir="false" />
  17 + <change beforePath="$PROJECT_DIR$/config/login_code.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/login_code.txt" afterDir="false" />
  18 + <change beforePath="$PROJECT_DIR$/config/resource_content.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_content.txt" afterDir="false" />
  19 + <change beforePath="$PROJECT_DIR$/config/resource_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_id.txt" afterDir="false" />
  20 + <change beforePath="$PROJECT_DIR$/config/resource_title.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/resource_title.txt" afterDir="false" />
  21 + <change beforePath="$PROJECT_DIR$/config/serialNo.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/serialNo.txt" afterDir="false" />
  22 + <change beforePath="$PROJECT_DIR$/config/task_Authorization.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_Authorization.txt" afterDir="false" />
  23 + <change beforePath="$PROJECT_DIR$/config/task_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_accessToken.csv" afterDir="false" />
  24 + <change beforePath="$PROJECT_DIR$/config/task_authCode.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_authCode.csv" afterDir="false" />
  25 + <change beforePath="$PROJECT_DIR$/config/task_id.txt" beforeDir="false" afterPath="$PROJECT_DIR$/config/task_id.txt" afterDir="false" />
  26 + <change beforePath="$PROJECT_DIR$/helpfunc/login_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/login_func.py" afterDir="false" />
  27 + <change beforePath="$PROJECT_DIR$/helpfunc/m_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/m_func.py" afterDir="false" />
  28 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
6 </list> 29 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 30 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="SHOW_DIALOG" value="false" /> 31 <option name="SHOW_DIALOG" value="false" />
@@ -12,13 +35,14 @@ @@ -12,13 +35,14 @@
12 </component> 35 </component>
13 <component name="CoverageDataManager"> 36 <component name="CoverageDataManager">
14 <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" />
15 - <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" /> 38 + <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" />
16 <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" />
17 <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$" />
18 <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" />
19 <SUITE FILE_PATH="coverage/ability_api$run.coverage" NAME="run Coverage Results" MODIFIED="1587223202115" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" /> 42 <SUITE FILE_PATH="coverage/ability_api$run.coverage" NAME="run Coverage Results" MODIFIED="1587223202115" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
  43 + <SUITE FILE_PATH="coverage/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" />
20 <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/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" />
21 - <SUITE FILE_PATH="coverage/task_api$m_func.coverage" NAME="m_func Coverage Results" MODIFIED="1598002429345" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" /> 45 + <SUITE FILE_PATH="coverage/task_api$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" />
22 <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 <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$" />
23 </component> 47 </component>
24 <component name="FavoritesManager"> 48 <component name="FavoritesManager">
@@ -27,23 +51,37 @@ @@ -27,23 +51,37 @@
27 <component name="FileEditorManager"> 51 <component name="FileEditorManager">
28 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 52 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
29 <file pinned="false" current-in-tab="false"> 53 <file pinned="false" current-in-tab="false">
30 - <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml"> 54 + <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
31 <provider selected="true" editor-type-id="text-editor"> 55 <provider selected="true" editor-type-id="text-editor">
  56 +<<<<<<< HEAD
32 <state relative-caret-position="780"> 57 <state relative-caret-position="780">
33 <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" /> 58 <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
  59 +=======
  60 + <state relative-caret-position="66">
  61 + <caret line="21" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="58" />
  62 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
34 </state> 63 </state>
35 </provider> 64 </provider>
36 </entry> 65 </entry>
37 </file> 66 </file>
38 <file pinned="false" current-in-tab="false"> 67 <file pinned="false" current-in-tab="false">
39 - <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml"> 68 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
40 <provider selected="true" editor-type-id="text-editor"> 69 <provider selected="true" editor-type-id="text-editor">
  70 +<<<<<<< HEAD
41 <state relative-caret-position="304"> 71 <state relative-caret-position="304">
42 <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" /> 72 <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
  73 +=======
  74 + <state relative-caret-position="154">
  75 + <caret line="9" column="15" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="15" />
  76 + <folding>
  77 + <element signature="e#108#137#0" expanded="true" />
  78 + </folding>
  79 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
43 </state> 80 </state>
44 </provider> 81 </provider>
45 </entry> 82 </entry>
46 </file> 83 </file>
  84 +<<<<<<< HEAD
47 <file pinned="false" current-in-tab="false"> 85 <file pinned="false" current-in-tab="false">
48 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py"> 86 <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
49 <provider selected="true" editor-type-id="text-editor"> 87 <provider selected="true" editor-type-id="text-editor">
@@ -52,15 +90,33 @@ @@ -52,15 +90,33 @@
52 <folding> 90 <folding>
53 <element signature="e#108#137#0" expanded="true" /> 91 <element signature="e#108#137#0" expanded="true" />
54 </folding> 92 </folding>
  93 +=======
  94 + <file pinned="false" current-in-tab="true">
  95 + <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
  96 + <provider selected="true" editor-type-id="text-editor">
  97 + <state relative-caret-position="154">
  98 + <caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
  99 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
55 </state> 100 </state>
56 </provider> 101 </provider>
57 </entry> 102 </entry>
58 </file> 103 </file>
  104 +<<<<<<< HEAD
59 <file pinned="false" current-in-tab="true"> 105 <file pinned="false" current-in-tab="true">
60 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml"> 106 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
61 <provider selected="true" editor-type-id="text-editor"> 107 <provider selected="true" editor-type-id="text-editor">
62 <state relative-caret-position="416"> 108 <state relative-caret-position="416">
63 <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" /> 109 <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
  110 +=======
  111 + <file pinned="false" current-in-tab="false">
  112 + <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
  113 + <provider selected="true" editor-type-id="text-editor">
  114 + <state relative-caret-position="6028">
  115 + <caret line="275" column="4" selection-start-line="275" selection-start-column="4" selection-end-line="275" selection-end-column="21" />
  116 + <folding>
  117 + <element signature="e#107#119#0" expanded="true" />
  118 + </folding>
  119 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
64 </state> 120 </state>
65 </provider> 121 </provider>
66 </entry> 122 </entry>
@@ -68,17 +124,17 @@ @@ -68,17 +124,17 @@
68 <file pinned="false" current-in-tab="false"> 124 <file pinned="false" current-in-tab="false">
69 <entry file="file://$PROJECT_DIR$/.env"> 125 <entry file="file://$PROJECT_DIR$/.env">
70 <provider selected="true" editor-type-id="text-editor"> 126 <provider selected="true" editor-type-id="text-editor">
71 - <state relative-caret-position="260"> 127 + <state relative-caret-position="220">
72 <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" /> 128 <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
73 </state> 129 </state>
74 </provider> 130 </provider>
75 </entry> 131 </entry>
76 </file> 132 </file>
77 <file pinned="false" current-in-tab="false"> 133 <file pinned="false" current-in-tab="false">
78 - <entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml"> 134 + <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
79 <provider selected="true" editor-type-id="text-editor"> 135 <provider selected="true" editor-type-id="text-editor">
80 - <state relative-caret-position="130">  
81 - <caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" /> 136 + <state relative-caret-position="176">
  137 + <caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
82 </state> 138 </state>
83 </provider> 139 </provider>
84 </entry> 140 </entry>
@@ -86,8 +142,13 @@ @@ -86,8 +142,13 @@
86 <file pinned="false" current-in-tab="false"> 142 <file pinned="false" current-in-tab="false">
87 <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py"> 143 <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
88 <provider selected="true" editor-type-id="text-editor"> 144 <provider selected="true" editor-type-id="text-editor">
  145 +<<<<<<< HEAD
89 <state relative-caret-position="6292"> 146 <state relative-caret-position="6292">
90 <caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" /> 147 <caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" />
  148 +=======
  149 + <state relative-caret-position="3124">
  150 + <caret line="143" selection-start-line="143" selection-end-line="143" />
  151 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
91 <folding> 152 <folding>
92 <element signature="e#117#128#0" expanded="true" /> 153 <element signature="e#117#128#0" expanded="true" />
93 </folding> 154 </folding>
@@ -95,6 +156,7 @@ @@ -95,6 +156,7 @@
95 </provider> 156 </provider>
96 </entry> 157 </entry>
97 </file> 158 </file>
  159 +<<<<<<< HEAD
98 <file pinned="false" current-in-tab="false"> 160 <file pinned="false" current-in-tab="false">
99 <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml"> 161 <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
100 <provider selected="true" editor-type-id="text-editor"> 162 <provider selected="true" editor-type-id="text-editor">
@@ -104,6 +166,8 @@ @@ -104,6 +166,8 @@
104 </provider> 166 </provider>
105 </entry> 167 </entry>
106 </file> 168 </file>
  169 +=======
  170 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
107 </leaf> 171 </leaf>
108 </component> 172 </component>
109 <component name="FileTemplateManagerImpl"> 173 <component name="FileTemplateManagerImpl">
@@ -128,6 +192,8 @@ @@ -128,6 +192,8 @@
128 <find>teardown_hook_get_task_name</find> 192 <find>teardown_hook_get_task_name</find>
129 <find>get_serialNo</find> 193 <find>get_serialNo</find>
130 <find>teardown_hook_get_serialNo</find> 194 <find>teardown_hook_get_serialNo</find>
  195 + <find>get_resource_id()</find>
  196 + <find>get_resource_id_to_int</find>
131 </findStrings> 197 </findStrings>
132 </component> 198 </component>
133 <component name="Git.Settings"> 199 <component name="Git.Settings">
@@ -182,7 +248,6 @@ @@ -182,7 +248,6 @@
182 <option value="$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml" /> 248 <option value="$PROJECT_DIR$/testcases/permission/ques_pf_permission/QX001_pf_permission.yml" />
183 <option value="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml" /> 249 <option value="$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_delete_testcase.yml" />
184 <option value="$PROJECT_DIR$/api/m_api/task_resource_api.yml" /> 250 <option value="$PROJECT_DIR$/api/m_api/task_resource_api.yml" />
185 - <option value="$PROJECT_DIR$/helpfunc/login_func.py" />  
186 <option value="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" /> 251 <option value="$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml" />
187 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml" /> 252 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_confirm_api.yml" />
188 <option value="$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml" /> 253 <option value="$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml" />
@@ -194,19 +259,25 @@ @@ -194,19 +259,25 @@
194 <option value="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" /> 259 <option value="$PROJECT_DIR$/testcases/task/task_finishTask_testcase.yml" />
195 <option value="$PROJECT_DIR$/testsuites/task_suites.yml" /> 260 <option value="$PROJECT_DIR$/testsuites/task_suites.yml" />
196 <option value="$PROJECT_DIR$/api/m_api/common/user_api.yml" /> 261 <option value="$PROJECT_DIR$/api/m_api/common/user_api.yml" />
  262 + <option value="$PROJECT_DIR$/debugtalk.py" />
  263 + <option value="$PROJECT_DIR$/helpfunc/login_func.py" />
  264 + <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
197 <option value="$PROJECT_DIR$/helpfunc/m_func.py" /> 265 <option value="$PROJECT_DIR$/helpfunc/m_func.py" />
198 <option value="$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml" /> 266 <option value="$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml" />
  267 +<<<<<<< HEAD
199 <option value="$PROJECT_DIR$/debugtalk.py" /> 268 <option value="$PROJECT_DIR$/debugtalk.py" />
200 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" /> 269 <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
  270 +=======
  271 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
201 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" /> 272 <option value="$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml" />
202 </list> 273 </list>
203 </option> 274 </option>
204 </component> 275 </component>
205 - <component name="ProjectFrameBounds" extendedState="6">  
206 - <option name="x" value="179" />  
207 - <option name="y" value="427" /> 276 + <component name="ProjectFrameBounds" extendedState="7">
  277 + <option name="x" value="-8" />
  278 + <option name="y" value="-8" />
208 <option name="width" value="1382" /> 279 <option name="width" value="1382" />
209 - <option name="height" value="741" /> 280 + <option name="height" value="744" />
210 </component> 281 </component>
211 <component name="ProjectId" id="1RGy0cbJxXUqydJBLy6eKhLCtup" /> 282 <component name="ProjectId" id="1RGy0cbJxXUqydJBLy6eKhLCtup" />
212 <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> 283 <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -287,6 +358,13 @@ @@ -287,6 +358,13 @@
287 <path> 358 <path>
288 <item name="task_api" type="b2602c69:ProjectViewProjectNode" /> 359 <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
289 <item name="task_api" type="462c0819:PsiDirectoryNode" /> 360 <item name="task_api" type="462c0819:PsiDirectoryNode" />
  361 + <item name="testcases" type="462c0819:PsiDirectoryNode" />
  362 + <item name="task" type="462c0819:PsiDirectoryNode" />
  363 + <item name="loot" type="462c0819:PsiDirectoryNode" />
  364 + </path>
  365 + <path>
  366 + <item name="task_api" type="b2602c69:ProjectViewProjectNode" />
  367 + <item name="task_api" type="462c0819:PsiDirectoryNode" />
290 <item name="testsuites" type="462c0819:PsiDirectoryNode" /> 368 <item name="testsuites" type="462c0819:PsiDirectoryNode" />
291 </path> 369 </path>
292 </expand> 370 </expand>
@@ -298,7 +376,7 @@ @@ -298,7 +376,7 @@
298 </component> 376 </component>
299 <component name="PropertiesComponent"> 377 <component name="PropertiesComponent">
300 <property name="WebServerToolWindowFactoryState" value="false" /> 378 <property name="WebServerToolWindowFactoryState" value="false" />
301 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../ability_api" /> 379 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
302 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> 380 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
303 </component> 381 </component>
304 <component name="RecentsManager"> 382 <component name="RecentsManager">
@@ -329,7 +407,7 @@ @@ -329,7 +407,7 @@
329 </list> 407 </list>
330 </option> 408 </option>
331 </component> 409 </component>
332 - <component name="RunManager" selected="Python.debugtalk"> 410 + <component name="RunManager" selected="Python.m_func">
333 <configuration name="debugtalk" type="PythonConfigurationType" factoryName="Python" temporary="true"> 411 <configuration name="debugtalk" type="PythonConfigurationType" factoryName="Python" temporary="true">
334 <module name="ability_api" /> 412 <module name="ability_api" />
335 <option name="INTERPRETER_OPTIONS" value="" /> 413 <option name="INTERPRETER_OPTIONS" value="" />
@@ -442,10 +520,10 @@ @@ -442,10 +520,10 @@
442 </configuration> 520 </configuration>
443 <recent_temporary> 521 <recent_temporary>
444 <list> 522 <list>
445 - <item itemvalue="Python.debugtalk" />  
446 <item itemvalue="Python.m_func" /> 523 <item itemvalue="Python.m_func" />
447 <item itemvalue="Python.pg_db_func" /> 524 <item itemvalue="Python.pg_db_func" />
448 <item itemvalue="Python.login_func" /> 525 <item itemvalue="Python.login_func" />
  526 + <item itemvalue="Python.debugtalk" />
449 <item itemvalue="Python.run" /> 527 <item itemvalue="Python.run" />
450 </list> 528 </list>
451 </recent_temporary> 529 </recent_temporary>
@@ -554,8 +632,15 @@ @@ -554,8 +632,15 @@
554 <workItem from="1597801010469" duration="16146000" /> 632 <workItem from="1597801010469" duration="16146000" />
555 <workItem from="1597886812090" duration="6866000" /> 633 <workItem from="1597886812090" duration="6866000" />
556 <workItem from="1597906408146" duration="2887000" /> 634 <workItem from="1597906408146" duration="2887000" />
  635 +<<<<<<< HEAD
557 <workItem from="1597973157365" duration="19140000" /> 636 <workItem from="1597973157365" duration="19140000" />
558 <workItem from="1598337033172" duration="73000" /> 637 <workItem from="1598337033172" duration="73000" />
  638 +=======
  639 + <workItem from="1597973157365" duration="18949000" />
  640 + <workItem from="1598065887022" duration="4905000" />
  641 + <workItem from="1598108947857" duration="3526000" />
  642 + <workItem from="1598168398954" duration="3596000" />
  643 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
559 </task> 644 </task>
560 <task id="LOCAL-00001" summary="优化测试用例"> 645 <task id="LOCAL-00001" summary="优化测试用例">
561 <created>1571644787323</created> 646 <created>1571644787323</created>
@@ -883,7 +968,11 @@ @@ -883,7 +968,11 @@
883 <servers /> 968 <servers />
884 </component> 969 </component>
885 <component name="TimeTrackingManager"> 970 <component name="TimeTrackingManager">
  971 +<<<<<<< HEAD
886 <option name="totallyTimeSpent" value="354188000" /> 972 <option name="totallyTimeSpent" value="354188000" />
  973 +=======
  974 + <option name="totallyTimeSpent" value="365951000" />
  975 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
887 </component> 976 </component>
888 <component name="TodoView" selected-index="3"> 977 <component name="TodoView" selected-index="3">
889 <todo-panel id="selected-file"> 978 <todo-panel id="selected-file">
@@ -894,15 +983,21 @@ @@ -894,15 +983,21 @@
894 </todo-panel> 983 </todo-panel>
895 </component> 984 </component>
896 <component name="ToolWindowManager"> 985 <component name="ToolWindowManager">
  986 +<<<<<<< HEAD
897 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 987 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
898 <editor active="true" /> 988 <editor active="true" />
899 <layout> 989 <layout>
900 <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22693133" /> 990 <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22693133" />
  991 +=======
  992 + <frame x="-8" y="-8" width="1382" height="744" extended-state="7" />
  993 + <layout>
  994 + <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49761903" visible="true" weight="0.22995462" />
  995 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
901 <window_info id="Structure" order="1" sideWeight="0.50238097" side_tool="true" weight="0.30711043" /> 996 <window_info id="Structure" order="1" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
902 <window_info id="Favorites" order="2" sideWeight="0.50238097" side_tool="true" weight="0.30711043" /> 997 <window_info id="Favorites" order="2" sideWeight="0.50238097" side_tool="true" weight="0.30711043" />
903 <window_info anchor="bottom" id="Message" order="0" /> 998 <window_info anchor="bottom" id="Message" order="0" />
904 <window_info anchor="bottom" id="Find" order="1" weight="0.32924107" /> 999 <window_info anchor="bottom" id="Find" order="1" weight="0.32924107" />
905 - <window_info anchor="bottom" id="Run" order="2" weight="0.3013393" /> 1000 + <window_info anchor="bottom" id="Run" order="2" weight="0.29982963" />
906 <window_info anchor="bottom" id="Debug" order="3" weight="0.39863715" /> 1001 <window_info anchor="bottom" id="Debug" order="3" weight="0.39863715" />
907 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> 1002 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
908 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> 1003 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -911,7 +1006,7 @@ @@ -911,7 +1006,7 @@
911 <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49848714" weight="0.328125" /> 1006 <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49848714" weight="0.328125" />
912 <window_info anchor="bottom" id="Database Changes" order="9" /> 1007 <window_info anchor="bottom" id="Database Changes" order="9" />
913 <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50226927" side_tool="true" weight="0.32879046" /> 1008 <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50226927" side_tool="true" weight="0.32879046" />
914 - <window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" visible="true" weight="0.3872768" /> 1009 + <window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.4977307" visible="true" weight="0.5519591" />
915 <window_info anchor="bottom" id="Python Console" order="12" weight="0.328125" /> 1010 <window_info anchor="bottom" id="Python Console" order="12" weight="0.328125" />
916 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 1011 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
917 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 1012 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -1084,16 +1179,6 @@ @@ -1084,16 +1179,6 @@
1084 </state> 1179 </state>
1085 </provider> 1180 </provider>
1086 </entry> 1181 </entry>
1087 - <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">  
1088 - <provider selected="true" editor-type-id="text-editor">  
1089 - <state relative-caret-position="133">  
1090 - <caret line="141" column="4" selection-start-line="141" selection-start-column="4" selection-end-line="141" selection-end-column="18" />  
1091 - <folding>  
1092 - <element signature="e#107#119#0" expanded="true" />  
1093 - </folding>  
1094 - </state>  
1095 - </provider>  
1096 - </entry>  
1097 <entry file="file://$PROJECT_DIR$/api/m_api/loot/tasksearchResources_api.yml" /> 1182 <entry file="file://$PROJECT_DIR$/api/m_api/loot/tasksearchResources_api.yml" />
1098 <entry file="file://$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml"> 1183 <entry file="file://$PROJECT_DIR$/api/m_api/loot/submitCompete_loot_api.yml">
1099 <provider selected="true" editor-type-id="text-editor"> 1184 <provider selected="true" editor-type-id="text-editor">
@@ -1133,20 +1218,7 @@ @@ -1133,20 +1218,7 @@
1133 </state> 1218 </state>
1134 </provider> 1219 </provider>
1135 </entry> 1220 </entry>
1136 - <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py">  
1137 - <provider selected="true" editor-type-id="text-editor">  
1138 - <state relative-caret-position="474">  
1139 - <caret line="170" selection-start-line="170" selection-end-line="170" />  
1140 - </state>  
1141 - </provider>  
1142 - </entry>  
1143 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml">  
1144 - <provider selected="true" editor-type-id="text-editor">  
1145 - <state relative-caret-position="471">  
1146 - <caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" />  
1147 - </state>  
1148 - </provider>  
1149 - </entry> 1221 + <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38/Lib/site-packages/urllib3/request.py" />
1150 <entry file="file://$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml"> 1222 <entry file="file://$PROJECT_DIR$/api/m_api/task_currentTasks_api.yml">
1151 <provider selected="true" editor-type-id="text-editor"> 1223 <provider selected="true" editor-type-id="text-editor">
1152 <state> 1224 <state>
@@ -1161,20 +1233,6 @@ @@ -1161,20 +1233,6 @@
1161 </state> 1233 </state>
1162 </provider> 1234 </provider>
1163 </entry> 1235 </entry>
1164 - <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml">  
1165 - <provider selected="true" editor-type-id="text-editor">  
1166 - <state relative-caret-position="-309">  
1167 - <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />  
1168 - </state>  
1169 - </provider>  
1170 - </entry>  
1171 - <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">  
1172 - <provider selected="true" editor-type-id="text-editor">  
1173 - <state relative-caret-position="604">  
1174 - <caret line="25" column="50" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" />  
1175 - </state>  
1176 - </provider>  
1177 - </entry>  
1178 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml"> 1236 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_reject_api.yml">
1179 <provider selected="true" editor-type-id="text-editor"> 1237 <provider selected="true" editor-type-id="text-editor">
1180 <state relative-caret-position="702"> 1238 <state relative-caret-position="702">
@@ -1225,12 +1283,23 @@ @@ -1225,12 +1283,23 @@
1225 </provider> 1283 </provider>
1226 </entry> 1284 </entry>
1227 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml"> 1285 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_update_0_api.yml">
  1286 +<<<<<<< HEAD
  1287 +=======
1228 <provider selected="true" editor-type-id="text-editor"> 1288 <provider selected="true" editor-type-id="text-editor">
1229 <state relative-caret-position="130"> 1289 <state relative-caret-position="130">
1230 <caret line="5" column="50" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="50" /> 1290 <caret line="5" column="50" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="50" />
1231 </state> 1291 </state>
1232 </provider> 1292 </provider>
1233 </entry> 1293 </entry>
  1294 + <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml">
  1295 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
  1296 + <provider selected="true" editor-type-id="text-editor">
  1297 + <state relative-caret-position="660">
  1298 + <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
  1299 + </state>
  1300 + </provider>
  1301 + </entry>
  1302 +<<<<<<< HEAD
1234 <entry file="file://$PROJECT_DIR$/debugtalk.py"> 1303 <entry file="file://$PROJECT_DIR$/debugtalk.py">
1235 <provider selected="true" editor-type-id="text-editor"> 1304 <provider selected="true" editor-type-id="text-editor">
1236 <state relative-caret-position="18"> 1305 <state relative-caret-position="18">
@@ -1238,11 +1307,18 @@ @@ -1238,11 +1307,18 @@
1238 <folding> 1307 <folding>
1239 <element signature="e#0#11#0" expanded="true" /> 1308 <element signature="e#0#11#0" expanded="true" />
1240 </folding> 1309 </folding>
  1310 +=======
  1311 + <entry file="file://$PROJECT_DIR$/testcases/task/task_rewards_taskDetails_testcase.yml">
  1312 + <provider selected="true" editor-type-id="text-editor">
  1313 + <state relative-caret-position="550">
  1314 + <caret line="25" column="50" selection-start-line="25" selection-start-column="50" selection-end-line="25" selection-end-column="50" />
  1315 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
1241 </state> 1316 </state>
1242 </provider> 1317 </provider>
1243 </entry> 1318 </entry>
1244 - <entry file="file://$PROJECT_DIR$/testsuites/task_suites.yml"> 1319 + <entry file="file://$PROJECT_DIR$/testcases/task/loot/loot_task_confirm_testcase.yml">
1245 <provider selected="true" editor-type-id="text-editor"> 1320 <provider selected="true" editor-type-id="text-editor">
  1321 +<<<<<<< HEAD
1246 <state relative-caret-position="780"> 1322 <state relative-caret-position="780">
1247 <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" /> 1323 <caret line="30" column="42" selection-start-line="30" selection-start-column="42" selection-end-line="30" selection-end-column="42" />
1248 </state> 1324 </state>
@@ -1255,11 +1331,30 @@ @@ -1255,11 +1331,30 @@
1255 <folding> 1331 <folding>
1256 <element signature="e#108#137#0" expanded="true" /> 1332 <element signature="e#108#137#0" expanded="true" />
1257 </folding> 1333 </folding>
  1334 +=======
  1335 + <state relative-caret-position="772">
  1336 + <caret line="36" selection-start-line="36" selection-end-line="36" />
  1337 + </state>
  1338 + </provider>
  1339 + </entry>
  1340 + <entry file="file://$PROJECT_DIR$/api/m_api/common/user_api.yml">
  1341 + <provider selected="true" editor-type-id="text-editor">
  1342 + <state relative-caret-position="110">
  1343 + <caret line="5" selection-start-line="5" selection-end-line="9" selection-end-column="41" />
  1344 + </state>
  1345 + </provider>
  1346 + </entry>
  1347 + <entry file="file://$PROJECT_DIR$/testcases/task/loot/save_loot_update_0_open_testcase.yml">
  1348 + <provider selected="true" editor-type-id="text-editor">
  1349 + <state relative-caret-position="-299">
  1350 + <caret line="7" selection-start-line="7" selection-end-line="7" />
  1351 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
1258 </state> 1352 </state>
1259 </provider> 1353 </provider>
1260 </entry> 1354 </entry>
1261 <entry file="file://$PROJECT_DIR$/.env"> 1355 <entry file="file://$PROJECT_DIR$/.env">
1262 <provider selected="true" editor-type-id="text-editor"> 1356 <provider selected="true" editor-type-id="text-editor">
  1357 +<<<<<<< HEAD
1263 <state relative-caret-position="260"> 1358 <state relative-caret-position="260">
1264 <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" /> 1359 <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
1265 </state> 1360 </state>
@@ -1276,12 +1371,61 @@ @@ -1276,12 +1371,61 @@
1276 <provider selected="true" editor-type-id="text-editor"> 1371 <provider selected="true" editor-type-id="text-editor">
1277 <state relative-caret-position="6292"> 1372 <state relative-caret-position="6292">
1278 <caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" /> 1373 <caret line="243" column="16" lean-forward="true" selection-start-line="243" selection-start-column="16" selection-end-line="243" selection-end-column="16" />
  1374 +=======
  1375 + <state relative-caret-position="132">
  1376 + <caret line="17" column="21" selection-start-line="17" selection-start-column="4" selection-end-line="17" selection-end-column="21" />
  1377 + <folding>
  1378 + <element signature="e#0#11#0" expanded="true" />
  1379 + </folding>
  1380 + </state>
  1381 + </provider>
  1382 + </entry>
  1383 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
  1384 + <provider selected="true" editor-type-id="text-editor">
  1385 + <state relative-caret-position="154">
  1386 + <caret line="9" column="15" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="15" />
  1387 + <folding>
  1388 + <element signature="e#108#137#0" expanded="true" />
  1389 + </folding>
  1390 + </state>
  1391 + </provider>
  1392 + </entry>
  1393 + <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
  1394 + <provider selected="true" editor-type-id="text-editor">
  1395 + <state relative-caret-position="6028">
  1396 + <caret line="275" column="4" selection-start-line="275" selection-start-column="4" selection-end-line="275" selection-end-column="21" />
  1397 + <folding>
  1398 + <element signature="e#107#119#0" expanded="true" />
  1399 + </folding>
  1400 + </state>
  1401 + </provider>
  1402 + </entry>
  1403 + <entry file="file://$PROJECT_DIR$/.env">
  1404 + <provider selected="true" editor-type-id="text-editor">
  1405 + <state relative-caret-position="220">
  1406 + <caret line="10" column="14" selection-start-line="10" selection-end-line="10" selection-end-column="14" />
  1407 + </state>
  1408 + </provider>
  1409 + </entry>
  1410 + <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
  1411 + <provider selected="true" editor-type-id="text-editor">
  1412 + <state relative-caret-position="176">
  1413 + <caret line="8" selection-start-line="8" selection-end-line="9" selection-end-column="52" />
  1414 + </state>
  1415 + </provider>
  1416 + </entry>
  1417 + <entry file="file://$PROJECT_DIR$/helpfunc/m_func.py">
  1418 + <provider selected="true" editor-type-id="text-editor">
  1419 + <state relative-caret-position="3124">
  1420 + <caret line="143" selection-start-line="143" selection-end-line="143" />
  1421 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
1279 <folding> 1422 <folding>
1280 <element signature="e#117#128#0" expanded="true" /> 1423 <element signature="e#117#128#0" expanded="true" />
1281 </folding> 1424 </folding>
1282 </state> 1425 </state>
1283 </provider> 1426 </provider>
1284 </entry> 1427 </entry>
  1428 +<<<<<<< HEAD
1285 <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml"> 1429 <entry file="file://$PROJECT_DIR$/api/app_api/login_api/task/accessToken_api.yml">
1286 <provider selected="true" editor-type-id="text-editor"> 1430 <provider selected="true" editor-type-id="text-editor">
1287 <state relative-caret-position="208"> 1431 <state relative-caret-position="208">
@@ -1293,13 +1437,24 @@ @@ -1293,13 +1437,24 @@
1293 <provider selected="true" editor-type-id="text-editor"> 1437 <provider selected="true" editor-type-id="text-editor">
1294 <state relative-caret-position="304"> 1438 <state relative-caret-position="304">
1295 <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" /> 1439 <caret line="66" selection-start-line="66" selection-end-line="67" selection-end-column="48" />
  1440 +=======
  1441 + <entry file="file://$PROJECT_DIR$/testcases/task/loot_task_finishTask_testcase.yml">
  1442 + <provider selected="true" editor-type-id="text-editor">
  1443 + <state relative-caret-position="66">
  1444 + <caret line="21" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="58" />
  1445 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
1296 </state> 1446 </state>
1297 </provider> 1447 </provider>
1298 </entry> 1448 </entry>
1299 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml"> 1449 <entry file="file://$PROJECT_DIR$/api/m_api/loot/loot_task_accept_api.yml">
1300 <provider selected="true" editor-type-id="text-editor"> 1450 <provider selected="true" editor-type-id="text-editor">
  1451 +<<<<<<< HEAD
1301 <state relative-caret-position="416"> 1452 <state relative-caret-position="416">
1302 <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" /> 1453 <caret line="43" column="40" selection-start-line="43" selection-start-column="40" selection-end-line="43" selection-end-column="40" />
  1454 +=======
  1455 + <state relative-caret-position="154">
  1456 + <caret line="64" column="17" selection-start-line="64" selection-start-column="17" selection-end-line="64" selection-end-column="17" />
  1457 +>>>>>>> 9e058e5d7a0b6d24ee8d4f50905376ab2a0a623f
1303 </state> 1458 </state>
1304 </provider> 1459 </provider>
1305 </entry> 1460 </entry>
@@ -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  
54 - name: $name0  
55 - percent: 25  
56 - score: 6.5  
57 - - uid: $uid1  
58 - name: $name1  
59 - percent: 6.5  
60 - score: 500  
61 - - uid: $uid2  
62 - name: $name2  
63 - percent: 25  
64 - score: 6.5 52 + - uid: $uid0
  53 + name: $name0
  54 + percent: ${convert_to_number(25)}
  55 + score: ${convert_to_number(5)}
  56 + - uid: $uid1
  57 + name: $name1
  58 + percent: ${convert_to_number(25)}
  59 + score: ${convert_to_number(5)}
  60 + - uid: $uid2
  61 + name: $name2
  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.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvcHdkTG9naW4iLCJpYXQiOjE1OTgzMzc4NzAsImV4cCI6MTU5ODM0ODY3MCwibmJmIjoxNTk4MzM3ODcwLCJqdGkiOiJPc1FMQUd6QmdxNUFiNDBhIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.nu8EwnYA9PwYHVBzuB6OfnacLD-V3LeyDLiPoeqIo54
1 -Gh8SznkQkAGwcyFePyZaEzRtRiBjGf6r  
  1 +C54raNPNzRzKT77XDBxkCeJTZpGBCPHQ
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTc5OTQ1OTQsImV4cCI6MTU5ODAwNTM5NCwibmJmIjoxNTk3OTk0NTk0LCJqdGkiOiJWM0ZWNEJiSUgxSm5wNHhuIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.VYMt8TpiwaTDbXdCNS_QnPjTk6jSkx6TUkEjPU1l-R8  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtYnVzaW5lc3MtYWRtaW4tZ2F0ZXdheS10ZXN0LmZqbWFpbWFpbWFpLmNvbVwvYXV0aFwvYW5vbnltb3VzTG9naW4iLCJpYXQiOjE1OTgzMzc4NzEsImV4cCI6MTU5ODM0ODY3MSwibmJmIjoxNTk4MzM3ODcxLCJqdGkiOiJRTDRiZFJ5T25EZ0xpOVdhIiwic3ViIjozMjQ4ODE3NjEzNjgxNjY0LCJwcnYiOiI4N2UwYWYxZWY5ZmQxNTgxMmZkZWM5NzE1M2ExNGUwYjA0NzU0NmFhIiwiY29tcGFueUlkIjozNjYsIm5pY2tuYW1lIjoiXHU4Yzc5XHU1YjUwXHU1OTM0IiwicGhvbmUiOiIxOTk5MDAwMDAwOCIsImlkIjozMjQ4ODE3NjEzNjgxNjY0LCJhZG1pblR5cGUiOjF9.x0itN9vEYO6wPFXxf3OyV_Etljtry3OwWktlpAyZr80
1 -rv7f2l9333  
  1 +oqlaho6q4k
1 -198271ab5e4be000a01629484af1736333b63c757d5e36850a5a91a3e5c3bcd8361fe39c  
  1 +84d2004bf28a2095230e8e14993d398d40aa7bd061b6ad48cb6f7a7cfdb84569d7d0ca57
1 -B34F2yFhTOHWa10B99/3c1nbcPnTP1mZuPmjPZOZZaFd05LH6hiAhSxL7/UmT7EXnj7dK9X1Q6zqJSJKEx+ufByotzgCSb+d5Fk13DXUKPCT0SvjbnsS7D+Bf31/7z5XjHl8e0fkAoGXNvR6ryQNSX37KSLW2WKRlDd25hh1Kx0=  
  1 +mYGaGzm/2A8LNNjaJG2iyFolUo9vPkYDkeIDBW8rSZeAtTiDMc6MYX+DjBpMKR1wPzyMSaaQgTIxqPA8EKx1GYwgOEdN2b7+/W6r6ZCP+g5MwWEbQj1VHmZwF+5A+ik2X9q6abD9yR48ShP96jKH+yTilDaG5nSmrYY6A0u46PE=
1 -3272692925319424  
  1 +3273395953934592
1 -eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk3OTk0NTk0LCJleHAiOjE1OTgwMDUzOTQsIm5iZiI6MTU5Nzk5NDU5NCwianRpIjoiNFR3UG9tc2k1VGNxWHE4TyIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.sKByudD3jxI-9W-Dy65Mtw2Gfen94kOdNkRVt5kKSdM  
  1 +eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC9zdXBsdXMtd29ydGgtd2ViLWdhdGV3YXktdGVzdC5mam1haW1haW1haS5jb21cL2F1dGhcL2xvZ2luIiwiaWF0IjoxNTk4MzM3ODcxLCJleHAiOjE1OTgzNDg2NzEsIm5iZiI6MTU5ODMzNzg3MSwianRpIjoiZ1pMN21pMmFycEhNYlRyaiIsInN1YiI6MzI0ODgxNzYxMzY4MTY2NCwicHJ2IjoiODdlMGFmMWVmOWZkMTU4MTJmZGVjOTcxNTNhMTRlMGIwNDc1NDZhYSIsImNvbXBhbnlJZCI6MzY2LCJuaWNrbmFtZSI6Ilx1OGM3OVx1NWI1MFx1NTkzNCIsInBob25lIjoiMTk5OTAwMDAwMDgiLCJ1aWQiOjMyNDg4MTc2MTM2ODE2NjQsImFkbWluVHlwZSI6Mn0.vaTxIhdCUnfG0CksphY0YGDqxr-iM_DOTmMX8NF_6UI
1 -8xYKezzCm4JmNXZKaFER3fcBm6bkzS3D  
  1 +QZJjDhX22fX4aJTT32s5BChPXJ8CJ2jG
1 -7vm9ofajxzl  
  1 +o213scwfkxo
1 -3020853417054045184  
  1 +3026612655420343296
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
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()
@@ -9,7 +9,7 @@ from urllib.parse import * @@ -9,7 +9,7 @@ from urllib.parse import *
9 9
10 10
11 path = 'E:/task_api/' 11 path = 'E:/task_api/'
12 - 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)