bianxinhua / partner_api · 提交

转到一个项目

作者 bianxinhua
提交 1aba3a623d57a6ee2f06be18abfad787f04997c8 1 个父辈 66d45942

add README

内嵌 并排对比
正在显示 33 个修改的文件 包含 547 行增加 和 912 行删除
@@ -2,13 +2,32 @@ @@ -2,13 +2,32 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment=""> 4 <list default="true" id="d6814b48-28ec-40b6-bcea-dcd9b8613715" name="Default Changelist" comment="">
  5 + <change afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml" afterDir="false" />
  6 + <change afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml" afterDir="false" />
  7 + <change afterPath="$PROJECT_DIR$/helpfunc/pg_db_func.py" afterDir="false" />
  8 + <change afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" afterDir="false" />
  9 + <change afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" afterDir="false" />
  10 + <change afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" afterDir="false" />
  11 + <change afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" afterDir="false" />
  12 + <change afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" afterDir="false" />
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 13 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml" afterDir="false" /> 14 + <change beforePath="$PROJECT_DIR$/api/demo_api.yml" beforeDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" afterDir="false" />
  16 + <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml" afterDir="false" />
  17 + <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" afterDir="false" />
  18 + <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" afterDir="false" />
  19 + <change beforePath="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" afterDir="false" />
  20 + <change beforePath="$PROJECT_DIR$/api/m_api/m_partner_detail_api.yml" beforeDir="false" />
  21 + <change beforePath="$PROJECT_DIR$/api/m_api/m_partner_edit_api.yml" beforeDir="false" />
  22 + <change beforePath="$PROJECT_DIR$/api/m_api/m_partner_list_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" afterDir="false" />
  23 + <change beforePath="$PROJECT_DIR$/api/m_api/m_partner_set-status_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" afterDir="false" />
  24 + <change beforePath="$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml" beforeDir="false" afterPath="$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml" afterDir="false" />
7 <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" /> 25 <change beforePath="$PROJECT_DIR$/config/m_accessToken.csv" beforeDir="false" afterPath="$PROJECT_DIR$/config/m_accessToken.csv" afterDir="false" />
8 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" /> 26 <change beforePath="$PROJECT_DIR$/debugtalk.py" beforeDir="false" afterPath="$PROJECT_DIR$/debugtalk.py" afterDir="false" />
9 - <change beforePath="$PROJECT_DIR$/helpfunc/db_pg_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/db_pg_func.py" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" afterDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" afterDir="false" /> 27 + <change beforePath="$PROJECT_DIR$/helpfunc/db_func.py" beforeDir="false" afterPath="$PROJECT_DIR$/helpfunc/db_func.py" afterDir="false" />
  28 + <change beforePath="$PROJECT_DIR$/helpfunc/db_pg_func.py" beforeDir="false" />
  29 + <change beforePath="$PROJECT_DIR$/logs/testsuites/partner_testsuite.parse_failed.json" beforeDir="false" afterPath="$PROJECT_DIR$/logs/testsuites/partner_testsuite.parse_failed.json" afterDir="false" />
  30 + <change beforePath="$PROJECT_DIR$/reports/20200711T163748.576936.html" beforeDir="false" />
12 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" /> 31 <change beforePath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" beforeDir="false" afterPath="$PROJECT_DIR$/testcases_excel/partner_api.xlsx" afterDir="false" />
13 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" /> 32 <change beforePath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" beforeDir="false" afterPath="$PROJECT_DIR$/testsuites/partner_testsuite.yml" afterDir="false" />
14 </list> 33 </list>
@@ -21,86 +40,109 @@ @@ -21,86 +40,109 @@
21 <component name="CoverageDataManager"> 40 <component name="CoverageDataManager">
22 <SUITE FILE_PATH="coverage/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1594439962224" 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/partner_api$debugtalk.coverage" NAME="debugtalk Coverage Results" MODIFIED="1594439962224" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
23 <SUITE FILE_PATH="coverage/partner_api$db_pg_func.coverage" NAME="db_pg_func Coverage Results" MODIFIED="1594485069390" 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/partner_api$db_pg_func.coverage" NAME="db_pg_func Coverage Results" MODIFIED="1594485069390" 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/partner_api$pg_db_func.coverage" NAME="pg_db_func Coverage Results" MODIFIED="1594569809263" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/helpfunc" />
24 </component> 44 </component>
25 <component name="FileEditorManager"> 45 <component name="FileEditorManager">
26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 46 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
27 <file pinned="false" current-in-tab="false"> 47 <file pinned="false" current-in-tab="false">
28 - <entry file="file://$PROJECT_DIR$/debugtalk.py"> 48 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml">
29 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
30 - <state relative-caret-position="308">  
31 - <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" />  
32 - <folding>  
33 - <element signature="e#0#13#0" expanded="true" />  
34 - </folding> 50 + <state relative-caret-position="88">
  51 + <caret line="13" selection-start-line="13" selection-end-line="16" selection-end-column="12" />
35 </state> 52 </state>
36 </provider> 53 </provider>
37 </entry> 54 </entry>
38 </file> 55 </file>
39 <file pinned="false" current-in-tab="false"> 56 <file pinned="false" current-in-tab="false">
40 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml"> 57 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml">
41 <provider selected="true" editor-type-id="text-editor"> 58 <provider selected="true" editor-type-id="text-editor">
42 - <state relative-caret-position="244">  
43 - <caret line="19" selection-start-line="19" selection-end-line="22" selection-end-column="12" /> 59 + <state>
  60 + <caret column="11" selection-start-column="11" selection-end-column="11" />
44 </state> 61 </state>
45 </provider> 62 </provider>
46 </entry> 63 </entry>
47 </file> 64 </file>
48 <file pinned="false" current-in-tab="false"> 65 <file pinned="false" current-in-tab="false">
49 - <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml"> 66 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml">
50 <provider selected="true" editor-type-id="text-editor"> 67 <provider selected="true" editor-type-id="text-editor">
51 - <state relative-caret-position="638">  
52 - <caret line="29" column="12" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="12" /> 68 + <state relative-caret-position="-66">
  69 + <caret column="11" selection-start-column="11" selection-end-column="11" />
53 </state> 70 </state>
54 </provider> 71 </provider>
55 </entry> 72 </entry>
56 </file> 73 </file>
57 - <file pinned="false" current-in-tab="true"> 74 + <file pinned="false" current-in-tab="false">
  75 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml">
  76 + <provider selected="true" editor-type-id="text-editor">
  77 + <state relative-caret-position="88">
  78 + <caret line="4" column="46" selection-start-line="4" selection-start-column="46" selection-end-line="4" selection-end-column="46" />
  79 + </state>
  80 + </provider>
  81 + </entry>
  82 + </file>
  83 + <file pinned="false" current-in-tab="false">
58 <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml"> 84 <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml">
59 <provider selected="true" editor-type-id="text-editor"> 85 <provider selected="true" editor-type-id="text-editor">
60 - <state relative-caret-position="26">  
61 - <caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" /> 86 + <state relative-caret-position="66">
  87 + <caret line="3" selection-start-line="3" selection-end-line="4" selection-end-column="48" />
  88 + </state>
  89 + </provider>
  90 + </entry>
  91 + </file>
  92 + <file pinned="false" current-in-tab="true">
  93 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml">
  94 + <provider selected="true" editor-type-id="text-editor">
  95 + <state relative-caret-position="88">
  96 + <caret line="4" column="46" selection-start-line="4" selection-start-column="46" selection-end-line="4" selection-end-column="46" />
62 </state> 97 </state>
63 </provider> 98 </provider>
64 </entry> 99 </entry>
65 </file> 100 </file>
66 <file pinned="false" current-in-tab="false"> 101 <file pinned="false" current-in-tab="false">
67 - <entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py"> 102 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml">
68 <provider selected="true" editor-type-id="text-editor"> 103 <provider selected="true" editor-type-id="text-editor">
69 <state relative-caret-position="126"> 104 <state relative-caret-position="126">
70 - <caret line="88" column="27" selection-start-line="88" selection-start-column="4" selection-end-line="88" selection-end-column="27" /> 105 + <caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
71 </state> 106 </state>
72 </provider> 107 </provider>
73 </entry> 108 </entry>
74 </file> 109 </file>
75 <file pinned="false" current-in-tab="false"> 110 <file pinned="false" current-in-tab="false">
76 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml"> 111 + <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
77 <provider selected="true" editor-type-id="text-editor"> 112 <provider selected="true" editor-type-id="text-editor">
78 - <state relative-caret-position="242">  
79 - <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="25" /> 113 + <state relative-caret-position="246">
  114 + <caret line="51" column="78" selection-start-line="51" selection-start-column="78" selection-end-line="51" selection-end-column="78" />
80 </state> 115 </state>
81 </provider> 116 </provider>
82 </entry> 117 </entry>
83 </file> 118 </file>
84 <file pinned="false" current-in-tab="false"> 119 <file pinned="false" current-in-tab="false">
85 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml"> 120 + <entry file="file://$PROJECT_DIR$/helpfunc/db_func.py">
86 <provider selected="true" editor-type-id="text-editor"> 121 <provider selected="true" editor-type-id="text-editor">
87 - <state relative-caret-position="286">  
88 - <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="27" /> 122 + <state relative-caret-position="145">
  123 + <caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
