郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 70f728a84a4f434da1c26d6a7327da5b8bfd7812 1 个父辈 69d17b76 master
1 个管道 的构建 通过 耗费 5 秒

修改提示信息

内嵌 并排对比
正在显示 2 个修改的文件 包含 441 行增加 和 225 行删除
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
5 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/pdf/2019121299974848,2019121210057100.pdf" afterPath="$PROJECT_DIR$/public/pdf/2019121299974848,2019121210057100.pdf" />  
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Common.php" afterPath="$PROJECT_DIR$/application/api/controller/Common.php" />
7 </list> 7 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -14,11 +14,11 @@ @@ -14,11 +14,11 @@
14 </component> 14 </component>
15 <component name="FileEditorManager"> 15 <component name="FileEditorManager">
16 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 16 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
17 - <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> 17 + <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
18 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 18 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
19 <provider selected="true" editor-type-id="text-editor"> 19 <provider selected="true" editor-type-id="text-editor">
20 - <state relative-caret-position="248">  
21 - <caret line="1954" column="38" lean-forward="true" selection-start-line="1954" selection-start-column="38" selection-end-line="1954" selection-end-column="38" /> 20 + <state relative-caret-position="412">
  21 + <caret line="1960" column="37" lean-forward="true" selection-start-line="1960" selection-start-column="37" selection-end-line="1960" selection-end-column="37" />
