diff --git a/.idea/workspace.xml b/.idea/workspace.xml index e65d69a..f9c7926 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Common.php" afterPath="$PROJECT_DIR$/application/api/controller/Common.php" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -15,212 +13,212 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="Common.php" pinned="false" current-in-tab="false"> + <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="314"> - <caret line="150" column="76" lean-forward="true" selection-start-line="150" selection-start-column="76" selection-end-line="150" selection-end-column="76" /> + <state relative-caret-position="364"> + <caret line="152" column="39" lean-forward="true" selection-start-line="152" selection-start-column="39" selection-end-line="152" selection-end-column="39" /> <folding> <element signature="e#38#68#0#PHP" expanded="true" /> <element signature="e#1222#1271#0#PHP" expanded="false" /> - <element signature="e#9898#10029#0#PHP" expanded="false" /> - <element signature="e#10034#10632#0#PHP" expanded="false" /> - <element signature="e#10638#10715#0#PHP" expanded="false" /> - <element signature="e#10720#14983#0#PHP" expanded="false" /> - <marker date="1575942586437" expanded="true" signature="1639:9267" ph="..." /> - <marker date="1575942586437" expanded="false" signature="1657:1792" ph="..." /> - <marker date="1575942586437" expanded="false" signature="1677:1743" ph="..." /> - <marker date="1575942586437" expanded="false" signature="1816:1863" ph="..." /> - <marker date="1575942586437" expanded="false" signature="1864:1902" ph="..." /> - <marker date="1575942586437" expanded="true" signature="1926:1973" ph="..." /> - <marker date="1575942586437" expanded="true" signature="1974:2129" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2153:2172" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2173:3073" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2228:2275" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2228:2276" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2228:2311" ph="..." /> - <marker date="1575942586437" expanded="false" signature="2261:2273" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2366:2414" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2366:2415" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2366:2449" ph="..." /> - <marker date="1575942586437" expanded="false" signature="2400:2412" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2504:2551" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2504:2552" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2504:2586" ph="..." /> - <marker date="1575942586437" expanded="false" signature="2537:2549" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2641:2689" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2641:2746" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2641:2787" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2675:2687" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2728:2744" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2842:2896" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2842:2932" ph="..." /> - <marker date="1575942586437" expanded="false" signature="2883:2895" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2987:3056" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3097:3115" ph="..." /> - <marker date="1575942586437" expanded="true" signature="3116:3533" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3144:3210" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3253:3298" ph="..." /> - <marker date="1575942586437" expanded="true" signature="3300:3306" ph=" " /> - <marker date="1575942586437" expanded="true" signature="3306:3312" ph=" " /> - <marker date="1575942586437" expanded="true" signature="3312:3318" ph=" " /> - <marker date="1575942586437" expanded="true" signature="3318:3324" ph=" " /> - <marker date="1575942586437" expanded="false" signature="3343:3352" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3395:3404" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3433:3442" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3557:3575" ph="..." /> - <marker date="1575942586437" expanded="true" signature="3576:3892" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3604:3670" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3709:3737" ph="..." /> - <marker date="1575942586437" expanded="true" signature="3739:3745" ph=" " /> - <marker date="1575942586437" expanded="true" signature="3745:3751" ph=" " /> - <marker date="1575942586437" expanded="true" signature="3751:3757" ph=" " /> - <marker date="1575942586437" expanded="true" signature="3757:3763" ph=" " /> - <marker date="1575942586437" expanded="false" signature="3816:3825" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3916:3934" ph="..." /> - <marker date="1575942586437" expanded="true" signature="3935:4294" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3963:4029" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4070:4115" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4117:4123" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4123:4129" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4129:4135" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4135:4141" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4224:4233" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4318:4365" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4367:4373" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4373:4379" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4379:4385" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4385:4391" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4446:4455" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4574:4621" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4623:4629" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4629:4635" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4635:4641" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4641:4647" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4701:4710" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4784:4800" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4853:4900" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4902:4908" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4908:4914" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4914:4920" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4920:4926" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4954:4980" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5066:5084" ph="..." /> - <marker date="1575942586437" expanded="true" signature="5085:5683" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5113:5179" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5218:5265" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5267:5273" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5273:5279" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5279:5285" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5285:5291" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5376:5423" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5425:5431" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5431:5437" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5437:5443" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5443:5449" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5550:5597" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5599:5605" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5605:5611" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5611:5617" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5617:5623" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5707:5725" ph="..." /> - <marker date="1575942586437" expanded="true" signature="5726:7409" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5754:5820" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5859:5906" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5908:5914" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5914:5920" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5920:5926" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5926:5932" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5958:5974" ph="..." /> - <marker date="1575942586437" expanded="false" signature="6094:6141" ph="..." /> - <marker date="1575942586437" expanded="false" signature="6143:6149" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6149:6155" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6155:6161" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6161:6167" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6319:6366" ph="..." /> - <marker date="1575942586437" expanded="false" signature="6368:6374" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6374:6380" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6380:6386" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6386:6392" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6511:6558" ph="..." /> - <marker date="1575942586437" expanded="false" signature="6560:6566" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6566:6572" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6572:6578" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6578:6584" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6668:6715" ph="..." /> - <marker date="1575942586437" expanded="false" signature="6717:6723" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6723:6729" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6729:6735" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6735:6741" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6801:6848" ph="..." /> - <marker date="1575942586437" expanded="false" signature="6850:6856" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6856:6862" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6862:6868" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6868:6874" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7058:7105" ph="..." /> - <marker date="1575942586437" expanded="false" signature="7107:7113" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7113:7119" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7119:7125" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7125:7131" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7259:7306" ph="..." /> - <marker date="1575942586437" expanded="false" signature="7308:7314" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7314:7320" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7320:7326" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7326:7332" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7433:7451" ph="..." /> - <marker date="1575942586437" expanded="true" signature="7452:7952" ph="..." /> - <marker date="1575942586437" expanded="false" signature="7480:7546" ph="..." /> - <marker date="1575942586437" expanded="false" signature="7587:7634" ph="..." /> - <marker date="1575942586437" expanded="false" signature="7636:7642" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7642:7648" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7648:7654" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7654:7660" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7772:7819" ph="..." /> - <marker date="1575942586437" expanded="false" signature="7821:7827" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7827:7833" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7833:7839" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7839:7845" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7976:7994" ph="..." /> - <marker date="1575942586437" expanded="true" signature="7995:8995" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8023:8089" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8128:8175" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8177:8183" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8183:8189" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8189:8195" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8195:8201" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8267:8314" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8316:8322" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8322:8328" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8328:8334" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8334:8340" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8397:8444" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8446:8452" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8452:8458" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8458:8464" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8464:8470" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8548:8595" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8597:8603" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8603:8609" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8609:8615" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8615:8621" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8714:8761" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8763:8769" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8769:8775" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8775:8781" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8781:8787" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8861:8908" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8910:8916" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8916:8922" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8922:8928" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8928:8934" ph=" " /> - <marker date="1575942586437" expanded="false" signature="9019:9099" ph="..." /> - <marker date="1575942586437" expanded="false" signature="9160:9240" ph="..." /> + <element signature="e#9891#10022#0#PHP" expanded="false" /> + <element signature="e#10027#10625#0#PHP" expanded="false" /> + <element signature="e#10631#10708#0#PHP" expanded="false" /> + <element signature="e#10713#14976#0#PHP" expanded="false" /> + <marker date="1575942949956" expanded="true" signature="1639:9267" ph="..." /> + <marker date="1575942949956" expanded="false" signature="1657:1792" ph="..." /> + <marker date="1575942949956" expanded="false" signature="1677:1743" ph="..." /> + <marker date="1575942949956" expanded="false" signature="1816:1863" ph="..." /> + <marker date="1575942949956" expanded="false" signature="1864:1902" ph="..." /> + <marker date="1575942949956" expanded="true" signature="1926:1973" ph="..." /> + <marker date="1575942949956" expanded="true" signature="1974:2129" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2153:2172" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2173:3073" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2228:2275" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2228:2276" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2228:2311" ph="..." /> + <marker date="1575942949956" expanded="false" signature="2261:2273" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2366:2414" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2366:2415" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2366:2449" ph="..." /> + <marker date="1575942949956" expanded="false" signature="2400:2412" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2504:2551" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2504:2552" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2504:2586" ph="..." /> + <marker date="1575942949956" expanded="false" signature="2537:2549" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2641:2689" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2641:2746" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2641:2787" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2675:2687" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2728:2744" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2842:2896" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2842:2932" ph="..." /> + <marker date="1575942949956" expanded="false" signature="2883:2895" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2987:3056" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3097:3115" ph="..." /> + <marker date="1575942949956" expanded="true" signature="3116:3533" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3144:3210" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3253:3298" ph="..." /> + <marker date="1575942949956" expanded="true" signature="3300:3306" ph=" " /> + <marker date="1575942949956" expanded="true" signature="3306:3312" ph=" " /> + <marker date="1575942949956" expanded="true" signature="3312:3318" ph=" " /> + <marker date="1575942949956" expanded="true" signature="3318:3324" ph=" " /> + <marker date="1575942949956" expanded="false" signature="3343:3352" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3395:3404" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3433:3442" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3557:3575" ph="..." /> + <marker date="1575942949956" expanded="true" signature="3576:3892" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3604:3670" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3709:3737" ph="..." /> + <marker date="1575942949956" expanded="true" signature="3739:3745" ph=" " /> + <marker date="1575942949956" expanded="true" signature="3745:3751" ph=" " /> + <marker date="1575942949956" expanded="true" signature="3751:3757" ph=" " /> + <marker date="1575942949956" expanded="true" signature="3757:3763" ph=" " /> + <marker date="1575942949956" expanded="false" signature="3816:3825" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3916:3934" ph="..." /> + <marker date="1575942949956" expanded="true" signature="3935:4294" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3963:4029" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4070:4115" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4117:4123" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4123:4129" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4129:4135" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4135:4141" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4224:4233" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4318:4365" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4367:4373" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4373:4379" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4379:4385" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4385:4391" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4446:4455" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4574:4621" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4623:4629" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4629:4635" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4635:4641" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4641:4647" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4701:4710" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4784:4800" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4853:4900" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4902:4908" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4908:4914" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4914:4920" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4920:4926" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4954:4980" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5066:5084" ph="..." /> + <marker date="1575942949956" expanded="true" signature="5085:5683" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5113:5179" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5218:5265" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5267:5273" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5273:5279" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5279:5285" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5285:5291" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5376:5423" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5425:5431" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5431:5437" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5437:5443" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5443:5449" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5550:5597" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5599:5605" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5605:5611" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5611:5617" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5617:5623" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5707:5725" ph="..." /> + <marker date="1575942949956" expanded="true" signature="5726:7409" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5754:5820" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5859:5906" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5908:5914" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5914:5920" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5920:5926" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5926:5932" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5958:5974" ph="..." /> + <marker date="1575942949956" expanded="false" signature="6094:6141" ph="..." /> + <marker date="1575942949956" expanded="false" signature="6143:6149" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6149:6155" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6155:6161" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6161:6167" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6319:6366" ph="..." /> + <marker date="1575942949956" expanded="false" signature="6368:6374" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6374:6380" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6380:6386" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6386:6392" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6511:6558" ph="..." /> + <marker date="1575942949956" expanded="false" signature="6560:6566" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6566:6572" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6572:6578" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6578:6584" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6668:6715" ph="..." /> + <marker date="1575942949956" expanded="false" signature="6717:6723" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6723:6729" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6729:6735" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6735:6741" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6801:6848" ph="..." /> + <marker date="1575942949956" expanded="false" signature="6850:6856" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6856:6862" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6862:6868" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6868:6874" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7058:7105" ph="..." /> + <marker date="1575942949956" expanded="false" signature="7107:7113" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7113:7119" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7119:7125" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7125:7131" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7259:7306" ph="..." /> + <marker date="1575942949956" expanded="false" signature="7308:7314" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7314:7320" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7320:7326" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7326:7332" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7433:7451" ph="..." /> + <marker date="1575942949956" expanded="true" signature="7452:7952" ph="..." /> + <marker date="1575942949956" expanded="false" signature="7480:7546" ph="..." /> + <marker date="1575942949956" expanded="false" signature="7587:7634" ph="..." /> + <marker date="1575942949956" expanded="false" signature="7636:7642" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7642:7648" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7648:7654" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7654:7660" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7772:7819" ph="..." /> + <marker date="1575942949956" expanded="false" signature="7821:7827" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7827:7833" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7833:7839" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7839:7845" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7976:7994" ph="..." /> + <marker date="1575942949956" expanded="true" signature="7995:8995" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8023:8089" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8128:8175" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8177:8183" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8183:8189" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8189:8195" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8195:8201" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8267:8314" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8316:8322" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8322:8328" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8328:8334" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8334:8340" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8397:8444" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8446:8452" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8452:8458" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8458:8464" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8464:8470" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8548:8595" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8597:8603" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8603:8609" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8609:8615" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8615:8621" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8714:8761" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8763:8769" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8769:8775" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8775:8781" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8781:8787" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8861:8908" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8910:8916" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8916:8922" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8922:8928" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8928:8934" ph=" " /> + <marker date="1575942949956" expanded="false" signature="9019:9099" ph="..." /> + <marker date="1575942949956" expanded="false" signature="9160:9240" ph="..." /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> + <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="428"> @@ -382,8 +380,8 @@ <option value="$PROJECT_DIR$/application/admin/view/order/shou.html" /> <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" /> - <option value="$PROJECT_DIR$/application/api/controller/Common.php" /> <option value="$PROJECT_DIR$/application/api/controller/User.php" /> + <option value="$PROJECT_DIR$/application/api/controller/Common.php" /> </list> </option> </component> @@ -402,8 +400,8 @@ </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> <component name="ProjectFrameBounds" extendedState="1"> - <option name="x" value="373" /> - <option name="y" value="87" /> + <option name="x" value="263" /> + <option name="y" value="61" /> <option name="width" value="1464" /> <option name="height" value="940" /> </component> @@ -434,17 +432,6 @@ <path> <item name="areial" type="b2602c69:ProjectViewProjectNode" /> <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> - </path> - <path> - <item name="areial" type="b2602c69:ProjectViewProjectNode" /> - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> - </path> - <path> - <item name="areial" type="b2602c69:ProjectViewProjectNode" /> - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> </path> <path> @@ -547,7 +534,7 @@ <workItem from="1575851041026" duration="14741000" /> <workItem from="1575874863361" duration="5705000" /> <workItem from="1575880737237" duration="12885000" /> - <workItem from="1575937244447" duration="5041000" /> + <workItem from="1575937244447" duration="5359000" /> </task> <task id="LOCAL-00001" summary="调试"> <created>1574145133364</created> @@ -574,7 +561,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="378839000" /> + <option name="totallyTimeSpent" value="379157000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -586,7 +573,7 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="373" y="87" width="1464" height="940" extended-state="1" /> + <frame x="263" y="61" width="1464" height="940" 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.22507122" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> @@ -1213,209 +1200,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="314"> - <caret line="150" column="76" lean-forward="true" selection-start-line="150" selection-start-column="76" selection-end-line="150" selection-end-column="76" /> - <folding> - <element signature="e#38#68#0#PHP" expanded="true" /> - <element signature="e#1222#1271#0#PHP" expanded="false" /> - <element signature="e#9898#10029#0#PHP" expanded="false" /> - <element signature="e#10034#10632#0#PHP" expanded="false" /> - <element signature="e#10638#10715#0#PHP" expanded="false" /> - <element signature="e#10720#14983#0#PHP" expanded="false" /> - <marker date="1575942586437" expanded="true" signature="1639:9267" ph="..." /> - <marker date="1575942586437" expanded="false" signature="1657:1792" ph="..." /> - <marker date="1575942586437" expanded="false" signature="1677:1743" ph="..." /> - <marker date="1575942586437" expanded="false" signature="1816:1863" ph="..." /> - <marker date="1575942586437" expanded="false" signature="1864:1902" ph="..." /> - <marker date="1575942586437" expanded="true" signature="1926:1973" ph="..." /> - <marker date="1575942586437" expanded="true" signature="1974:2129" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2153:2172" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2173:3073" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2228:2275" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2228:2276" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2228:2311" ph="..." /> - <marker date="1575942586437" expanded="false" signature="2261:2273" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2366:2414" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2366:2415" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2366:2449" ph="..." /> - <marker date="1575942586437" expanded="false" signature="2400:2412" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2504:2551" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2504:2552" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2504:2586" ph="..." /> - <marker date="1575942586437" expanded="false" signature="2537:2549" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2641:2689" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2641:2746" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2641:2787" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2675:2687" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2728:2744" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2842:2896" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2842:2932" ph="..." /> - <marker date="1575942586437" expanded="false" signature="2883:2895" ph="..." /> - <marker date="1575942586437" expanded="true" signature="2987:3056" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3097:3115" ph="..." /> - <marker date="1575942586437" expanded="true" signature="3116:3533" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3144:3210" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3253:3298" ph="..." /> - <marker date="1575942586437" expanded="true" signature="3300:3306" ph=" " /> - <marker date="1575942586437" expanded="true" signature="3306:3312" ph=" " /> - <marker date="1575942586437" expanded="true" signature="3312:3318" ph=" " /> - <marker date="1575942586437" expanded="true" signature="3318:3324" ph=" " /> - <marker date="1575942586437" expanded="false" signature="3343:3352" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3395:3404" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3433:3442" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3557:3575" ph="..." /> - <marker date="1575942586437" expanded="true" signature="3576:3892" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3604:3670" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3709:3737" ph="..." /> - <marker date="1575942586437" expanded="true" signature="3739:3745" ph=" " /> - <marker date="1575942586437" expanded="true" signature="3745:3751" ph=" " /> - <marker date="1575942586437" expanded="true" signature="3751:3757" ph=" " /> - <marker date="1575942586437" expanded="true" signature="3757:3763" ph=" " /> - <marker date="1575942586437" expanded="false" signature="3816:3825" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3916:3934" ph="..." /> - <marker date="1575942586437" expanded="true" signature="3935:4294" ph="..." /> - <marker date="1575942586437" expanded="false" signature="3963:4029" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4070:4115" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4117:4123" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4123:4129" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4129:4135" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4135:4141" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4224:4233" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4318:4365" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4367:4373" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4373:4379" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4379:4385" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4385:4391" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4446:4455" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4574:4621" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4623:4629" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4629:4635" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4635:4641" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4641:4647" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4701:4710" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4784:4800" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4853:4900" ph="..." /> - <marker date="1575942586437" expanded="false" signature="4902:4908" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4908:4914" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4914:4920" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4920:4926" ph=" " /> - <marker date="1575942586437" expanded="false" signature="4954:4980" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5066:5084" ph="..." /> - <marker date="1575942586437" expanded="true" signature="5085:5683" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5113:5179" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5218:5265" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5267:5273" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5273:5279" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5279:5285" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5285:5291" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5376:5423" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5425:5431" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5431:5437" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5437:5443" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5443:5449" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5550:5597" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5599:5605" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5605:5611" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5611:5617" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5617:5623" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5707:5725" ph="..." /> - <marker date="1575942586437" expanded="true" signature="5726:7409" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5754:5820" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5859:5906" ph="..." /> - <marker date="1575942586437" expanded="false" signature="5908:5914" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5914:5920" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5920:5926" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5926:5932" ph=" " /> - <marker date="1575942586437" expanded="false" signature="5958:5974" ph="..." /> - <marker date="1575942586437" expanded="false" signature="6094:6141" ph="..." /> - <marker date="1575942586437" expanded="false" signature="6143:6149" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6149:6155" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6155:6161" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6161:6167" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6319:6366" ph="..." /> - <marker date="1575942586437" expanded="false" signature="6368:6374" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6374:6380" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6380:6386" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6386:6392" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6511:6558" ph="..." /> - <marker date="1575942586437" expanded="false" signature="6560:6566" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6566:6572" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6572:6578" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6578:6584" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6668:6715" ph="..." /> - <marker date="1575942586437" expanded="false" signature="6717:6723" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6723:6729" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6729:6735" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6735:6741" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6801:6848" ph="..." /> - <marker date="1575942586437" expanded="false" signature="6850:6856" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6856:6862" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6862:6868" ph=" " /> - <marker date="1575942586437" expanded="false" signature="6868:6874" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7058:7105" ph="..." /> - <marker date="1575942586437" expanded="false" signature="7107:7113" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7113:7119" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7119:7125" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7125:7131" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7259:7306" ph="..." /> - <marker date="1575942586437" expanded="false" signature="7308:7314" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7314:7320" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7320:7326" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7326:7332" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7433:7451" ph="..." /> - <marker date="1575942586437" expanded="true" signature="7452:7952" ph="..." /> - <marker date="1575942586437" expanded="false" signature="7480:7546" ph="..." /> - <marker date="1575942586437" expanded="false" signature="7587:7634" ph="..." /> - <marker date="1575942586437" expanded="false" signature="7636:7642" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7642:7648" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7648:7654" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7654:7660" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7772:7819" ph="..." /> - <marker date="1575942586437" expanded="false" signature="7821:7827" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7827:7833" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7833:7839" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7839:7845" ph=" " /> - <marker date="1575942586437" expanded="false" signature="7976:7994" ph="..." /> - <marker date="1575942586437" expanded="true" signature="7995:8995" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8023:8089" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8128:8175" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8177:8183" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8183:8189" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8189:8195" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8195:8201" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8267:8314" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8316:8322" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8322:8328" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8328:8334" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8334:8340" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8397:8444" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8446:8452" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8452:8458" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8458:8464" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8464:8470" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8548:8595" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8597:8603" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8603:8609" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8609:8615" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8615:8621" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8714:8761" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8763:8769" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8769:8775" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8775:8781" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8781:8787" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8861:8908" ph="..." /> - <marker date="1575942586437" expanded="false" signature="8910:8916" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8916:8922" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8922:8928" ph=" " /> - <marker date="1575942586437" expanded="false" signature="8928:8934" ph=" " /> - <marker date="1575942586437" expanded="false" signature="9019:9099" ph="..." /> - <marker date="1575942586437" expanded="false" signature="9160:9240" ph="..." /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="428"> @@ -1498,5 +1282,208 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="364"> + <caret line="152" column="39" lean-forward="true" selection-start-line="152" selection-start-column="39" selection-end-line="152" selection-end-column="39" /> + <folding> + <element signature="e#38#68#0#PHP" expanded="true" /> + <element signature="e#1222#1271#0#PHP" expanded="false" /> + <element signature="e#9891#10022#0#PHP" expanded="false" /> + <element signature="e#10027#10625#0#PHP" expanded="false" /> + <element signature="e#10631#10708#0#PHP" expanded="false" /> + <element signature="e#10713#14976#0#PHP" expanded="false" /> + <marker date="1575942949956" expanded="true" signature="1639:9267" ph="..." /> + <marker date="1575942949956" expanded="false" signature="1657:1792" ph="..." /> + <marker date="1575942949956" expanded="false" signature="1677:1743" ph="..." /> + <marker date="1575942949956" expanded="false" signature="1816:1863" ph="..." /> + <marker date="1575942949956" expanded="false" signature="1864:1902" ph="..." /> + <marker date="1575942949956" expanded="true" signature="1926:1973" ph="..." /> + <marker date="1575942949956" expanded="true" signature="1974:2129" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2153:2172" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2173:3073" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2228:2275" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2228:2276" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2228:2311" ph="..." /> + <marker date="1575942949956" expanded="false" signature="2261:2273" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2366:2414" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2366:2415" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2366:2449" ph="..." /> + <marker date="1575942949956" expanded="false" signature="2400:2412" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2504:2551" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2504:2552" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2504:2586" ph="..." /> + <marker date="1575942949956" expanded="false" signature="2537:2549" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2641:2689" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2641:2746" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2641:2787" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2675:2687" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2728:2744" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2842:2896" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2842:2932" ph="..." /> + <marker date="1575942949956" expanded="false" signature="2883:2895" ph="..." /> + <marker date="1575942949956" expanded="true" signature="2987:3056" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3097:3115" ph="..." /> + <marker date="1575942949956" expanded="true" signature="3116:3533" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3144:3210" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3253:3298" ph="..." /> + <marker date="1575942949956" expanded="true" signature="3300:3306" ph=" " /> + <marker date="1575942949956" expanded="true" signature="3306:3312" ph=" " /> + <marker date="1575942949956" expanded="true" signature="3312:3318" ph=" " /> + <marker date="1575942949956" expanded="true" signature="3318:3324" ph=" " /> + <marker date="1575942949956" expanded="false" signature="3343:3352" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3395:3404" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3433:3442" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3557:3575" ph="..." /> + <marker date="1575942949956" expanded="true" signature="3576:3892" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3604:3670" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3709:3737" ph="..." /> + <marker date="1575942949956" expanded="true" signature="3739:3745" ph=" " /> + <marker date="1575942949956" expanded="true" signature="3745:3751" ph=" " /> + <marker date="1575942949956" expanded="true" signature="3751:3757" ph=" " /> + <marker date="1575942949956" expanded="true" signature="3757:3763" ph=" " /> + <marker date="1575942949956" expanded="false" signature="3816:3825" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3916:3934" ph="..." /> + <marker date="1575942949956" expanded="true" signature="3935:4294" ph="..." /> + <marker date="1575942949956" expanded="false" signature="3963:4029" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4070:4115" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4117:4123" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4123:4129" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4129:4135" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4135:4141" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4224:4233" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4318:4365" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4367:4373" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4373:4379" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4379:4385" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4385:4391" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4446:4455" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4574:4621" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4623:4629" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4629:4635" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4635:4641" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4641:4647" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4701:4710" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4784:4800" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4853:4900" ph="..." /> + <marker date="1575942949956" expanded="false" signature="4902:4908" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4908:4914" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4914:4920" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4920:4926" ph=" " /> + <marker date="1575942949956" expanded="false" signature="4954:4980" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5066:5084" ph="..." /> + <marker date="1575942949956" expanded="true" signature="5085:5683" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5113:5179" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5218:5265" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5267:5273" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5273:5279" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5279:5285" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5285:5291" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5376:5423" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5425:5431" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5431:5437" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5437:5443" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5443:5449" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5550:5597" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5599:5605" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5605:5611" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5611:5617" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5617:5623" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5707:5725" ph="..." /> + <marker date="1575942949956" expanded="true" signature="5726:7409" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5754:5820" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5859:5906" ph="..." /> + <marker date="1575942949956" expanded="false" signature="5908:5914" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5914:5920" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5920:5926" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5926:5932" ph=" " /> + <marker date="1575942949956" expanded="false" signature="5958:5974" ph="..." /> + <marker date="1575942949956" expanded="false" signature="6094:6141" ph="..." /> + <marker date="1575942949956" expanded="false" signature="6143:6149" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6149:6155" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6155:6161" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6161:6167" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6319:6366" ph="..." /> + <marker date="1575942949956" expanded="false" signature="6368:6374" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6374:6380" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6380:6386" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6386:6392" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6511:6558" ph="..." /> + <marker date="1575942949956" expanded="false" signature="6560:6566" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6566:6572" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6572:6578" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6578:6584" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6668:6715" ph="..." /> + <marker date="1575942949956" expanded="false" signature="6717:6723" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6723:6729" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6729:6735" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6735:6741" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6801:6848" ph="..." /> + <marker date="1575942949956" expanded="false" signature="6850:6856" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6856:6862" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6862:6868" ph=" " /> + <marker date="1575942949956" expanded="false" signature="6868:6874" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7058:7105" ph="..." /> + <marker date="1575942949956" expanded="false" signature="7107:7113" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7113:7119" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7119:7125" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7125:7131" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7259:7306" ph="..." /> + <marker date="1575942949956" expanded="false" signature="7308:7314" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7314:7320" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7320:7326" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7326:7332" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7433:7451" ph="..." /> + <marker date="1575942949956" expanded="true" signature="7452:7952" ph="..." /> + <marker date="1575942949956" expanded="false" signature="7480:7546" ph="..." /> + <marker date="1575942949956" expanded="false" signature="7587:7634" ph="..." /> + <marker date="1575942949956" expanded="false" signature="7636:7642" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7642:7648" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7648:7654" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7654:7660" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7772:7819" ph="..." /> + <marker date="1575942949956" expanded="false" signature="7821:7827" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7827:7833" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7833:7839" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7839:7845" ph=" " /> + <marker date="1575942949956" expanded="false" signature="7976:7994" ph="..." /> + <marker date="1575942949956" expanded="true" signature="7995:8995" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8023:8089" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8128:8175" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8177:8183" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8183:8189" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8189:8195" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8195:8201" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8267:8314" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8316:8322" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8322:8328" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8328:8334" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8334:8340" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8397:8444" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8446:8452" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8452:8458" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8458:8464" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8464:8470" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8548:8595" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8597:8603" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8603:8609" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8609:8615" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8615:8621" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8714:8761" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8763:8769" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8769:8775" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8775:8781" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8781:8787" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8861:8908" ph="..." /> + <marker date="1575942949956" expanded="false" signature="8910:8916" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8916:8922" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8922:8928" ph=" " /> + <marker date="1575942949956" expanded="false" signature="8928:8934" ph=" " /> + <marker date="1575942949956" expanded="false" signature="9019:9099" ph="..." /> + <marker date="1575942949956" expanded="false" signature="9160:9240" ph="..." /> + </folding> + </state> + </provider> + </entry> </component> </project> \ No newline at end of file diff --git a/application/api/controller/Common.php b/application/api/controller/Common.php index 873469a..eb5c985 100644 --- a/application/api/controller/Common.php +++ b/application/api/controller/Common.php @@ -149,7 +149,7 @@ class Common extends Api ob_clean(); $pdf->Output(ROOT_PATH.'public'.DS.'pdf'.DS.$order_num.'.pdf', 'F'); - $url = 'https://areial.w.broing.cn'.'/public/pdf/'.$order_num.'.pdf'; + $url = 'https://areial.w.broing.cn'.'/pdf/'.$order_num.'.pdf'; $this->success('success',$url); // var_dump($pdf);exit; exit;