89 </state> 124 </state>
90 </provider> 125 </provider>
91 </entry> 126 </entry>
92 </file> 127 </file>
93 <file pinned="false" current-in-tab="false"> 128 <file pinned="false" current-in-tab="false">
94 - <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 129 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml">
95 <provider selected="true" editor-type-id="text-editor"> 130 <provider selected="true" editor-type-id="text-editor">
96 - <state relative-caret-position="158">  
97 - <caret line="36" column="71" selection-start-line="36" selection-start-column="71" selection-end-line="36" selection-end-column="71" /> 131 + <state relative-caret-position="-242">
  132 + <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
98 </state> 133 </state>
99 </provider> 134 </provider>
100 </entry> 135 </entry>
101 </file> 136 </file>
102 </leaf> 137 </leaf>
103 </component> 138 </component>
  139 + <component name="FileTemplateManagerImpl">
  140 + <option name="RECENT_TEMPLATES">
  141 + <list>
  142 + <option value="Python Script" />
  143 + </list>
  144 + </option>
  145 + </component>
104 <component name="Git.Settings"> 146 <component name="Git.Settings">
105 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> 147 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
106 </component> 148 </component>
@@ -110,27 +152,40 @@ @@ -110,27 +152,40 @@
110 <option value="$PROJECT_DIR$/testcases/m_admin_login_testcases.yml" /> 152 <option value="$PROJECT_DIR$/testcases/m_admin_login_testcases.yml" />
111 <option value="$PROJECT_DIR$/.env" /> 153 <option value="$PROJECT_DIR$/.env" />
112 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml" /> 154 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml" />
113 - <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" />  
114 <option value="$PROJECT_DIR$/testcases/admin/ADMIN002_list_admin_testcases.yml" /> 155 <option value="$PROJECT_DIR$/testcases/admin/ADMIN002_list_admin_testcases.yml" />
115 - <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" />  
116 - <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" />  
117 <option value="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" /> 156 <option value="$PROJECT_DIR$/testcases/admin/ADMIN003_list_admin_testcases.yml" />
118 - <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" />  
119 - <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml" />  
120 <option value="$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml" /> 157 <option value="$PROJECT_DIR$/testcases/admin/ADMIN006_forbidden_admin_testcases.yml" />
121 <option value="$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml" /> 158 <option value="$PROJECT_DIR$/testcases/admin/ADMIN005_forbidden_admin_testcases.yml" />
122 <option value="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" /> 159 <option value="$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml" />
123 <option value="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" /> 160 <option value="$PROJECT_DIR$/testcases/admin/ADMIN002_edit_admin_testcases.yml" />
124 <option value="$PROJECT_DIR$/testcases/m_login_testcases.yml" /> 161 <option value="$PROJECT_DIR$/testcases/m_login_testcases.yml" />
125 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml" /> 162 <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml" />
126 - <option value="$PROJECT_DIR$/debugtalk.py" />  
127 <option value="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" /> 163 <option value="$PROJECT_DIR$/testcases/admin/ADMIN001_add_admin_testcases.yml" />
128 - <option value="$PROJECT_DIR$/helpfunc/db_pg_func.py" />  
129 <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml" /> 164 <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml" />
130 - <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml" />  
131 <option value="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" /> 165 <option value="$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml" />
132 - <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />  
133 <option value="$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml" /> 166 <option value="$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml" />
  167 + <option value="$PROJECT_DIR$/helpfunc/db_pg_func.py" />
  168 + <option value="$PROJECT_DIR$/debugtalk.py" />
  169 + <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_list_api.yml" />
  170 + <option value="$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml" />
  171 + <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml" />
  172 + <option value="$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml" />
  173 + <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml" />
  174 + <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml" />
  175 + <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml" />
  176 + <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml" />
  177 + <option value="$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml" />
  178 + <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml" />
  179 + <option value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
  180 + <option value="$PROJECT_DIR$/helpfunc/db_func.py" />
  181 + <option value="$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml" />
  182 + <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml" />
  183 + <option value="$PROJECT_DIR$/api/m_api/m_partner_set-status_1_api.yml" />
  184 + <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml" />
  185 + <option value="$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml" />
  186 + <option value="$PROJECT_DIR$/testsuites/partner_testsuite.yml" />
  187 + <option value="$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml" />
  188 + <option value="$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml" />
134 </list> 189 </list>
135 </option> 190 </option>
136 </component> 191 </component>
@@ -186,12 +241,6 @@ @@ -186,12 +241,6 @@
186 <path> 241 <path>
187 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" /> 242 <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />
188 <item name="partner_api" type="462c0819:PsiDirectoryNode" /> 243 <item name="partner_api" type="462c0819:PsiDirectoryNode" />
189 - <item name="helpfunc" type="462c0819:PsiDirectoryNode" />  
190 - <item name="db_pg_func.py" type="8704e2dd:PyFileNode" />  
191 - </path>  
192 - <path>  
193 - <item name="partner_api" type="b2602c69:ProjectViewProjectNode" />  
194 - <item name="partner_api" type="462c0819:PsiDirectoryNode" />  
195 <item name="testcases" type="462c0819:PsiDirectoryNode" /> 244 <item name="testcases" type="462c0819:PsiDirectoryNode" />
196 </path> 245 </path>
197 <path> 246 <path>
@@ -218,6 +267,16 @@ @@ -218,6 +267,16 @@
218 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 267 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
219 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" /> 268 <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
220 </component> 269 </component>
  270 + <component name="RecentsManager">
  271 + <key name="CopyFile.RECENT_KEYS">
  272 + <recent name="E:\mmm_auto\partner_api\testcases\partners" />
  273 + <recent name="E:\mmm_auto\partner_api\api\m_api" />
  274 + <recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
  275 + </key>
  276 + <key name="MoveFile.RECENT_KEYS">
  277 + <recent name="E:\mmm_auto\partner_api\api\m_api\partners" />
  278 + </key>
  279 + </component>
221 <component name="RunDashboard"> 280 <component name="RunDashboard">
222 <option name="ruleStates"> 281 <option name="ruleStates">
223 <list> 282 <list>
@@ -230,7 +289,7 @@ @@ -230,7 +289,7 @@
230 </list> 289 </list>
231 </option> 290 </option>
232 </component> 291 </component>
233 - <component name="RunManager" selected="Python.db_pg_func"> 292 + <component name="RunManager" selected="Python.pg_db_func">
234 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true"> 293 <configuration name="db_pg_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
235 <module name="partner_api" /> 294 <module name="partner_api" />
236 <option name="INTERPRETER_OPTIONS" value="" /> 295 <option name="INTERPRETER_OPTIONS" value="" />
@@ -275,8 +334,31 @@ @@ -275,8 +334,31 @@
275 <option name="INPUT_FILE" value="" /> 334 <option name="INPUT_FILE" value="" />
276 <method v="2" /> 335 <method v="2" />
277 </configuration> 336 </configuration>
  337 + <configuration name="pg_db_func" type="PythonConfigurationType" factoryName="Python" temporary="true">
  338 + <module name="partner_api" />
  339 + <option name="INTERPRETER_OPTIONS" value="" />
  340 + <option name="PARENT_ENVS" value="true" />
  341 + <envs>
  342 + <env name="PYTHONUNBUFFERED" value="1" />
  343 + </envs>
  344 + <option name="SDK_HOME" value="" />
  345 + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/helpfunc" />
  346 + <option name="IS_MODULE_SDK" value="true" />
  347 + <option name="ADD_CONTENT_ROOTS" value="true" />
  348 + <option name="ADD_SOURCE_ROOTS" value="true" />
  349 + <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
  350 + <option name="SCRIPT_NAME" value="$PROJECT_DIR$/helpfunc/pg_db_func.py" />
  351 + <option name="PARAMETERS" value="" />
  352 + <option name="SHOW_COMMAND_LINE" value="false" />
  353 + <option name="EMULATE_TERMINAL" value="false" />
  354 + <option name="MODULE_MODE" value="false" />
  355 + <option name="REDIRECT_INPUT" value="false" />
  356 + <option name="INPUT_FILE" value="" />
  357 + <method v="2" />
  358 + </configuration>
278 <recent_temporary> 359 <recent_temporary>
279 <list> 360 <list>
  361 + <item itemvalue="Python.pg_db_func" />
280 <item itemvalue="Python.db_pg_func" /> 362 <item itemvalue="Python.db_pg_func" />
281 <item itemvalue="Python.debugtalk" /> 363 <item itemvalue="Python.debugtalk" />
282 </list> 364 </list>
@@ -298,24 +380,26 @@ @@ -298,24 +380,26 @@
298 <workItem from="1594352160255" duration="8702000" /> 380 <workItem from="1594352160255" duration="8702000" />
299 <workItem from="1594436598031" duration="2974000" /> 381 <workItem from="1594436598031" duration="2974000" />
300 <workItem from="1594481917603" duration="2344000" /> 382 <workItem from="1594481917603" duration="2344000" />
  383 + <workItem from="1594540531041" duration="1200000" />
  384 + <workItem from="1594542274462" duration="237000" />
  385 + <workItem from="1594565757545" duration="4997000" />
