正在显示
2 个修改的文件
包含
406 行增加
和
419 行删除
@@ -2,9 +2,7 @@ | @@ -2,9 +2,7 @@ | ||
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> | 4 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> |
5 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
6 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Common.php" afterPath="$PROJECT_DIR$/application/api/controller/Common.php" /> | 5 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Common.php" afterPath="$PROJECT_DIR$/application/api/controller/Common.php" /> |
7 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> | ||
8 | </list> | 6 | </list> |
9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
10 | <option name="TRACKING_ENABLED" value="true" /> | 8 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -15,212 +13,212 @@ | @@ -15,212 +13,212 @@ | ||
15 | </component> | 13 | </component> |
16 | <component name="FileEditorManager"> | 14 | <component name="FileEditorManager"> |
17 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 15 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
18 | - <file leaf-file-name="Common.php" pinned="false" current-in-tab="false"> | 16 | + <file leaf-file-name="Common.php" pinned="false" current-in-tab="true"> |
19 | <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php"> | 17 | <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php"> |
20 | <provider selected="true" editor-type-id="text-editor"> | 18 | <provider selected="true" editor-type-id="text-editor"> |
21 | - <state relative-caret-position="314"> | ||
22 | - <caret line="150" column="76" lean-forward="true" selection-start-line="150" selection-start-column="76" selection-end-line="150" selection-end-column="76" /> | 19 | + <state relative-caret-position="364"> |
20 | + <caret line="152" column="39" lean-forward="true" selection-start-line="152" selection-start-column="39" selection-end-line="152" selection-end-column="39" /> | ||
23 | <folding> | 21 | <folding> |
24 | <element signature="e#38#68#0#PHP" expanded="true" /> | 22 | <element signature="e#38#68#0#PHP" expanded="true" /> |
25 | <element signature="e#1222#1271#0#PHP" expanded="false" /> | 23 | <element signature="e#1222#1271#0#PHP" expanded="false" /> |
26 | - <element signature="e#9898#10029#0#PHP" expanded="false" /> | ||
27 | - <element signature="e#10034#10632#0#PHP" expanded="false" /> | ||
28 | - <element signature="e#10638#10715#0#PHP" expanded="false" /> | ||
29 | - <element signature="e#10720#14983#0#PHP" expanded="false" /> | ||
30 | - <marker date="1575942586437" expanded="true" signature="1639:9267" ph="..." /> | ||
31 | - <marker date="1575942586437" expanded="false" signature="1657:1792" ph="..." /> | ||
32 | - <marker date="1575942586437" expanded="false" signature="1677:1743" ph="..." /> | ||
33 | - <marker date="1575942586437" expanded="false" signature="1816:1863" ph="..." /> | ||
34 | - <marker date="1575942586437" expanded="false" signature="1864:1902" ph="..." /> | ||
35 | - <marker date="1575942586437" expanded="true" signature="1926:1973" ph="..." /> | ||
36 | - <marker date="1575942586437" expanded="true" signature="1974:2129" ph="..." /> | ||
37 | - <marker date="1575942586437" expanded="true" signature="2153:2172" ph="..." /> | ||
38 | - <marker date="1575942586437" expanded="true" signature="2173:3073" ph="..." /> | ||
39 | - <marker date="1575942586437" expanded="true" signature="2228:2275" ph="..." /> | ||
40 | - <marker date="1575942586437" expanded="true" signature="2228:2276" ph="..." /> | ||
41 | - <marker date="1575942586437" expanded="true" signature="2228:2311" ph="..." /> | ||
42 | - <marker date="1575942586437" expanded="false" signature="2261:2273" ph="..." /> | ||
43 | - <marker date="1575942586437" expanded="true" signature="2366:2414" ph="..." /> | ||
44 | - <marker date="1575942586437" expanded="true" signature="2366:2415" ph="..." /> | ||
45 | - <marker date="1575942586437" expanded="true" signature="2366:2449" ph="..." /> | ||
46 | - <marker date="1575942586437" expanded="false" signature="2400:2412" ph="..." /> | ||
47 | - <marker date="1575942586437" expanded="true" signature="2504:2551" ph="..." /> | ||
48 | - <marker date="1575942586437" expanded="true" signature="2504:2552" ph="..." /> | ||
49 | - <marker date="1575942586437" expanded="true" signature="2504:2586" ph="..." /> | ||
50 | - <marker date="1575942586437" expanded="false" signature="2537:2549" ph="..." /> | ||
51 | - <marker date="1575942586437" expanded="true" signature="2641:2689" ph="..." /> | ||
52 | - <marker date="1575942586437" expanded="true" signature="2641:2746" ph="..." /> | ||
53 | - <marker date="1575942586437" expanded="true" signature="2641:2787" ph="..." /> | ||
54 | - <marker date="1575942586437" expanded="true" signature="2675:2687" ph="..." /> | ||
55 | - <marker date="1575942586437" expanded="true" signature="2728:2744" ph="..." /> | ||
56 | - <marker date="1575942586437" expanded="true" signature="2842:2896" ph="..." /> | ||
57 | - <marker date="1575942586437" expanded="true" signature="2842:2932" ph="..." /> | ||
58 | - <marker date="1575942586437" expanded="false" signature="2883:2895" ph="..." /> | ||
59 | - <marker date="1575942586437" expanded="true" signature="2987:3056" ph="..." /> | ||
60 | - <marker date="1575942586437" expanded="false" signature="3097:3115" ph="..." /> | ||
61 | - <marker date="1575942586437" expanded="true" signature="3116:3533" ph="..." /> | ||
62 | - <marker date="1575942586437" expanded="false" signature="3144:3210" ph="..." /> | ||
63 | - <marker date="1575942586437" expanded="false" signature="3253:3298" ph="..." /> | ||
64 | - <marker date="1575942586437" expanded="true" signature="3300:3306" ph=" " /> | ||
65 | - <marker date="1575942586437" expanded="true" signature="3306:3312" ph=" " /> | ||
66 | - <marker date="1575942586437" expanded="true" signature="3312:3318" ph=" " /> | ||
67 | - <marker date="1575942586437" expanded="true" signature="3318:3324" ph=" " /> | ||
68 | - <marker date="1575942586437" expanded="false" signature="3343:3352" ph="..." /> | ||
69 | - <marker date="1575942586437" expanded="false" signature="3395:3404" ph="..." /> | ||
70 | - <marker date="1575942586437" expanded="false" signature="3433:3442" ph="..." /> | ||
71 | - <marker date="1575942586437" expanded="false" signature="3557:3575" ph="..." /> | ||
72 | - <marker date="1575942586437" expanded="true" signature="3576:3892" ph="..." /> | ||
73 | - <marker date="1575942586437" expanded="false" signature="3604:3670" ph="..." /> | ||
74 | - <marker date="1575942586437" expanded="false" signature="3709:3737" ph="..." /> | ||
75 | - <marker date="1575942586437" expanded="true" signature="3739:3745" ph=" " /> | ||
76 | - <marker date="1575942586437" expanded="true" signature="3745:3751" ph=" " /> | ||
77 | - <marker date="1575942586437" expanded="true" signature="3751:3757" ph=" " /> | ||
78 | - <marker date="1575942586437" expanded="true" signature="3757:3763" ph=" " /> | ||
79 | - <marker date="1575942586437" expanded="false" signature="3816:3825" ph="..." /> | ||
80 | - <marker date="1575942586437" expanded="false" signature="3916:3934" ph="..." /> | ||
81 | - <marker date="1575942586437" expanded="true" signature="3935:4294" ph="..." /> | ||
82 | - <marker date="1575942586437" expanded="false" signature="3963:4029" ph="..." /> | ||
83 | - <marker date="1575942586437" expanded="false" signature="4070:4115" ph="..." /> | ||
84 | - <marker date="1575942586437" expanded="false" signature="4117:4123" ph=" " /> | ||
85 | - <marker date="1575942586437" expanded="false" signature="4123:4129" ph=" " /> | ||
86 | - <marker date="1575942586437" expanded="false" signature="4129:4135" ph=" " /> | ||
87 | - <marker date="1575942586437" expanded="false" signature="4135:4141" ph=" " /> | ||
88 | - <marker date="1575942586437" expanded="false" signature="4224:4233" ph="..." /> | ||
89 | - <marker date="1575942586437" expanded="false" signature="4318:4365" ph="..." /> | ||
90 | - <marker date="1575942586437" expanded="false" signature="4367:4373" ph=" " /> | ||
91 | - <marker date="1575942586437" expanded="false" signature="4373:4379" ph=" " /> | ||
92 | - <marker date="1575942586437" expanded="false" signature="4379:4385" ph=" " /> | ||
93 | - <marker date="1575942586437" expanded="false" signature="4385:4391" ph=" " /> | ||
94 | - <marker date="1575942586437" expanded="false" signature="4446:4455" ph="..." /> | ||
95 | - <marker date="1575942586437" expanded="false" signature="4574:4621" ph="..." /> | ||
96 | - <marker date="1575942586437" expanded="false" signature="4623:4629" ph=" " /> | ||
97 | - <marker date="1575942586437" expanded="false" signature="4629:4635" ph=" " /> | ||
98 | - <marker date="1575942586437" expanded="false" signature="4635:4641" ph=" " /> | ||
99 | - <marker date="1575942586437" expanded="false" signature="4641:4647" ph=" " /> | ||
100 | - <marker date="1575942586437" expanded="false" signature="4701:4710" ph="..." /> | ||
101 | - <marker date="1575942586437" expanded="false" signature="4784:4800" ph="..." /> | ||
102 | - <marker date="1575942586437" expanded="false" signature="4853:4900" ph="..." /> | ||
103 | - <marker date="1575942586437" expanded="false" signature="4902:4908" ph=" " /> | ||
104 | - <marker date="1575942586437" expanded="false" signature="4908:4914" ph=" " /> | ||
105 | - <marker date="1575942586437" expanded="false" signature="4914:4920" ph=" " /> | ||
106 | - <marker date="1575942586437" expanded="false" signature="4920:4926" ph=" " /> | ||
107 | - <marker date="1575942586437" expanded="false" signature="4954:4980" ph="..." /> | ||
108 | - <marker date="1575942586437" expanded="false" signature="5066:5084" ph="..." /> | ||
109 | - <marker date="1575942586437" expanded="true" signature="5085:5683" ph="..." /> | ||
110 | - <marker date="1575942586437" expanded="false" signature="5113:5179" ph="..." /> | ||
111 | - <marker date="1575942586437" expanded="false" signature="5218:5265" ph="..." /> | ||
112 | - <marker date="1575942586437" expanded="false" signature="5267:5273" ph=" " /> | ||
113 | - <marker date="1575942586437" expanded="false" signature="5273:5279" ph=" " /> | ||
114 | - <marker date="1575942586437" expanded="false" signature="5279:5285" ph=" " /> | ||
115 | - <marker date="1575942586437" expanded="false" signature="5285:5291" ph=" " /> | ||
116 | - <marker date="1575942586437" expanded="false" signature="5376:5423" ph="..." /> | ||
117 | - <marker date="1575942586437" expanded="false" signature="5425:5431" ph=" " /> | ||
118 | - <marker date="1575942586437" expanded="false" signature="5431:5437" ph=" " /> | ||
119 | - <marker date="1575942586437" expanded="false" signature="5437:5443" ph=" " /> | ||
120 | - <marker date="1575942586437" expanded="false" signature="5443:5449" ph=" " /> | ||
121 | - <marker date="1575942586437" expanded="false" signature="5550:5597" ph="..." /> | ||
122 | - <marker date="1575942586437" expanded="false" signature="5599:5605" ph=" " /> | ||
123 | - <marker date="1575942586437" expanded="false" signature="5605:5611" ph=" " /> | ||
124 | - <marker date="1575942586437" expanded="false" signature="5611:5617" ph=" " /> | ||
125 | - <marker date="1575942586437" expanded="false" signature="5617:5623" ph=" " /> | ||
126 | - <marker date="1575942586437" expanded="false" signature="5707:5725" ph="..." /> | ||
127 | - <marker date="1575942586437" expanded="true" signature="5726:7409" ph="..." /> | ||
128 | - <marker date="1575942586437" expanded="false" signature="5754:5820" ph="..." /> | ||
129 | - <marker date="1575942586437" expanded="false" signature="5859:5906" ph="..." /> | ||
130 | - <marker date="1575942586437" expanded="false" signature="5908:5914" ph=" " /> | ||
131 | - <marker date="1575942586437" expanded="false" signature="5914:5920" ph=" " /> | ||
132 | - <marker date="1575942586437" expanded="false" signature="5920:5926" ph=" " /> | ||
133 | - <marker date="1575942586437" expanded="false" signature="5926:5932" ph=" " /> | ||
134 | - <marker date="1575942586437" expanded="false" signature="5958:5974" ph="..." /> | ||
135 | - <marker date="1575942586437" expanded="false" signature="6094:6141" ph="..." /> | ||
136 | - <marker date="1575942586437" expanded="false" signature="6143:6149" ph=" " /> | ||
137 | - <marker date="1575942586437" expanded="false" signature="6149:6155" ph=" " /> | ||
138 | - <marker date="1575942586437" expanded="false" signature="6155:6161" ph=" " /> | ||
139 | - <marker date="1575942586437" expanded="false" signature="6161:6167" ph=" " /> | ||
140 | - <marker date="1575942586437" expanded="false" signature="6319:6366" ph="..." /> | ||
141 | - <marker date="1575942586437" expanded="false" signature="6368:6374" ph=" " /> | ||
142 | - <marker date="1575942586437" expanded="false" signature="6374:6380" ph=" " /> | ||
143 | - <marker date="1575942586437" expanded="false" signature="6380:6386" ph=" " /> | ||
144 | - <marker date="1575942586437" expanded="false" signature="6386:6392" ph=" " /> | ||
145 | - <marker date="1575942586437" expanded="false" signature="6511:6558" ph="..." /> | ||
146 | - <marker date="1575942586437" expanded="false" signature="6560:6566" ph=" " /> | ||
147 | - <marker date="1575942586437" expanded="false" signature="6566:6572" ph=" " /> | ||
148 | - <marker date="1575942586437" expanded="false" signature="6572:6578" ph=" " /> | ||
149 | - <marker date="1575942586437" expanded="false" signature="6578:6584" ph=" " /> | ||
150 | - <marker date="1575942586437" expanded="false" signature="6668:6715" ph="..." /> | ||
151 | - <marker date="1575942586437" expanded="false" signature="6717:6723" ph=" " /> | ||
152 | - <marker date="1575942586437" expanded="false" signature="6723:6729" ph=" " /> | ||
153 | - <marker date="1575942586437" expanded="false" signature="6729:6735" ph=" " /> | ||
154 | - <marker date="1575942586437" expanded="false" signature="6735:6741" ph=" " /> | ||
155 | - <marker date="1575942586437" expanded="false" signature="6801:6848" ph="..." /> | ||
156 | - <marker date="1575942586437" expanded="false" signature="6850:6856" ph=" " /> | ||
157 | - <marker date="1575942586437" expanded="false" signature="6856:6862" ph=" " /> | ||
158 | - <marker date="1575942586437" expanded="false" signature="6862:6868" ph=" " /> | ||
159 | - <marker date="1575942586437" expanded="false" signature="6868:6874" ph=" " /> | ||
160 | - <marker date="1575942586437" expanded="false" signature="7058:7105" ph="..." /> | ||
161 | - <marker date="1575942586437" expanded="false" signature="7107:7113" ph=" " /> | ||
162 | - <marker date="1575942586437" expanded="false" signature="7113:7119" ph=" " /> | ||
163 | - <marker date="1575942586437" expanded="false" signature="7119:7125" ph=" " /> | ||
164 | - <marker date="1575942586437" expanded="false" signature="7125:7131" ph=" " /> | ||
165 | - <marker date="1575942586437" expanded="false" signature="7259:7306" ph="..." /> | ||
166 | - <marker date="1575942586437" expanded="false" signature="7308:7314" ph=" " /> | ||
167 | - <marker date="1575942586437" expanded="false" signature="7314:7320" ph=" " /> | ||
168 | - <marker date="1575942586437" expanded="false" signature="7320:7326" ph=" " /> | ||
169 | - <marker date="1575942586437" expanded="false" signature="7326:7332" ph=" " /> | ||
170 | - <marker date="1575942586437" expanded="false" signature="7433:7451" ph="..." /> | ||
171 | - <marker date="1575942586437" expanded="true" signature="7452:7952" ph="..." /> | ||
172 | - <marker date="1575942586437" expanded="false" signature="7480:7546" ph="..." /> | ||
173 | - <marker date="1575942586437" expanded="false" signature="7587:7634" ph="..." /> | ||
174 | - <marker date="1575942586437" expanded="false" signature="7636:7642" ph=" " /> | ||
175 | - <marker date="1575942586437" expanded="false" signature="7642:7648" ph=" " /> | ||
176 | - <marker date="1575942586437" expanded="false" signature="7648:7654" ph=" " /> | ||
177 | - <marker date="1575942586437" expanded="false" signature="7654:7660" ph=" " /> | ||
178 | - <marker date="1575942586437" expanded="false" signature="7772:7819" ph="..." /> | ||
179 | - <marker date="1575942586437" expanded="false" signature="7821:7827" ph=" " /> | ||
180 | - <marker date="1575942586437" expanded="false" signature="7827:7833" ph=" " /> | ||
181 | - <marker date="1575942586437" expanded="false" signature="7833:7839" ph=" " /> | ||
182 | - <marker date="1575942586437" expanded="false" signature="7839:7845" ph=" " /> | ||
183 | - <marker date="1575942586437" expanded="false" signature="7976:7994" ph="..." /> | ||
184 | - <marker date="1575942586437" expanded="true" signature="7995:8995" ph="..." /> | ||
185 | - <marker date="1575942586437" expanded="false" signature="8023:8089" ph="..." /> | ||
186 | - <marker date="1575942586437" expanded="false" signature="8128:8175" ph="..." /> | ||
187 | - <marker date="1575942586437" expanded="false" signature="8177:8183" ph=" " /> | ||
188 | - <marker date="1575942586437" expanded="false" signature="8183:8189" ph=" " /> | ||
189 | - <marker date="1575942586437" expanded="false" signature="8189:8195" ph=" " /> | ||
190 | - <marker date="1575942586437" expanded="false" signature="8195:8201" ph=" " /> | ||
191 | - <marker date="1575942586437" expanded="false" signature="8267:8314" ph="..." /> | ||
192 | - <marker date="1575942586437" expanded="false" signature="8316:8322" ph=" " /> | ||
193 | - <marker date="1575942586437" expanded="false" signature="8322:8328" ph=" " /> | ||
194 | - <marker date="1575942586437" expanded="false" signature="8328:8334" ph=" " /> | ||
195 | - <marker date="1575942586437" expanded="false" signature="8334:8340" ph=" " /> | ||
196 | - <marker date="1575942586437" expanded="false" signature="8397:8444" ph="..." /> | ||
197 | - <marker date="1575942586437" expanded="false" signature="8446:8452" ph=" " /> | ||
198 | - <marker date="1575942586437" expanded="false" signature="8452:8458" ph=" " /> | ||
199 | - <marker date="1575942586437" expanded="false" signature="8458:8464" ph=" " /> | ||
200 | - <marker date="1575942586437" expanded="false" signature="8464:8470" ph=" " /> | ||
201 | - <marker date="1575942586437" expanded="false" signature="8548:8595" ph="..." /> | ||
202 | - <marker date="1575942586437" expanded="false" signature="8597:8603" ph=" " /> | ||
203 | - <marker date="1575942586437" expanded="false" signature="8603:8609" ph=" " /> | ||
204 | - <marker date="1575942586437" expanded="false" signature="8609:8615" ph=" " /> | ||
205 | - <marker date="1575942586437" expanded="false" signature="8615:8621" ph=" " /> | ||
206 | - <marker date="1575942586437" expanded="false" signature="8714:8761" ph="..." /> | ||
207 | - <marker date="1575942586437" expanded="false" signature="8763:8769" ph=" " /> | ||
208 | - <marker date="1575942586437" expanded="false" signature="8769:8775" ph=" " /> | ||
209 | - <marker date="1575942586437" expanded="false" signature="8775:8781" ph=" " /> | ||
210 | - <marker date="1575942586437" expanded="false" signature="8781:8787" ph=" " /> | ||
211 | - <marker date="1575942586437" expanded="false" signature="8861:8908" ph="..." /> | ||
212 | - <marker date="1575942586437" expanded="false" signature="8910:8916" ph=" " /> | ||
213 | - <marker date="1575942586437" expanded="false" signature="8916:8922" ph=" " /> | ||
214 | - <marker date="1575942586437" expanded="false" signature="8922:8928" ph=" " /> | ||
215 | - <marker date="1575942586437" expanded="false" signature="8928:8934" ph=" " /> | ||
216 | - <marker date="1575942586437" expanded="false" signature="9019:9099" ph="..." /> | ||
217 | - <marker date="1575942586437" expanded="false" signature="9160:9240" ph="..." /> | 24 | + <element signature="e#9891#10022#0#PHP" expanded="false" /> |
25 | + <element signature="e#10027#10625#0#PHP" expanded="false" /> | ||
26 | + <element signature="e#10631#10708#0#PHP" expanded="false" /> | ||
27 | + <element signature="e#10713#14976#0#PHP" expanded="false" /> | ||
28 | + <marker date="1575942949956" expanded="true" signature="1639:9267" ph="..." /> | ||
29 | + <marker date="1575942949956" expanded="false" signature="1657:1792" ph="..." /> | ||
30 | + <marker date="1575942949956" expanded="false" signature="1677:1743" ph="..." /> | ||
31 | + <marker date="1575942949956" expanded="false" signature="1816:1863" ph="..." /> | ||
32 | + <marker date="1575942949956" expanded="false" signature="1864:1902" ph="..." /> | ||
33 | + <marker date="1575942949956" expanded="true" signature="1926:1973" ph="..." /> | ||
34 | + <marker date="1575942949956" expanded="true" signature="1974:2129" ph="..." /> | ||
35 | + <marker date="1575942949956" expanded="true" signature="2153:2172" ph="..." /> | ||
36 | + <marker date="1575942949956" expanded="true" signature="2173:3073" ph="..." /> | ||
37 | + <marker date="1575942949956" expanded="true" signature="2228:2275" ph="..." /> | ||
38 | + <marker date="1575942949956" expanded="true" signature="2228:2276" ph="..." /> | ||
39 | + <marker date="1575942949956" expanded="true" signature="2228:2311" ph="..." /> | ||
40 | + <marker date="1575942949956" expanded="false" signature="2261:2273" ph="..." /> | ||
41 | + <marker date="1575942949956" expanded="true" signature="2366:2414" ph="..." /> | ||
42 | + <marker date="1575942949956" expanded="true" signature="2366:2415" ph="..." /> | ||
43 | + <marker date="1575942949956" expanded="true" signature="2366:2449" ph="..." /> | ||
44 | + <marker date="1575942949956" expanded="false" signature="2400:2412" ph="..." /> | ||
45 | + <marker date="1575942949956" expanded="true" signature="2504:2551" ph="..." /> | ||
46 | + <marker date="1575942949956" expanded="true" signature="2504:2552" ph="..." /> | ||
47 | + <marker date="1575942949956" expanded="true" signature="2504:2586" ph="..." /> | ||
48 | + <marker date="1575942949956" expanded="false" signature="2537:2549" ph="..." /> | ||
49 | + <marker date="1575942949956" expanded="true" signature="2641:2689" ph="..." /> | ||
50 | + <marker date="1575942949956" expanded="true" signature="2641:2746" ph="..." /> | ||
51 | + <marker date="1575942949956" expanded="true" signature="2641:2787" ph="..." /> | ||
52 | + <marker date="1575942949956" expanded="true" signature="2675:2687" ph="..." /> | ||
53 | + <marker date="1575942949956" expanded="true" signature="2728:2744" ph="..." /> | ||
54 | + <marker date="1575942949956" expanded="true" signature="2842:2896" ph="..." /> | ||
55 | + <marker date="1575942949956" expanded="true" signature="2842:2932" ph="..." /> | ||
56 | + <marker date="1575942949956" expanded="false" signature="2883:2895" ph="..." /> | ||
57 | + <marker date="1575942949956" expanded="true" signature="2987:3056" ph="..." /> | ||
58 | + <marker date="1575942949956" expanded="false" signature="3097:3115" ph="..." /> | ||
59 | + <marker date="1575942949956" expanded="true" signature="3116:3533" ph="..." /> | ||
60 | + <marker date="1575942949956" expanded="false" signature="3144:3210" ph="..." /> | ||
61 | + <marker date="1575942949956" expanded="false" signature="3253:3298" ph="..." /> | ||
62 | + <marker date="1575942949956" expanded="true" signature="3300:3306" ph=" " /> | ||
63 | + <marker date="1575942949956" expanded="true" signature="3306:3312" ph=" " /> | ||
64 | + <marker date="1575942949956" expanded="true" signature="3312:3318" ph=" " /> | ||
65 | + <marker date="1575942949956" expanded="true" signature="3318:3324" ph=" " /> | ||
66 | + <marker date="1575942949956" expanded="false" signature="3343:3352" ph="..." /> | ||
67 | + <marker date="1575942949956" expanded="false" signature="3395:3404" ph="..." /> | ||
68 | + <marker date="1575942949956" expanded="false" signature="3433:3442" ph="..." /> | ||
69 | + <marker date="1575942949956" expanded="false" signature="3557:3575" ph="..." /> | ||
70 | + <marker date="1575942949956" expanded="true" signature="3576:3892" ph="..." /> | ||
71 | + <marker date="1575942949956" expanded="false" signature="3604:3670" ph="..." /> | ||
72 | + <marker date="1575942949956" expanded="false" signature="3709:3737" ph="..." /> | ||
73 | + <marker date="1575942949956" expanded="true" signature="3739:3745" ph=" " /> | ||
74 | + <marker date="1575942949956" expanded="true" signature="3745:3751" ph=" " /> | ||
75 | + <marker date="1575942949956" expanded="true" signature="3751:3757" ph=" " /> | ||
76 | + <marker date="1575942949956" expanded="true" signature="3757:3763" ph=" " /> | ||
77 | + <marker date="1575942949956" expanded="false" signature="3816:3825" ph="..." /> | ||
78 | + <marker date="1575942949956" expanded="false" signature="3916:3934" ph="..." /> | ||
79 | + <marker date="1575942949956" expanded="true" signature="3935:4294" ph="..." /> | ||
80 | + <marker date="1575942949956" expanded="false" signature="3963:4029" ph="..." /> | ||
81 | + <marker date="1575942949956" expanded="false" signature="4070:4115" ph="..." /> | ||
82 | + <marker date="1575942949956" expanded="false" signature="4117:4123" ph=" " /> | ||
83 | + <marker date="1575942949956" expanded="false" signature="4123:4129" ph=" " /> | ||
84 | + <marker date="1575942949956" expanded="false" signature="4129:4135" ph=" " /> | ||
85 | + <marker date="1575942949956" expanded="false" signature="4135:4141" ph=" " /> | ||
86 | + <marker date="1575942949956" expanded="false" signature="4224:4233" ph="..." /> | ||
87 | + <marker date="1575942949956" expanded="false" signature="4318:4365" ph="..." /> | ||
88 | + <marker date="1575942949956" expanded="false" signature="4367:4373" ph=" " /> | ||
89 | + <marker date="1575942949956" expanded="false" signature="4373:4379" ph=" " /> | ||
90 | + <marker date="1575942949956" expanded="false" signature="4379:4385" ph=" " /> | ||
91 | + <marker date="1575942949956" expanded="false" signature="4385:4391" ph=" " /> | ||
92 | + <marker date="1575942949956" expanded="false" signature="4446:4455" ph="..." /> | ||
93 | + <marker date="1575942949956" expanded="false" signature="4574:4621" ph="..." /> | ||
94 | + <marker date="1575942949956" expanded="false" signature="4623:4629" ph=" " /> | ||
95 | + <marker date="1575942949956" expanded="false" signature="4629:4635" ph=" " /> | ||
96 | + <marker date="1575942949956" expanded="false" signature="4635:4641" ph=" " /> | ||
97 | + <marker date="1575942949956" expanded="false" signature="4641:4647" ph=" " /> | ||
98 | + <marker date="1575942949956" expanded="false" signature="4701:4710" ph="..." /> | ||
99 | + <marker date="1575942949956" expanded="false" signature="4784:4800" ph="..." /> | ||
100 | + <marker date="1575942949956" expanded="false" signature="4853:4900" ph="..." /> | ||
101 | + <marker date="1575942949956" expanded="false" signature="4902:4908" ph=" " /> | ||
102 | + <marker date="1575942949956" expanded="false" signature="4908:4914" ph=" " /> | ||
103 | + <marker date="1575942949956" expanded="false" signature="4914:4920" ph=" " /> | ||
104 | + <marker date="1575942949956" expanded="false" signature="4920:4926" ph=" " /> | ||
105 | + <marker date="1575942949956" expanded="false" signature="4954:4980" ph="..." /> | ||
106 | + <marker date="1575942949956" expanded="false" signature="5066:5084" ph="..." /> | ||
107 | + <marker date="1575942949956" expanded="true" signature="5085:5683" ph="..." /> | ||
108 | + <marker date="1575942949956" expanded="false" signature="5113:5179" ph="..." /> | ||
109 | + <marker date="1575942949956" expanded="false" signature="5218:5265" ph="..." /> | ||
110 | + <marker date="1575942949956" expanded="false" signature="5267:5273" ph=" " /> | ||
111 | + <marker date="1575942949956" expanded="false" signature="5273:5279" ph=" " /> | ||
112 | + <marker date="1575942949956" expanded="false" signature="5279:5285" ph=" " /> | ||
113 | + <marker date="1575942949956" expanded="false" signature="5285:5291" ph=" " /> | ||
114 | + <marker date="1575942949956" expanded="false" signature="5376:5423" ph="..." /> | ||
115 | + <marker date="1575942949956" expanded="false" signature="5425:5431" ph=" " /> | ||
116 | + <marker date="1575942949956" expanded="false" signature="5431:5437" ph=" " /> | ||
117 | + <marker date="1575942949956" expanded="false" signature="5437:5443" ph=" " /> | ||
118 | + <marker date="1575942949956" expanded="false" signature="5443:5449" ph=" " /> | ||
119 | + <marker date="1575942949956" expanded="false" signature="5550:5597" ph="..." /> | ||
120 | + <marker date="1575942949956" expanded="false" signature="5599:5605" ph=" " /> | ||
121 | + <marker date="1575942949956" expanded="false" signature="5605:5611" ph=" " /> | ||
122 | + <marker date="1575942949956" expanded="false" signature="5611:5617" ph=" " /> | ||
123 | + <marker date="1575942949956" expanded="false" signature="5617:5623" ph=" " /> | ||
124 | + <marker date="1575942949956" expanded="false" signature="5707:5725" ph="..." /> | ||
125 | + <marker date="1575942949956" expanded="true" signature="5726:7409" ph="..." /> | ||
126 | + <marker date="1575942949956" expanded="false" signature="5754:5820" ph="..." /> | ||
127 | + <marker date="1575942949956" expanded="false" signature="5859:5906" ph="..." /> | ||
128 | + <marker date="1575942949956" expanded="false" signature="5908:5914" ph=" " /> | ||
129 | + <marker date="1575942949956" expanded="false" signature="5914:5920" ph=" " /> | ||
130 | + <marker date="1575942949956" expanded="false" signature="5920:5926" ph=" " /> | ||
131 | + <marker date="1575942949956" expanded="false" signature="5926:5932" ph=" " /> | ||
132 | + <marker date="1575942949956" expanded="false" signature="5958:5974" ph="..." /> | ||
133 | + <marker date="1575942949956" expanded="false" signature="6094:6141" ph="..." /> | ||
134 | + <marker date="1575942949956" expanded="false" signature="6143:6149" ph=" " /> | ||
135 | + <marker date="1575942949956" expanded="false" signature="6149:6155" ph=" " /> | ||
136 | + <marker date="1575942949956" expanded="false" signature="6155:6161" ph=" " /> | ||
137 | + <marker date="1575942949956" expanded="false" signature="6161:6167" ph=" " /> | ||
138 | + <marker date="1575942949956" expanded="false" signature="6319:6366" ph="..." /> | ||
139 | + <marker date="1575942949956" expanded="false" signature="6368:6374" ph=" " /> | ||
140 | + <marker date="1575942949956" expanded="false" signature="6374:6380" ph=" " /> | ||
141 | + <marker date="1575942949956" expanded="false" signature="6380:6386" ph=" " /> | ||
142 | + <marker date="1575942949956" expanded="false" signature="6386:6392" ph=" " /> | ||
143 | + <marker date="1575942949956" expanded="false" signature="6511:6558" ph="..." /> | ||
144 | + <marker date="1575942949956" expanded="false" signature="6560:6566" ph=" " /> | ||
145 | + <marker date="1575942949956" expanded="false" signature="6566:6572" ph=" " /> | ||
146 | + <marker date="1575942949956" expanded="false" signature="6572:6578" ph=" " /> | ||
147 | + <marker date="1575942949956" expanded="false" signature="6578:6584" ph=" " /> | ||
148 | + <marker date="1575942949956" expanded="false" signature="6668:6715" ph="..." /> | ||
149 | + <marker date="1575942949956" expanded="false" signature="6717:6723" ph=" " /> | ||
150 | + <marker date="1575942949956" expanded="false" signature="6723:6729" ph=" " /> | ||
151 | + <marker date="1575942949956" expanded="false" signature="6729:6735" ph=" " /> | ||
152 | + <marker date="1575942949956" expanded="false" signature="6735:6741" ph=" " /> | ||
153 | + <marker date="1575942949956" expanded="false" signature="6801:6848" ph="..." /> | ||
154 | + <marker date="1575942949956" expanded="false" signature="6850:6856" ph=" " /> | ||
155 | + <marker date="1575942949956" expanded="false" signature="6856:6862" ph=" " /> | ||
156 | + <marker date="1575942949956" expanded="false" signature="6862:6868" ph=" " /> | ||
157 | + <marker date="1575942949956" expanded="false" signature="6868:6874" ph=" " /> | ||
158 | + <marker date="1575942949956" expanded="false" signature="7058:7105" ph="..." /> | ||
159 | + <marker date="1575942949956" expanded="false" signature="7107:7113" ph=" " /> | ||
160 | + <marker date="1575942949956" expanded="false" signature="7113:7119" ph=" " /> | ||
161 | + <marker date="1575942949956" expanded="false" signature="7119:7125" ph=" " /> | ||
162 | + <marker date="1575942949956" expanded="false" signature="7125:7131" ph=" " /> | ||
163 | + <marker date="1575942949956" expanded="false" signature="7259:7306" ph="..." /> | ||
164 | + <marker date="1575942949956" expanded="false" signature="7308:7314" ph=" " /> | ||
165 | + <marker date="1575942949956" expanded="false" signature="7314:7320" ph=" " /> | ||
166 | + <marker date="1575942949956" expanded="false" signature="7320:7326" ph=" " /> | ||
167 | + <marker date="1575942949956" expanded="false" signature="7326:7332" ph=" " /> | ||
168 | + <marker date="1575942949956" expanded="false" signature="7433:7451" ph="..." /> | ||
169 | + <marker date="1575942949956" expanded="true" signature="7452:7952" ph="..." /> | ||
170 | + <marker date="1575942949956" expanded="false" signature="7480:7546" ph="..." /> | ||
171 | + <marker date="1575942949956" expanded="false" signature="7587:7634" ph="..." /> | ||
172 | + <marker date="1575942949956" expanded="false" signature="7636:7642" ph=" " /> | ||
173 | + <marker date="1575942949956" expanded="false" signature="7642:7648" ph=" " /> | ||
174 | + <marker date="1575942949956" expanded="false" signature="7648:7654" ph=" " /> | ||
175 | + <marker date="1575942949956" expanded="false" signature="7654:7660" ph=" " /> | ||
176 | + <marker date="1575942949956" expanded="false" signature="7772:7819" ph="..." /> | ||
177 | + <marker date="1575942949956" expanded="false" signature="7821:7827" ph=" " /> | ||
178 | + <marker date="1575942949956" expanded="false" signature="7827:7833" ph=" " /> | ||
179 | + <marker date="1575942949956" expanded="false" signature="7833:7839" ph=" " /> | ||
180 | + <marker date="1575942949956" expanded="false" signature="7839:7845" ph=" " /> | ||
181 | + <marker date="1575942949956" expanded="false" signature="7976:7994" ph="..." /> | ||
182 | + <marker date="1575942949956" expanded="true" signature="7995:8995" ph="..." /> | ||
183 | + <marker date="1575942949956" expanded="false" signature="8023:8089" ph="..." /> | ||
184 | + <marker date="1575942949956" expanded="false" signature="8128:8175" ph="..." /> | ||
185 | + <marker date="1575942949956" expanded="false" signature="8177:8183" ph=" " /> | ||
186 | + <marker date="1575942949956" expanded="false" signature="8183:8189" ph=" " /> | ||
187 | + <marker date="1575942949956" expanded="false" signature="8189:8195" ph=" " /> | ||
188 | + <marker date="1575942949956" expanded="false" signature="8195:8201" ph=" " /> | ||
189 | + <marker date="1575942949956" expanded="false" signature="8267:8314" ph="..." /> | ||
190 | + <marker date="1575942949956" expanded="false" signature="8316:8322" ph=" " /> | ||
191 | + <marker date="1575942949956" expanded="false" signature="8322:8328" ph=" " /> | ||
192 | + <marker date="1575942949956" expanded="false" signature="8328:8334" ph=" " /> | ||
193 | + <marker date="1575942949956" expanded="false" signature="8334:8340" ph=" " /> | ||
194 | + <marker date="1575942949956" expanded="false" signature="8397:8444" ph="..." /> | ||
195 | + <marker date="1575942949956" expanded="false" signature="8446:8452" ph=" " /> | ||
196 | + <marker date="1575942949956" expanded="false" signature="8452:8458" ph=" " /> | ||
197 | + <marker date="1575942949956" expanded="false" signature="8458:8464" ph=" " /> | ||
198 | + <marker date="1575942949956" expanded="false" signature="8464:8470" ph=" " /> | ||
199 | + <marker date="1575942949956" expanded="false" signature="8548:8595" ph="..." /> | ||
200 | + <marker date="1575942949956" expanded="false" signature="8597:8603" ph=" " /> | ||
201 | + <marker date="1575942949956" expanded="false" signature="8603:8609" ph=" " /> | ||
202 | + <marker date="1575942949956" expanded="false" signature="8609:8615" ph=" " /> | ||
203 | + <marker date="1575942949956" expanded="false" signature="8615:8621" ph=" " /> | ||
204 | + <marker date="1575942949956" expanded="false" signature="8714:8761" ph="..." /> | ||
205 | + <marker date="1575942949956" expanded="false" signature="8763:8769" ph=" " /> | ||
206 | + <marker date="1575942949956" expanded="false" signature="8769:8775" ph=" " /> | ||
207 | + <marker date="1575942949956" expanded="false" signature="8775:8781" ph=" " /> | ||
208 | + <marker date="1575942949956" expanded="false" signature="8781:8787" ph=" " /> | ||
209 | + <marker date="1575942949956" expanded="false" signature="8861:8908" ph="..." /> | ||
210 | + <marker date="1575942949956" expanded="false" signature="8910:8916" ph=" " /> | ||
211 | + <marker date="1575942949956" expanded="false" signature="8916:8922" ph=" " /> | ||
212 | + <marker date="1575942949956" expanded="false" signature="8922:8928" ph=" " /> | ||
213 | + <marker date="1575942949956" expanded="false" signature="8928:8934" ph=" " /> | ||
214 | + <marker date="1575942949956" expanded="false" signature="9019:9099" ph="..." /> | ||
215 | + <marker date="1575942949956" expanded="false" signature="9160:9240" ph="..." /> | ||
218 | </folding> | 216 | </folding> |
219 | </state> | 217 | </state> |
220 | </provider> | 218 | </provider> |
221 | </entry> | 219 | </entry> |
222 | </file> | 220 | </file> |
223 | - <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> | 221 | + <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> |
224 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 222 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
225 | <provider selected="true" editor-type-id="text-editor"> | 223 | <provider selected="true" editor-type-id="text-editor"> |
226 | <state relative-caret-position="428"> | 224 | <state relative-caret-position="428"> |
@@ -382,8 +380,8 @@ | @@ -382,8 +380,8 @@ | ||
382 | <option value="$PROJECT_DIR$/application/admin/view/order/shou.html" /> | 380 | <option value="$PROJECT_DIR$/application/admin/view/order/shou.html" /> |
383 | <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> | 381 | <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> |
384 | <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" /> | 382 | <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" /> |
385 | - <option value="$PROJECT_DIR$/application/api/controller/Common.php" /> | ||
386 | <option value="$PROJECT_DIR$/application/api/controller/User.php" /> | 383 | <option value="$PROJECT_DIR$/application/api/controller/User.php" /> |
384 | + <option value="$PROJECT_DIR$/application/api/controller/Common.php" /> | ||
387 | </list> | 385 | </list> |
388 | </option> | 386 | </option> |
389 | </component> | 387 | </component> |
@@ -402,8 +400,8 @@ | @@ -402,8 +400,8 @@ | ||
402 | </component> | 400 | </component> |
403 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 401 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
404 | <component name="ProjectFrameBounds" extendedState="1"> | 402 | <component name="ProjectFrameBounds" extendedState="1"> |
405 | - <option name="x" value="373" /> | ||
406 | - <option name="y" value="87" /> | 403 | + <option name="x" value="263" /> |
404 | + <option name="y" value="61" /> | ||
407 | <option name="width" value="1464" /> | 405 | <option name="width" value="1464" /> |
408 | <option name="height" value="940" /> | 406 | <option name="height" value="940" /> |
409 | </component> | 407 | </component> |
@@ -434,17 +432,6 @@ | @@ -434,17 +432,6 @@ | ||
434 | <path> | 432 | <path> |
435 | <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | 433 | <item name="areial" type="b2602c69:ProjectViewProjectNode" /> |
436 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | 434 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> |
437 | - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
438 | - </path> | ||
439 | - <path> | ||
440 | - <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
441 | - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
442 | - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
443 | - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
444 | - </path> | ||
445 | - <path> | ||
446 | - <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
447 | - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
448 | <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> | 435 | <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> |
449 | </path> | 436 | </path> |
450 | <path> | 437 | <path> |
@@ -547,7 +534,7 @@ | @@ -547,7 +534,7 @@ | ||
547 | <workItem from="1575851041026" duration="14741000" /> | 534 | <workItem from="1575851041026" duration="14741000" /> |
548 | <workItem from="1575874863361" duration="5705000" /> | 535 | <workItem from="1575874863361" duration="5705000" /> |
549 | <workItem from="1575880737237" duration="12885000" /> | 536 | <workItem from="1575880737237" duration="12885000" /> |
550 | - <workItem from="1575937244447" duration="5041000" /> | 537 | + <workItem from="1575937244447" duration="5359000" /> |
551 | </task> | 538 | </task> |
552 | <task id="LOCAL-00001" summary="调试"> | 539 | <task id="LOCAL-00001" summary="调试"> |
553 | <created>1574145133364</created> | 540 | <created>1574145133364</created> |
@@ -574,7 +561,7 @@ | @@ -574,7 +561,7 @@ | ||
574 | <servers /> | 561 | <servers /> |
575 | </component> | 562 | </component> |
576 | <component name="TimeTrackingManager"> | 563 | <component name="TimeTrackingManager"> |
577 | - <option name="totallyTimeSpent" value="378839000" /> | 564 | + <option name="totallyTimeSpent" value="379157000" /> |
578 | </component> | 565 | </component> |
579 | <component name="TodoView"> | 566 | <component name="TodoView"> |
580 | <todo-panel id="selected-file"> | 567 | <todo-panel id="selected-file"> |
@@ -586,7 +573,7 @@ | @@ -586,7 +573,7 @@ | ||
586 | </todo-panel> | 573 | </todo-panel> |
587 | </component> | 574 | </component> |
588 | <component name="ToolWindowManager"> | 575 | <component name="ToolWindowManager"> |
589 | - <frame x="373" y="87" width="1464" height="940" extended-state="1" /> | 576 | + <frame x="263" y="61" width="1464" height="940" extended-state="1" /> |
590 | <editor active="true" /> | 577 | <editor active="true" /> |
591 | <layout> | 578 | <layout> |
592 | <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" /> | 579 | <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 @@ | @@ -1213,209 +1200,6 @@ | ||
1213 | </state> | 1200 | </state> |
1214 | </provider> | 1201 | </provider> |
1215 | </entry> | 1202 | </entry> |
1216 | - <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php"> | ||
1217 | - <provider selected="true" editor-type-id="text-editor"> | ||
1218 | - <state relative-caret-position="314"> | ||
1219 | - <caret line="150" column="76" lean-forward="true" selection-start-line="150" selection-start-column="76" selection-end-line="150" selection-end-column="76" /> | ||
1220 | - <folding> | ||
1221 | - <element signature="e#38#68#0#PHP" expanded="true" /> | ||
1222 | - <element signature="e#1222#1271#0#PHP" expanded="false" /> | ||
1223 | - <element signature="e#9898#10029#0#PHP" expanded="false" /> | ||
1224 | - <element signature="e#10034#10632#0#PHP" expanded="false" /> | ||
1225 | - <element signature="e#10638#10715#0#PHP" expanded="false" /> | ||
1226 | - <element signature="e#10720#14983#0#PHP" expanded="false" /> | ||
1227 | - <marker date="1575942586437" expanded="true" signature="1639:9267" ph="..." /> | ||
1228 | - <marker date="1575942586437" expanded="false" signature="1657:1792" ph="..." /> | ||
1229 | - <marker date="1575942586437" expanded="false" signature="1677:1743" ph="..." /> | ||
1230 | - <marker date="1575942586437" expanded="false" signature="1816:1863" ph="..." /> | ||
1231 | - <marker date="1575942586437" expanded="false" signature="1864:1902" ph="..." /> | ||
1232 | - <marker date="1575942586437" expanded="true" signature="1926:1973" ph="..." /> | ||
1233 | - <marker date="1575942586437" expanded="true" signature="1974:2129" ph="..." /> | ||
1234 | - <marker date="1575942586437" expanded="true" signature="2153:2172" ph="..." /> | ||
1235 | - <marker date="1575942586437" expanded="true" signature="2173:3073" ph="..." /> | ||
1236 | - <marker date="1575942586437" expanded="true" signature="2228:2275" ph="..." /> | ||
1237 | - <marker date="1575942586437" expanded="true" signature="2228:2276" ph="..." /> | ||
1238 | - <marker date="1575942586437" expanded="true" signature="2228:2311" ph="..." /> | ||
1239 | - <marker date="1575942586437" expanded="false" signature="2261:2273" ph="..." /> | ||
1240 | - <marker date="1575942586437" expanded="true" signature="2366:2414" ph="..." /> | ||
1241 | - <marker date="1575942586437" expanded="true" signature="2366:2415" ph="..." /> | ||
1242 | - <marker date="1575942586437" expanded="true" signature="2366:2449" ph="..." /> | ||
1243 | - <marker date="1575942586437" expanded="false" signature="2400:2412" ph="..." /> | ||
1244 | - <marker date="1575942586437" expanded="true" signature="2504:2551" ph="..." /> | ||
1245 | - <marker date="1575942586437" expanded="true" signature="2504:2552" ph="..." /> | ||
1246 | - <marker date="1575942586437" expanded="true" signature="2504:2586" ph="..." /> | ||
1247 | - <marker date="1575942586437" expanded="false" signature="2537:2549" ph="..." /> | ||
1248 | - <marker date="1575942586437" expanded="true" signature="2641:2689" ph="..." /> | ||
1249 | - <marker date="1575942586437" expanded="true" signature="2641:2746" ph="..." /> | ||
1250 | - <marker date="1575942586437" expanded="true" signature="2641:2787" ph="..." /> | ||
1251 | - <marker date="1575942586437" expanded="true" signature="2675:2687" ph="..." /> | ||
1252 | - <marker date="1575942586437" expanded="true" signature="2728:2744" ph="..." /> | ||
1253 | - <marker date="1575942586437" expanded="true" signature="2842:2896" ph="..." /> | ||
1254 | - <marker date="1575942586437" expanded="true" signature="2842:2932" ph="..." /> | ||
1255 | - <marker date="1575942586437" expanded="false" signature="2883:2895" ph="..." /> | ||
1256 | - <marker date="1575942586437" expanded="true" signature="2987:3056" ph="..." /> | ||
1257 | - <marker date="1575942586437" expanded="false" signature="3097:3115" ph="..." /> | ||
1258 | - <marker date="1575942586437" expanded="true" signature="3116:3533" ph="..." /> | ||
1259 | - <marker date="1575942586437" expanded="false" signature="3144:3210" ph="..." /> | ||
1260 | - <marker date="1575942586437" expanded="false" signature="3253:3298" ph="..." /> | ||
1261 | - <marker date="1575942586437" expanded="true" signature="3300:3306" ph=" " /> | ||
1262 | - <marker date="1575942586437" expanded="true" signature="3306:3312" ph=" " /> | ||
1263 | - <marker date="1575942586437" expanded="true" signature="3312:3318" ph=" " /> | ||
1264 | - <marker date="1575942586437" expanded="true" signature="3318:3324" ph=" " /> | ||
1265 | - <marker date="1575942586437" expanded="false" signature="3343:3352" ph="..." /> | ||
1266 | - <marker date="1575942586437" expanded="false" signature="3395:3404" ph="..." /> | ||
1267 | - <marker date="1575942586437" expanded="false" signature="3433:3442" ph="..." /> | ||
1268 | - <marker date="1575942586437" expanded="false" signature="3557:3575" ph="..." /> | ||
1269 | - <marker date="1575942586437" expanded="true" signature="3576:3892" ph="..." /> | ||
1270 | - <marker date="1575942586437" expanded="false" signature="3604:3670" ph="..." /> | ||
1271 | - <marker date="1575942586437" expanded="false" signature="3709:3737" ph="..." /> | ||
1272 | - <marker date="1575942586437" expanded="true" signature="3739:3745" ph=" " /> | ||
1273 | - <marker date="1575942586437" expanded="true" signature="3745:3751" ph=" " /> | ||
1274 | - <marker date="1575942586437" expanded="true" signature="3751:3757" ph=" " /> | ||
1275 | - <marker date="1575942586437" expanded="true" signature="3757:3763" ph=" " /> | ||
1276 | - <marker date="1575942586437" expanded="false" signature="3816:3825" ph="..." /> | ||
1277 | - <marker date="1575942586437" expanded="false" signature="3916:3934" ph="..." /> | ||
1278 | - <marker date="1575942586437" expanded="true" signature="3935:4294" ph="..." /> | ||
1279 | - <marker date="1575942586437" expanded="false" signature="3963:4029" ph="..." /> | ||
1280 | - <marker date="1575942586437" expanded="false" signature="4070:4115" ph="..." /> | ||
1281 | - <marker date="1575942586437" expanded="false" signature="4117:4123" ph=" " /> | ||
1282 | - <marker date="1575942586437" expanded="false" signature="4123:4129" ph=" " /> | ||
1283 | - <marker date="1575942586437" expanded="false" signature="4129:4135" ph=" " /> | ||
1284 | - <marker date="1575942586437" expanded="false" signature="4135:4141" ph=" " /> | ||
1285 | - <marker date="1575942586437" expanded="false" signature="4224:4233" ph="..." /> | ||
1286 | - <marker date="1575942586437" expanded="false" signature="4318:4365" ph="..." /> | ||
1287 | - <marker date="1575942586437" expanded="false" signature="4367:4373" ph=" " /> | ||
1288 | - <marker date="1575942586437" expanded="false" signature="4373:4379" ph=" " /> | ||
1289 | - <marker date="1575942586437" expanded="false" signature="4379:4385" ph=" " /> | ||
1290 | - <marker date="1575942586437" expanded="false" signature="4385:4391" ph=" " /> | ||
1291 | - <marker date="1575942586437" expanded="false" signature="4446:4455" ph="..." /> | ||
1292 | - <marker date="1575942586437" expanded="false" signature="4574:4621" ph="..." /> | ||
1293 | - <marker date="1575942586437" expanded="false" signature="4623:4629" ph=" " /> | ||
1294 | - <marker date="1575942586437" expanded="false" signature="4629:4635" ph=" " /> | ||
1295 | - <marker date="1575942586437" expanded="false" signature="4635:4641" ph=" " /> | ||
1296 | - <marker date="1575942586437" expanded="false" signature="4641:4647" ph=" " /> | ||
1297 | - <marker date="1575942586437" expanded="false" signature="4701:4710" ph="..." /> | ||
1298 | - <marker date="1575942586437" expanded="false" signature="4784:4800" ph="..." /> | ||
1299 | - <marker date="1575942586437" expanded="false" signature="4853:4900" ph="..." /> | ||
1300 | - <marker date="1575942586437" expanded="false" signature="4902:4908" ph=" " /> | ||
1301 | - <marker date="1575942586437" expanded="false" signature="4908:4914" ph=" " /> | ||
1302 | - <marker date="1575942586437" expanded="false" signature="4914:4920" ph=" " /> | ||
1303 | - <marker date="1575942586437" expanded="false" signature="4920:4926" ph=" " /> | ||
1304 | - <marker date="1575942586437" expanded="false" signature="4954:4980" ph="..." /> | ||
1305 | - <marker date="1575942586437" expanded="false" signature="5066:5084" ph="..." /> | ||
1306 | - <marker date="1575942586437" expanded="true" signature="5085:5683" ph="..." /> | ||
1307 | - <marker date="1575942586437" expanded="false" signature="5113:5179" ph="..." /> | ||
1308 | - <marker date="1575942586437" expanded="false" signature="5218:5265" ph="..." /> | ||
1309 | - <marker date="1575942586437" expanded="false" signature="5267:5273" ph=" " /> | ||
1310 | - <marker date="1575942586437" expanded="false" signature="5273:5279" ph=" " /> | ||
1311 | - <marker date="1575942586437" expanded="false" signature="5279:5285" ph=" " /> | ||
1312 | - <marker date="1575942586437" expanded="false" signature="5285:5291" ph=" " /> | ||
1313 | - <marker date="1575942586437" expanded="false" signature="5376:5423" ph="..." /> | ||
1314 | - <marker date="1575942586437" expanded="false" signature="5425:5431" ph=" " /> | ||
1315 | - <marker date="1575942586437" expanded="false" signature="5431:5437" ph=" " /> | ||
1316 | - <marker date="1575942586437" expanded="false" signature="5437:5443" ph=" " /> | ||
1317 | - <marker date="1575942586437" expanded="false" signature="5443:5449" ph=" " /> | ||
1318 | - <marker date="1575942586437" expanded="false" signature="5550:5597" ph="..." /> | ||
1319 | - <marker date="1575942586437" expanded="false" signature="5599:5605" ph=" " /> | ||
1320 | - <marker date="1575942586437" expanded="false" signature="5605:5611" ph=" " /> | ||
1321 | - <marker date="1575942586437" expanded="false" signature="5611:5617" ph=" " /> | ||
1322 | - <marker date="1575942586437" expanded="false" signature="5617:5623" ph=" " /> | ||
1323 | - <marker date="1575942586437" expanded="false" signature="5707:5725" ph="..." /> | ||
1324 | - <marker date="1575942586437" expanded="true" signature="5726:7409" ph="..." /> | ||
1325 | - <marker date="1575942586437" expanded="false" signature="5754:5820" ph="..." /> | ||
1326 | - <marker date="1575942586437" expanded="false" signature="5859:5906" ph="..." /> | ||
1327 | - <marker date="1575942586437" expanded="false" signature="5908:5914" ph=" " /> | ||
1328 | - <marker date="1575942586437" expanded="false" signature="5914:5920" ph=" " /> | ||
1329 | - <marker date="1575942586437" expanded="false" signature="5920:5926" ph=" " /> | ||
1330 | - <marker date="1575942586437" expanded="false" signature="5926:5932" ph=" " /> | ||
1331 | - <marker date="1575942586437" expanded="false" signature="5958:5974" ph="..." /> | ||
1332 | - <marker date="1575942586437" expanded="false" signature="6094:6141" ph="..." /> | ||
1333 | - <marker date="1575942586437" expanded="false" signature="6143:6149" ph=" " /> | ||
1334 | - <marker date="1575942586437" expanded="false" signature="6149:6155" ph=" " /> | ||
1335 | - <marker date="1575942586437" expanded="false" signature="6155:6161" ph=" " /> | ||
1336 | - <marker date="1575942586437" expanded="false" signature="6161:6167" ph=" " /> | ||
1337 | - <marker date="1575942586437" expanded="false" signature="6319:6366" ph="..." /> | ||
1338 | - <marker date="1575942586437" expanded="false" signature="6368:6374" ph=" " /> | ||
1339 | - <marker date="1575942586437" expanded="false" signature="6374:6380" ph=" " /> | ||
1340 | - <marker date="1575942586437" expanded="false" signature="6380:6386" ph=" " /> | ||
1341 | - <marker date="1575942586437" expanded="false" signature="6386:6392" ph=" " /> | ||
1342 | - <marker date="1575942586437" expanded="false" signature="6511:6558" ph="..." /> | ||
1343 | - <marker date="1575942586437" expanded="false" signature="6560:6566" ph=" " /> | ||
1344 | - <marker date="1575942586437" expanded="false" signature="6566:6572" ph=" " /> | ||
1345 | - <marker date="1575942586437" expanded="false" signature="6572:6578" ph=" " /> | ||
1346 | - <marker date="1575942586437" expanded="false" signature="6578:6584" ph=" " /> | ||
1347 | - <marker date="1575942586437" expanded="false" signature="6668:6715" ph="..." /> | ||
1348 | - <marker date="1575942586437" expanded="false" signature="6717:6723" ph=" " /> | ||
1349 | - <marker date="1575942586437" expanded="false" signature="6723:6729" ph=" " /> | ||
1350 | - <marker date="1575942586437" expanded="false" signature="6729:6735" ph=" " /> | ||
1351 | - <marker date="1575942586437" expanded="false" signature="6735:6741" ph=" " /> | ||
1352 | - <marker date="1575942586437" expanded="false" signature="6801:6848" ph="..." /> | ||
1353 | - <marker date="1575942586437" expanded="false" signature="6850:6856" ph=" " /> | ||
1354 | - <marker date="1575942586437" expanded="false" signature="6856:6862" ph=" " /> | ||
1355 | - <marker date="1575942586437" expanded="false" signature="6862:6868" ph=" " /> | ||
1356 | - <marker date="1575942586437" expanded="false" signature="6868:6874" ph=" " /> | ||
1357 | - <marker date="1575942586437" expanded="false" signature="7058:7105" ph="..." /> | ||
1358 | - <marker date="1575942586437" expanded="false" signature="7107:7113" ph=" " /> | ||
1359 | - <marker date="1575942586437" expanded="false" signature="7113:7119" ph=" " /> | ||
1360 | - <marker date="1575942586437" expanded="false" signature="7119:7125" ph=" " /> | ||
1361 | - <marker date="1575942586437" expanded="false" signature="7125:7131" ph=" " /> | ||
1362 | - <marker date="1575942586437" expanded="false" signature="7259:7306" ph="..." /> | ||
1363 | - <marker date="1575942586437" expanded="false" signature="7308:7314" ph=" " /> | ||
1364 | - <marker date="1575942586437" expanded="false" signature="7314:7320" ph=" " /> | ||
1365 | - <marker date="1575942586437" expanded="false" signature="7320:7326" ph=" " /> | ||
1366 | - <marker date="1575942586437" expanded="false" signature="7326:7332" ph=" " /> | ||
1367 | - <marker date="1575942586437" expanded="false" signature="7433:7451" ph="..." /> | ||
1368 | - <marker date="1575942586437" expanded="true" signature="7452:7952" ph="..." /> | ||
1369 | - <marker date="1575942586437" expanded="false" signature="7480:7546" ph="..." /> | ||
1370 | - <marker date="1575942586437" expanded="false" signature="7587:7634" ph="..." /> | ||
1371 | - <marker date="1575942586437" expanded="false" signature="7636:7642" ph=" " /> | ||
1372 | - <marker date="1575942586437" expanded="false" signature="7642:7648" ph=" " /> | ||
1373 | - <marker date="1575942586437" expanded="false" signature="7648:7654" ph=" " /> | ||
1374 | - <marker date="1575942586437" expanded="false" signature="7654:7660" ph=" " /> | ||
1375 | - <marker date="1575942586437" expanded="false" signature="7772:7819" ph="..." /> | ||
1376 | - <marker date="1575942586437" expanded="false" signature="7821:7827" ph=" " /> | ||
1377 | - <marker date="1575942586437" expanded="false" signature="7827:7833" ph=" " /> | ||
1378 | - <marker date="1575942586437" expanded="false" signature="7833:7839" ph=" " /> | ||
1379 | - <marker date="1575942586437" expanded="false" signature="7839:7845" ph=" " /> | ||
1380 | - <marker date="1575942586437" expanded="false" signature="7976:7994" ph="..." /> | ||
1381 | - <marker date="1575942586437" expanded="true" signature="7995:8995" ph="..." /> | ||
1382 | - <marker date="1575942586437" expanded="false" signature="8023:8089" ph="..." /> | ||
1383 | - <marker date="1575942586437" expanded="false" signature="8128:8175" ph="..." /> | ||
1384 | - <marker date="1575942586437" expanded="false" signature="8177:8183" ph=" " /> | ||
1385 | - <marker date="1575942586437" expanded="false" signature="8183:8189" ph=" " /> | ||
1386 | - <marker date="1575942586437" expanded="false" signature="8189:8195" ph=" " /> | ||
1387 | - <marker date="1575942586437" expanded="false" signature="8195:8201" ph=" " /> | ||
1388 | - <marker date="1575942586437" expanded="false" signature="8267:8314" ph="..." /> | ||
1389 | - <marker date="1575942586437" expanded="false" signature="8316:8322" ph=" " /> | ||
1390 | - <marker date="1575942586437" expanded="false" signature="8322:8328" ph=" " /> | ||
1391 | - <marker date="1575942586437" expanded="false" signature="8328:8334" ph=" " /> | ||
1392 | - <marker date="1575942586437" expanded="false" signature="8334:8340" ph=" " /> | ||
1393 | - <marker date="1575942586437" expanded="false" signature="8397:8444" ph="..." /> | ||
1394 | - <marker date="1575942586437" expanded="false" signature="8446:8452" ph=" " /> | ||
1395 | - <marker date="1575942586437" expanded="false" signature="8452:8458" ph=" " /> | ||
1396 | - <marker date="1575942586437" expanded="false" signature="8458:8464" ph=" " /> | ||
1397 | - <marker date="1575942586437" expanded="false" signature="8464:8470" ph=" " /> | ||
1398 | - <marker date="1575942586437" expanded="false" signature="8548:8595" ph="..." /> | ||
1399 | - <marker date="1575942586437" expanded="false" signature="8597:8603" ph=" " /> | ||
1400 | - <marker date="1575942586437" expanded="false" signature="8603:8609" ph=" " /> | ||
1401 | - <marker date="1575942586437" expanded="false" signature="8609:8615" ph=" " /> | ||
1402 | - <marker date="1575942586437" expanded="false" signature="8615:8621" ph=" " /> | ||
1403 | - <marker date="1575942586437" expanded="false" signature="8714:8761" ph="..." /> | ||
1404 | - <marker date="1575942586437" expanded="false" signature="8763:8769" ph=" " /> | ||
1405 | - <marker date="1575942586437" expanded="false" signature="8769:8775" ph=" " /> | ||
1406 | - <marker date="1575942586437" expanded="false" signature="8775:8781" ph=" " /> | ||
1407 | - <marker date="1575942586437" expanded="false" signature="8781:8787" ph=" " /> | ||
1408 | - <marker date="1575942586437" expanded="false" signature="8861:8908" ph="..." /> | ||
1409 | - <marker date="1575942586437" expanded="false" signature="8910:8916" ph=" " /> | ||
1410 | - <marker date="1575942586437" expanded="false" signature="8916:8922" ph=" " /> | ||
1411 | - <marker date="1575942586437" expanded="false" signature="8922:8928" ph=" " /> | ||
1412 | - <marker date="1575942586437" expanded="false" signature="8928:8934" ph=" " /> | ||
1413 | - <marker date="1575942586437" expanded="false" signature="9019:9099" ph="..." /> | ||
1414 | - <marker date="1575942586437" expanded="false" signature="9160:9240" ph="..." /> | ||
1415 | - </folding> | ||
1416 | - </state> | ||
1417 | - </provider> | ||
1418 | - </entry> | ||
1419 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 1203 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
1420 | <provider selected="true" editor-type-id="text-editor"> | 1204 | <provider selected="true" editor-type-id="text-editor"> |
1421 | <state relative-caret-position="428"> | 1205 | <state relative-caret-position="428"> |
@@ -1498,5 +1282,208 @@ | @@ -1498,5 +1282,208 @@ | ||
1498 | </state> | 1282 | </state> |
1499 | </provider> | 1283 | </provider> |
1500 | </entry> | 1284 | </entry> |
1285 | + <entry file="file://$PROJECT_DIR$/application/api/controller/Common.php"> | ||
1286 | + <provider selected="true" editor-type-id="text-editor"> | ||
1287 | + <state relative-caret-position="364"> | ||
1288 | + <caret line="152" column="39" lean-forward="true" selection-start-line="152" selection-start-column="39" selection-end-line="152" selection-end-column="39" /> | ||
1289 | + <folding> | ||
1290 | + <element signature="e#38#68#0#PHP" expanded="true" /> | ||
1291 | + <element signature="e#1222#1271#0#PHP" expanded="false" /> | ||
1292 | + <element signature="e#9891#10022#0#PHP" expanded="false" /> | ||
1293 | + <element signature="e#10027#10625#0#PHP" expanded="false" /> | ||
1294 | + <element signature="e#10631#10708#0#PHP" expanded="false" /> | ||
1295 | + <element signature="e#10713#14976#0#PHP" expanded="false" /> | ||
1296 | + <marker date="1575942949956" expanded="true" signature="1639:9267" ph="..." /> | ||
1297 | + <marker date="1575942949956" expanded="false" signature="1657:1792" ph="..." /> | ||
1298 | + <marker date="1575942949956" expanded="false" signature="1677:1743" ph="..." /> | ||
1299 | + <marker date="1575942949956" expanded="false" signature="1816:1863" ph="..." /> | ||
1300 | + <marker date="1575942949956" expanded="false" signature="1864:1902" ph="..." /> | ||
1301 | + <marker date="1575942949956" expanded="true" signature="1926:1973" ph="..." /> | ||
1302 | + <marker date="1575942949956" expanded="true" signature="1974:2129" ph="..." /> | ||
1303 | + <marker date="1575942949956" expanded="true" signature="2153:2172" ph="..." /> | ||
1304 | + <marker date="1575942949956" expanded="true" signature="2173:3073" ph="..." /> | ||
1305 | + <marker date="1575942949956" expanded="true" signature="2228:2275" ph="..." /> | ||
1306 | + <marker date="1575942949956" expanded="true" signature="2228:2276" ph="..." /> | ||
1307 | + <marker date="1575942949956" expanded="true" signature="2228:2311" ph="..." /> | ||
1308 | + <marker date="1575942949956" expanded="false" signature="2261:2273" ph="..." /> | ||
1309 | + <marker date="1575942949956" expanded="true" signature="2366:2414" ph="..." /> | ||
1310 | + <marker date="1575942949956" expanded="true" signature="2366:2415" ph="..." /> | ||
1311 | + <marker date="1575942949956" expanded="true" signature="2366:2449" ph="..." /> | ||
1312 | + <marker date="1575942949956" expanded="false" signature="2400:2412" ph="..." /> | ||
1313 | + <marker date="1575942949956" expanded="true" signature="2504:2551" ph="..." /> | ||
1314 | + <marker date="1575942949956" expanded="true" signature="2504:2552" ph="..." /> | ||
1315 | + <marker date="1575942949956" expanded="true" signature="2504:2586" ph="..." /> | ||
1316 | + <marker date="1575942949956" expanded="false" signature="2537:2549" ph="..." /> | ||
1317 | + <marker date="1575942949956" expanded="true" signature="2641:2689" ph="..." /> | ||
1318 | + <marker date="1575942949956" expanded="true" signature="2641:2746" ph="..." /> | ||
1319 | + <marker date="1575942949956" expanded="true" signature="2641:2787" ph="..." /> | ||
1320 | + <marker date="1575942949956" expanded="true" signature="2675:2687" ph="..." /> | ||
1321 | + <marker date="1575942949956" expanded="true" signature="2728:2744" ph="..." /> | ||
1322 | + <marker date="1575942949956" expanded="true" signature="2842:2896" ph="..." /> | ||
1323 | + <marker date="1575942949956" expanded="true" signature="2842:2932" ph="..." /> | ||
1324 | + <marker date="1575942949956" expanded="false" signature="2883:2895" ph="..." /> | ||
1325 | + <marker date="1575942949956" expanded="true" signature="2987:3056" ph="..." /> | ||
1326 | + <marker date="1575942949956" expanded="false" signature="3097:3115" ph="..." /> | ||
1327 | + <marker date="1575942949956" expanded="true" signature="3116:3533" ph="..." /> | ||
1328 | + <marker date="1575942949956" expanded="false" signature="3144:3210" ph="..." /> | ||
1329 | + <marker date="1575942949956" expanded="false" signature="3253:3298" ph="..." /> | ||
1330 | + <marker date="1575942949956" expanded="true" signature="3300:3306" ph=" " /> | ||
1331 | + <marker date="1575942949956" expanded="true" signature="3306:3312" ph=" " /> | ||
1332 | + <marker date="1575942949956" expanded="true" signature="3312:3318" ph=" " /> | ||
1333 | + <marker date="1575942949956" expanded="true" signature="3318:3324" ph=" " /> | ||
1334 | + <marker date="1575942949956" expanded="false" signature="3343:3352" ph="..." /> | ||
1335 | + <marker date="1575942949956" expanded="false" signature="3395:3404" ph="..." /> | ||
1336 | + <marker date="1575942949956" expanded="false" signature="3433:3442" ph="..." /> | ||
1337 | + <marker date="1575942949956" expanded="false" signature="3557:3575" ph="..." /> | ||
1338 | + <marker date="1575942949956" expanded="true" signature="3576:3892" ph="..." /> | ||
1339 | + <marker date="1575942949956" expanded="false" signature="3604:3670" ph="..." /> | ||
1340 | + <marker date="1575942949956" expanded="false" signature="3709:3737" ph="..." /> | ||
1341 | + <marker date="1575942949956" expanded="true" signature="3739:3745" ph=" " /> | ||
1342 | + <marker date="1575942949956" expanded="true" signature="3745:3751" ph=" " /> | ||
1343 | + <marker date="1575942949956" expanded="true" signature="3751:3757" ph=" " /> | ||
1344 | + <marker date="1575942949956" expanded="true" signature="3757:3763" ph=" " /> | ||
1345 | + <marker date="1575942949956" expanded="false" signature="3816:3825" ph="..." /> | ||
1346 | + <marker date="1575942949956" expanded="false" signature="3916:3934" ph="..." /> | ||
1347 | + <marker date="1575942949956" expanded="true" signature="3935:4294" ph="..." /> | ||
1348 | + <marker date="1575942949956" expanded="false" signature="3963:4029" ph="..." /> | ||
1349 | + <marker date="1575942949956" expanded="false" signature="4070:4115" ph="..." /> | ||
1350 | + <marker date="1575942949956" expanded="false" signature="4117:4123" ph=" " /> | ||
1351 | + <marker date="1575942949956" expanded="false" signature="4123:4129" ph=" " /> | ||
1352 | + <marker date="1575942949956" expanded="false" signature="4129:4135" ph=" " /> | ||
1353 | + <marker date="1575942949956" expanded="false" signature="4135:4141" ph=" " /> | ||
1354 | + <marker date="1575942949956" expanded="false" signature="4224:4233" ph="..." /> | ||
1355 | + <marker date="1575942949956" expanded="false" signature="4318:4365" ph="..." /> | ||
1356 | + <marker date="1575942949956" expanded="false" signature="4367:4373" ph=" " /> | ||
1357 | + <marker date="1575942949956" expanded="false" signature="4373:4379" ph=" " /> | ||
1358 | + <marker date="1575942949956" expanded="false" signature="4379:4385" ph=" " /> | ||
1359 | + <marker date="1575942949956" expanded="false" signature="4385:4391" ph=" " /> | ||
1360 | + <marker date="1575942949956" expanded="false" signature="4446:4455" ph="..." /> | ||
1361 | + <marker date="1575942949956" expanded="false" signature="4574:4621" ph="..." /> | ||
1362 | + <marker date="1575942949956" expanded="false" signature="4623:4629" ph=" " /> | ||
1363 | + <marker date="1575942949956" expanded="false" signature="4629:4635" ph=" " /> | ||
1364 | + <marker date="1575942949956" expanded="false" signature="4635:4641" ph=" " /> | ||
1365 | + <marker date="1575942949956" expanded="false" signature="4641:4647" ph=" " /> | ||
1366 | + <marker date="1575942949956" expanded="false" signature="4701:4710" ph="..." /> | ||
1367 | + <marker date="1575942949956" expanded="false" signature="4784:4800" ph="..." /> | ||
1368 | + <marker date="1575942949956" expanded="false" signature="4853:4900" ph="..." /> | ||
1369 | + <marker date="1575942949956" expanded="false" signature="4902:4908" ph=" " /> | ||
1370 | + <marker date="1575942949956" expanded="false" signature="4908:4914" ph=" " /> | ||
1371 | + <marker date="1575942949956" expanded="false" signature="4914:4920" ph=" " /> | ||
1372 | + <marker date="1575942949956" expanded="false" signature="4920:4926" ph=" " /> | ||
1373 | + <marker date="1575942949956" expanded="false" signature="4954:4980" ph="..." /> | ||
1374 | + <marker date="1575942949956" expanded="false" signature="5066:5084" ph="..." /> | ||
1375 | + <marker date="1575942949956" expanded="true" signature="5085:5683" ph="..." /> | ||
1376 | + <marker date="1575942949956" expanded="false" signature="5113:5179" ph="..." /> | ||
1377 | + <marker date="1575942949956" expanded="false" signature="5218:5265" ph="..." /> | ||
1378 | + <marker date="1575942949956" expanded="false" signature="5267:5273" ph=" " /> | ||
1379 | + <marker date="1575942949956" expanded="false" signature="5273:5279" ph=" " /> | ||
1380 | + <marker date="1575942949956" expanded="false" signature="5279:5285" ph=" " /> | ||
1381 | + <marker date="1575942949956" expanded="false" signature="5285:5291" ph=" " /> | ||
1382 | + <marker date="1575942949956" expanded="false" signature="5376:5423" ph="..." /> | ||
1383 | + <marker date="1575942949956" expanded="false" signature="5425:5431" ph=" " /> | ||
1384 | + <marker date="1575942949956" expanded="false" signature="5431:5437" ph=" " /> | ||
1385 | + <marker date="1575942949956" expanded="false" signature="5437:5443" ph=" " /> | ||
1386 | + <marker date="1575942949956" expanded="false" signature="5443:5449" ph=" " /> | ||
1387 | + <marker date="1575942949956" expanded="false" signature="5550:5597" ph="..." /> | ||
1388 | + <marker date="1575942949956" expanded="false" signature="5599:5605" ph=" " /> | ||
1389 | + <marker date="1575942949956" expanded="false" signature="5605:5611" ph=" " /> | ||
1390 | + <marker date="1575942949956" expanded="false" signature="5611:5617" ph=" " /> | ||
1391 | + <marker date="1575942949956" expanded="false" signature="5617:5623" ph=" " /> | ||
1392 | + <marker date="1575942949956" expanded="false" signature="5707:5725" ph="..." /> | ||
1393 | + <marker date="1575942949956" expanded="true" signature="5726:7409" ph="..." /> | ||
1394 | + <marker date="1575942949956" expanded="false" signature="5754:5820" ph="..." /> | ||
1395 | + <marker date="1575942949956" expanded="false" signature="5859:5906" ph="..." /> | ||
1396 | + <marker date="1575942949956" expanded="false" signature="5908:5914" ph=" " /> | ||
1397 | + <marker date="1575942949956" expanded="false" signature="5914:5920" ph=" " /> | ||
1398 | + <marker date="1575942949956" expanded="false" signature="5920:5926" ph=" " /> | ||
1399 | + <marker date="1575942949956" expanded="false" signature="5926:5932" ph=" " /> | ||
1400 | + <marker date="1575942949956" expanded="false" signature="5958:5974" ph="..." /> | ||
1401 | + <marker date="1575942949956" expanded="false" signature="6094:6141" ph="..." /> | ||
1402 | + <marker date="1575942949956" expanded="false" signature="6143:6149" ph=" " /> | ||
1403 | + <marker date="1575942949956" expanded="false" signature="6149:6155" ph=" " /> | ||
1404 | + <marker date="1575942949956" expanded="false" signature="6155:6161" ph=" " /> | ||
1405 | + <marker date="1575942949956" expanded="false" signature="6161:6167" ph=" " /> | ||
1406 | + <marker date="1575942949956" expanded="false" signature="6319:6366" ph="..." /> | ||
1407 | + <marker date="1575942949956" expanded="false" signature="6368:6374" ph=" " /> | ||
1408 | + <marker date="1575942949956" expanded="false" signature="6374:6380" ph=" " /> | ||
1409 | + <marker date="1575942949956" expanded="false" signature="6380:6386" ph=" " /> | ||
1410 | + <marker date="1575942949956" expanded="false" signature="6386:6392" ph=" " /> | ||
1411 | + <marker date="1575942949956" expanded="false" signature="6511:6558" ph="..." /> | ||
1412 | + <marker date="1575942949956" expanded="false" signature="6560:6566" ph=" " /> | ||
1413 | + <marker date="1575942949956" expanded="false" signature="6566:6572" ph=" " /> | ||
1414 | + <marker date="1575942949956" expanded="false" signature="6572:6578" ph=" " /> | ||
1415 | + <marker date="1575942949956" expanded="false" signature="6578:6584" ph=" " /> | ||
1416 | + <marker date="1575942949956" expanded="false" signature="6668:6715" ph="..." /> | ||
1417 | + <marker date="1575942949956" expanded="false" signature="6717:6723" ph=" " /> | ||
1418 | + <marker date="1575942949956" expanded="false" signature="6723:6729" ph=" " /> | ||
1419 | + <marker date="1575942949956" expanded="false" signature="6729:6735" ph=" " /> | ||
1420 | + <marker date="1575942949956" expanded="false" signature="6735:6741" ph=" " /> | ||
1421 | + <marker date="1575942949956" expanded="false" signature="6801:6848" ph="..." /> | ||
1422 | + <marker date="1575942949956" expanded="false" signature="6850:6856" ph=" " /> | ||
1423 | + <marker date="1575942949956" expanded="false" signature="6856:6862" ph=" " /> | ||
1424 | + <marker date="1575942949956" expanded="false" signature="6862:6868" ph=" " /> | ||
1425 | + <marker date="1575942949956" expanded="false" signature="6868:6874" ph=" " /> | ||
1426 | + <marker date="1575942949956" expanded="false" signature="7058:7105" ph="..." /> | ||
1427 | + <marker date="1575942949956" expanded="false" signature="7107:7113" ph=" " /> | ||
1428 | + <marker date="1575942949956" expanded="false" signature="7113:7119" ph=" " /> | ||
1429 | + <marker date="1575942949956" expanded="false" signature="7119:7125" ph=" " /> | ||
1430 | + <marker date="1575942949956" expanded="false" signature="7125:7131" ph=" " /> | ||
1431 | + <marker date="1575942949956" expanded="false" signature="7259:7306" ph="..." /> | ||
1432 | + <marker date="1575942949956" expanded="false" signature="7308:7314" ph=" " /> | ||
1433 | + <marker date="1575942949956" expanded="false" signature="7314:7320" ph=" " /> | ||
1434 | + <marker date="1575942949956" expanded="false" signature="7320:7326" ph=" " /> | ||
1435 | + <marker date="1575942949956" expanded="false" signature="7326:7332" ph=" " /> | ||
1436 | + <marker date="1575942949956" expanded="false" signature="7433:7451" ph="..." /> | ||
1437 | + <marker date="1575942949956" expanded="true" signature="7452:7952" ph="..." /> | ||
1438 | + <marker date="1575942949956" expanded="false" signature="7480:7546" ph="..." /> | ||
1439 | + <marker date="1575942949956" expanded="false" signature="7587:7634" ph="..." /> | ||
1440 | + <marker date="1575942949956" expanded="false" signature="7636:7642" ph=" " /> | ||
1441 | + <marker date="1575942949956" expanded="false" signature="7642:7648" ph=" " /> | ||
1442 | + <marker date="1575942949956" expanded="false" signature="7648:7654" ph=" " /> | ||
1443 | + <marker date="1575942949956" expanded="false" signature="7654:7660" ph=" " /> | ||
1444 | + <marker date="1575942949956" expanded="false" signature="7772:7819" ph="..." /> | ||
1445 | + <marker date="1575942949956" expanded="false" signature="7821:7827" ph=" " /> | ||
1446 | + <marker date="1575942949956" expanded="false" signature="7827:7833" ph=" " /> | ||
1447 | + <marker date="1575942949956" expanded="false" signature="7833:7839" ph=" " /> | ||
1448 | + <marker date="1575942949956" expanded="false" signature="7839:7845" ph=" " /> | ||
1449 | + <marker date="1575942949956" expanded="false" signature="7976:7994" ph="..." /> | ||
1450 | + <marker date="1575942949956" expanded="true" signature="7995:8995" ph="..." /> | ||
1451 | + <marker date="1575942949956" expanded="false" signature="8023:8089" ph="..." /> | ||
1452 | + <marker date="1575942949956" expanded="false" signature="8128:8175" ph="..." /> | ||
1453 | + <marker date="1575942949956" expanded="false" signature="8177:8183" ph=" " /> | ||
1454 | + <marker date="1575942949956" expanded="false" signature="8183:8189" ph=" " /> | ||
1455 | + <marker date="1575942949956" expanded="false" signature="8189:8195" ph=" " /> | ||
1456 | + <marker date="1575942949956" expanded="false" signature="8195:8201" ph=" " /> | ||
1457 | + <marker date="1575942949956" expanded="false" signature="8267:8314" ph="..." /> | ||
1458 | + <marker date="1575942949956" expanded="false" signature="8316:8322" ph=" " /> | ||
1459 | + <marker date="1575942949956" expanded="false" signature="8322:8328" ph=" " /> | ||
1460 | + <marker date="1575942949956" expanded="false" signature="8328:8334" ph=" " /> | ||
1461 | + <marker date="1575942949956" expanded="false" signature="8334:8340" ph=" " /> | ||
1462 | + <marker date="1575942949956" expanded="false" signature="8397:8444" ph="..." /> | ||
1463 | + <marker date="1575942949956" expanded="false" signature="8446:8452" ph=" " /> | ||
1464 | + <marker date="1575942949956" expanded="false" signature="8452:8458" ph=" " /> | ||
1465 | + <marker date="1575942949956" expanded="false" signature="8458:8464" ph=" " /> | ||
1466 | + <marker date="1575942949956" expanded="false" signature="8464:8470" ph=" " /> | ||
1467 | + <marker date="1575942949956" expanded="false" signature="8548:8595" ph="..." /> | ||
1468 | + <marker date="1575942949956" expanded="false" signature="8597:8603" ph=" " /> | ||
1469 | + <marker date="1575942949956" expanded="false" signature="8603:8609" ph=" " /> | ||
1470 | + <marker date="1575942949956" expanded="false" signature="8609:8615" ph=" " /> | ||
1471 | + <marker date="1575942949956" expanded="false" signature="8615:8621" ph=" " /> | ||
1472 | + <marker date="1575942949956" expanded="false" signature="8714:8761" ph="..." /> | ||
1473 | + <marker date="1575942949956" expanded="false" signature="8763:8769" ph=" " /> | ||
1474 | + <marker date="1575942949956" expanded="false" signature="8769:8775" ph=" " /> | ||
1475 | + <marker date="1575942949956" expanded="false" signature="8775:8781" ph=" " /> | ||
1476 | + <marker date="1575942949956" expanded="false" signature="8781:8787" ph=" " /> | ||
1477 | + <marker date="1575942949956" expanded="false" signature="8861:8908" ph="..." /> | ||
1478 | + <marker date="1575942949956" expanded="false" signature="8910:8916" ph=" " /> | ||
1479 | + <marker date="1575942949956" expanded="false" signature="8916:8922" ph=" " /> | ||
1480 | + <marker date="1575942949956" expanded="false" signature="8922:8928" ph=" " /> | ||
1481 | + <marker date="1575942949956" expanded="false" signature="8928:8934" ph=" " /> | ||
1482 | + <marker date="1575942949956" expanded="false" signature="9019:9099" ph="..." /> | ||
1483 | + <marker date="1575942949956" expanded="false" signature="9160:9240" ph="..." /> | ||
1484 | + </folding> | ||
1485 | + </state> | ||
1486 | + </provider> | ||
1487 | + </entry> | ||
1501 | </component> | 1488 | </component> |
1502 | </project> | 1489 | </project> |
@@ -149,7 +149,7 @@ class Common extends Api | @@ -149,7 +149,7 @@ class Common extends Api | ||
149 | 149 | ||
150 | ob_clean(); | 150 | ob_clean(); |
151 | $pdf->Output(ROOT_PATH.'public'.DS.'pdf'.DS.$order_num.'.pdf', 'F'); | 151 | $pdf->Output(ROOT_PATH.'public'.DS.'pdf'.DS.$order_num.'.pdf', 'F'); |
152 | - $url = 'https://areial.w.broing.cn'.'/public/pdf/'.$order_num.'.pdf'; | 152 | + $url = 'https://areial.w.broing.cn'.'/pdf/'.$order_num.'.pdf'; |
153 | $this->success('success',$url); | 153 | $this->success('success',$url); |
154 | // var_dump($pdf);exit; | 154 | // var_dump($pdf);exit; |
155 | exit; | 155 | exit; |
-
请 注册 或 登录 后发表评论