正在显示
2 个修改的文件
包含
115 行增加
和
116 行删除
@@ -2,7 +2,6 @@ | @@ -2,7 +2,6 @@ | ||
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/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> | 5 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> |
7 | </list> | 6 | </list> |
8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
@@ -17,8 +16,8 @@ | @@ -17,8 +16,8 @@ | ||
17 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> | 16 | <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> |
18 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 17 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
19 | <provider selected="true" editor-type-id="text-editor"> | 18 | <provider selected="true" editor-type-id="text-editor"> |
20 | - <state relative-caret-position="307"> | ||
21 | - <caret line="194" column="44" lean-forward="false" selection-start-line="194" selection-start-column="44" selection-end-line="194" selection-end-column="44" /> | 19 | + <state relative-caret-position="134"> |
20 | + <caret line="599" column="33" lean-forward="false" selection-start-line="599" selection-start-column="33" selection-end-line="599" selection-end-column="33" /> | ||
22 | <folding> | 21 | <folding> |
23 | <element signature="e#365#484#0#PHP" expanded="false" /> | 22 | <element signature="e#365#484#0#PHP" expanded="false" /> |
24 | <element signature="e#490#1228#0#PHP" expanded="false" /> | 23 | <element signature="e#490#1228#0#PHP" expanded="false" /> |
@@ -29,6 +28,7 @@ | @@ -29,6 +28,7 @@ | ||
29 | <element signature="e#4577#4984#0#PHP" expanded="false" /> | 28 | <element signature="e#4577#4984#0#PHP" expanded="false" /> |
30 | <element signature="e#4989#5332#0#PHP" expanded="false" /> | 29 | <element signature="e#4989#5332#0#PHP" expanded="false" /> |
31 | <element signature="e#5338#5751#0#PHP" expanded="false" /> | 30 | <element signature="e#5338#5751#0#PHP" expanded="false" /> |
31 | + <element signature="e#5756#6073#0#PHP" expanded="false" /> | ||
32 | <element signature="e#6079#6916#0#PHP" expanded="false" /> | 32 | <element signature="e#6079#6916#0#PHP" expanded="false" /> |
33 | <element signature="e#6921#9116#0#PHP" expanded="false" /> | 33 | <element signature="e#6921#9116#0#PHP" expanded="false" /> |
34 | <element signature="e#9122#9802#0#PHP" expanded="false" /> | 34 | <element signature="e#9122#9802#0#PHP" expanded="false" /> |
@@ -42,57 +42,57 @@ | @@ -42,57 +42,57 @@ | ||
42 | <element signature="e#16091#16807#0#PHP" expanded="false" /> | 42 | <element signature="e#16091#16807#0#PHP" expanded="false" /> |
43 | <element signature="e#16812#19352#0#PHP" expanded="false" /> | 43 | <element signature="e#16812#19352#0#PHP" expanded="false" /> |
44 | <element signature="e#19358#20260#0#PHP" expanded="false" /> | 44 | <element signature="e#19358#20260#0#PHP" expanded="false" /> |
45 | - <element signature="e#20265#23205#0#PHP" expanded="false" /> | ||
46 | - <element signature="e#23211#23588#0#PHP" expanded="false" /> | ||
47 | - <element signature="e#23593#23914#0#PHP" expanded="false" /> | ||
48 | - <element signature="e#23920#24425#0#PHP" expanded="false" /> | ||
49 | - <element signature="e#24430#24681#0#PHP" expanded="false" /> | ||
50 | - <element signature="e#24687#25166#0#PHP" expanded="false" /> | ||
51 | - <element signature="e#25171#25928#0#PHP" expanded="false" /> | ||
52 | - <element signature="e#25934#26415#0#PHP" expanded="false" /> | ||
53 | - <element signature="e#26420#27190#0#PHP" expanded="false" /> | ||
54 | - <element signature="e#27196#27559#0#PHP" expanded="false" /> | ||
55 | - <element signature="e#27564#27755#0#PHP" expanded="false" /> | ||
56 | - <element signature="e#27761#28119#0#PHP" expanded="false" /> | ||
57 | - <element signature="e#28124#28315#0#PHP" expanded="false" /> | ||
58 | - <element signature="e#28321#29464#0#PHP" expanded="false" /> | ||
59 | - <element signature="e#29469#32134#0#PHP" expanded="false" /> | ||
60 | - <element signature="e#32140#32638#0#PHP" expanded="false" /> | ||
61 | - <element signature="e#32643#34389#0#PHP" expanded="false" /> | ||
62 | - <element signature="e#34395#34808#0#PHP" expanded="false" /> | ||
63 | - <element signature="e#34813#35292#0#PHP" expanded="false" /> | ||
64 | - <element signature="e#35298#35832#0#PHP" expanded="false" /> | ||
65 | - <element signature="e#35837#37222#0#PHP" expanded="false" /> | ||
66 | - <element signature="e#37228#37882#0#PHP" expanded="false" /> | ||
67 | - <element signature="e#37887#39902#0#PHP" expanded="false" /> | ||
68 | - <element signature="e#39908#40668#0#PHP" expanded="false" /> | ||
69 | - <element signature="e#40673#43382#0#PHP" expanded="false" /> | ||
70 | - <element signature="e#43408#44239#0#PHP" expanded="false" /> | ||
71 | - <element signature="e#44245#44665#0#PHP" expanded="false" /> | ||
72 | - <element signature="e#44670#45153#0#PHP" expanded="false" /> | ||
73 | - <element signature="e#45159#45965#0#PHP" expanded="false" /> | ||
74 | - <element signature="e#45970#49128#0#PHP" expanded="false" /> | ||
75 | - <element signature="e#49143#50478#0#PHP" expanded="false" /> | ||
76 | - <element signature="e#50494#51528#0#PHP" expanded="false" /> | ||
77 | - <element signature="e#51534#52292#0#PHP" expanded="false" /> | ||
78 | - <element signature="e#52297#56040#0#PHP" expanded="false" /> | ||
79 | - <element signature="e#56046#56438#0#PHP" expanded="false" /> | ||
80 | - <element signature="e#56443#57395#0#PHP" expanded="false" /> | ||
81 | - <element signature="e#57419#57992#0#PHP" expanded="false" /> | ||
82 | - <element signature="e#57998#58597#0#PHP" expanded="false" /> | ||
83 | - <element signature="e#58602#59529#0#PHP" expanded="false" /> | ||
84 | - <element signature="e#59535#60249#0#PHP" expanded="false" /> | ||
85 | - <element signature="e#60255#60682#0#PHP" expanded="false" /> | ||
86 | - <element signature="e#60687#61156#0#PHP" expanded="false" /> | ||
87 | - <element signature="e#61163#62368#0#PHP" expanded="false" /> | ||
88 | - <element signature="e#62373#64076#0#PHP" expanded="false" /> | ||
89 | - <element signature="e#62520#62859#1#PHP" expanded="false" /> | ||
90 | - <element signature="e#62889#63243#1#PHP" expanded="false" /> | ||
91 | - <element signature="e#64082#64948#0#PHP" expanded="false" /> | ||
92 | - <element signature="e#64953#67488#0#PHP" expanded="false" /> | ||
93 | - <element signature="e#65148#65285#1#PHP" expanded="false" /> | ||
94 | - <element signature="e#65315#65455#1#PHP" expanded="false" /> | ||
95 | - <element signature="e#66125#66209#0#PHP" expanded="false" /> | 45 | + <element signature="e#20265#23083#0#PHP" expanded="false" /> |
46 | + <element signature="e#23089#23466#0#PHP" expanded="false" /> | ||
47 | + <element signature="e#23471#23792#0#PHP" expanded="false" /> | ||
48 | + <element signature="e#23798#24303#0#PHP" expanded="false" /> | ||
49 | + <element signature="e#24308#24559#0#PHP" expanded="false" /> | ||
50 | + <element signature="e#24565#25044#0#PHP" expanded="false" /> | ||
51 | + <element signature="e#25049#25806#0#PHP" expanded="false" /> | ||
52 | + <element signature="e#25812#26293#0#PHP" expanded="false" /> | ||
53 | + <element signature="e#26298#27068#0#PHP" expanded="false" /> | ||
54 | + <element signature="e#27074#27437#0#PHP" expanded="false" /> | ||
55 | + <element signature="e#27442#27633#0#PHP" expanded="false" /> | ||
56 | + <element signature="e#27639#27997#0#PHP" expanded="false" /> | ||
57 | + <element signature="e#28002#28193#0#PHP" expanded="false" /> | ||
58 | + <element signature="e#28199#29342#0#PHP" expanded="false" /> | ||
59 | + <element signature="e#29347#32012#0#PHP" expanded="false" /> | ||
60 | + <element signature="e#32018#32516#0#PHP" expanded="false" /> | ||
61 | + <element signature="e#32521#34267#0#PHP" expanded="false" /> | ||
62 | + <element signature="e#34273#34686#0#PHP" expanded="false" /> | ||
63 | + <element signature="e#34691#35170#0#PHP" expanded="false" /> | ||
64 | + <element signature="e#35176#35710#0#PHP" expanded="false" /> | ||
65 | + <element signature="e#35715#37100#0#PHP" expanded="false" /> | ||
66 | + <element signature="e#37106#37760#0#PHP" expanded="false" /> | ||
67 | + <element signature="e#37765#39780#0#PHP" expanded="false" /> | ||
68 | + <element signature="e#39786#40546#0#PHP" expanded="false" /> | ||
69 | + <element signature="e#40551#43260#0#PHP" expanded="false" /> | ||
70 | + <element signature="e#43286#44117#0#PHP" expanded="false" /> | ||
71 | + <element signature="e#44123#44543#0#PHP" expanded="false" /> | ||
72 | + <element signature="e#44548#45031#0#PHP" expanded="false" /> | ||
73 | + <element signature="e#45037#45843#0#PHP" expanded="false" /> | ||
74 | + <element signature="e#45848#49006#0#PHP" expanded="false" /> | ||
75 | + <element signature="e#49021#50356#0#PHP" expanded="false" /> | ||
76 | + <element signature="e#50372#51406#0#PHP" expanded="false" /> | ||
77 | + <element signature="e#51412#52170#0#PHP" expanded="false" /> | ||
78 | + <element signature="e#52175#55918#0#PHP" expanded="false" /> | ||
79 | + <element signature="e#55924#56316#0#PHP" expanded="false" /> | ||
80 | + <element signature="e#56321#57273#0#PHP" expanded="false" /> | ||
81 | + <element signature="e#57297#57870#0#PHP" expanded="false" /> | ||
82 | + <element signature="e#57876#58475#0#PHP" expanded="false" /> | ||
83 | + <element signature="e#58480#59407#0#PHP" expanded="false" /> | ||
84 | + <element signature="e#59413#60127#0#PHP" expanded="false" /> | ||
85 | + <element signature="e#60133#60560#0#PHP" expanded="false" /> | ||
86 | + <element signature="e#60565#61034#0#PHP" expanded="false" /> | ||
87 | + <element signature="e#61041#62246#0#PHP" expanded="false" /> | ||
88 | + <element signature="e#62251#63954#0#PHP" expanded="false" /> | ||
89 | + <element signature="e#62398#62737#1#PHP" expanded="false" /> | ||
90 | + <element signature="e#62767#63121#1#PHP" expanded="false" /> | ||
91 | + <element signature="e#63960#64826#0#PHP" expanded="false" /> | ||
92 | + <element signature="e#64831#67366#0#PHP" expanded="false" /> | ||
93 | + <element signature="e#65026#65163#1#PHP" expanded="false" /> | ||
94 | + <element signature="e#65193#65333#1#PHP" expanded="false" /> | ||
95 | + <element signature="e#66003#66087#0#PHP" expanded="false" /> | ||
96 | </folding> | 96 | </folding> |
97 | </state> | 97 | </state> |
98 | </provider> | 98 | </provider> |
@@ -196,8 +196,8 @@ | @@ -196,8 +196,8 @@ | ||
196 | </component> | 196 | </component> |
197 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 197 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
198 | <component name="ProjectFrameBounds" extendedState="1"> | 198 | <component name="ProjectFrameBounds" extendedState="1"> |
199 | - <option name="x" value="277" /> | ||
200 | - <option name="y" value="126" /> | 199 | + <option name="x" value="362" /> |
200 | + <option name="y" value="107" /> | ||
201 | <option name="width" value="1464" /> | 201 | <option name="width" value="1464" /> |
202 | <option name="height" value="940" /> | 202 | <option name="height" value="940" /> |
203 | </component> | 203 | </component> |
@@ -340,7 +340,7 @@ | @@ -340,7 +340,7 @@ | ||
340 | <workItem from="1575937244447" duration="6285000" /> | 340 | <workItem from="1575937244447" duration="6285000" /> |
341 | <workItem from="1575949803768" duration="5926000" /> | 341 | <workItem from="1575949803768" duration="5926000" /> |
342 | <workItem from="1575959458925" duration="956000" /> | 342 | <workItem from="1575959458925" duration="956000" /> |
343 | - <workItem from="1575979358020" duration="23000" /> | 343 | + <workItem from="1575979358020" duration="656000" /> |
344 | </task> | 344 | </task> |
345 | <task id="LOCAL-00001" summary="调试"> | 345 | <task id="LOCAL-00001" summary="调试"> |
346 | <created>1574145133364</created> | 346 | <created>1574145133364</created> |
@@ -367,7 +367,7 @@ | @@ -367,7 +367,7 @@ | ||
367 | <servers /> | 367 | <servers /> |
368 | </component> | 368 | </component> |
369 | <component name="TimeTrackingManager"> | 369 | <component name="TimeTrackingManager"> |
370 | - <option name="totallyTimeSpent" value="386988000" /> | 370 | + <option name="totallyTimeSpent" value="387621000" /> |
371 | </component> | 371 | </component> |
372 | <component name="TodoView"> | 372 | <component name="TodoView"> |
373 | <todo-panel id="selected-file"> | 373 | <todo-panel id="selected-file"> |
@@ -379,7 +379,7 @@ | @@ -379,7 +379,7 @@ | ||
379 | </todo-panel> | 379 | </todo-panel> |
380 | </component> | 380 | </component> |
381 | <component name="ToolWindowManager"> | 381 | <component name="ToolWindowManager"> |
382 | - <frame x="277" y="126" width="1464" height="940" extended-state="1" /> | 382 | + <frame x="362" y="107" width="1464" height="940" extended-state="1" /> |
383 | <editor active="true" /> | 383 | <editor active="true" /> |
384 | <layout> | 384 | <layout> |
385 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23504274" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> | 385 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23504274" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
@@ -389,7 +389,7 @@ | @@ -389,7 +389,7 @@ | ||
389 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 389 | <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
390 | <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> | 390 | <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
391 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 391 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
392 | - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3601741" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | 392 | + <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3599004" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
393 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> | 393 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> |
394 | <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | 394 | <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> |
395 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 395 | <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
@@ -678,7 +678,7 @@ | @@ -678,7 +678,7 @@ | ||
678 | <state relative-caret-position="703"> | 678 | <state relative-caret-position="703"> |
679 | <caret line="179" column="5" lean-forward="false" selection-start-line="179" selection-start-column="5" selection-end-line="179" selection-end-column="5" /> | 679 | <caret line="179" column="5" lean-forward="false" selection-start-line="179" selection-start-column="5" selection-end-line="179" selection-end-column="5" /> |
680 | <folding> | 680 | <folding> |
681 | - <element signature="e#38#68#0#PHP" expanded="true" /> | 681 | + <element signature="e#38#68#0#PHP" expanded="false" /> |
682 | <element signature="e#1222#1271#0#PHP" expanded="false" /> | 682 | <element signature="e#1222#1271#0#PHP" expanded="false" /> |
683 | <element signature="e#9891#10022#0#PHP" expanded="false" /> | 683 | <element signature="e#9891#10022#0#PHP" expanded="false" /> |
684 | <element signature="e#10027#10625#0#PHP" expanded="false" /> | 684 | <element signature="e#10027#10625#0#PHP" expanded="false" /> |
@@ -1004,8 +1004,8 @@ | @@ -1004,8 +1004,8 @@ | ||
1004 | </entry> | 1004 | </entry> |
1005 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 1005 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
1006 | <provider selected="true" editor-type-id="text-editor"> | 1006 | <provider selected="true" editor-type-id="text-editor"> |
1007 | - <state relative-caret-position="307"> | ||
1008 | - <caret line="194" column="44" lean-forward="false" selection-start-line="194" selection-start-column="44" selection-end-line="194" selection-end-column="44" /> | 1007 | + <state relative-caret-position="134"> |
1008 | + <caret line="599" column="33" lean-forward="false" selection-start-line="599" selection-start-column="33" selection-end-line="599" selection-end-column="33" /> | ||
1009 | <folding> | 1009 | <folding> |
1010 | <element signature="e#365#484#0#PHP" expanded="false" /> | 1010 | <element signature="e#365#484#0#PHP" expanded="false" /> |
1011 | <element signature="e#490#1228#0#PHP" expanded="false" /> | 1011 | <element signature="e#490#1228#0#PHP" expanded="false" /> |
@@ -1016,6 +1016,7 @@ | @@ -1016,6 +1016,7 @@ | ||
1016 | <element signature="e#4577#4984#0#PHP" expanded="false" /> | 1016 | <element signature="e#4577#4984#0#PHP" expanded="false" /> |
1017 | <element signature="e#4989#5332#0#PHP" expanded="false" /> | 1017 | <element signature="e#4989#5332#0#PHP" expanded="false" /> |
1018 | <element signature="e#5338#5751#0#PHP" expanded="false" /> | 1018 | <element signature="e#5338#5751#0#PHP" expanded="false" /> |
1019 | + <element signature="e#5756#6073#0#PHP" expanded="false" /> | ||
1019 | <element signature="e#6079#6916#0#PHP" expanded="false" /> | 1020 | <element signature="e#6079#6916#0#PHP" expanded="false" /> |
1020 | <element signature="e#6921#9116#0#PHP" expanded="false" /> | 1021 | <element signature="e#6921#9116#0#PHP" expanded="false" /> |
1021 | <element signature="e#9122#9802#0#PHP" expanded="false" /> | 1022 | <element signature="e#9122#9802#0#PHP" expanded="false" /> |
@@ -1029,57 +1030,57 @@ | @@ -1029,57 +1030,57 @@ | ||
1029 | <element signature="e#16091#16807#0#PHP" expanded="false" /> | 1030 | <element signature="e#16091#16807#0#PHP" expanded="false" /> |
1030 | <element signature="e#16812#19352#0#PHP" expanded="false" /> | 1031 | <element signature="e#16812#19352#0#PHP" expanded="false" /> |
1031 | <element signature="e#19358#20260#0#PHP" expanded="false" /> | 1032 | <element signature="e#19358#20260#0#PHP" expanded="false" /> |
1032 | - <element signature="e#20265#23205#0#PHP" expanded="false" /> | ||
1033 | - <element signature="e#23211#23588#0#PHP" expanded="false" /> | ||
1034 | - <element signature="e#23593#23914#0#PHP" expanded="false" /> | ||
1035 | - <element signature="e#23920#24425#0#PHP" expanded="false" /> | ||
1036 | - <element signature="e#24430#24681#0#PHP" expanded="false" /> | ||
1037 | - <element signature="e#24687#25166#0#PHP" expanded="false" /> | ||
1038 | - <element signature="e#25171#25928#0#PHP" expanded="false" /> | ||
1039 | - <element signature="e#25934#26415#0#PHP" expanded="false" /> | ||
1040 | - <element signature="e#26420#27190#0#PHP" expanded="false" /> | ||
1041 | - <element signature="e#27196#27559#0#PHP" expanded="false" /> | ||
1042 | - <element signature="e#27564#27755#0#PHP" expanded="false" /> | ||
1043 | - <element signature="e#27761#28119#0#PHP" expanded="false" /> | ||
1044 | - <element signature="e#28124#28315#0#PHP" expanded="false" /> | ||
1045 | - <element signature="e#28321#29464#0#PHP" expanded="false" /> | ||
1046 | - <element signature="e#29469#32134#0#PHP" expanded="false" /> | ||
1047 | - <element signature="e#32140#32638#0#PHP" expanded="false" /> | ||
1048 | - <element signature="e#32643#34389#0#PHP" expanded="false" /> | ||
1049 | - <element signature="e#34395#34808#0#PHP" expanded="false" /> | ||
1050 | - <element signature="e#34813#35292#0#PHP" expanded="false" /> | ||
1051 | - <element signature="e#35298#35832#0#PHP" expanded="false" /> | ||
1052 | - <element signature="e#35837#37222#0#PHP" expanded="false" /> | ||
1053 | - <element signature="e#37228#37882#0#PHP" expanded="false" /> | ||
1054 | - <element signature="e#37887#39902#0#PHP" expanded="false" /> | ||
1055 | - <element signature="e#39908#40668#0#PHP" expanded="false" /> | ||
1056 | - <element signature="e#40673#43382#0#PHP" expanded="false" /> | ||
1057 | - <element signature="e#43408#44239#0#PHP" expanded="false" /> | ||
1058 | - <element signature="e#44245#44665#0#PHP" expanded="false" /> | ||
1059 | - <element signature="e#44670#45153#0#PHP" expanded="false" /> | ||
1060 | - <element signature="e#45159#45965#0#PHP" expanded="false" /> | ||
1061 | - <element signature="e#45970#49128#0#PHP" expanded="false" /> | ||
1062 | - <element signature="e#49143#50478#0#PHP" expanded="false" /> | ||
1063 | - <element signature="e#50494#51528#0#PHP" expanded="false" /> | ||
1064 | - <element signature="e#51534#52292#0#PHP" expanded="false" /> | ||
1065 | - <element signature="e#52297#56040#0#PHP" expanded="false" /> | ||
1066 | - <element signature="e#56046#56438#0#PHP" expanded="false" /> | ||
1067 | - <element signature="e#56443#57395#0#PHP" expanded="false" /> | ||
1068 | - <element signature="e#57419#57992#0#PHP" expanded="false" /> | ||
1069 | - <element signature="e#57998#58597#0#PHP" expanded="false" /> | ||
1070 | - <element signature="e#58602#59529#0#PHP" expanded="false" /> | ||
1071 | - <element signature="e#59535#60249#0#PHP" expanded="false" /> | ||
1072 | - <element signature="e#60255#60682#0#PHP" expanded="false" /> | ||
1073 | - <element signature="e#60687#61156#0#PHP" expanded="false" /> | ||
1074 | - <element signature="e#61163#62368#0#PHP" expanded="false" /> | ||
1075 | - <element signature="e#62373#64076#0#PHP" expanded="false" /> | ||
1076 | - <element signature="e#62520#62859#1#PHP" expanded="false" /> | ||
1077 | - <element signature="e#62889#63243#1#PHP" expanded="false" /> | ||
1078 | - <element signature="e#64082#64948#0#PHP" expanded="false" /> | ||
1079 | - <element signature="e#64953#67488#0#PHP" expanded="false" /> | ||
1080 | - <element signature="e#65148#65285#1#PHP" expanded="false" /> | ||
1081 | - <element signature="e#65315#65455#1#PHP" expanded="false" /> | ||
1082 | - <element signature="e#66125#66209#0#PHP" expanded="false" /> | 1033 | + <element signature="e#20265#23083#0#PHP" expanded="false" /> |
1034 | + <element signature="e#23089#23466#0#PHP" expanded="false" /> | ||
1035 | + <element signature="e#23471#23792#0#PHP" expanded="false" /> | ||
1036 | + <element signature="e#23798#24303#0#PHP" expanded="false" /> | ||
1037 | + <element signature="e#24308#24559#0#PHP" expanded="false" /> | ||
1038 | + <element signature="e#24565#25044#0#PHP" expanded="false" /> | ||
1039 | + <element signature="e#25049#25806#0#PHP" expanded="false" /> | ||
1040 | + <element signature="e#25812#26293#0#PHP" expanded="false" /> | ||
1041 | + <element signature="e#26298#27068#0#PHP" expanded="false" /> | ||
1042 | + <element signature="e#27074#27437#0#PHP" expanded="false" /> | ||
1043 | + <element signature="e#27442#27633#0#PHP" expanded="false" /> | ||
1044 | + <element signature="e#27639#27997#0#PHP" expanded="false" /> | ||
1045 | + <element signature="e#28002#28193#0#PHP" expanded="false" /> | ||
1046 | + <element signature="e#28199#29342#0#PHP" expanded="false" /> | ||
1047 | + <element signature="e#29347#32012#0#PHP" expanded="false" /> | ||
1048 | + <element signature="e#32018#32516#0#PHP" expanded="false" /> | ||
1049 | + <element signature="e#32521#34267#0#PHP" expanded="false" /> | ||
1050 | + <element signature="e#34273#34686#0#PHP" expanded="false" /> | ||
1051 | + <element signature="e#34691#35170#0#PHP" expanded="false" /> | ||
1052 | + <element signature="e#35176#35710#0#PHP" expanded="false" /> | ||
1053 | + <element signature="e#35715#37100#0#PHP" expanded="false" /> | ||
1054 | + <element signature="e#37106#37760#0#PHP" expanded="false" /> | ||
1055 | + <element signature="e#37765#39780#0#PHP" expanded="false" /> | ||
1056 | + <element signature="e#39786#40546#0#PHP" expanded="false" /> | ||
1057 | + <element signature="e#40551#43260#0#PHP" expanded="false" /> | ||
1058 | + <element signature="e#43286#44117#0#PHP" expanded="false" /> | ||
1059 | + <element signature="e#44123#44543#0#PHP" expanded="false" /> | ||
1060 | + <element signature="e#44548#45031#0#PHP" expanded="false" /> | ||
1061 | + <element signature="e#45037#45843#0#PHP" expanded="false" /> | ||
1062 | + <element signature="e#45848#49006#0#PHP" expanded="false" /> | ||
1063 | + <element signature="e#49021#50356#0#PHP" expanded="false" /> | ||
1064 | + <element signature="e#50372#51406#0#PHP" expanded="false" /> | ||
1065 | + <element signature="e#51412#52170#0#PHP" expanded="false" /> | ||
1066 | + <element signature="e#52175#55918#0#PHP" expanded="false" /> | ||
1067 | + <element signature="e#55924#56316#0#PHP" expanded="false" /> | ||
1068 | + <element signature="e#56321#57273#0#PHP" expanded="false" /> | ||
1069 | + <element signature="e#57297#57870#0#PHP" expanded="false" /> | ||
1070 | + <element signature="e#57876#58475#0#PHP" expanded="false" /> | ||
1071 | + <element signature="e#58480#59407#0#PHP" expanded="false" /> | ||
1072 | + <element signature="e#59413#60127#0#PHP" expanded="false" /> | ||
1073 | + <element signature="e#60133#60560#0#PHP" expanded="false" /> | ||
1074 | + <element signature="e#60565#61034#0#PHP" expanded="false" /> | ||
1075 | + <element signature="e#61041#62246#0#PHP" expanded="false" /> | ||
1076 | + <element signature="e#62251#63954#0#PHP" expanded="false" /> | ||
1077 | + <element signature="e#62398#62737#1#PHP" expanded="false" /> | ||
1078 | + <element signature="e#62767#63121#1#PHP" expanded="false" /> | ||
1079 | + <element signature="e#63960#64826#0#PHP" expanded="false" /> | ||
1080 | + <element signature="e#64831#67366#0#PHP" expanded="false" /> | ||
1081 | + <element signature="e#65026#65163#1#PHP" expanded="false" /> | ||
1082 | + <element signature="e#65193#65333#1#PHP" expanded="false" /> | ||
1083 | + <element signature="e#66003#66087#0#PHP" expanded="false" /> | ||
1083 | </folding> | 1084 | </folding> |
1084 | </state> | 1085 | </state> |
1085 | </provider> | 1086 | </provider> |
@@ -629,7 +629,6 @@ class User extends Api | @@ -629,7 +629,6 @@ class User extends Api | ||
629 | $data['thumbnail'] = $rule.$data['thumbnail']; | 629 | $data['thumbnail'] = $rule.$data['thumbnail']; |
630 | $data['share'] = $rule.$data['share']; | 630 | $data['share'] = $rule.$data['share']; |
631 | $data['video'] = $rule.$data['video']; | 631 | $data['video'] = $rule.$data['video']; |
632 | - $data['content'] = strip_tags($data['content']); | ||
633 | $data['is_vip'] = 0; | 632 | $data['is_vip'] = 0; |
634 | $this->success('SUCCESS',$data); | 633 | $this->success('SUCCESS',$data); |
635 | }elseif($res['is_vip'] == 1){ | 634 | }elseif($res['is_vip'] == 1){ |
@@ -657,7 +656,6 @@ class User extends Api | @@ -657,7 +656,6 @@ class User extends Api | ||
657 | $data['thumbnail'] = $rule.$data['thumbnail']; | 656 | $data['thumbnail'] = $rule.$data['thumbnail']; |
658 | $data['share'] = $rule.$data['share']; | 657 | $data['share'] = $rule.$data['share']; |
659 | $data['video'] = $rule.$data['video']; | 658 | $data['video'] = $rule.$data['video']; |
660 | - $data['content'] = strip_tags($data['content']); | ||
661 | $this->success('SUCCESS',$data); | 659 | $this->success('SUCCESS',$data); |
662 | } | 660 | } |
663 | } | 661 | } |
-
请 注册 或 登录 后发表评论