301 </task> 386 </task>
302 <servers /> 387 <servers />
303 </component> 388 </component>
304 <component name="TimeTrackingManager"> 389 <component name="TimeTrackingManager">
305 - <option name="totallyTimeSpent" value="41979000" /> 390 + <option name="totallyTimeSpent" value="48413000" />
306 </component> 391 </component>
307 <component name="ToolWindowManager"> 392 <component name="ToolWindowManager">
308 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 393 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
309 - <editor active="true" />  
310 <layout> 394 <layout>
311 <window_info id="Favorites" order="0" side_tool="true" /> 395 <window_info id="Favorites" order="0" side_tool="true" />
312 - <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.2753404" /> 396 + <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.28895614" />
313 <window_info id="Structure" order="2" side_tool="true" weight="0.25" /> 397 <window_info id="Structure" order="2" side_tool="true" weight="0.25" />
314 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" /> 398 <window_info anchor="bottom" id="Docker" order="0" show_stripe_button="false" />
315 - <window_info anchor="bottom" id="Terminal" order="1" visible="true" weight="0.42078364" /> 399 + <window_info active="true" anchor="bottom" id="Terminal" order="1" visible="true" weight="0.42078364" />
316 <window_info anchor="bottom" id="Message" order="2" /> 400 <window_info anchor="bottom" id="Message" order="2" />
317 <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" /> 401 <window_info anchor="bottom" id="Event Log" order="3" side_tool="true" />
318 - <window_info anchor="bottom" id="Find" order="4" /> 402 + <window_info anchor="bottom" id="Find" order="4" weight="0.32879046" />
319 <window_info anchor="bottom" id="Python Console" order="5" weight="0.32879046" /> 403 <window_info anchor="bottom" id="Python Console" order="5" weight="0.32879046" />
320 <window_info anchor="bottom" id="Database Changes" order="6" /> 404 <window_info anchor="bottom" id="Database Changes" order="6" />
321 <window_info anchor="bottom" id="Run" order="7" weight="0.2879046" /> 405 <window_info anchor="bottom" id="Run" order="7" weight="0.2879046" />
@@ -354,13 +438,6 @@ @@ -354,13 +438,6 @@
354 </state> 438 </state>
355 </provider> 439 </provider>
356 </entry> 440 </entry>
357 - <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">  
358 - <provider selected="true" editor-type-id="text-editor">  
359 - <state relative-caret-position="396">  
360 - <caret line="18" column="23" selection-start-line="10" selection-start-column="4" selection-end-line="18" selection-end-column="23" />  
361 - </state>  
362 - </provider>  
363 - </entry>  
364 <entry file="file://$PROJECT_DIR$/.env"> 441 <entry file="file://$PROJECT_DIR$/.env">
365 <provider selected="true" editor-type-id="text-editor"> 442 <provider selected="true" editor-type-id="text-editor">
366 <state relative-caret-position="154"> 443 <state relative-caret-position="154">
@@ -368,28 +445,7 @@ @@ -368,28 +445,7 @@
368 </state> 445 </state>
369 </provider> 446 </provider>
370 </entry> 447 </entry>
371 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml">  
372 - <provider selected="true" editor-type-id="text-editor">  
373 - <state relative-caret-position="66">  
374 - <caret line="15" selection-start-line="15" selection-end-line="21" selection-end-column="11" />  
375 - </state>  
376 - </provider>  
377 - </entry>  
378 <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_api.yml" /> 448 <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_api.yml" />
379 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml">  
380 - <provider selected="true" editor-type-id="text-editor">  
381 - <state relative-caret-position="41">  
382 - <caret line="13" selection-start-line="13" selection-end-line="16" selection-end-column="12" />  
383 - </state>  
384 - </provider>  
385 - </entry>  
386 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml">  
387 - <provider selected="true" editor-type-id="text-editor">  
388 - <state relative-caret-position="-132">  
389 - <caret column="12" selection-start-column="12" selection-end-column="12" />  
390 - </state>  
391 - </provider>  
392 - </entry>  
393 <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml"> 449 <entry file="file://$PROJECT_DIR$/testcases/admin/ADMIN004_detail_admin_testcases.yml">
394 <provider selected="true" editor-type-id="text-editor"> 450 <provider selected="true" editor-type-id="text-editor">
395 <state relative-caret-position="129"> 451 <state relative-caret-position="129">
@@ -419,20 +475,6 @@ @@ -419,20 +475,6 @@
419 </provider> 475 </provider>
420 </entry> 476 </entry>
421 <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml" /> 477 <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_api.yml" />
422 - <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml">  
423 - <provider selected="true" editor-type-id="text-editor">  
424 - <state relative-caret-position="220">  
425 - <caret line="10" column="17" lean-forward="true" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />  
426 - </state>  
427 - </provider>  
428 - </entry>  
429 - <entry file="file://$PROJECT_DIR$/helpfunc/db_func.py">  
430 - <provider selected="true" editor-type-id="text-editor">  
431 - <state relative-caret-position="145">  
432 - <caret line="15" column="32" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="32" />  
433 - </state>  
434 - </provider>  
435 - </entry>  
436 <entry file="file://$PROJECT_DIR$/api/m_api/m_order_purpose_add_api.yml"> 478 <entry file="file://$PROJECT_DIR$/api/m_api/m_order_purpose_add_api.yml">
437 <provider selected="true" editor-type-id="text-editor"> 479 <provider selected="true" editor-type-id="text-editor">
438 <state relative-caret-position="176"> 480 <state relative-caret-position="176">
@@ -464,69 +506,190 @@ @@ -464,69 +506,190 @@
464 </state> 506 </state>
465 </provider> 507 </provider>
466 </entry> 508 </entry>
  509 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml">
  510 + <provider selected="true" editor-type-id="text-editor">
  511 + <state relative-caret-position="264">
  512 + <caret line="12" column="20" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" />
  513 + </state>
  514 + </provider>
  515 + </entry>
  516 + <entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py" />
  517 + <entry file="file://$PROJECT_DIR$/helpfunc/login_func.py">
  518 + <provider selected="true" editor-type-id="text-editor">
  519 + <state relative-caret-position="246">
  520 + <caret line="18" column="23" selection-start-line="10" selection-start-column="4" selection-end-line="18" selection-end-column="23" />
  521 + </state>
  522 + </provider>
  523 + </entry>
  524 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS003_list_partner_testcases.yml">
  525 + <provider selected="true" editor-type-id="text-editor">
  526 + <state relative-caret-position="176">
  527 + <caret line="14" column="63" selection-start-line="14" selection-start-column="63" selection-end-line="14" selection-end-column="63" />
  528 + </state>
  529 + </provider>
  530 + </entry>
  531 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS004_list_partner_testcases.yml">
  532 + <provider selected="true" editor-type-id="text-editor">
  533 + <state relative-caret-position="-57">
  534 + <caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
  535 + </state>
  536 + </provider>
  537 + </entry>
  538 + <entry file="file://$PROJECT_DIR$/api/m_api/m_partner_edit_api.yml">
  539 + <provider selected="true" editor-type-id="text-editor">
  540 + <state relative-caret-position="-66" />
  541 + </provider>
  542 + </entry>
467 <entry file="file://$PROJECT_DIR$/debugtalk.py"> 543 <entry file="file://$PROJECT_DIR$/debugtalk.py">
468 <provider selected="true" editor-type-id="text-editor"> 544 <provider selected="true" editor-type-id="text-editor">
469 - <state relative-caret-position="308">  
470 - <caret line="21" column="19" selection-start-line="21" selection-start-column="19" selection-end-line="21" selection-end-column="19" /> 545 + <state relative-caret-position="22">
  546 + <caret line="9" column="18" selection-start-line="9" selection-start-column="18" selection-end-line="9" selection-end-column="18" />
471 <folding> 547 <folding>
472 <element signature="e#0#13#0" expanded="true" /> 548 <element signature="e#0#13#0" expanded="true" />
473 </folding> 549 </folding>
474 </state> 550 </state>
475 </provider> 551 </provider>
476 </entry> 552 </entry>
  553 + <entry file="file://$PROJECT_DIR$/api/demo_api.yml">
  554 + <provider selected="true" editor-type-id="text-editor" />
  555 + </entry>
  556 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_detail_api.yml">
  557 + <provider selected="true" editor-type-id="text-editor">
  558 + <state relative-caret-position="66">
  559 + <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
  560 + </state>
  561 + </provider>
  562 + </entry>
477 <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml"> 563 <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_0_api.yml">
478 <provider selected="true" editor-type-id="text-editor"> 564 <provider selected="true" editor-type-id="text-editor">
479 - <state relative-caret-position="286">  
480 - <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="27" /> 565 + <state relative-caret-position="66">
  566 + <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
  567 + </state>
  568 + </provider>
  569 + </entry>
  570 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_forbidden_1_api.yml">
  571 + <provider selected="true" editor-type-id="text-editor">
  572 + <state relative-caret-position="66">
  573 + <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
  574 + </state>
  575 + </provider>
  576 + </entry>
  577 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_list_api.yml">
  578 + <provider selected="true" editor-type-id="text-editor">
  579 + <state relative-caret-position="66">
  580 + <caret line="3" column="22" selection-start-line="3" selection-start-column="22" selection-end-line="3" selection-end-column="22" />
481 </state> 581 </state>
482 </provider> 582 </provider>
483 </entry> 583 </entry>
484 <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml"> 584 <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(edit)_api.yml">
485 <provider selected="true" editor-type-id="text-editor"> 585 <provider selected="true" editor-type-id="text-editor">
486 - <state relative-caret-position="242">  
487 - <caret line="11" column="17" selection-start-line="11" selection-start-column="17" selection-end-line="11" selection-end-column="25" /> 586 + <state relative-caret-position="88">
  587 + <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