22 <folding> 22 <folding>
23 <element signature="e#365#484#0#PHP" expanded="false" /> 23 <element signature="e#365#484#0#PHP" expanded="false" />
24 <element signature="e#490#1228#0#PHP" expanded="false" /> 24 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -101,6 +101,222 @@ @@ -101,6 +101,222 @@
101 </provider> 101 </provider>
102 </entry> 102 </entry>
103 </file> 103 </file>
  104 + <file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
  105 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
  106 + <provider selected="true" editor-type-id="text-editor">
  107 + <state relative-caret-position="248">
  108 + <caret line="103" column="4" lean-forward="true" selection-start-line="103" selection-start-column="4" selection-end-line="108" selection-end-column="10" />
  109 + <folding />
  110 + </state>
  111 + </provider>
  112 + </entry>
  113 + </file>
  114 + <file leaf-file-name="Common.php" pinned="false" current-in-tab="true">
  115 + <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
  116 + <provider selected="true" editor-type-id="text-editor">
  117 + <state relative-caret-position="473">
  118 + <caret line="319" column="34" lean-forward="true" selection-start-line="319" selection-start-column="34" selection-end-line="319" selection-end-column="34" />
  119 + <folding>
  120 + <element signature="e#38#68#0#PHP" expanded="true" />
  121 + <element signature="e#1303#1352#0#PHP" expanded="false" />
  122 + <element signature="e#10105#10236#0#PHP" expanded="false" />
  123 + <element signature="e#10241#10839#0#PHP" expanded="false" />
  124 + <element signature="e#10845#10922#0#PHP" expanded="false" />
  125 + <element signature="e#10927#15190#0#PHP" expanded="false" />
  126 + <marker date="1576204149637" expanded="false" signature="1720:9443" ph="..." />
  127 + <marker date="1576204149637" expanded="false" signature="1738:1873" ph="..." />
  128 + <marker date="1576204149637" expanded="false" signature="1758:1824" ph="..." />
  129 + <marker date="1576204149637" expanded="false" signature="1897:1944" ph="..." />
  130 + <marker date="1576204149637" expanded="false" signature="1945:1983" ph="..." />
  131 + <marker date="1576204149637" expanded="true" signature="2007:2034" ph="..." />
  132 + <marker date="1576204149637" expanded="true" signature="2035:2190" ph="..." />
  133 + <marker date="1576204149637" expanded="true" signature="2191:3278" ph="..." />
  134 + <marker date="1576204149637" expanded="true" signature="2214:2230" ph="..." />
  135 + <marker date="1576204149637" expanded="true" signature="2231:3278" ph="..." />
  136 + <marker date="1576204149637" expanded="true" signature="2257:2284" ph="..." />
  137 + <marker date="1576204149637" expanded="true" signature="2257:2301" ph="..." />
  138 + <marker date="1576204149637" expanded="true" signature="2302:2380" ph="..." />
  139 + <marker date="1576204149637" expanded="true" signature="2332:2344" ph="..." />
  140 + <marker date="1576204149637" expanded="true" signature="2404:2431" ph="..." />
  141 + <marker date="1576204149637" expanded="true" signature="2404:2448" ph="..." />
  142 + <marker date="1576204149637" expanded="true" signature="2449:2527" ph="..." />
  143 + <marker date="1576204149637" expanded="true" signature="2480:2492" ph="..." />
  144 + <marker date="1576204149637" expanded="true" signature="2551:2578" ph="..." />
  145 + <marker date="1576204149637" expanded="true" signature="2551:2595" ph="..." />
  146 + <marker date="1576204149637" expanded="true" signature="2596:2674" ph="..." />
  147 + <marker date="1576204149637" expanded="true" signature="2627:2639" ph="..." />
  148 + <marker date="1576204149637" expanded="true" signature="2698:2725" ph="..." />
  149 + <marker date="1576204149637" expanded="true" signature="2698:2742" ph="..." />
  150 + <marker date="1576204149637" expanded="true" signature="2743:2824" ph="..." />
  151 + <marker date="1576204149637" expanded="true" signature="2774:2786" ph="..." />
  152 + <marker date="1576204149637" expanded="true" signature="2848:2892" ph="..." />
  153 + <marker date="1576204149637" expanded="true" signature="2893:2978" ph="..." />
  154 + <marker date="1576204149637" expanded="true" signature="2925:2937" ph="..." />
  155 + <marker date="1576204149637" expanded="true" signature="3002:3029" ph="..." />
  156 + <marker date="1576204149637" expanded="true" signature="3002:3046" ph="..." />
  157 + <marker date="1576204149637" expanded="true" signature="3047:3129" ph="..." />
  158 + <marker date="1576204149637" expanded="true" signature="3081:3093" ph="..." />
  159 + <marker date="1576204149637" expanded="true" signature="3153:3180" ph="..." />
  160 + <marker date="1576204149637" expanded="true" signature="3153:3197" ph="..." />
  161 + <marker date="1576204149637" expanded="true" signature="3198:3261" ph="..." />
  162 + <marker date="1576204149637" expanded="true" signature="3303:3709" ph="..." />
  163 + <marker date="1576204149637" expanded="false" signature="3331:3397" ph="..." />
  164 + <marker date="1576204149637" expanded="true" signature="3440:3485" ph="..." />
  165 + <marker date="1576204149637" expanded="true" signature="3519:3528" ph="..." />
  166 + <marker date="1576204149637" expanded="false" signature="3571:3580" ph="..." />
  167 + <marker date="1576204149637" expanded="true" signature="3609:3618" ph="..." />
  168 + <marker date="1576204149637" expanded="false" signature="3733:3751" ph="..." />
  169 + <marker date="1576204149637" expanded="true" signature="3752:4068" ph="..." />
  170 + <marker date="1576204149637" expanded="false" signature="3780:3846" ph="..." />
  171 + <marker date="1576204149637" expanded="false" signature="3885:3913" ph="..." />
  172 + <marker date="1576204149637" expanded="true" signature="3915:3921" ph=" " />
  173 + <marker date="1576204149637" expanded="true" signature="3921:3927" ph=" " />
  174 + <marker date="1576204149637" expanded="true" signature="3927:3933" ph=" " />
  175 + <marker date="1576204149637" expanded="true" signature="3933:3939" ph=" " />
  176 + <marker date="1576204149637" expanded="false" signature="3992:4001" ph="..." />
  177 + <marker date="1576204149637" expanded="false" signature="4092:4110" ph="..." />
  178 + <marker date="1576204149637" expanded="true" signature="4111:4470" ph="..." />
  179 + <marker date="1576204149637" expanded="false" signature="4139:4205" ph="..." />
  180 + <marker date="1576204149637" expanded="false" signature="4246:4291" ph="..." />
  181 + <marker date="1576204149637" expanded="false" signature="4293:4299" ph=" " />
  182 + <marker date="1576204149637" expanded="false" signature="4299:4305" ph=" " />
  183 + <marker date="1576204149637" expanded="false" signature="4305:4311" ph=" " />
  184 + <marker date="1576204149637" expanded="false" signature="4311:4317" ph=" " />
  185 + <marker date="1576204149637" expanded="false" signature="4400:4409" ph="..." />
  186 + <marker date="1576204149637" expanded="false" signature="4494:4541" ph="..." />
  187 + <marker date="1576204149637" expanded="false" signature="4543:4549" ph=" " />
  188 + <marker date="1576204149637" expanded="false" signature="4549:4555" ph=" " />
  189 + <marker date="1576204149637" expanded="false" signature="4555:4561" ph=" " />
  190 + <marker date="1576204149637" expanded="false" signature="4561:4567" ph=" " />
  191 + <marker date="1576204149637" expanded="false" signature="4622:4631" ph="..." />
  192 + <marker date="1576204149637" expanded="false" signature="4750:4797" ph="..." />
  193 + <marker date="1576204149637" expanded="false" signature="4799:4805" ph=" " />
  194 + <marker date="1576204149637" expanded="false" signature="4805:4811" ph=" " />
  195 + <marker date="1576204149637" expanded="false" signature="4811:4817" ph=" " />
  196 + <marker date="1576204149637" expanded="false" signature="4817:4823" ph=" " />
  197 + <marker date="1576204149637" expanded="false" signature="4877:4886" ph="..." />
  198 + <marker date="1576204149637" expanded="false" signature="4960:4976" ph="..." />
  199 + <marker date="1576204149637" expanded="false" signature="5029:5076" ph="..." />
  200 + <marker date="1576204149637" expanded="false" signature="5078:5084" ph=" " />
  201 + <marker date="1576204149637" expanded="false" signature="5084:5090" ph=" " />
  202 + <marker date="1576204149637" expanded="false" signature="5090:5096" ph=" " />
  203 + <marker date="1576204149637" expanded="false" signature="5096:5102" ph=" " />
  204 + <marker date="1576204149637" expanded="false" signature="5130:5156" ph="..." />
  205 + <marker date="1576204149637" expanded="false" signature="5242:5260" ph="..." />
  206 + <marker date="1576204149637" expanded="true" signature="5261:5859" ph="..." />
  207 + <marker date="1576204149637" expanded="false" signature="5289:5355" ph="..." />
  208 + <marker date="1576204149637" expanded="false" signature="5394:5441" ph="..." />
  209 + <marker date="1576204149637" expanded="false" signature="5443:5449" ph=" " />
  210 + <marker date="1576204149637" expanded="false" signature="5449:5455" ph=" " />
  211 + <marker date="1576204149637" expanded="false" signature="5455:5461" ph=" " />
  212 + <marker date="1576204149637" expanded="false" signature="5461:5467" ph=" " />
  213 + <marker date="1576204149637" expanded="false" signature="5552:5599" ph="..." />
  214 + <marker date="1576204149637" expanded="false" signature="5601:5607" ph=" " />
  215 + <marker date="1576204149637" expanded="false" signature="5607:5613" ph=" " />
  216 + <marker date="1576204149637" expanded="false" signature="5613:5619" ph=" " />
  217 + <marker date="1576204149637" expanded="false" signature="5619:5625" ph=" " />
  218 + <marker date="1576204149637" expanded="false" signature="5726:5773" ph="..." />
  219 + <marker date="1576204149637" expanded="false" signature="5775:5781" ph=" " />
  220 + <marker date="1576204149637" expanded="false" signature="5781:5787" ph=" " />
  221 + <marker date="1576204149637" expanded="false" signature="5787:5793" ph=" " />
  222 + <marker date="1576204149637" expanded="false" signature="5793:5799" ph=" " />
  223 + <marker date="1576204149637" expanded="false" signature="5883:5901" ph="..." />
  224 + <marker date="1576204149637" expanded="true" signature="5902:7585" ph="..." />
  225 + <marker date="1576204149637" expanded="false" signature="5930:5996" ph="..." />
  226 + <marker date="1576204149637" expanded="true" signature="6035:6082" ph="..." />
  227 + <marker date="1576204149637" expanded="false" signature="6084:6090" ph=" " />
  228 + <marker date="1576204149637" expanded="false" signature="6090:6096" ph=" " />
  229 + <marker date="1576204149637" expanded="false" signature="6096:6102" ph=" " />
  230 + <marker date="1576204149637" expanded="false" signature="6102:6108" ph=" " />
  231 + <marker date="1576204149637" expanded="false" signature="6134:6150" ph="..." />
  232 + <marker date="1576204149637" expanded="true" signature="6270:6317" ph="..." />
  233 + <marker date="1576204149637" expanded="false" signature="6319:6325" ph=" " />
  234 + <marker date="1576204149637" expanded="false" signature="6325:6331" ph=" " />
  235 + <marker date="1576204149637" expanded="false" signature="6331:6337" ph=" " />
  236 + <marker date="1576204149637" expanded="false" signature="6337:6343" ph=" " />
  237 + <marker date="1576204149637" expanded="true" signature="6495:6542" ph="..." />
  238 + <marker date="1576204149637" expanded="false" signature="6544:6550" ph=" " />
  239 + <marker date="1576204149637" expanded="false" signature="6550:6556" ph=" " />
  240 + <marker date="1576204149637" expanded="false" signature="6556:6562" ph=" " />
  241 + <marker date="1576204149637" expanded="false" signature="6562:6568" ph=" " />
  242 + <marker date="1576204149637" expanded="false" signature="6687:6734" ph="..." />
  243 + <marker date="1576204149637" expanded="false" signature="6736:6742" ph=" " />
  244 + <marker date="1576204149637" expanded="false" signature="6742:6748" ph=" " />
  245 + <marker date="1576204149637" expanded="false" signature="6748:6754" ph=" " />
  246 + <marker date="1576204149637" expanded="false" signature="6754:6760" ph=" " />
  247 + <marker date="1576204149637" expanded="false" signature="6844:6891" ph="..." />
  248 + <marker date="1576204149637" expanded="false" signature="6893:6899" ph=" " />
  249 + <marker date="1576204149637" expanded="false" signature="6899:6905" ph=" " />
  250 + <marker date="1576204149637" expanded="false" signature="6905:6911" ph=" " />
  251 + <marker date="1576204149637" expanded="false" signature="6911:6917" ph=" " />
  252 + <marker date="1576204149637" expanded="false" signature="6977:7024" ph="..." />
  253 + <marker date="1576204149637" expanded="false" signature="7026:7032" ph=" " />
  254 + <marker date="1576204149637" expanded="false" signature="7032:7038" ph=" " />
  255 + <marker date="1576204149637" expanded="false" signature="7038:7044" ph=" " />
  256 + <marker date="1576204149637" expanded="false" signature="7044:7050" ph=" " />
  257 + <marker date="1576204149637" expanded="false" signature="7234:7281" ph="..." />
  258 + <marker date="1576204149637" expanded="false" signature="7283:7289" ph=" " />
  259 + <marker date="1576204149637" expanded="false" signature="7289:7295" ph=" " />
  260 + <marker date="1576204149637" expanded="false" signature="7295:7301" ph=" " />
  261 + <marker date="1576204149637" expanded="false" signature="7301:7307" ph=" " />
  262 + <marker date="1576204149637" expanded="false" signature="7435:7482" ph="..." />
  263 + <marker date="1576204149637" expanded="false" signature="7484:7490" ph=" " />
  264 + <marker date="1576204149637" expanded="false" signature="7490:7496" ph=" " />
  265 + <marker date="1576204149637" expanded="false" signature="7496:7502" ph=" " />
  266 + <marker date="1576204149637" expanded="false" signature="7502:7508" ph=" " />
  267 + <marker date="1576204149637" expanded="false" signature="7609:7627" ph="..." />
  268 + <marker date="1576204149637" expanded="true" signature="7628:8128" ph="..." />
  269 + <marker date="1576204149637" expanded="false" signature="7656:7722" ph="..." />
  270 + <marker date="1576204149637" expanded="false" signature="7763:7810" ph="..." />
  271 + <marker date="1576204149637" expanded="false" signature="7812:7818" ph=" " />
  272 + <marker date="1576204149637" expanded="false" signature="7818:7824" ph=" " />
  273 + <marker date="1576204149637" expanded="false" signature="7824:7830" ph=" " />
  274 + <marker date="1576204149637" expanded="false" signature="7830:7836" ph=" " />
  275 + <marker date="1576204149637" expanded="false" signature="7948:7995" ph="..." />
  276 + <marker date="1576204149637" expanded="false" signature="7997:8003" ph=" " />
  277 + <marker date="1576204149637" expanded="false" signature="8003:8009" ph=" " />
  278 + <marker date="1576204149637" expanded="false" signature="8009:8015" ph=" " />
  279 + <marker date="1576204149637" expanded="false" signature="8015:8021" ph=" " />
  280 + <marker date="1576204149637" expanded="false" signature="8152:8170" ph="..." />
  281 + <marker date="1576204149637" expanded="true" signature="8171:9171" ph="..." />
  282 + <marker date="1576204149637" expanded="false" signature="8199:8265" ph="..." />
  283 + <marker date="1576204149637" expanded="false" signature="8304:8351" ph="..." />
  284 + <marker date="1576204149637" expanded="false" signature="8353:8359" ph=" " />
  285 + <marker date="1576204149637" expanded="false" signature="8359:8365" ph=" " />
  286 + <marker date="1576204149637" expanded="false" signature="8365:8371" ph=" " />
  287 + <marker date="1576204149637" expanded="false" signature="8371:8377" ph=" " />
  288 + <marker date="1576204149637" expanded="false" signature="8443:8490" ph="..." />
  289 + <marker date="1576204149637" expanded="false" signature="8492:8498" ph=" " />
  290 + <marker date="1576204149637" expanded="false" signature="8498:8504" ph=" " />
  291 + <marker date="1576204149637" expanded="false" signature="8504:8510" ph=" " />
  292 + <marker date="1576204149637" expanded="false" signature="8510:8516" ph=" " />
  293 + <marker date="1576204149637" expanded="false" signature="8573:8620" ph="..." />
  294 + <marker date="1576204149637" expanded="false" signature="8622:8628" ph=" " />
  295 + <marker date="1576204149637" expanded="false" signature="8628:8634" ph=" " />
  296 + <marker date="1576204149637" expanded="false" signature="8634:8640" ph=" " />
  297 + <marker date="1576204149637" expanded="false" signature="8640:8646" ph=" " />
  298 + <marker date="1576204149637" expanded="false" signature="8724:8771" ph="..." />
  299 + <marker date="1576204149637" expanded="false" signature="8773:8779" ph=" " />
  300 + <marker date="1576204149637" expanded="false" signature="8779:8785" ph=" " />
  301 + <marker date="1576204149637" expanded="false" signature="8785:8791" ph=" " />
  302 + <marker date="1576204149637" expanded="false" signature="8791:8797" ph=" " />
  303 + <marker date="1576204149637" expanded="false" signature="8890:8937" ph="..." />
  304 + <marker date="1576204149637" expanded="false" signature="8939:8945" ph=" " />
  305 + <marker date="1576204149637" expanded="false" signature="8945:8951" ph=" " />
  306 + <marker date="1576204149637" expanded="false" signature="8951:8957" ph=" " />
  307 + <marker date="1576204149637" expanded="false" signature="8957:8963" ph=" " />
  308 + <marker date="1576204149637" expanded="false" signature="9037:9084" ph="..." />
  309 + <marker date="1576204149637" expanded="false" signature="9086:9092" ph=" " />
  310 + <marker date="1576204149637" expanded="false" signature="9092:9098" ph=" " />
  311 + <marker date="1576204149637" expanded="false" signature="9098:9104" ph=" " />
  312 + <marker date="1576204149637" expanded="false" signature="9104:9110" ph=" " />
  313 + <marker date="1576204149637" expanded="false" signature="9195:9275" ph="..." />
  314 + <marker date="1576204149637" expanded="false" signature="9336:9416" ph="..." />
  315 + </folding>
  316 + </state>
  317 + </provider>
  318 + </entry>
  319 + </file>
