From bad51114cc9e56cf3ad6f4e1cb237ba425936bcd Mon Sep 17 00:00:00 2001 From: guosheng <gs@bronet.cn> Date: Fri, 13 Dec 2019 09:42:06 +0800 Subject: [PATCH] 修改邮箱配置 --- .idea/workspace.xml | 775 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- application/api/controller/Common.php | 8 ++++---- public/pdf/2019121299974848,2019121210057100.pdf | Bin 333497 -> 0 bytes 3 files changed, 392 insertions(+), 391 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 018e2ea..4120fa8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,7 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/pdf/2019121299974848,2019121210057100.pdf" afterPath="$PROJECT_DIR$/public/pdf/2019121299974848,2019121210057100.pdf" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Common.php" afterPath="$PROJECT_DIR$/application/api/controller/Common.php" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -103,8 +104,8 @@ <file leaf-file-name="Common.php" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="400"> - <caret line="313" column="65" lean-forward="false" selection-start-line="313" selection-start-column="65" selection-end-line="313" selection-end-column="65" /> + <state relative-caret-position="98"> + <caret line="302" column="57" lean-forward="true" selection-start-line="302" selection-start-column="57" selection-end-line="302" selection-end-column="57" /> <folding> <element signature="e#38#68#0#PHP" expanded="true" /> <element signature="e#1303#1352#0#PHP" expanded="false" /> @@ -112,195 +113,195 @@ <element signature="e#10241#10839#0#PHP" expanded="false" /> <element signature="e#10845#10922#0#PHP" expanded="false" /> <element signature="e#10927#15190#0#PHP" expanded="false" /> - <marker date="1576200329735" expanded="false" signature="1720:9443" ph="..." /> - <marker date="1576200329735" expanded="false" signature="1738:1873" ph="..." /> - <marker date="1576200329735" expanded="false" signature="1758:1824" ph="..." /> - <marker date="1576200329735" expanded="false" signature="1897:1944" ph="..." /> - <marker date="1576200329735" expanded="false" signature="1945:1983" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2007:2034" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2035:2190" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2191:3278" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2214:2230" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2231:3278" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2257:2284" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2257:2301" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2302:2380" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2332:2344" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2404:2431" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2404:2448" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2449:2527" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2480:2492" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2551:2578" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2551:2595" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2596:2674" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2627:2639" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2698:2725" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2698:2742" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2743:2824" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2774:2786" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2848:2892" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2893:2978" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2925:2937" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3002:3029" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3002:3046" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3047:3129" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3081:3093" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3153:3180" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3153:3197" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3198:3261" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3303:3709" ph="..." /> - <marker date="1576200329735" expanded="false" signature="3331:3397" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3440:3485" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3519:3528" ph="..." /> - <marker date="1576200329735" expanded="false" signature="3571:3580" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3609:3618" ph="..." /> - <marker date="1576200329735" expanded="false" signature="3733:3751" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3752:4068" ph="..." /> - <marker date="1576200329735" expanded="false" signature="3780:3846" ph="..." /> - <marker date="1576200329735" expanded="false" signature="3885:3913" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3915:3921" ph=" " /> - <marker date="1576200329735" expanded="true" signature="3921:3927" ph=" " /> - <marker date="1576200329735" expanded="true" signature="3927:3933" ph=" " /> - <marker date="1576200329735" expanded="true" signature="3933:3939" ph=" " /> - <marker date="1576200329735" expanded="false" signature="3992:4001" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4092:4110" ph="..." /> - <marker date="1576200329735" expanded="true" signature="4111:4470" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4139:4205" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4246:4291" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4293:4299" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4299:4305" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4305:4311" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4311:4317" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4400:4409" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4494:4541" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4543:4549" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4549:4555" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4555:4561" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4561:4567" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4622:4631" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4750:4797" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4799:4805" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4805:4811" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4811:4817" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4817:4823" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4877:4886" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4960:4976" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5029:5076" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5078:5084" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5084:5090" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5090:5096" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5096:5102" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5130:5156" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5242:5260" ph="..." /> - <marker date="1576200329735" expanded="true" signature="5261:5859" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5289:5355" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5394:5441" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5443:5449" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5449:5455" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5455:5461" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5461:5467" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5552:5599" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5601:5607" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5607:5613" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5613:5619" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5619:5625" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5726:5773" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5775:5781" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5781:5787" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5787:5793" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5793:5799" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5883:5901" ph="..." /> - <marker date="1576200329735" expanded="true" signature="5902:7585" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5930:5996" ph="..." /> - <marker date="1576200329735" expanded="true" signature="6035:6082" ph="..." /> - <marker date="1576200329735" expanded="false" signature="6084:6090" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6090:6096" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6096:6102" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6102:6108" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6134:6150" ph="..." /> - <marker date="1576200329735" expanded="true" signature="6270:6317" ph="..." /> - <marker date="1576200329735" expanded="false" signature="6319:6325" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6325:6331" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6331:6337" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6337:6343" ph=" " /> - <marker date="1576200329735" expanded="true" signature="6495:6542" ph="..." /> - <marker date="1576200329735" expanded="false" signature="6544:6550" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6550:6556" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6556:6562" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6562:6568" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6687:6734" ph="..." /> - <marker date="1576200329735" expanded="false" signature="6736:6742" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6742:6748" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6748:6754" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6754:6760" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6844:6891" ph="..." /> - <marker date="1576200329735" expanded="false" signature="6893:6899" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6899:6905" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6905:6911" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6911:6917" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6977:7024" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7026:7032" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7032:7038" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7038:7044" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7044:7050" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7234:7281" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7283:7289" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7289:7295" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7295:7301" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7301:7307" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7435:7482" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7484:7490" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7490:7496" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7496:7502" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7502:7508" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7609:7627" ph="..." /> - <marker date="1576200329735" expanded="true" signature="7628:8128" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7656:7722" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7763:7810" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7812:7818" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7818:7824" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7824:7830" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7830:7836" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7948:7995" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7997:8003" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8003:8009" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8009:8015" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8015:8021" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8152:8170" ph="..." /> - <marker date="1576200329735" expanded="true" signature="8171:9171" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8199:8265" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8304:8351" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8353:8359" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8359:8365" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8365:8371" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8371:8377" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8443:8490" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8492:8498" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8498:8504" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8504:8510" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8510:8516" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8573:8620" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8622:8628" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8628:8634" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8634:8640" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8640:8646" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8724:8771" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8773:8779" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8779:8785" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8785:8791" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8791:8797" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8890:8937" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8939:8945" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8945:8951" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8951:8957" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8957:8963" ph=" " /> - <marker date="1576200329735" expanded="false" signature="9037:9084" ph="..." /> - <marker date="1576200329735" expanded="false" signature="9086:9092" ph=" " /> - <marker date="1576200329735" expanded="false" signature="9092:9098" ph=" " /> - <marker date="1576200329735" expanded="false" signature="9098:9104" ph=" " /> - <marker date="1576200329735" expanded="false" signature="9104:9110" ph=" " /> - <marker date="1576200329735" expanded="false" signature="9195:9275" ph="..." /> - <marker date="1576200329735" expanded="false" signature="9336:9416" ph="..." /> + <marker date="1576201280007" expanded="false" signature="1720:9443" ph="..." /> + <marker date="1576201280007" expanded="false" signature="1738:1873" ph="..." /> + <marker date="1576201280007" expanded="false" signature="1758:1824" ph="..." /> + <marker date="1576201280007" expanded="false" signature="1897:1944" ph="..." /> + <marker date="1576201280007" expanded="false" signature="1945:1983" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2007:2034" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2035:2190" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2191:3278" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2214:2230" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2231:3278" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2257:2284" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2257:2301" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2302:2380" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2332:2344" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2404:2431" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2404:2448" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2449:2527" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2480:2492" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2551:2578" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2551:2595" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2596:2674" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2627:2639" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2698:2725" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2698:2742" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2743:2824" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2774:2786" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2848:2892" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2893:2978" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2925:2937" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3002:3029" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3002:3046" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3047:3129" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3081:3093" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3153:3180" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3153:3197" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3198:3261" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3303:3709" ph="..." /> + <marker date="1576201280007" expanded="false" signature="3331:3397" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3440:3485" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3519:3528" ph="..." /> + <marker date="1576201280007" expanded="false" signature="3571:3580" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3609:3618" ph="..." /> + <marker date="1576201280007" expanded="false" signature="3733:3751" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3752:4068" ph="..." /> + <marker date="1576201280007" expanded="false" signature="3780:3846" ph="..." /> + <marker date="1576201280007" expanded="false" signature="3885:3913" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3915:3921" ph=" " /> + <marker date="1576201280007" expanded="true" signature="3921:3927" ph=" " /> + <marker date="1576201280007" expanded="true" signature="3927:3933" ph=" " /> + <marker date="1576201280007" expanded="true" signature="3933:3939" ph=" " /> + <marker date="1576201280007" expanded="false" signature="3992:4001" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4092:4110" ph="..." /> + <marker date="1576201280007" expanded="true" signature="4111:4470" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4139:4205" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4246:4291" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4293:4299" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4299:4305" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4305:4311" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4311:4317" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4400:4409" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4494:4541" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4543:4549" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4549:4555" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4555:4561" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4561:4567" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4622:4631" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4750:4797" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4799:4805" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4805:4811" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4811:4817" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4817:4823" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4877:4886" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4960:4976" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5029:5076" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5078:5084" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5084:5090" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5090:5096" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5096:5102" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5130:5156" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5242:5260" ph="..." /> + <marker date="1576201280007" expanded="true" signature="5261:5859" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5289:5355" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5394:5441" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5443:5449" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5449:5455" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5455:5461" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5461:5467" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5552:5599" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5601:5607" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5607:5613" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5613:5619" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5619:5625" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5726:5773" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5775:5781" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5781:5787" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5787:5793" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5793:5799" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5883:5901" ph="..." /> + <marker date="1576201280007" expanded="true" signature="5902:7585" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5930:5996" ph="..." /> + <marker date="1576201280007" expanded="true" signature="6035:6082" ph="..." /> + <marker date="1576201280007" expanded="false" signature="6084:6090" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6090:6096" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6096:6102" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6102:6108" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6134:6150" ph="..." /> + <marker date="1576201280007" expanded="true" signature="6270:6317" ph="..." /> + <marker date="1576201280007" expanded="false" signature="6319:6325" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6325:6331" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6331:6337" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6337:6343" ph=" " /> + <marker date="1576201280007" expanded="true" signature="6495:6542" ph="..." /> + <marker date="1576201280007" expanded="false" signature="6544:6550" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6550:6556" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6556:6562" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6562:6568" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6687:6734" ph="..." /> + <marker date="1576201280007" expanded="false" signature="6736:6742" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6742:6748" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6748:6754" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6754:6760" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6844:6891" ph="..." /> + <marker date="1576201280007" expanded="false" signature="6893:6899" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6899:6905" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6905:6911" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6911:6917" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6977:7024" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7026:7032" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7032:7038" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7038:7044" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7044:7050" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7234:7281" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7283:7289" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7289:7295" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7295:7301" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7301:7307" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7435:7482" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7484:7490" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7490:7496" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7496:7502" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7502:7508" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7609:7627" ph="..." /> + <marker date="1576201280007" expanded="true" signature="7628:8128" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7656:7722" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7763:7810" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7812:7818" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7818:7824" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7824:7830" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7830:7836" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7948:7995" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7997:8003" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8003:8009" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8009:8015" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8015:8021" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8152:8170" ph="..." /> + <marker date="1576201280007" expanded="true" signature="8171:9171" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8199:8265" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8304:8351" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8353:8359" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8359:8365" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8365:8371" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8371:8377" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8443:8490" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8492:8498" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8498:8504" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8504:8510" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8510:8516" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8573:8620" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8622:8628" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8628:8634" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8634:8640" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8640:8646" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8724:8771" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8773:8779" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8779:8785" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8785:8791" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8791:8797" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8890:8937" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8939:8945" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8945:8951" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8951:8957" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8957:8963" ph=" " /> + <marker date="1576201280007" expanded="false" signature="9037:9084" ph="..." /> + <marker date="1576201280007" expanded="false" signature="9086:9092" ph=" " /> + <marker date="1576201280007" expanded="false" signature="9092:9098" ph=" " /> + <marker date="1576201280007" expanded="false" signature="9098:9104" ph=" " /> + <marker date="1576201280007" expanded="false" signature="9104:9110" ph=" " /> + <marker date="1576201280007" expanded="false" signature="9195:9275" ph="..." /> + <marker date="1576201280007" expanded="false" signature="9336:9416" ph="..." /> </folding> </state> </provider> @@ -404,8 +405,8 @@ </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> <component name="ProjectFrameBounds" extendedState="1"> - <option name="x" value="330" /> - <option name="y" value="61" /> + <option name="x" value="226" /> + <option name="y" value="218" /> <option name="width" value="1578" /> <option name="height" value="949" /> </component> @@ -558,7 +559,7 @@ <workItem from="1576128183316" duration="7364000" /> <workItem from="1576135696788" duration="17540000" /> <workItem from="1576153922472" duration="9154000" /> - <workItem from="1576196503707" duration="3344000" /> + <workItem from="1576196503707" duration="4309000" /> </task> <task id="LOCAL-00001" summary="调试"> <created>1574145133364</created> @@ -585,7 +586,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="427636000" /> + <option name="totallyTimeSpent" value="428601000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -597,7 +598,7 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="330" y="61" width="1578" height="949" extended-state="1" /> + <frame x="226" y="218" width="1578" height="949" extended-state="1" /> <editor active="true" /> <layout> <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" /> @@ -1113,8 +1114,8 @@ </entry> <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="400"> - <caret line="313" column="65" lean-forward="false" selection-start-line="313" selection-start-column="65" selection-end-line="313" selection-end-column="65" /> + <state relative-caret-position="98"> + <caret line="302" column="57" lean-forward="true" selection-start-line="302" selection-start-column="57" selection-end-line="302" selection-end-column="57" /> <folding> <element signature="e#38#68#0#PHP" expanded="true" /> <element signature="e#1303#1352#0#PHP" expanded="false" /> @@ -1122,195 +1123,195 @@ <element signature="e#10241#10839#0#PHP" expanded="false" /> <element signature="e#10845#10922#0#PHP" expanded="false" /> <element signature="e#10927#15190#0#PHP" expanded="false" /> - <marker date="1576200329735" expanded="false" signature="1720:9443" ph="..." /> - <marker date="1576200329735" expanded="false" signature="1738:1873" ph="..." /> - <marker date="1576200329735" expanded="false" signature="1758:1824" ph="..." /> - <marker date="1576200329735" expanded="false" signature="1897:1944" ph="..." /> - <marker date="1576200329735" expanded="false" signature="1945:1983" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2007:2034" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2035:2190" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2191:3278" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2214:2230" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2231:3278" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2257:2284" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2257:2301" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2302:2380" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2332:2344" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2404:2431" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2404:2448" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2449:2527" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2480:2492" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2551:2578" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2551:2595" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2596:2674" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2627:2639" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2698:2725" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2698:2742" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2743:2824" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2774:2786" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2848:2892" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2893:2978" ph="..." /> - <marker date="1576200329735" expanded="true" signature="2925:2937" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3002:3029" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3002:3046" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3047:3129" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3081:3093" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3153:3180" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3153:3197" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3198:3261" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3303:3709" ph="..." /> - <marker date="1576200329735" expanded="false" signature="3331:3397" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3440:3485" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3519:3528" ph="..." /> - <marker date="1576200329735" expanded="false" signature="3571:3580" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3609:3618" ph="..." /> - <marker date="1576200329735" expanded="false" signature="3733:3751" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3752:4068" ph="..." /> - <marker date="1576200329735" expanded="false" signature="3780:3846" ph="..." /> - <marker date="1576200329735" expanded="false" signature="3885:3913" ph="..." /> - <marker date="1576200329735" expanded="true" signature="3915:3921" ph=" " /> - <marker date="1576200329735" expanded="true" signature="3921:3927" ph=" " /> - <marker date="1576200329735" expanded="true" signature="3927:3933" ph=" " /> - <marker date="1576200329735" expanded="true" signature="3933:3939" ph=" " /> - <marker date="1576200329735" expanded="false" signature="3992:4001" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4092:4110" ph="..." /> - <marker date="1576200329735" expanded="true" signature="4111:4470" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4139:4205" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4246:4291" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4293:4299" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4299:4305" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4305:4311" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4311:4317" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4400:4409" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4494:4541" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4543:4549" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4549:4555" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4555:4561" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4561:4567" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4622:4631" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4750:4797" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4799:4805" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4805:4811" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4811:4817" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4817:4823" ph=" " /> - <marker date="1576200329735" expanded="false" signature="4877:4886" ph="..." /> - <marker date="1576200329735" expanded="false" signature="4960:4976" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5029:5076" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5078:5084" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5084:5090" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5090:5096" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5096:5102" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5130:5156" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5242:5260" ph="..." /> - <marker date="1576200329735" expanded="true" signature="5261:5859" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5289:5355" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5394:5441" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5443:5449" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5449:5455" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5455:5461" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5461:5467" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5552:5599" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5601:5607" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5607:5613" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5613:5619" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5619:5625" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5726:5773" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5775:5781" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5781:5787" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5787:5793" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5793:5799" ph=" " /> - <marker date="1576200329735" expanded="false" signature="5883:5901" ph="..." /> - <marker date="1576200329735" expanded="true" signature="5902:7585" ph="..." /> - <marker date="1576200329735" expanded="false" signature="5930:5996" ph="..." /> - <marker date="1576200329735" expanded="true" signature="6035:6082" ph="..." /> - <marker date="1576200329735" expanded="false" signature="6084:6090" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6090:6096" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6096:6102" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6102:6108" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6134:6150" ph="..." /> - <marker date="1576200329735" expanded="true" signature="6270:6317" ph="..." /> - <marker date="1576200329735" expanded="false" signature="6319:6325" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6325:6331" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6331:6337" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6337:6343" ph=" " /> - <marker date="1576200329735" expanded="true" signature="6495:6542" ph="..." /> - <marker date="1576200329735" expanded="false" signature="6544:6550" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6550:6556" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6556:6562" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6562:6568" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6687:6734" ph="..." /> - <marker date="1576200329735" expanded="false" signature="6736:6742" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6742:6748" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6748:6754" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6754:6760" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6844:6891" ph="..." /> - <marker date="1576200329735" expanded="false" signature="6893:6899" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6899:6905" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6905:6911" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6911:6917" ph=" " /> - <marker date="1576200329735" expanded="false" signature="6977:7024" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7026:7032" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7032:7038" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7038:7044" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7044:7050" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7234:7281" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7283:7289" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7289:7295" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7295:7301" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7301:7307" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7435:7482" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7484:7490" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7490:7496" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7496:7502" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7502:7508" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7609:7627" ph="..." /> - <marker date="1576200329735" expanded="true" signature="7628:8128" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7656:7722" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7763:7810" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7812:7818" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7818:7824" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7824:7830" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7830:7836" ph=" " /> - <marker date="1576200329735" expanded="false" signature="7948:7995" ph="..." /> - <marker date="1576200329735" expanded="false" signature="7997:8003" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8003:8009" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8009:8015" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8015:8021" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8152:8170" ph="..." /> - <marker date="1576200329735" expanded="true" signature="8171:9171" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8199:8265" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8304:8351" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8353:8359" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8359:8365" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8365:8371" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8371:8377" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8443:8490" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8492:8498" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8498:8504" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8504:8510" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8510:8516" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8573:8620" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8622:8628" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8628:8634" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8634:8640" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8640:8646" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8724:8771" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8773:8779" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8779:8785" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8785:8791" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8791:8797" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8890:8937" ph="..." /> - <marker date="1576200329735" expanded="false" signature="8939:8945" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8945:8951" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8951:8957" ph=" " /> - <marker date="1576200329735" expanded="false" signature="8957:8963" ph=" " /> - <marker date="1576200329735" expanded="false" signature="9037:9084" ph="..." /> - <marker date="1576200329735" expanded="false" signature="9086:9092" ph=" " /> - <marker date="1576200329735" expanded="false" signature="9092:9098" ph=" " /> - <marker date="1576200329735" expanded="false" signature="9098:9104" ph=" " /> - <marker date="1576200329735" expanded="false" signature="9104:9110" ph=" " /> - <marker date="1576200329735" expanded="false" signature="9195:9275" ph="..." /> - <marker date="1576200329735" expanded="false" signature="9336:9416" ph="..." /> + <marker date="1576201280007" expanded="false" signature="1720:9443" ph="..." /> + <marker date="1576201280007" expanded="false" signature="1738:1873" ph="..." /> + <marker date="1576201280007" expanded="false" signature="1758:1824" ph="..." /> + <marker date="1576201280007" expanded="false" signature="1897:1944" ph="..." /> + <marker date="1576201280007" expanded="false" signature="1945:1983" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2007:2034" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2035:2190" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2191:3278" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2214:2230" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2231:3278" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2257:2284" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2257:2301" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2302:2380" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2332:2344" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2404:2431" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2404:2448" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2449:2527" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2480:2492" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2551:2578" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2551:2595" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2596:2674" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2627:2639" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2698:2725" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2698:2742" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2743:2824" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2774:2786" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2848:2892" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2893:2978" ph="..." /> + <marker date="1576201280007" expanded="true" signature="2925:2937" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3002:3029" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3002:3046" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3047:3129" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3081:3093" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3153:3180" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3153:3197" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3198:3261" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3303:3709" ph="..." /> + <marker date="1576201280007" expanded="false" signature="3331:3397" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3440:3485" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3519:3528" ph="..." /> + <marker date="1576201280007" expanded="false" signature="3571:3580" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3609:3618" ph="..." /> + <marker date="1576201280007" expanded="false" signature="3733:3751" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3752:4068" ph="..." /> + <marker date="1576201280007" expanded="false" signature="3780:3846" ph="..." /> + <marker date="1576201280007" expanded="false" signature="3885:3913" ph="..." /> + <marker date="1576201280007" expanded="true" signature="3915:3921" ph=" " /> + <marker date="1576201280007" expanded="true" signature="3921:3927" ph=" " /> + <marker date="1576201280007" expanded="true" signature="3927:3933" ph=" " /> + <marker date="1576201280007" expanded="true" signature="3933:3939" ph=" " /> + <marker date="1576201280007" expanded="false" signature="3992:4001" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4092:4110" ph="..." /> + <marker date="1576201280007" expanded="true" signature="4111:4470" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4139:4205" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4246:4291" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4293:4299" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4299:4305" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4305:4311" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4311:4317" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4400:4409" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4494:4541" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4543:4549" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4549:4555" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4555:4561" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4561:4567" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4622:4631" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4750:4797" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4799:4805" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4805:4811" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4811:4817" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4817:4823" ph=" " /> + <marker date="1576201280007" expanded="false" signature="4877:4886" ph="..." /> + <marker date="1576201280007" expanded="false" signature="4960:4976" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5029:5076" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5078:5084" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5084:5090" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5090:5096" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5096:5102" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5130:5156" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5242:5260" ph="..." /> + <marker date="1576201280007" expanded="true" signature="5261:5859" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5289:5355" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5394:5441" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5443:5449" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5449:5455" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5455:5461" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5461:5467" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5552:5599" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5601:5607" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5607:5613" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5613:5619" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5619:5625" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5726:5773" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5775:5781" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5781:5787" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5787:5793" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5793:5799" ph=" " /> + <marker date="1576201280007" expanded="false" signature="5883:5901" ph="..." /> + <marker date="1576201280007" expanded="true" signature="5902:7585" ph="..." /> + <marker date="1576201280007" expanded="false" signature="5930:5996" ph="..." /> + <marker date="1576201280007" expanded="true" signature="6035:6082" ph="..." /> + <marker date="1576201280007" expanded="false" signature="6084:6090" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6090:6096" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6096:6102" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6102:6108" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6134:6150" ph="..." /> + <marker date="1576201280007" expanded="true" signature="6270:6317" ph="..." /> + <marker date="1576201280007" expanded="false" signature="6319:6325" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6325:6331" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6331:6337" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6337:6343" ph=" " /> + <marker date="1576201280007" expanded="true" signature="6495:6542" ph="..." /> + <marker date="1576201280007" expanded="false" signature="6544:6550" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6550:6556" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6556:6562" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6562:6568" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6687:6734" ph="..." /> + <marker date="1576201280007" expanded="false" signature="6736:6742" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6742:6748" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6748:6754" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6754:6760" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6844:6891" ph="..." /> + <marker date="1576201280007" expanded="false" signature="6893:6899" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6899:6905" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6905:6911" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6911:6917" ph=" " /> + <marker date="1576201280007" expanded="false" signature="6977:7024" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7026:7032" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7032:7038" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7038:7044" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7044:7050" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7234:7281" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7283:7289" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7289:7295" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7295:7301" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7301:7307" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7435:7482" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7484:7490" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7490:7496" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7496:7502" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7502:7508" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7609:7627" ph="..." /> + <marker date="1576201280007" expanded="true" signature="7628:8128" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7656:7722" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7763:7810" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7812:7818" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7818:7824" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7824:7830" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7830:7836" ph=" " /> + <marker date="1576201280007" expanded="false" signature="7948:7995" ph="..." /> + <marker date="1576201280007" expanded="false" signature="7997:8003" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8003:8009" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8009:8015" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8015:8021" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8152:8170" ph="..." /> + <marker date="1576201280007" expanded="true" signature="8171:9171" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8199:8265" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8304:8351" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8353:8359" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8359:8365" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8365:8371" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8371:8377" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8443:8490" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8492:8498" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8498:8504" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8504:8510" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8510:8516" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8573:8620" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8622:8628" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8628:8634" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8634:8640" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8640:8646" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8724:8771" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8773:8779" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8779:8785" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8785:8791" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8791:8797" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8890:8937" ph="..." /> + <marker date="1576201280007" expanded="false" signature="8939:8945" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8945:8951" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8951:8957" ph=" " /> + <marker date="1576201280007" expanded="false" signature="8957:8963" ph=" " /> + <marker date="1576201280007" expanded="false" signature="9037:9084" ph="..." /> + <marker date="1576201280007" expanded="false" signature="9086:9092" ph=" " /> + <marker date="1576201280007" expanded="false" signature="9092:9098" ph=" " /> + <marker date="1576201280007" expanded="false" signature="9098:9104" ph=" " /> + <marker date="1576201280007" expanded="false" signature="9104:9110" ph=" " /> + <marker date="1576201280007" expanded="false" signature="9195:9275" ph="..." /> + <marker date="1576201280007" expanded="false" signature="9336:9416" ph="..." /> </folding> </state> </provider> diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php index 756c4bd..9f4443f 100644 --- a/application/api/controller/Common.php +++ b/application/api/controller/Common.php @@ -294,15 +294,15 @@ class Common extends Api $mail->isSMTP(); // 使用SMTP $mail->Host = 'smtp.163.com'; // SMTP服务器 $mail->SMTPAuth = true; // 允许 SMTP 认证 - $mail->Username = '18511199763@163.com'; // SMTP 用户名 即邮箱的用户名 - $mail->Password = 'gs1073991919'; // SMTP 密码 部分邮箱是授权码(例如163邮箱) + $mail->Username = 'lh865157660@163.com'; // SMTP 用户名 即邮箱的用户名 + $mail->Password = 'root123456'; // SMTP 密码 部分邮箱是授权码(例如163邮箱) $mail->SMTPSecure = 'ssl'; // 允许 TLS 或者ssl协议 $mail->Port = 465; // 服务器端口 25 或者465 具体要看邮箱服务器支持 - $mail->setFrom('18511199763@163.com', 'Mailer'); //发件人 + $mail->setFrom('lh865157660@163.com', 'Mailer'); //发件人 $mail->addAddress($addressee, 'Joe'); // 收件人 //$mail->addAddress('ellen@example.com'); // 可添加多个收件人 - $mail->addReplyTo('18511199763@163.com', 'info'); //回复的时候回复给哪个邮箱 建议和发件人一致 + $mail->addReplyTo('lh865157660@163.com', 'info'); //回复的时候回复给哪个邮箱 建议和发件人一致 //$mail->addCC('cc@example.com'); //抄送 //$mail->addBCC('bcc@example.com'); //密送 diff --git a/public/pdf/2019121299974848,2019121210057100.pdf b/public/pdf/2019121299974848,2019121210057100.pdf index 81195b6..48293b6 100644 Binary files a/public/pdf/2019121299974848,2019121210057100.pdf and b/public/pdf/2019121299974848,2019121210057100.pdf differ -- libgit2 0.24.0