488 </state> 588 </state>
489 </provider> 589 </provider>
490 </entry> 590 </entry>
491 - <entry file="file://$PROJECT_DIR$/helpfunc/db_pg_func.py"> 591 + <entry file="file://$PROJECT_DIR$/api/m_api/admin/m_admin_update(new)_api.yml">
492 <provider selected="true" editor-type-id="text-editor"> 592 <provider selected="true" editor-type-id="text-editor">
493 - <state relative-caret-position="126">  
494 - <caret line="88" column="27" selection-start-line="88" selection-start-column="4" selection-end-line="88" selection-end-column="27" /> 593 + <state relative-caret-position="154">
  594 + <caret line="10" column="17" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
495 </state> 595 </state>
496 </provider> 596 </provider>
497 </entry> 597 </entry>
498 <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml"> 598 <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_add_api.yml">
499 <provider selected="true" editor-type-id="text-editor"> 599 <provider selected="true" editor-type-id="text-editor">
500 - <state relative-caret-position="244">  
501 - <caret line="19" selection-start-line="19" selection-end-line="22" selection-end-column="12" /> 600 + <state>
  601 + <caret line="6" column="23" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="52" />
  602 + </state>
  603 + </provider>
  604 + </entry>
  605 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnerName_list_api.yml">
  606 + <provider selected="true" editor-type-id="text-editor">
  607 + <state relative-caret-position="198">
  608 + <caret line="9" column="23" selection-start-line="9" selection-start-column="23" selection-end-line="9" selection-end-column="52" />
  609 + </state>
  610 + </provider>
  611 + </entry>
  612 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_partnertype_list_api.yml">
  613 + <provider selected="true" editor-type-id="text-editor">
  614 + <state relative-caret-position="220">
  615 + <caret line="10" column="22" selection-start-line="10" selection-start-column="22" selection-end-line="10" selection-end-column="22" />
  616 + </state>
  617 + </provider>
  618 + </entry>
  619 + <entry file="file://$PROJECT_DIR$/helpfunc/pg_db_func.py">
  620 + <provider selected="true" editor-type-id="text-editor">
  621 + <state relative-caret-position="222">
  622 + <caret line="131" column="40" selection-start-line="131" selection-start-column="28" selection-end-line="131" selection-end-column="40" />
502 </state> 623 </state>
503 </provider> 624 </provider>
504 </entry> 625 </entry>
505 <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml"> 626 <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_edit_api.yml">
506 <provider selected="true" editor-type-id="text-editor"> 627 <provider selected="true" editor-type-id="text-editor">
507 - <state relative-caret-position="638">  
508 - <caret line="29" column="12" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="12" /> 628 + <state relative-caret-position="-242">
  629 + <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />
509 </state> 630 </state>
510 </provider> 631 </provider>
511 </entry> 632 </entry>
512 - <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS001_add_partner_testcases.yml"> 633 + <entry file="file://$PROJECT_DIR$/helpfunc/db_func.py">
513 <provider selected="true" editor-type-id="text-editor"> 634 <provider selected="true" editor-type-id="text-editor">
514 - <state relative-caret-position="264">  
515 - <caret line="12" column="20" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="20" /> 635 + <state relative-caret-position="145">
  636 + <caret line="12" column="11" selection-start-line="12" selection-start-column="11" selection-end-line="12" selection-end-column="11" />
  637 + </state>
  638 + </provider>
  639 + </entry>
  640 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS005_detail_partner_testcases.yml">
  641 + <provider selected="true" editor-type-id="text-editor">
  642 + <state relative-caret-position="126">
  643 + <caret line="20" column="25" selection-start-line="20" selection-start-column="25" selection-end-line="20" selection-end-column="25" />
  644 + </state>
  645 + </provider>
  646 + </entry>
  647 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_detail_api.yml">
  648 + <provider selected="true" editor-type-id="text-editor">
  649 + <state relative-caret-position="88">
  650 + <caret line="13" selection-start-line="13" selection-end-line="16" selection-end-column="12" />
  651 + </state>
  652 + </provider>
  653 + </entry>
  654 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_1_api.yml">
  655 + <provider selected="true" editor-type-id="text-editor">
  656 + <state relative-caret-position="-66">
  657 + <caret column="11" selection-start-column="11" selection-end-column="11" />
  658 + </state>
  659 + </provider>
  660 + </entry>
  661 + <entry file="file://$PROJECT_DIR$/api/m_api/partners/m_partner_set-status_2_api.yml">
  662 + <provider selected="true" editor-type-id="text-editor">
  663 + <state>
  664 + <caret column="11" selection-start-column="11" selection-end-column="11" />
516 </state> 665 </state>
517 </provider> 666 </provider>
518 </entry> 667 </entry>
519 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml"> 668 <entry file="file://$PROJECT_DIR$/testsuites/partner_testsuite.yml">
520 <provider selected="true" editor-type-id="text-editor"> 669 <provider selected="true" editor-type-id="text-editor">
521 - <state relative-caret-position="158">  
522 - <caret line="36" column="71" selection-start-line="36" selection-start-column="71" selection-end-line="36" selection-end-column="71" /> 670 + <state relative-caret-position="246">
  671 + <caret line="51" column="78" selection-start-line="51" selection-start-column="78" selection-end-line="51" selection-end-column="78" />
523 </state> 672 </state>
524 </provider> 673 </provider>
525 </entry> 674 </entry>
526 <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml"> 675 <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS002_edit_partner_testcases.yml">
527 <provider selected="true" editor-type-id="text-editor"> 676 <provider selected="true" editor-type-id="text-editor">
528 - <state relative-caret-position="26">  
529 - <caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" /> 677 + <state relative-caret-position="66">
  678 + <caret line="3" selection-start-line="3" selection-end-line="4" selection-end-column="48" />
  679 + </state>
  680 + </provider>
  681 + </entry>
  682 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS006_set-status_partner1_testcases.yml">
  683 + <provider selected="true" editor-type-id="text-editor">
  684 + <state relative-caret-position="88">
  685 + <caret line="4" column="46" selection-start-line="4" selection-start-column="46" selection-end-line="4" selection-end-column="46" />
  686 + </state>
  687 + </provider>
  688 + </entry>
  689 + <entry file="file://$PROJECT_DIR$/testcases/partners/PARTNERS007_set-status_partner2_testcases.yml">
  690 + <provider selected="true" editor-type-id="text-editor">
  691 + <state relative-caret-position="88">
  692 + <caret line="4" column="46" selection-start-line="4" selection-start-column="46" selection-end-line="4" selection-end-column="46" />
530 </state> 693 </state>
531 </provider> 694 </provider>
532 </entry> 695 </entry>
1 -  
2 -name: demo api  
3 -variables:  
4 - var1: value1  
5 - var2: value2  
6 -request:  
7 - url: /api/path/$var1  
8 - method: POST  
9 - headers:  
10 - Content-Type: "application/json"  
11 - json:  
12 - key: $var2  
13 -validate:  
14 - - eq: ["status_code", 200]  
1 name: 管理员详情 1 name: 管理员详情
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - id: ${get_admin_id_from_database(admin_user)} 4 + id: ${get_id_from_database(admin_user)}
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
1 name: 管理员禁用 1 name: 管理员禁用
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - id: ${get_admin_id_from_database(admin_user)} 4 + id: ${get_id_from_database(admin_user)}
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
1 name: 管理员禁启用 1 name: 管理员禁启用
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - id: ${get_admin_id_from_database(admin_user)} 4 + id: ${get_id_from_database(admin_user)}
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
1 name: 管理员列表 1 name: 管理员列表
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - searchText: ${get_admin_account_from_database(admin_user)} 4 + searchText: ${get_account_from_database(admin_user)}
5 request: 5 request:
6 headers: 6 headers:
7 Content-Type: application/json;charset=utf-8 7 Content-Type: application/json;charset=utf-8
1 name: 管理员修改 1 name: 管理员修改
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - account: ${get_admin_account_from_database(admin_user)}  
5 - id: ${get_admin_id_from_database(admin_user)} 4 + account: ${get_account_from_database(admin_user)}
  5 + id: ${get_id_from_database(admin_user)}