104 </leaf> 320 </leaf>
105 </component> 321 </component>
106 <component name="FileTemplateManagerImpl"> 322 <component name="FileTemplateManagerImpl">
@@ -198,7 +414,7 @@ @@ -198,7 +414,7 @@
198 <sorting>DEFINITION_ORDER</sorting> 414 <sorting>DEFINITION_ORDER</sorting>
199 </component> 415 </component>
200 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 416 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
201 - <component name="ProjectFrameBounds" extendedState="1"> 417 + <component name="ProjectFrameBounds">
202 <option name="x" value="234" /> 418 <option name="x" value="234" />
203 <option name="y" value="52" /> 419 <option name="y" value="52" />
204 <option name="width" value="1578" /> 420 <option name="width" value="1578" />
@@ -348,7 +564,7 @@ @@ -348,7 +564,7 @@
348 <workItem from="1576128183316" duration="7364000" /> 564 <workItem from="1576128183316" duration="7364000" />
349 <workItem from="1576135696788" duration="17540000" /> 565 <workItem from="1576135696788" duration="17540000" />
350 <workItem from="1576153922472" duration="9154000" /> 566 <workItem from="1576153922472" duration="9154000" />
351 - <workItem from="1576196503707" duration="5700000" /> 567 + <workItem from="1576196503707" duration="6817000" />
352 </task> 568 </task>
353 <task id="LOCAL-00001" summary="调试"> 569 <task id="LOCAL-00001" summary="调试">
354 <created>1574145133364</created> 570 <created>1574145133364</created>
@@ -375,7 +591,7 @@ @@ -375,7 +591,7 @@
375 <servers /> 591 <servers />
376 </component> 592 </component>
377 <component name="TimeTrackingManager"> 593 <component name="TimeTrackingManager">
378 - <option name="totallyTimeSpent" value="429992000" /> 594 + <option name="totallyTimeSpent" value="431109000" />
379 </component> 595 </component>
380 <component name="TodoView"> 596 <component name="TodoView">
381 <todo-panel id="selected-file"> 597 <todo-panel id="selected-file">
@@ -387,7 +603,8 @@ @@ -387,7 +603,8 @@
387 </todo-panel> 603 </todo-panel>
388 </component> 604 </component>
389 <component name="ToolWindowManager"> 605 <component name="ToolWindowManager">
390 - <frame x="234" y="52" width="1578" height="949" extended-state="1" /> 606 + <frame x="234" y="52" width="1578" height="949" extended-state="0" />
  607 + <editor active="true" />