6 request: 6 request:
7 headers: 7 headers:
8 Content-Type: application/json;charset=utf-8 8 Content-Type: application/json;charset=utf-8
1 -name: /v1/partners/detail  
2 -base_url: ${ENV(base_manager_url)}  
3 -request:  
4 - headers:  
5 - Content-Type: application/json;charset=utf-8  
6 - User-Agent: okhttp/3.12.3  
7 - Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1ODc0NTg0MjgsImlhdCI6MTU4NzQzNjgyNywiaXNzIjoibW1tX29wcG1nIiwibmJmIjoxNTg3NDM2ODI3LCJ1aWQiOjMyNDQ3NDc3Mjg1MzMyNDgsImNvbXBhbnlfaWQiOjM2MCwidXNlcl9jb21wYW55X2lkIjozMjQ0NzQ3NzI4NTMzMjQ4fQ.5t4HO5gbAXT_WXHGNf8ZsbXpPHrzsFhnuXWBtPZ4tWs  
8 - json:  
9 - id: 11  
10 -# account: ${convert_to_string(13559112969)}  
11 -# state: 1  
12 -# cooperationTime: '2020-06-28'  
13 -# salesmanName: '小张'  
14 -# phone: ${convert_to_string(15588888888)}  
15 - method: POST  
16 - url: /v1/partners/detail  
1 -name: 合伙人编辑  
2 -base_url: ${ENV(base_manager_url)}  
3 -request:  
4 - headers:  
5 - Content-Type: application/json;charset=utf-8  
6 - User-Agent: okhttp/3.12.3  
7 - Authorization: Bearer ${get_m_accesstoken()}  
8 - json:  
9 - partnerName: 'bxh002'  
10 - partnerType: 2  
11 - area: '福建省福州市一区'  
12 - account: ${convert_to_string(13459147027)}  
13 - state: 1  
14 - cooperationTime: '2020-06-30'  
15 - salesmanName: '小张'  
16 - phone: ${convert_to_string(13459147027)}  
17 - id: 22  
18 - method: POST  
19 - url: /v1/partners/edit  
1 -name: /v1/partners/list  
2 -base_url: ${ENV(base_manager_url)}  
3 -request:  
4 - headers:  
5 - Content-Type: application/json;charset=utf-8  
6 - User-Agent: okhttp/3.12.3  
7 - Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1ODc0NTg0MjgsImlhdCI6MTU4NzQzNjgyNywiaXNzIjoibW1tX29wcG1nIiwibmJmIjoxNTg3NDM2ODI3LCJ1aWQiOjMyNDQ3NDc3Mjg1MzMyNDgsImNvbXBhbnlfaWQiOjM2MCwidXNlcl9jb21wYW55X2lkIjozMjQ0NzQ3NzI4NTMzMjQ4fQ.5t4HO5gbAXT_WXHGNf8ZsbXpPHrzsFhnuXWBtPZ4tWs  
8 - json:  
9 - partnerName:  
10 - partnerType:  
11 - area:  
12 -# account: ${convert_to_string(13559112969)}  
13 -# state: 1  
14 -# cooperationTime: '2020-06-28'  
15 -# salesmanName: '小张'  
16 -# phone: ${convert_to_string(15588888888)}  
17 - method: POST  
18 - url: /v1/partners/list  
1 -name: /v1/partners/set-status  
2 -base_url: ${ENV(base_manager_url)}  
3 -request:  
4 - headers:  
5 - Content-Type: application/json;charset=utf-8  
6 - User-Agent: okhttp/3.12.3  
7 - Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1ODc0NTg0MjgsImlhdCI6MTU4NzQzNjgyNywiaXNzIjoibW1tX29wcG1nIiwibmJmIjoxNTg3NDM2ODI3LCJ1aWQiOjMyNDQ3NDc3Mjg1MzMyNDgsImNvbXBhbnlfaWQiOjM2MCwidXNlcl9jb21wYW55X2lkIjozMjQ0NzQ3NzI4NTMzMjQ4fQ.5t4HO5gbAXT_WXHGNf8ZsbXpPHrzsFhnuXWBtPZ4tWs  
8 - json:  
9 - status: 2  
10 - id: 9  
11 - method: POST  
12 - url: /v1/partners/set-status  
  1 +name: /v1/partners/detail
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + id: ${get_id_from_database(partner_info)}
  5 +request:
  6 + headers:
  7 + Content-Type: application/json;charset=utf-8
  8 + User-Agent: okhttp/3.12.3
  9 + Authorization: Bearer ${get_m_accesstoken()}
  10 + json:
  11 + id: $id
  12 + method: POST
  13 + url: v1/partners/detail
  14 +validate:
  15 + - eq:
  16 + - content.msg
  17 + - ok
  18 + - eq:
  19 + - content.data.state
  20 + - $status
1 name: 合伙人编辑 1 name: 合伙人编辑
2 base_url: ${ENV(base_manager_url)} 2 base_url: ${ENV(base_manager_url)}
3 variables: 3 variables:
4 - account: ${get_admin_account_from_database(partner_info)}  
5 - id: ${get_admin_id_from_database(partner_info)} 4 + account: ${get_account_from_database(partner_info)}
  5 + id: ${get_id_from_database(partner_info)}
6 partnerName: ${get_partnername_from_database(partner_info)} 6 partnerName: ${get_partnername_from_database(partner_info)}
7 area: ${get_area_from_database(partner_info)} 7 area: ${get_area_from_database(partner_info)}
8 salesmanName: ${get_salesman_from_database(partner_info)} 8 salesmanName: ${get_salesman_from_database(partner_info)}
  1 +name: /v1/partners/list
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + status: ${get_status_from_database(partner_info)}
  5 + partnerName: ${get_partnername_from_database(partner_info)}
  6 +request:
  7 + headers:
  8 + Content-Type: application/json;charset=utf-8
  9 + User-Agent: okhttp/3.12.3
  10 + Authorization: Bearer ${get_m_accesstoken()}
  11 + json:
  12 + partnerName: $partnerName
  13 + partnerType: 1
  14 + pageNumber: 1
  15 + pageSize: 10
  16 + method: POST
  17 + url: v1/partners/list
  18 +validate:
  19 + - eq:
  20 + - content.msg
  21 + - ok
  22 + - eq:
  23 + - content.data.gridResult.lists.0.state
  24 + - $status
  1 +name: /v1/partners/list
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + status: ${get_status_from_database(partner_info)}
  5 +request:
  6 + headers:
  7 + Content-Type: application/json;charset=utf-8
  8 + User-Agent: okhttp/3.12.3
  9 + Authorization: Bearer ${get_m_accesstoken()}
  10 + json:
  11 + partnerName: ""
  12 + partnerType: 1
  13 + pageNumber: 1
  14 + pageSize: 10
  15 + method: POST
  16 + url: v1/partners/list
  17 +validate:
  18 + - eq:
  19 + - content.msg
  20 + - ok
  21 + - eq:
  22 + - content.data.gridResult.lists.0.state
  23 + - $status
  1 +name: 禁用合伙人
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + id: ${get_id_from_database(partner_info)}
  5 +request:
  6 + headers:
  7 + Content-Type: application/json;charset=utf-8
  8 + User-Agent: okhttp/3.12.3
  9 + Authorization: Bearer ${get_m_accesstoken()}
  10 + json:
  11 + status: 1
  12 + id: $id
  13 + method: POST
  14 + url: v1/partners/set-status
  15 +validate:
  16 + - eq:
  17 + - content.msg
  18 + - ok
  1 +name: 启用合伙人
  2 +base_url: ${ENV(base_manager_url)}
  3 +variables:
  4 + id: ${get_id_from_database(partner_info)}
  5 +request:
  6 + headers:
  7 + Content-Type: application/json;charset=utf-8
  8 + User-Agent: okhttp/3.12.3
  9 + Authorization: Bearer ${get_m_accesstoken()}
  10 + json:
  11 + status: 2
  12 + id: $id
  13 + method: POST
  14 + url: v1/partners/set-status
  15 +validate:
  16 + - eq:
  17 + - content.msg
  18 + - ok
1 -eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ1Mjg2NzAsImlhdCI6MTU5NDQ4NTQ3MCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDQ4NTQ3MCwidWlkIjoxOH0.xQZCkxPOLzLxTd5sKsVXVA3QeHYZNzFyM1gO6-4XQkc  
  1 +eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ2MTQxNTQsImlhdCI6MTU5NDU3MDk1NCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDU3MDk1NCwidWlkIjoxOH0.kmi2wDld4RbqDn7HWsqejOtss9zSCqDtSvrR8-R9SY0
@@ -2,7 +2,7 @@ import random @@ -2,7 +2,7 @@ import random
2 import string 2 import string
3 import time,datetime 3 import time,datetime
4 from helpfunc.login_func import * 4 from helpfunc.login_func import *
5 -from helpfunc.db_pg_func import * 5 +from helpfunc.pg_db_func import *
6 from helpfunc.db_func import * 6 from helpfunc.db_func import *
7 from helpfunc.header_func import * 7 from helpfunc.header_func import *
8 from random import randint 8 from random import randint
@@ -10,7 +10,7 @@ db_config ={"host": "101.37.68.23", @@ -10,7 +10,7 @@ db_config ={"host": "101.37.68.23",
10 "db": "opportunity_test", 10 "db": "opportunity_test",
11 "charset": 'utf8'} 11 "charset": 'utf8'}
12 12
13 -def get_id_from_database(tbl, company_id, column, column_value): 13 +def get_id1_from_database(tbl, company_id, column, column_value):
14 db = pymysql.connect(**db_config) 14 db = pymysql.connect(**db_config)
15 cursor = db.cursor() 15 cursor = db.cursor()
16 company_id = str(company_id) 16 company_id = str(company_id)
1 -# @Time :2019/11/26 11:25  
2 -# @Author :dengyuting  
3 -# @File :db_func.py 1 +#! /usr/bin/env python
  2 +# -*- coding: utf-8 -*-
  3 +# Date: 2020/7/12 16:27
  4 +# @Author:bxh
  5 +# @file: pg_db_func.py
4 import psycopg2 6 import psycopg2
5 7
6 # 获得连接 8 # 获得连接
@@ -16,7 +18,7 @@ def GetConnect(): @@ -16,7 +18,7 @@ def GetConnect():
16 print("连接数据库失败，%s" % err) 18 print("连接数据库失败，%s" % err)
17 return conn 19 return conn
18 20
19 -def get_admin_id_from_database(tbl): 21 +def get_id_from_database(tbl):
20 db = GetConnect() 22 db = GetConnect()
21 cursor = db.cursor() 23 cursor = db.cursor()
22 sql= "select id from " + tbl + ' ' + 'order by id desc ' 24 sql= "select id from " + tbl + ' ' + 'order by id desc '
@@ -30,7 +32,7 @@ def get_admin_id_from_database(tbl): @@ -30,7 +32,7 @@ def get_admin_id_from_database(tbl):
30 db.rollback() 32 db.rollback()
31 db.close() 33 db.close()
32 34
33 -def get_admin_account_from_database(tbl): 35 +def get_account_from_database(tbl):
34 db = GetConnect() 36 db = GetConnect()
35 cursor = db.cursor() 37 cursor = db.cursor()
36 sql= "select account from " + tbl + ' ' + 'order by id desc ' 38 sql= "select account from " + tbl + ' ' + 'order by id desc '
@@ -99,4 +101,32 @@ def get_phone_from_database(tbl): @@ -99,4 +101,32 @@ def get_phone_from_database(tbl):
99 print(err) 101 print(err)
100 db.rollback() 102 db.rollback()
101 db.close() 103 db.close()
102 -print(get_phone_from_database('partner_info'))  
  104 +
  105 +def get_status_from_database(tbl):
  106 + db = GetConnect()
  107 + cursor = db.cursor()
  108 + sql= "select status from " + tbl + ' ' + 'order by id desc '
  109 + try:
  110 + cursor.execute(sql)
  111 + result = cursor.fetchone()
  112 + return result[0]
  113 + except Exception as err:
  114 + # 发生错误时回滚
  115 + print(err)
  116 + db.rollback()
  117 + db.close()
  118 +
  119 +def get_partnername_from_database(tbl):
  120 + db = GetConnect()
  121 + cursor = db.cursor()
  122 + sql= "select partner_name from " + tbl + ' ' + "where partner_category = 1" + ' ' + 'order by id desc '
  123 + try:
  124 + cursor.execute(sql)
  125 + result = cursor.fetchone()
  126 + return result[0]
  127 + except Exception as err:
  128 + # 发生错误时回滚
  129 + print(err)
  130 + db.rollback()
  131 + db.close()
  132 +print(get_id_from_database('partner_info'))