391 <layout> 608 <layout>
392 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18050066" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 609 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18050066" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
393 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> 610 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -396,7 +613,7 @@ @@ -396,7 +613,7 @@
396 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 613 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
397 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> 614 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
398 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 615 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
399 - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4729064" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 616 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4729064" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
400 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> 617 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
401 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 618 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
402 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 619 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -794,218 +1011,6 @@ @@ -794,218 +1011,6 @@
794 </state> 1011 </state>
795 </provider> 1012 </provider>
796 </entry> 1013 </entry>
797 - <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">  
798 - <provider selected="true" editor-type-id="text-editor">  
799 - <state relative-caret-position="248">  
800 - <caret line="302" column="57" lean-forward="true" selection-start-line="302" selection-start-column="57" selection-end-line="302" selection-end-column="57" />  
801 - <folding>  
802 - <element signature="e#38#68#0#PHP" expanded="true" />  
803 - <element signature="e#1303#1352#0#PHP" expanded="false" />  
804 - <element signature="e#10105#10236#0#PHP" expanded="false" />  
805 - <element signature="e#10241#10839#0#PHP" expanded="false" />  
806 - <element signature="e#10845#10922#0#PHP" expanded="false" />  
807 - <element signature="e#10927#15190#0#PHP" expanded="false" />  
808 - <marker date="1576201280007" expanded="false" signature="1720:9443" ph="..." />  
809 - <marker date="1576201280007" expanded="false" signature="1738:1873" ph="..." />  
810 - <marker date="1576201280007" expanded="false" signature="1758:1824" ph="..." />  
811 - <marker date="1576201280007" expanded="false" signature="1897:1944" ph="..." />  
812 - <marker date="1576201280007" expanded="false" signature="1945:1983" ph="..." />  
813 - <marker date="1576201280007" expanded="true" signature="2007:2034" ph="..." />  
814 - <marker date="1576201280007" expanded="true" signature="2035:2190" ph="..." />  
815 - <marker date="1576201280007" expanded="true" signature="2191:3278" ph="..." />  
816 - <marker date="1576201280007" expanded="true" signature="2214:2230" ph="..." />  
817 - <marker date="1576201280007" expanded="true" signature="2231:3278" ph="..." />  
818 - <marker date="1576201280007" expanded="true" signature="2257:2284" ph="..." />  
819 - <marker date="1576201280007" expanded="true" signature="2257:2301" ph="..." />  
820 - <marker date="1576201280007" expanded="true" signature="2302:2380" ph="..." />  
821 - <marker date="1576201280007" expanded="true" signature="2332:2344" ph="..." />  
822 - <marker date="1576201280007" expanded="true" signature="2404:2431" ph="..." />  
823 - <marker date="1576201280007" expanded="true" signature="2404:2448" ph="..." />  
824 - <marker date="1576201280007" expanded="true" signature="2449:2527" ph="..." />  
825 - <marker date="1576201280007" expanded="true" signature="2480:2492" ph="..." />  
826 - <marker date="1576201280007" expanded="true" signature="2551:2578" ph="..." />  
827 - <marker date="1576201280007" expanded="true" signature="2551:2595" ph="..." />  
828 - <marker date="1576201280007" expanded="true" signature="2596:2674" ph="..." />  
829 - <marker date="1576201280007" expanded="true" signature="2627:2639" ph="..." />  
830 - <marker date="1576201280007" expanded="true" signature="2698:2725" ph="..." />  
831 - <marker date="1576201280007" expanded="true" signature="2698:2742" ph="..." />  
832 - <marker date="1576201280007" expanded="true" signature="2743:2824" ph="..." />  
833 - <marker date="1576201280007" expanded="true" signature="2774:2786" ph="..." />  
834 - <marker date="1576201280007" expanded="true" signature="2848:2892" ph="..." />  
835 - <marker date="1576201280007" expanded="true" signature="2893:2978" ph="..." />  
836 - <marker date="1576201280007" expanded="true" signature="2925:2937" ph="..." />  
837 - <marker date="1576201280007" expanded="true" signature="3002:3029" ph="..." />  
838 - <marker date="1576201280007" expanded="true" signature="3002:3046" ph="..." />  
839 - <marker date="1576201280007" expanded="true" signature="3047:3129" ph="..." />  
840 - <marker date="1576201280007" expanded="true" signature="3081:3093" ph="..." />  
841 - <marker date="1576201280007" expanded="true" signature="3153:3180" ph="..." />  
842 - <marker date="1576201280007" expanded="true" signature="3153:3197" ph="..." />  
843 - <marker date="1576201280007" expanded="true" signature="3198:3261" ph="..." />  
844 - <marker date="1576201280007" expanded="true" signature="3303:3709" ph="..." />  
845 - <marker date="1576201280007" expanded="false" signature="3331:3397" ph="..." />  
846 - <marker date="1576201280007" expanded="true" signature="3440:3485" ph="..." />  
847 - <marker date="1576201280007" expanded="true" signature="3519:3528" ph="..." />  
848 - <marker date="1576201280007" expanded="false" signature="3571:3580" ph="..." />  
849 - <marker date="1576201280007" expanded="true" signature="3609:3618" ph="..." />  
850 - <marker date="1576201280007" expanded="false" signature="3733:3751" ph="..." />  
851 - <marker date="1576201280007" expanded="true" signature="3752:4068" ph="..." />  
852 - <marker date="1576201280007" expanded="false" signature="3780:3846" ph="..." />  
853 - <marker date="1576201280007" expanded="false" signature="3885:3913" ph="..." />  
854 - <marker date="1576201280007" expanded="true" signature="3915:3921" ph=" " />  
855 - <marker date="1576201280007" expanded="true" signature="3921:3927" ph=" " />  
856 - <marker date="1576201280007" expanded="true" signature="3927:3933" ph=" " />  
857 - <marker date="1576201280007" expanded="true" signature="3933:3939" ph=" " />  
858 - <marker date="1576201280007" expanded="false" signature="3992:4001" ph="..." />  
859 - <marker date="1576201280007" expanded="false" signature="4092:4110" ph="..." />  
860 - <marker date="1576201280007" expanded="true" signature="4111:4470" ph="..." />  
861 - <marker date="1576201280007" expanded="false" signature="4139:4205" ph="..." />  
862 - <marker date="1576201280007" expanded="false" signature="4246:4291" ph="..." />  
863 - <marker date="1576201280007" expanded="false" signature="4293:4299" ph=" " />  
864 - <marker date="1576201280007" expanded="false" signature="4299:4305" ph=" " />  
865 - <marker date="1576201280007" expanded="false" signature="4305:4311" ph=" " />  
866 - <marker date="1576201280007" expanded="false" signature="4311:4317" ph=" " />  
867 - <marker date="1576201280007" expanded="false" signature="4400:4409" ph="..." />  
868 - <marker date="1576201280007" expanded="false" signature="4494:4541" ph="..." />  
869 - <marker date="1576201280007" expanded="false" signature="4543:4549" ph=" " />  
870 - <marker date="1576201280007" expanded="false" signature="4549:4555" ph=" " />  
871 - <marker date="1576201280007" expanded="false" signature="4555:4561" ph=" " />  
872 - <marker date="1576201280007" expanded="false" signature="4561:4567" ph=" " />  
873 - <marker date="1576201280007" expanded="false" signature="4622:4631" ph="..." />  
874 - <marker date="1576201280007" expanded="false" signature="4750:4797" ph="..." />  
875 - <marker date="1576201280007" expanded="false" signature="4799:4805" ph=" " />  
876 - <marker date="1576201280007" expanded="false" signature="4805:4811" ph=" " />  
877 - <marker date="1576201280007" expanded="false" signature="4811:4817" ph=" " />  
878 - <marker date="1576201280007" expanded="false" signature="4817:4823" ph=" " />  
879 - <marker date="1576201280007" expanded="false" signature="4877:4886" ph="..." />  
880 - <marker date="1576201280007" expanded="false" signature="4960:4976" ph="..." />  
881 - <marker date="1576201280007" expanded="false" signature="5029:5076" ph="..." />  
882 - <marker date="1576201280007" expanded="false" signature="5078:5084" ph=" " />  
883 - <marker date="1576201280007" expanded="false" signature="5084:5090" ph=" " />  
884 - <marker date="1576201280007" expanded="false" signature="5090:5096" ph=" " />  
885 - <marker date="1576201280007" expanded="false" signature="5096:5102" ph=" " />  
886 - <marker date="1576201280007" expanded="false" signature="5130:5156" ph="..." />  
887 - <marker date="1576201280007" expanded="false" signature="5242:5260" ph="..." />  
888 - <marker date="1576201280007" expanded="true" signature="5261:5859" ph="..." />  
889 - <marker date="1576201280007" expanded="false" signature="5289:5355" ph="..." />  
890 - <marker date="1576201280007" expanded="false" signature="5394:5441" ph="..." />  
891 - <marker date="1576201280007" expanded="false" signature="5443:5449" ph=" " />  
892 - <marker date="1576201280007" expanded="false" signature="5449:5455" ph=" " />  
893 - <marker date="1576201280007" expanded="false" signature="5455:5461" ph=" " />  
894 - <marker date="1576201280007" expanded="false" signature="5461:5467" ph=" " />  
895 - <marker date="1576201280007" expanded="false" signature="5552:5599" ph="..." />  
896 - <marker date="1576201280007" expanded="false" signature="5601:5607" ph=" " />  
897 - <marker date="1576201280007" expanded="false" signature="5607:5613" ph=" " />  
898 - <marker date="1576201280007" expanded="false" signature="5613:5619" ph=" " />  
899 - <marker date="1576201280007" expanded="false" signature="5619:5625" ph=" " />  
900 - <marker date="1576201280007" expanded="false" signature="5726:5773" ph="..." />  
901 - <marker date="1576201280007" expanded="false" signature="5775:5781" ph=" " />  
902 - <marker date="1576201280007" expanded="false" signature="5781:5787" ph=" " />  
903 - <marker date="1576201280007" expanded="false" signature="5787:5793" ph=" " />  
904 - <marker date="1576201280007" expanded="false" signature="5793:5799" ph=" " />  
905 - <marker date="1576201280007" expanded="false" signature="5883:5901" ph="..." />  
906 - <marker date="1576201280007" expanded="true" signature="5902:7585" ph="..." />  
907 - <marker date="1576201280007" expanded="false" signature="5930:5996" ph="..." />  
908 - <marker date="1576201280007" expanded="true" signature="6035:6082" ph="..." />  
909 - <marker date="1576201280007" expanded="false" signature="6084:6090" ph=" " />  
910 - <marker date="1576201280007" expanded="false" signature="6090:6096" ph=" " />  
911 - <marker date="1576201280007" expanded="false" signature="6096:6102" ph=" " />  
912 - <marker date="1576201280007" expanded="false" signature="6102:6108" ph=" " />  
913 - <marker date="1576201280007" expanded="false" signature="6134:6150" ph="..." />  
914 - <marker date="1576201280007" expanded="true" signature="6270:6317" ph="..." />  
915 - <marker date="1576201280007" expanded="false" signature="6319:6325" ph=" " />  
916 - <marker date="1576201280007" expanded="false" signature="6325:6331" ph=" " />  
917 - <marker date="1576201280007" expanded="false" signature="6331:6337" ph=" " />  
918 - <marker date="1576201280007" expanded="false" signature="6337:6343" ph=" " />  
919 - <marker date="1576201280007" expanded="true" signature="6495:6542" ph="..." />  
920 - <marker date="1576201280007" expanded="false" signature="6544:6550" ph=" " />  
921 - <marker date="1576201280007" expanded="false" signature="6550:6556" ph=" " />  
922 - <marker date="1576201280007" expanded="false" signature="6556:6562" ph=" " />  
923 - <marker date="1576201280007" expanded="false" signature="6562:6568" ph=" " />  
924 - <marker date="1576201280007" expanded="false" signature="6687:6734" ph="..." />  
925 - <marker date="1576201280007" expanded="false" signature="6736:6742" ph=" " />  
926 - <marker date="1576201280007" expanded="false" signature="6742:6748" ph=" " />  
927 - <marker date="1576201280007" expanded="false" signature="6748:6754" ph=" " />  
928 - <marker date="1576201280007" expanded="false" signature="6754:6760" ph=" " />  
929 - <marker date="1576201280007" expanded="false" signature="6844:6891" ph="..." />  
930 - <marker date="1576201280007" expanded="false" signature="6893:6899" ph=" " />  
931 - <marker date="1576201280007" expanded="false" signature="6899:6905" ph=" " />  
932 - <marker date="1576201280007" expanded="false" signature="6905:6911" ph=" " />  
933 - <marker date="1576201280007" expanded="false" signature="6911:6917" ph=" " />  
934 - <marker date="1576201280007" expanded="false" signature="6977:7024" ph="..." />  
935 - <marker date="1576201280007" expanded="false" signature="7026:7032" ph=" " />  
936 - <marker date="1576201280007" expanded="false" signature="7032:7038" ph=" " />  
937 - <marker date="1576201280007" expanded="false" signature="7038:7044" ph=" " />  
938 - <marker date="1576201280007" expanded="false" signature="7044:7050" ph=" " />  
939 - <marker date="1576201280007" expanded="false" signature="7234:7281" ph="..." />  
940 - <marker date="1576201280007" expanded="false" signature="7283:7289" ph=" " />  
941 - <marker date="1576201280007" expanded="false" signature="7289:7295" ph=" " />  
942 - <marker date="1576201280007" expanded="false" signature="7295:7301" ph=" " />  
943 - <marker date="1576201280007" expanded="false" signature="7301:7307" ph=" " />  
944 - <marker date="1576201280007" expanded="false" signature="7435:7482" ph="..." />  
945 - <marker date="1576201280007" expanded="false" signature="7484:7490" ph=" " />  
946 - <marker date="1576201280007" expanded="false" signature="7490:7496" ph=" " />  
947 - <marker date="1576201280007" expanded="false" signature="7496:7502" ph=" " />  
948 - <marker date="1576201280007" expanded="false" signature="7502:7508" ph=" " />  
949 - <marker date="1576201280007" expanded="false" signature="7609:7627" ph="..." />  
950 - <marker date="1576201280007" expanded="true" signature="7628:8128" ph="..." />  
951 - <marker date="1576201280007" expanded="false" signature="7656:7722" ph="..." />  
952 - <marker date="1576201280007" expanded="false" signature="7763:7810" ph="..." />  
953 - <marker date="1576201280007" expanded="false" signature="7812:7818" ph=" " />  
954 - <marker date="1576201280007" expanded="false" signature="7818:7824" ph=" " />  
955 - <marker date="1576201280007" expanded="false" signature="7824:7830" ph=" " />  
956 - <marker date="1576201280007" expanded="false" signature="7830:7836" ph=" " />  
957 - <marker date="1576201280007" expanded="false" signature="7948:7995" ph="..." />  
958 - <marker date="1576201280007" expanded="false" signature="7997:8003" ph=" " />  
959 - <marker date="1576201280007" expanded="false" signature="8003:8009" ph=" " />  
960 - <marker date="1576201280007" expanded="false" signature="8009:8015" ph=" " />  
961 - <marker date="1576201280007" expanded="false" signature="8015:8021" ph=" " />  
962 - <marker date="1576201280007" expanded="false" signature="8152:8170" ph="..." />  
963 - <marker date="1576201280007" expanded="true" signature="8171:9171" ph="..." />  
964 - <marker date="1576201280007" expanded="false" signature="8199:8265" ph="..." />  
965 - <marker date="1576201280007" expanded="false" signature="8304:8351" ph="..." />  
966 - <marker date="1576201280007" expanded="false" signature="8353:8359" ph=" " />  
967 - <marker date="1576201280007" expanded="false" signature="8359:8365" ph=" " />  
968 - <marker date="1576201280007" expanded="false" signature="8365:8371" ph=" " />  
969 - <marker date="1576201280007" expanded="false" signature="8371:8377" ph=" " />  
970 - <marker date="1576201280007" expanded="false" signature="8443:8490" ph="..." />  
971 - <marker date="1576201280007" expanded="false" signature="8492:8498" ph=" " />  
972 - <marker date="1576201280007" expanded="false" signature="8498:8504" ph=" " />  
973 - <marker date="1576201280007" expanded="false" signature="8504:8510" ph=" " />  
974 - <marker date="1576201280007" expanded="false" signature="8510:8516" ph=" " />  
975 - <marker date="1576201280007" expanded="false" signature="8573:8620" ph="..." />  
976 - <marker date="1576201280007" expanded="false" signature="8622:8628" ph=" " />  
977 - <marker date="1576201280007" expanded="false" signature="8628:8634" ph=" " />  
978 - <marker date="1576201280007" expanded="false" signature="8634:8640" ph=" " />  
979 - <marker date="1576201280007" expanded="false" signature="8640:8646" ph=" " />  
980 - <marker date="1576201280007" expanded="false" signature="8724:8771" ph="..." />  
981 - <marker date="1576201280007" expanded="false" signature="8773:8779" ph=" " />  
982 - <marker date="1576201280007" expanded="false" signature="8779:8785" ph=" " />  
983 - <marker date="1576201280007" expanded="false" signature="8785:8791" ph=" " />  
984 - <marker date="1576201280007" expanded="false" signature="8791:8797" ph=" " />  
985 - <marker date="1576201280007" expanded="false" signature="8890:8937" ph="..." />  
986 - <marker date="1576201280007" expanded="false" signature="8939:8945" ph=" " />  
987 - <marker date="1576201280007" expanded="false" signature="8945:8951" ph=" " />  
988 - <marker date="1576201280007" expanded="false" signature="8951:8957" ph=" " />  
989 - <marker date="1576201280007" expanded="false" signature="8957:8963" ph=" " />  
990 - <marker date="1576201280007" expanded="false" signature="9037:9084" ph="..." />  
991 - <marker date="1576201280007" expanded="false" signature="9086:9092" ph=" " />  
992 - <marker date="1576201280007" expanded="false" signature="9092:9098" ph=" " />  
993 - <marker date="1576201280007" expanded="false" signature="9098:9104" ph=" " />  
994 - <marker date="1576201280007" expanded="false" signature="9104:9110" ph=" " />  
995 - <marker date="1576201280007" expanded="false" signature="9195:9275" ph="..." />  
996 - <marker date="1576201280007" expanded="false" signature="9336:9416" ph="..." />  
997 - </folding>  
998 - </state>  
999 - </provider>  
1000 - </entry>  
1001 - <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">  
1002 - <provider selected="true" editor-type-id="text-editor">  
1003 - <state relative-caret-position="25">  
1004 - <caret line="1" column="4" lean-forward="true" selection-start-line="1" selection-start-column="4" selection-end-line="6" selection-end-column="10" />  
1005 - <folding />  
1006 - </state>  
1007 - </provider>  
1008 - </entry>  
1009 <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html"> 1014 <entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
1010 <provider selected="true" editor-type-id="text-editor"> 1015 <provider selected="true" editor-type-id="text-editor">
1011 <state relative-caret-position="150"> 1016 <state relative-caret-position="150">
@@ -1022,10 +1027,18 @@ @@ -1022,10 +1027,18 @@
1022 </state> 1027 </state>
1023 </provider> 1028 </provider>
1024 </entry> 1029 </entry>
1025 - <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 1030 + <entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
1026 <provider selected="true" editor-type-id="text-editor"> 1031 <provider selected="true" editor-type-id="text-editor">
1027 <state relative-caret-position="248"> 1032 <state relative-caret-position="248">
1028 - <caret line="1954" column="38" lean-forward="true" selection-start-line="1954" selection-start-column="38" selection-end-line="1954" selection-end-column="38" /> 1033 + <caret line="103" column="4" lean-forward="true" selection-start-line="103" selection-start-column="4" selection-end-line="108" selection-end-column="10" />
  1034 + <folding />
  1035 + </state>
  1036 + </provider>
  1037 + </entry>
  1038 + <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
  1039 + <provider selected="true" editor-type-id="text-editor">
  1040 + <state relative-caret-position="412">
  1041 + <caret line="1960" column="37" lean-forward="true" selection-start-line="1960" selection-start-column="37" selection-end-line="1960" selection-end-column="37" />