1 { 1 {
2 "testcase":[ 2 "testcase":[
3 - "testcases/partners/PARTNERS001_add_partner_testcases.yml" 3 + "testcases/partners/PARTNERS006_set-status_partner1_testcases.yml",
  4 + "testcases/partners/PARTNERS007_set-status_partner2_testcases.yml"
4 ] 5 ]
5 } 6 }
1 -<head>  
2 - <meta content="text/html; charset=utf-8" http-equiv="content-type" />  
3 - <meta name="viewport" content="width=device-width, initial-scale=1.0">  
4 - <title> - TestReport</title>  
5 - <style>  
6 - body {  
7 - background-color: #f2f2f2;  
8 - color: #333;  
9 - margin: 0 auto;  
10 - width: 960px;  
11 - }  
12 - #summary {  
13 - width: 960px;  
14 - margin-bottom: 20px;  
15 - }  
16 - #summary th {  
17 - background-color: skyblue;  
18 - padding: 5px 12px;  
19 - }  
20 - #summary td {  
21 - background-color: lightblue;  
22 - text-align: center;  
23 - padding: 4px 8px;  
24 - }  
25 - .details {  
26 - width: 960px;  
27 - margin-bottom: 20px;  
28 - }  
29 - .details th {  
30 - background-color: skyblue;  
31 - padding: 5px 12px;  
32 - }  
33 - .details tr .passed {  
34 - background-color: lightgreen;  
35 - }  
36 - .details tr .failed {  
37 - background-color: red;  
38 - }  
39 - .details tr .unchecked {  
40 - background-color: gray;  
41 - }  
42 - .details td {  
43 - background-color: lightblue;  
44 - padding: 5px 12px;  
45 - }  
46 - .details .detail {  
47 - background-color: lightgrey;  
48 - font-size: smaller;  
49 - padding: 5px 10px;  
50 - line-height: 20px;  
51 - text-align: left;  
52 - }  
53 - .details .success {  
54 - background-color: greenyellow;  
55 - }  
56 - .details .error {  
57 - background-color: red;  
58 - }  
59 - .details .failure {  
60 - background-color: salmon;  
61 - }  
62 - .details .skipped {  
63 - background-color: gray;  
64 - }  
65 -  
66 - .button {  
67 - font-size: 1em;  
68 - padding: 6px;  
69 - width: 4em;  
70 - text-align: center;  
71 - background-color: #06d85f;  
72 - border-radius: 20px/50px;  
73 - cursor: pointer;  
74 - transition: all 0.3s ease-out;  
75 - }  
76 - a.button{  
77 - color: gray;  
78 - text-decoration: none;  
79 - display: inline-block;  
80 - }  
81 - .button:hover {  
82 - background: #2cffbd;  
83 - }  
84 -  
85 - .overlay {  
86 - position: fixed;  
87 - top: 0;  
88 - bottom: 0;  
89 - left: 0;  
90 - right: 0;  
91 - background: rgba(0, 0, 0, 0.7);  
92 - transition: opacity 500ms;  
93 - visibility: hidden;  
94 - opacity: 0;  
95 - line-height: 25px;  
96 - }  
97 - .overlay:target {  
98 - visibility: visible;  
99 - opacity: 1;  
100 - }  
101 -  
102 - .popup {  
103 - margin: 70px auto;  
104 - padding: 20px;  
105 - background: #fff;  
106 - border-radius: 10px;  
107 - width: 50%;  
108 - position: relative;  
109 - transition: all 3s ease-in-out;  
110 - }  
111 -  
112 - .popup h2 {  
113 - margin-top: 0;  
114 - color: #333;  
115 - font-family: Tahoma, Arial, sans-serif;  
116 - }  
117 - .popup .close {  
118 - position: absolute;  
119 - top: 20px;  
120 - right: 30px;  
121 - transition: all 200ms;  
122 - font-size: 30px;  
123 - font-weight: bold;  
124 - text-decoration: none;  
125 - color: #333;  
126 - }  
127 - .popup .close:hover {  
128 - color: #06d85f;  
129 - }  
130 - .popup .content {  
131 - max-height: 80%;  
132 - overflow: auto;  
133 - text-align: left;  
134 - }  
135 - .popup .separator {  
136 - color:royalblue  
137 - }  
138 -  
139 - @media screen and (max-width: 700px) {  
140 - .box {  
141 - width: 70%;  
142 - }  
143 - .popup {  
144 - width: 70%;  
145 - }  
146 - }  
147 -  
148 - </style>  
149 -</head>  
150 -  
151 -<body>  
152 - <h1>Test Report: </h1>  
153 -  
154 - <h2>Summary</h2>  
155 - <table id="summary">  
156 - <tr>  
157 - <th>START AT</th>  
158 - <td colspan="4">2020-07-11T16:37:48.576936</td>  
159 - </tr>  
160 - <tr>  
161 - <th>DURATION</th>  
162 - <td colspan="4">0.978 seconds</td>  
163 - </tr>  
164 - <tr>  
165 - <th>PLATFORM</th>  
166 - <td>HttpRunner 2.5.7 </td>  
167 - <td>CPython 3.8.1 </td>  
168 - <td colspan="2">Windows-7-6.1.7601-SP1</td>  
169 - </tr>  
170 - <tr>  
171 - <th>STAT</th>  
172 - <th colspan="2">TESTCASES (success/fail)</th>  
173 - <th colspan="2">TESTSTEPS (success/fail/error/skip)</th>  
174 - </tr>  
175 - <tr>  
176 - <td>total (details) =></td>  
177 - <td colspan="2">1 (1/0)</td>  
178 - <td colspan="2">2 (2/0/0/0)</td>  
179 - </tr>  
180 - </table>  
181 -  
182 - <h2>Details</h2>  
183 -  
184 -  
185 -  
186 - <h3>PARTNERS002：编辑管理员</h3>  
187 - <table id="suite_1" class="details">  
188 - <tr>  
189 - <td>TOTAL: 2</td>  
190 - <td>SUCCESS: 2</td>  
191 - <td>FAILED: 0</td>  
192 - <td>ERROR: 0</td>  
193 - <td>SKIPPED: 0</td>  
194 - </tr>  
195 - <tr>  
196 - <th>Status</th>  
197 - <th colspan="2">Name</th>  
198 - <th>Response Time</th>  
199 - <th>Detail</th>  
200 - </tr>  
201 -  
202 -  
203 -  
204 -  
205 - <tr id="record_1_1">  
206 - <th class="success" style="width:5em;">success</th>  
207 - <td colspan="2">10000000001 登录系统</td>  
208 - <td style="text-align:center;width:6em;">142.01 ms</td>  
209 - <td class="detail">  
210 -  
211 -  
212 -  
213 - <a class="button" href="#popup_log_1_1_1">log-1</a>  
214 - <div id="popup_log_1_1_1" class="overlay">  
215 - <div class="popup">  
216 - <h2>Request and Response data</h2>  
217 - <a class="close" href="#record_1_1_1">&times;</a>  
218 -  
219 - <div class="content">  
220 - <h3>Name: 10000000001 登录系统</h3>  
221 -  
222 -  
223 -  
224 -  
225 -  
226 - <h3>Request:</h3>  
227 - <div style="overflow: auto">  
228 - <table>  
229 -  
230 - <tr>  
231 - <th>url</th>  
232 - <td>  
233 -  
234 - https://public-interface-test.fjmaimaimai.com/partnermg/v1/auth/login  
235 -  
236 - </td>  
237 - </tr>  
238 -  
239 - <tr>  
240 - <th>method</th>  
241 - <td>  
242 -  
243 - POST  
244 -  
245 - </td>  
246 - </tr>  
247 -  
248 - <tr>  
249 - <th>headers</th>  
250 - <td>  
251 -  
252 - <pre>{  
253 - &#34;User-Agent&#34;: &#34;Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.75 Safari/537.36&#34;,  
254 - &#34;Accept-Encoding&#34;: &#34;gzip, deflate&#34;,  
255 - &#34;Accept&#34;: &#34;*/*&#34;,  
256 - &#34;Connection&#34;: &#34;keep-alive&#34;,  
257 - &#34;Content-Type&#34;: &#34;application/json;charset=utf-8&#34;,  
258 - &#34;Content-Length&#34;: &#34;83&#34;  
259 -}</pre>  
260 -  
261 - </td>  
262 - </tr>  
263 -  
264 - <tr>  
265 - <th>body</th>  
266 - <td>  
267 -  
268 - <pre>{  
269 - &#34;password&#34;: &#34;7c4a8d09ca3762af61e59520943dc26494f8941b&#34;,  
270 - &#34;username&#34;: &#34;10000000001&#34;  
271 -}</pre>  
272 -  
273 - </td>  
274 - </tr>  
275 -  
276 - </table>  
277 - </div>  
278 -  
279 - <h3>Response:</h3>  
280 - <div style="overflow: auto">  
281 - <table>  
282 -  
283 - <tr>  
284 - <th>ok</th>  
285 - <td>  
286 -  
287 - True  
288 -  
289 - </td>  
290 - </tr>  
291 -  
292 - <tr>  
293 - <th>url</th>  
294 - <td>  
295 -  
296 - https://public-interface-test.fjmaimaimai.com/partnermg/v1/auth/login  
297 -  
298 - </td>  
299 - </tr>  
300 -  
301 - <tr>  
302 - <th>status_code</th>  
303 - <td>  
304 -  
305 - 200  
306 -  
307 - </td>  
308 - </tr>  
309 -  
310 - <tr>  
311 - <th>reason</th>  
312 - <td>  
313 -  
314 - OK  
315 -  
316 - </td>  
317 - </tr>  
318 -  
319 - <tr>  
320 - <th>cookies</th>  
321 - <td>  
322 -  
323 - {}  
324 -  
325 - </td>  
326 - </tr>  
327 -  
328 - <tr>  
329 - <th>encoding</th>  
330 - <td>  
331 -  
332 - utf-8  
333 -  
334 - </td>  
335 - </tr>  
336 -  
337 - <tr>  
338 - <th>headers</th>  
339 - <td>  
340 -  
341 - <pre>{  
342 - &#34;Date&#34;: &#34;Sat, 11 Jul 2020 16:37:50 GMT&#34;,  
343 - &#34;Content-Type&#34;: &#34;application/json; charset=utf-8&#34;,  
344 - &#34;Transfer-Encoding&#34;: &#34;chunked&#34;,  
345 - &#34;Connection&#34;: &#34;keep-alive&#34;,  
346 - &#34;Vary&#34;: &#34;Accept-Encoding, Accept-Encoding&#34;,  
347 - &#34;Access-Control-Allow-Credentials&#34;: &#34;true&#34;,  
348 - &#34;Access-Control-Allow-Headers&#34;: &#34;Origin,Authorization,Access-Control-Allow-Origin,Content-Type,x-requested-with&#34;,  
349 - &#34;Access-Control-Allow-Methods&#34;: &#34;*&#34;,  
350 - &#34;Access-Control-Allow-Origin&#34;: &#34;*&#34;,  
351 - &#34;Access-Control-Expose-Headers&#34;: &#34;Content-Length&#34;,  
352 - &#34;Strict-Transport-Security&#34;: &#34;max-age=15724800; includeSubDomains&#34;,  
353 - &#34;Content-Encoding&#34;: &#34;gzip&#34;  
354 -}</pre>  
355 -  
356 - </td>  
357 - </tr>  
358 -  
359 - <tr>  
360 - <th>content_type</th>  
361 - <td>  
362 -  
363 - application/json; charset=utf-8  
364 -  
365 - </td>  
366 - </tr>  
367 -  
368 - <tr>  
369 - <th>body</th>  
370 - <td>  
371 -  
372 -  
373 - <pre>{  
374 - &#34;code&#34;: 0,  
375 - &#34;msg&#34;: &#34;ok&#34;,  
376 - &#34;data&#34;: {  
377 - &#34;access&#34;: {  
378 - &#34;accessToken&#34;: &#34;eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ1Mjg2NzAsImlhdCI6MTU5NDQ4NTQ3MCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDQ4NTQ3MCwidWlkIjoxOH0.xQZCkxPOLzLxTd5sKsVXVA3QeHYZNzFyM1gO6-4XQkc&#34;,  
379 - &#34;expiresIn&#34;: 43200  
380 - }  
381 - }  
382 -}</pre>  
383 -  
384 -  
385 - </td>  
386 - </tr>  
387 -  
388 - </table>  
389 - </div>  
390 -  
391 -  
392 - <h3>Validators:</h3>  
393 - <div style="overflow: auto">  
394 -  
395 -  
396 - <table>  
397 - <tr>  
398 - <th>check</th>  
399 - <th>comparator</th>  
400 - <th>expect value</th>  
401 - <th>actual value</th>  
402 - </tr>  
403 -  
404 - <tr>  
405 -  
406 - <td class="passed">  
407 -  
408 - content.msg  
409 - </td>  
410 - <td>equals</td>  
411 - <td>ok</td>  
412 - <td>ok</td>  
413 - </tr>  
414 -  
415 - </table>  
416 -  
417 -  
418 -  
419 -  
420 - </div>  
421 -  
422 - <h3>Statistics:</h3>  
423 - <div style="overflow: auto">  
424 - <table>  
425 - <tr>  
426 - <th>content_size(bytes)</th>  
427 - <td>311</td>  
428 - </tr>  
429 - <tr>  
430 - <th>response_time(ms)</th>  
431 - <td>142.01</td>  
432 - </tr>  
433 - <tr>  
434 - <th>elapsed(ms)</th>  
435 - <td>130.386</td>  
436 - </tr>  
437 - </table>  
438 - </div>  
439 -  
440 - </div>  
441 - </div>  
442 - </div>  
443 -  
444 -  
445 -  
446 -  
447 - </td>  
448 - </tr>  
449 -  
450 -  
451 -  
452 - <tr id="record_1_2">  
453 - <th class="success" style="width:5em;">success</th>  
454 - <td colspan="2">10000000001 合伙人编辑</td>  
455 - <td style="text-align:center;width:6em;">45.00 ms</td>  
456 - <td class="detail">  
457 -  
458 -  
459 -  
460 - <a class="button" href="#popup_log_1_2_1">log-1</a>  
461 - <div id="popup_log_1_2_1" class="overlay">  
462 - <div class="popup">  
463 - <h2>Request and Response data</h2>  
464 - <a class="close" href="#record_1_2_1">&times;</a>  
465 -  
466 - <div class="content">  
467 - <h3>Name: 10000000001 合伙人编辑</h3>  
468 -  
469 -  
470 -  
471 -  
472 -  
473 - <h3>Request:</h3>  
474 - <div style="overflow: auto">  
475 - <table>  
476 -  
477 - <tr>  
478 - <th>url</th>  
479 - <td>  
480 -  
481 - https://public-interface-test.fjmaimaimai.com/partnermg/v1/partners/edit  
482 -  
483 - </td>  
484 - </tr>  
485 -  
486 - <tr>  
487 - <th>method</th>  
488 - <td>  
489 -  
490 - POST  
491 -  
492 - </td>  
493 - </tr>  
494 -  
495 - <tr>  
496 - <th>headers</th>  
497 - <td>  
498 -  
499 - <pre>{  
500 - &#34;User-Agent&#34;: &#34;okhttp/3.12.3&#34;,  
501 - &#34;Accept-Encoding&#34;: &#34;gzip, deflate&#34;,  
502 - &#34;Accept&#34;: &#34;*/*&#34;,  
503 - &#34;Connection&#34;: &#34;keep-alive&#34;,  
504 - &#34;Content-Type&#34;: &#34;application/json;charset=utf-8&#34;,  
505 - &#34;Authorization&#34;: &#34;Bearer bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1OTQ1Mjg2NzAsImlhdCI6MTU5NDQ4NTQ3MCwiaXNzIjoibW1tX3BhcnRuZXJtZyIsIm5iZiI6MTU5NDQ4NTQ3MCwidWlkIjoxOH0.xQZCkxPOLzLxTd5sKsVXVA3QeHYZNzFyM1gO6-4XQkc&#34;,  
506 - &#34;Content-Length&#34;: &#34;252&#34;  
507 -}</pre>  
508 -  
509 - </td>  
510 - </tr>  
511 -  
512 - <tr>  
513 - <th>body</th>  
514 - <td>  
515 -  
516 - <pre>{  
517 - &#34;partnerName&#34;: &#34;卞信华&#34;,  
518 - &#34;partnerType&#34;: 1,  
519 - &#34;area&#34;: &#34;福建省福州市XXXXX区&#34;,  
520 - &#34;account&#34;: &#34;18100000002&#34;,  
521 - &#34;state&#34;: 1,  
522 - &#34;cooperationTime&#34;: &#34;2020-07-12&#34;,  
523 - &#34;salesmanName&#34;: &#34;小小&#34;,  
524 - &#34;phone&#34;: &#34;10000000001&#34;,  
525 - &#34;id&#34;: 172  
526 -}</pre>  
527 -  
528 - </td>  
529 - </tr>  
530 -  
531 - </table>  
532 - </div>  
533 -  
534 - <h3>Response:</h3>  
535 - <div style="overflow: auto">  
536 - <table>  
537 -  
538 - <tr>  
539 - <th>ok</th>  
540 - <td>  
541 -  
542 - True  
543 -  
544 - </td>  
545 - </tr>  
546 -  
547 - <tr>  
548 - <th>url</th>  
549 - <td>  
550 -  
551 - https://public-interface-test.fjmaimaimai.com/partnermg/v1/partners/edit  
552 -  
553 - </td>  
554 - </tr>  
555 -  
556 - <tr>  
557 - <th>status_code</th>  
558 - <td>  
559 -  
560 - 200  
561 -  
562 - </td>  
563 - </tr>  
564 -  
565 - <tr>  
566 - <th>reason</th>  
567 - <td>  
568 -  
569 - OK  
570 -  
571 - </td>  
572 - </tr>  
573 -  
574 - <tr>  
575 - <th>cookies</th>  
576 - <td>  
577 -  
578 - {}  
579 -  
580 - </td>  
581 - </tr>  
582 -  
583 - <tr>  
584 - <th>encoding</th>  
585 - <td>  
586 -  
587 - utf-8  
588 -  
589 - </td>  
590 - </tr>  
591 -  
592 - <tr>  
593 - <th>headers</th>  
594 - <td>  
595 -  
596 - <pre>{  
597 - &#34;Date&#34;: &#34;Sat, 11 Jul 2020 16:37:51 GMT&#34;,  
598 - &#34;Content-Type&#34;: &#34;application/json; charset=utf-8&#34;,  
599 - &#34;Content-Length&#34;: &#34;44&#34;,  
600 - &#34;Connection&#34;: &#34;keep-alive&#34;,  
601 - &#34;Access-Control-Allow-Credentials&#34;: &#34;true&#34;,  
602 - &#34;Access-Control-Allow-Headers&#34;: &#34;Origin,Authorization,Access-Control-Allow-Origin,Content-Type,x-requested-with&#34;,  
603 - &#34;Access-Control-Allow-Methods&#34;: &#34;*&#34;,  
604 - &#34;Access-Control-Allow-Origin&#34;: &#34;*&#34;,  
605 - &#34;Access-Control-Expose-Headers&#34;: &#34;Content-Length&#34;,  
606 - &#34;Strict-Transport-Security&#34;: &#34;max-age=15724800; includeSubDomains&#34;  
607 -}</pre>  
608 -  
609 - </td>  
610 - </tr>  
611 -  
612 - <tr>  
613 - <th>content_type</th>  
614 - <td>  
615 -  
616 - application/json; charset=utf-8  
617 -  
618 - </td>  
619 - </tr>  
620 -  
621 - <tr>  
622 - <th>body</th>  
623 - <td>  
624 -  
625 -  
626 - <pre>{  
627 - &#34;code&#34;: 0,  
628 - &#34;msg&#34;: &#34;ok&#34;,  
629 - &#34;data&#34;: {}  
630 -}</pre>  
631 -  
632 -  
633 - </td>  
634 - </tr>  
635 -  
636 - </table>  
637 - </div>  
638 -  
639 -  
640 - <h3>Validators:</h3>  
641 - <div style="overflow: auto">  
642 -  
643 -  
644 - <table>  
645 - <tr>  
646 - <th>check</th>  
647 - <th>comparator</th>  
648 - <th>expect value</th>  
649 - <th>actual value</th>  
650 - </tr>  
651 -  
652 - <tr>  
653 -  
654 - <td class="passed">  
655 -  
656 - content.msg  
657 - </td>  
658 - <td>equals</td>  
659 - <td>ok</td>  
660 - <td>ok</td>  
661 - </tr>  
662 -  
663 - </table>  
664 -  
665 -  
666 -  
667 -  
668 - </div>  
669 -  
670 - <h3>Statistics:</h3>  
671 - <div style="overflow: auto">  
672 - <table>  
673 - <tr>  
674 - <th>content_size(bytes)</th>  
675 - <td>44</td>  
676 - </tr>  
677 - <tr>  
678 - <th>response_time(ms)</th>  
679 - <td>45.0</td>  
680 - </tr>  
681 - <tr>  
682 - <th>elapsed(ms)</th>  
683 - <td>40.066</td>  
684 - </tr>  
685 - </table>  
686 - </div>  
687 -  
688 - </div>  
689 - </div>  
690 - </div>  
691 -  
692 -  
693 -  
694 -  
695 - </td>  
696 - </tr>  
697 -  
698 - </table>  
699 -  
700 -</body>  
  1 +config:
  2 + name: 搜索合伙类型
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${convert_to_string(10000000001)}
  6 + status: ${get_status_from_database(partner_info)}
  7 + teardown_hooks:
  8 + - ${sleep(2)}
  9 +
  10 +teststeps:
  11 +- name: $phone 登录系统
  12 + testcase: testcases/m_login_testcases.yml
  13 +
  14 +- name: $phone 搜索合伙类型
  15 + api: api/m_api/partners/m_partner_partnertype_list_api.yml
  16 + validate:
  17 + - eq:
  18 + - content.msg
  19 + - ok
  20 + - eq:
  21 + - content.data.gridResult.lists.0.state
  22 + - $status
  1 +config:
  2 + name: 搜索合伙人名称
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${convert_to_string(10000000001)}
  6 + status: ${get_status_from_database(partner_info)}
  7 + teardown_hooks:
  8 + - ${sleep(2)}
  9 +
  10 +teststeps:
  11 +- name: $phone 登录系统
  12 + testcase: testcases/m_login_testcases.yml
  13 +
  14 +- name: $phone 搜索合伙人名称
  15 + api: api/m_api/partners/m_partner_partnerName_list_api.yml
  16 + validate:
  17 + - eq:
  18 + - content.msg
  19 + - ok
  20 + - eq:
  21 + - content.data.gridResult.lists.0.state
  22 + - $status
  1 +config:
  2 + name: 查看合伙人
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${convert_to_string(10000000001)}
  6 + status: ${get_status_from_database(partner_info)}
  7 + teardown_hooks:
  8 + - ${sleep(2)}
  9 +
  10 +teststeps:
  11 +- name: $phone 登录系统
  12 + testcase: testcases/m_login_testcases.yml
  13 +
  14 +- name: $phone 查看合伙人
  15 + api: api/m_api/partners/m_partner_detail_api.yml
  16 + validate:
  17 + - eq:
  18 + - content.msg
  19 + - ok
  20 + - eq:
  21 + - content.data.state
  22 + - $status
  1 +config:
  2 + name: 禁用合伙人
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${convert_to_string(10000000001)}
  6 + teardown_hooks:
  7 + - ${sleep(2)}
  8 +
  9 +teststeps:
  10 +- name: $phone 登录系统
  11 + testcase: testcases/m_login_testcases.yml
  12 +
  13 +- name: $phone 禁用合伙人
  14 + api: api/m_api/partners/m_partner_set-status_1_api.yml
  15 + validate:
  16 + - eq:
  17 + - content.msg
  18 + - ok
  1 +config:
  2 + name: 启用合伙人
  3 + base_url: ${ENV(base_manager_url)}
  4 + variables:
  5 + phone: ${convert_to_string(10000000001)}
  6 + teardown_hooks:
  7 + - ${sleep(2)}
  8 +
  9 +teststeps:
  10 +- name: $phone 登录系统
  11 + testcase: testcases/m_login_testcases.yml
  12 +
  13 +- name: $phone 启用合伙人
  14 + api: api/m_api/partners/m_partner_set-status_2_api.yml
  15 + validate:
  16 + - eq:
  17 + - content.msg
  18 + - ok
@@ -33,5 +33,20 @@ testcases: @@ -33,5 +33,20 @@ testcases:
33 # parameters: 33 # parameters:
34 # account: ${create_phone_number(1)} 34 # account: ${create_phone_number(1)}
35 35
36 -- name: PARTNERS002：编辑管理员  
37 - testcase: testcases/partners/PARTNERS002_edit_partner_testcases.yml  
  36 +#- name: PARTNERS002：编辑合伙人
  37 +# testcase: testcases/partners/PARTNERS002_edit_partner_testcases.yml
  38 +
  39 +#- name: PARTNERS003：搜索合伙类型
  40 +# testcase: testcases/partners/PARTNERS003_list_partner_testcases.yml
  41 +
  42 +#- name: PARTNERS004：搜索合伙人名称
  43 +# testcase: testcases/partners/PARTNERS004_list_partner_testcases.yml
  44 +
  45 +#- name: PARTNERS005：查看合伙人
  46 +# testcase: testcases/partners/PARTNERS005_detail_partner_testcases.yml
  47 +
  48 +- name: PARTNERS006：禁用合伙人
  49 + testcase: testcases/partners/PARTNERS006_set-status_partner1_testcases.yml
  50 +
  51 +- name: PARTNERS006：启用合伙人
  52 + testcase: testcases/partners/PARTNERS007_set-status_partner2_testcases.yml