1029 <folding> 1042 <folding>
1030 <element signature="e#365#484#0#PHP" expanded="false" /> 1043 <element signature="e#365#484#0#PHP" expanded="false" />
1031 <element signature="e#490#1228#0#PHP" expanded="false" /> 1044 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -1107,5 +1120,209 @@ @@ -1107,5 +1120,209 @@
1107 </state> 1120 </state>
1108 </provider> 1121 </provider>
1109 </entry> 1122 </entry>
  1123 + <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
  1124 + <provider selected="true" editor-type-id="text-editor">
  1125 + <state relative-caret-position="473">
  1126 + <caret line="319" column="34" lean-forward="true" selection-start-line="319" selection-start-column="34" selection-end-line="319" selection-end-column="34" />
  1127 + <folding>
  1128 + <element signature="e#38#68#0#PHP" expanded="true" />
  1129 + <element signature="e#1303#1352#0#PHP" expanded="false" />
  1130 + <element signature="e#10105#10236#0#PHP" expanded="false" />
  1131 + <element signature="e#10241#10839#0#PHP" expanded="false" />
  1132 + <element signature="e#10845#10922#0#PHP" expanded="false" />
  1133 + <element signature="e#10927#15190#0#PHP" expanded="false" />
  1134 + <marker date="1576204149637" expanded="false" signature="1720:9443" ph="..." />
  1135 + <marker date="1576204149637" expanded="false" signature="1738:1873" ph="..." />
  1136 + <marker date="1576204149637" expanded="false" signature="1758:1824" ph="..." />
  1137 + <marker date="1576204149637" expanded="false" signature="1897:1944" ph="..." />
  1138 + <marker date="1576204149637" expanded="false" signature="1945:1983" ph="..." />
  1139 + <marker date="1576204149637" expanded="true" signature="2007:2034" ph="..." />
  1140 + <marker date="1576204149637" expanded="true" signature="2035:2190" ph="..." />
  1141 + <marker date="1576204149637" expanded="true" signature="2191:3278" ph="..." />
  1142 + <marker date="1576204149637" expanded="true" signature="2214:2230" ph="..." />
  1143 + <marker date="1576204149637" expanded="true" signature="2231:3278" ph="..." />
  1144 + <marker date="1576204149637" expanded="true" signature="2257:2284" ph="..." />
  1145 + <marker date="1576204149637" expanded="true" signature="2257:2301" ph="..." />
  1146 + <marker date="1576204149637" expanded="true" signature="2302:2380" ph="..." />
  1147 + <marker date="1576204149637" expanded="true" signature="2332:2344" ph="..." />
  1148 + <marker date="1576204149637" expanded="true" signature="2404:2431" ph="..." />
  1149 + <marker date="1576204149637" expanded="true" signature="2404:2448" ph="..." />
  1150 + <marker date="1576204149637" expanded="true" signature="2449:2527" ph="..." />
  1151 + <marker date="1576204149637" expanded="true" signature="2480:2492" ph="..." />
  1152 + <marker date="1576204149637" expanded="true" signature="2551:2578" ph="..." />
  1153 + <marker date="1576204149637" expanded="true" signature="2551:2595" ph="..." />
  1154 + <marker date="1576204149637" expanded="true" signature="2596:2674" ph="..." />
  1155 + <marker date="1576204149637" expanded="true" signature="2627:2639" ph="..." />
  1156 + <marker date="1576204149637" expanded="true" signature="2698:2725" ph="..." />
  1157 + <marker date="1576204149637" expanded="true" signature="2698:2742" ph="..." />
  1158 + <marker date="1576204149637" expanded="true" signature="2743:2824" ph="..." />
  1159 + <marker date="1576204149637" expanded="true" signature="2774:2786" ph="..." />
  1160 + <marker date="1576204149637" expanded="true" signature="2848:2892" ph="..." />
  1161 + <marker date="1576204149637" expanded="true" signature="2893:2978" ph="..." />
  1162 + <marker date="1576204149637" expanded="true" signature="2925:2937" ph="..." />
  1163 + <marker date="1576204149637" expanded="true" signature="3002:3029" ph="..." />
  1164 + <marker date="1576204149637" expanded="true" signature="3002:3046" ph="..." />
  1165 + <marker date="1576204149637" expanded="true" signature="3047:3129" ph="..." />
  1166 + <marker date="1576204149637" expanded="true" signature="3081:3093" ph="..." />
  1167 + <marker date="1576204149637" expanded="true" signature="3153:3180" ph="..." />
  1168 + <marker date="1576204149637" expanded="true" signature="3153:3197" ph="..." />
  1169 + <marker date="1576204149637" expanded="true" signature="3198:3261" ph="..." />
  1170 + <marker date="1576204149637" expanded="true" signature="3303:3709" ph="..." />
  1171 + <marker date="1576204149637" expanded="false" signature="3331:3397" ph="..." />
  1172 + <marker date="1576204149637" expanded="true" signature="3440:3485" ph="..." />
  1173 + <marker date="1576204149637" expanded="true" signature="3519:3528" ph="..." />
  1174 + <marker date="1576204149637" expanded="false" signature="3571:3580" ph="..." />
  1175 + <marker date="1576204149637" expanded="true" signature="3609:3618" ph="..." />
  1176 + <marker date="1576204149637" expanded="false" signature="3733:3751" ph="..." />
  1177 + <marker date="1576204149637" expanded="true" signature="3752:4068" ph="..." />
  1178 + <marker date="1576204149637" expanded="false" signature="3780:3846" ph="..." />
  1179 + <marker date="1576204149637" expanded="false" signature="3885:3913" ph="..." />
  1180 + <marker date="1576204149637" expanded="true" signature="3915:3921" ph=" " />
  1181 + <marker date="1576204149637" expanded="true" signature="3921:3927" ph=" " />
  1182 + <marker date="1576204149637" expanded="true" signature="3927:3933" ph=" " />
  1183 + <marker date="1576204149637" expanded="true" signature="3933:3939" ph=" " />
  1184 + <marker date="1576204149637" expanded="false" signature="3992:4001" ph="..." />
  1185 + <marker date="1576204149637" expanded="false" signature="4092:4110" ph="..." />
  1186 + <marker date="1576204149637" expanded="true" signature="4111:4470" ph="..." />
  1187 + <marker date="1576204149637" expanded="false" signature="4139:4205" ph="..." />
  1188 + <marker date="1576204149637" expanded="false" signature="4246:4291" ph="..." />
  1189 + <marker date="1576204149637" expanded="false" signature="4293:4299" ph=" " />
  1190 + <marker date="1576204149637" expanded="false" signature="4299:4305" ph=" " />
  1191 + <marker date="1576204149637" expanded="false" signature="4305:4311" ph=" " />
  1192 + <marker date="1576204149637" expanded="false" signature="4311:4317" ph=" " />
  1193 + <marker date="1576204149637" expanded="false" signature="4400:4409" ph="..." />
  1194 + <marker date="1576204149637" expanded="false" signature="4494:4541" ph="..." />
  1195 + <marker date="1576204149637" expanded="false" signature="4543:4549" ph=" " />
  1196 + <marker date="1576204149637" expanded="false" signature="4549:4555" ph=" " />
  1197 + <marker date="1576204149637" expanded="false" signature="4555:4561" ph=" " />
  1198 + <marker date="1576204149637" expanded="false" signature="4561:4567" ph=" " />
  1199 + <marker date="1576204149637" expanded="false" signature="4622:4631" ph="..." />
  1200 + <marker date="1576204149637" expanded="false" signature="4750:4797" ph="..." />
  1201 + <marker date="1576204149637" expanded="false" signature="4799:4805" ph=" " />
  1202 + <marker date="1576204149637" expanded="false" signature="4805:4811" ph=" " />
  1203 + <marker date="1576204149637" expanded="false" signature="4811:4817" ph=" " />
  1204 + <marker date="1576204149637" expanded="false" signature="4817:4823" ph=" " />
  1205 + <marker date="1576204149637" expanded="false" signature="4877:4886" ph="..." />
  1206 + <marker date="1576204149637" expanded="false" signature="4960:4976" ph="..." />
  1207 + <marker date="1576204149637" expanded="false" signature="5029:5076" ph="..." />
  1208 + <marker date="1576204149637" expanded="false" signature="5078:5084" ph=" " />
  1209 + <marker date="1576204149637" expanded="false" signature="5084:5090" ph=" " />
  1210 + <marker date="1576204149637" expanded="false" signature="5090:5096" ph=" " />
  1211 + <marker date="1576204149637" expanded="false" signature="5096:5102" ph=" " />
  1212 + <marker date="1576204149637" expanded="false" signature="5130:5156" ph="..." />
  1213 + <marker date="1576204149637" expanded="false" signature="5242:5260" ph="..." />
  1214 + <marker date="1576204149637" expanded="true" signature="5261:5859" ph="..." />
  1215 + <marker date="1576204149637" expanded="false" signature="5289:5355" ph="..." />
  1216 + <marker date="1576204149637" expanded="false" signature="5394:5441" ph="..." />
  1217 + <marker date="1576204149637" expanded="false" signature="5443:5449" ph=" " />
  1218 + <marker date="1576204149637" expanded="false" signature="5449:5455" ph=" " />
  1219 + <marker date="1576204149637" expanded="false" signature="5455:5461" ph=" " />
  1220 + <marker date="1576204149637" expanded="false" signature="5461:5467" ph=" " />
  1221 + <marker date="1576204149637" expanded="false" signature="5552:5599" ph="..." />
  1222 + <marker date="1576204149637" expanded="false" signature="5601:5607" ph=" " />
  1223 + <marker date="1576204149637" expanded="false" signature="5607:5613" ph=" " />
  1224 + <marker date="1576204149637" expanded="false" signature="5613:5619" ph=" " />
  1225 + <marker date="1576204149637" expanded="false" signature="5619:5625" ph=" " />
  1226 + <marker date="1576204149637" expanded="false" signature="5726:5773" ph="..." />
  1227 + <marker date="1576204149637" expanded="false" signature="5775:5781" ph=" " />
  1228 + <marker date="1576204149637" expanded="false" signature="5781:5787" ph=" " />
  1229 + <marker date="1576204149637" expanded="false" signature="5787:5793" ph=" " />
  1230 + <marker date="1576204149637" expanded="false" signature="5793:5799" ph=" " />
  1231 + <marker date="1576204149637" expanded="false" signature="5883:5901" ph="..." />
  1232 + <marker date="1576204149637" expanded="true" signature="5902:7585" ph="..." />
  1233 + <marker date="1576204149637" expanded="false" signature="5930:5996" ph="..." />
  1234 + <marker date="1576204149637" expanded="true" signature="6035:6082" ph="..." />
  1235 + <marker date="1576204149637" expanded="false" signature="6084:6090" ph=" " />
  1236 + <marker date="1576204149637" expanded="false" signature="6090:6096" ph=" " />
  1237 + <marker date="1576204149637" expanded="false" signature="6096:6102" ph=" " />
  1238 + <marker date="1576204149637" expanded="false" signature="6102:6108" ph=" " />
  1239 + <marker date="1576204149637" expanded="false" signature="6134:6150" ph="..." />
  1240 + <marker date="1576204149637" expanded="true" signature="6270:6317" ph="..." />
  1241 + <marker date="1576204149637" expanded="false" signature="6319:6325" ph=" " />
  1242 + <marker date="1576204149637" expanded="false" signature="6325:6331" ph=" " />
  1243 + <marker date="1576204149637" expanded="false" signature="6331:6337" ph=" " />
  1244 + <marker date="1576204149637" expanded="false" signature="6337:6343" ph=" " />
  1245 + <marker date="1576204149637" expanded="true" signature="6495:6542" ph="..." />
  1246 + <marker date="1576204149637" expanded="false" signature="6544:6550" ph=" " />
  1247 + <marker date="1576204149637" expanded="false" signature="6550:6556" ph=" " />
  1248 + <marker date="1576204149637" expanded="false" signature="6556:6562" ph=" " />
  1249 + <marker date="1576204149637" expanded="false" signature="6562:6568" ph=" " />
  1250 + <marker date="1576204149637" expanded="false" signature="6687:6734" ph="..." />
  1251 + <marker date="1576204149637" expanded="false" signature="6736:6742" ph=" " />
  1252 + <marker date="1576204149637" expanded="false" signature="6742:6748" ph=" " />
  1253 + <marker date="1576204149637" expanded="false" signature="6748:6754" ph=" " />
  1254 + <marker date="1576204149637" expanded="false" signature="6754:6760" ph=" " />
  1255 + <marker date="1576204149637" expanded="false" signature="6844:6891" ph="..." />
  1256 + <marker date="1576204149637" expanded="false" signature="6893:6899" ph=" " />
  1257 + <marker date="1576204149637" expanded="false" signature="6899:6905" ph=" " />
  1258 + <marker date="1576204149637" expanded="false" signature="6905:6911" ph=" " />
  1259 + <marker date="1576204149637" expanded="false" signature="6911:6917" ph=" " />
  1260 + <marker date="1576204149637" expanded="false" signature="6977:7024" ph="..." />
  1261 + <marker date="1576204149637" expanded="false" signature="7026:7032" ph=" " />
  1262 + <marker date="1576204149637" expanded="false" signature="7032:7038" ph=" " />
  1263 + <marker date="1576204149637" expanded="false" signature="7038:7044" ph=" " />
  1264 + <marker date="1576204149637" expanded="false" signature="7044:7050" ph=" " />
  1265 + <marker date="1576204149637" expanded="false" signature="7234:7281" ph="..." />
  1266 + <marker date="1576204149637" expanded="false" signature="7283:7289" ph=" " />
  1267 + <marker date="1576204149637" expanded="false" signature="7289:7295" ph=" " />
  1268 + <marker date="1576204149637" expanded="false" signature="7295:7301" ph=" " />
  1269 + <marker date="1576204149637" expanded="false" signature="7301:7307" ph=" " />
  1270 + <marker date="1576204149637" expanded="false" signature="7435:7482" ph="..." />
  1271 + <marker date="1576204149637" expanded="false" signature="7484:7490" ph=" " />
  1272 + <marker date="1576204149637" expanded="false" signature="7490:7496" ph=" " />
  1273 + <marker date="1576204149637" expanded="false" signature="7496:7502" ph=" " />
  1274 + <marker date="1576204149637" expanded="false" signature="7502:7508" ph=" " />
  1275 + <marker date="1576204149637" expanded="false" signature="7609:7627" ph="..." />
  1276 + <marker date="1576204149637" expanded="true" signature="7628:8128" ph="..." />
  1277 + <marker date="1576204149637" expanded="false" signature="7656:7722" ph="..." />
  1278 + <marker date="1576204149637" expanded="false" signature="7763:7810" ph="..." />
  1279 + <marker date="1576204149637" expanded="false" signature="7812:7818" ph=" " />
  1280 + <marker date="1576204149637" expanded="false" signature="7818:7824" ph=" " />
  1281 + <marker date="1576204149637" expanded="false" signature="7824:7830" ph=" " />
  1282 + <marker date="1576204149637" expanded="false" signature="7830:7836" ph=" " />
  1283 + <marker date="1576204149637" expanded="false" signature="7948:7995" ph="..." />
  1284 + <marker date="1576204149637" expanded="false" signature="7997:8003" ph=" " />
  1285 + <marker date="1576204149637" expanded="false" signature="8003:8009" ph=" " />
  1286 + <marker date="1576204149637" expanded="false" signature="8009:8015" ph=" " />
  1287 + <marker date="1576204149637" expanded="false" signature="8015:8021" ph=" " />
  1288 + <marker date="1576204149637" expanded="false" signature="8152:8170" ph="..." />
  1289 + <marker date="1576204149637" expanded="true" signature="8171:9171" ph="..." />
  1290 + <marker date="1576204149637" expanded="false" signature="8199:8265" ph="..." />
  1291 + <marker date="1576204149637" expanded="false" signature="8304:8351" ph="..." />
  1292 + <marker date="1576204149637" expanded="false" signature="8353:8359" ph=" " />
  1293 + <marker date="1576204149637" expanded="false" signature="8359:8365" ph=" " />
  1294 + <marker date="1576204149637" expanded="false" signature="8365:8371" ph=" " />
  1295 + <marker date="1576204149637" expanded="false" signature="8371:8377" ph=" " />
  1296 + <marker date="1576204149637" expanded="false" signature="8443:8490" ph="..." />
  1297 + <marker date="1576204149637" expanded="false" signature="8492:8498" ph=" " />
  1298 + <marker date="1576204149637" expanded="false" signature="8498:8504" ph=" " />
  1299 + <marker date="1576204149637" expanded="false" signature="8504:8510" ph=" " />
  1300 + <marker date="1576204149637" expanded="false" signature="8510:8516" ph=" " />
  1301 + <marker date="1576204149637" expanded="false" signature="8573:8620" ph="..." />
  1302 + <marker date="1576204149637" expanded="false" signature="8622:8628" ph=" " />
  1303 + <marker date="1576204149637" expanded="false" signature="8628:8634" ph=" " />
  1304 + <marker date="1576204149637" expanded="false" signature="8634:8640" ph=" " />
  1305 + <marker date="1576204149637" expanded="false" signature="8640:8646" ph=" " />
  1306 + <marker date="1576204149637" expanded="false" signature="8724:8771" ph="..." />
  1307 + <marker date="1576204149637" expanded="false" signature="8773:8779" ph=" " />
  1308 + <marker date="1576204149637" expanded="false" signature="8779:8785" ph=" " />
  1309 + <marker date="1576204149637" expanded="false" signature="8785:8791" ph=" " />
  1310 + <marker date="1576204149637" expanded="false" signature="8791:8797" ph=" " />
  1311 + <marker date="1576204149637" expanded="false" signature="8890:8937" ph="..." />
  1312 + <marker date="1576204149637" expanded="false" signature="8939:8945" ph=" " />
  1313 + <marker date="1576204149637" expanded="false" signature="8945:8951" ph=" " />
  1314 + <marker date="1576204149637" expanded="false" signature="8951:8957" ph=" " />
  1315 + <marker date="1576204149637" expanded="false" signature="8957:8963" ph=" " />
  1316 + <marker date="1576204149637" expanded="false" signature="9037:9084" ph="..." />
  1317 + <marker date="1576204149637" expanded="false" signature="9086:9092" ph=" " />
  1318 + <marker date="1576204149637" expanded="false" signature="9092:9098" ph=" " />
  1319 + <marker date="1576204149637" expanded="false" signature="9098:9104" ph=" " />
  1320 + <marker date="1576204149637" expanded="false" signature="9104:9110" ph=" " />
  1321 + <marker date="1576204149637" expanded="false" signature="9195:9275" ph="..." />
  1322 + <marker date="1576204149637" expanded="false" signature="9336:9416" ph="..." />
  1323 + </folding>
  1324 + </state>
  1325 + </provider>
  1326 + </entry>
1110 </component> 1327 </component>
1111 </project> 1328 </project>
@@ -317,9 +317,8 @@ class Common extends Api @@ -317,9 +317,8 @@ class Common extends Api
317 $mail->AltBody = '如果邮件客户端不支持HTML则显示此内容'; 317 $mail->AltBody = '如果邮件客户端不支持HTML则显示此内容';
318 318
319 $mail->send(); 319 $mail->send();
320 - echo '邮件发送成功';  
321 } catch (Exception $e) { 320 } catch (Exception $e) {
322 - echo '邮件发送失败: ', $mail->ErrorInfo; 321 +
323 } 322 }
324 } 323 }
325 } 324 }