郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 1db0e3b86f53700cb424bdc6c6074a2b52b5fbd2 1 个父辈 a5ac4d4f
1 个管道 的构建 通过 耗费 13 秒

修改搜索

内嵌 并排对比
正在显示 3 个修改的文件 包含 157 行增加 和 359 行删除
... ... @@ -5,7 +5,9 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -19,8 +21,8 @@
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="155">
<caret line="568" column="29" lean-forward="false" selection-start-line="568" selection-start-column="20" selection-end-line="568" selection-end-column="29" />
<state relative-caret-position="156">
<caret line="321" column="35" lean-forward="true" selection-start-line="321" selection-start-column="35" selection-end-line="321" selection-end-column="35" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -34,74 +36,73 @@
<element signature="e#5446#5789#0#PHP" expanded="false" />
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#6536#7634#0#PHP" expanded="false" />
<element signature="e#7639#10426#0#PHP" expanded="false" />
<element signature="e#8426#8733#0#PHP" expanded="false" />
<element signature="e#8796#9078#0#PHP" expanded="false" />
<element signature="e#9142#9412#0#PHP" expanded="false" />
<element signature="e#10432#11112#0#PHP" expanded="false" />
<element signature="e#11117#11975#0#PHP" expanded="false" />
<element signature="e#11981#12770#0#PHP" expanded="false" />
<element signature="e#12775#14124#0#PHP" expanded="false" />
<element signature="e#14130#14832#0#PHP" expanded="false" />
<element signature="e#14837#16157#0#PHP" expanded="false" />
<element signature="e#16163#16739#0#PHP" expanded="false" />
<element signature="e#16744#17356#0#PHP" expanded="false" />
<element signature="e#17362#18078#0#PHP" expanded="false" />
<element signature="e#22216#23146#0#PHP" expanded="false" />
<element signature="e#23151#28292#0#PHP" expanded="false" />
<element signature="e#28298#28675#0#PHP" expanded="false" />
<element signature="e#28680#29119#0#PHP" expanded="false" />
<element signature="e#29125#29946#0#PHP" expanded="false" />
<element signature="e#29951#33355#0#PHP" expanded="false" />
<element signature="e#30397#33349#0#PHP" expanded="false" />
<element signature="e#33361#33866#0#PHP" expanded="false" />
<element signature="e#33871#34122#0#PHP" expanded="false" />
<element signature="e#34128#34607#0#PHP" expanded="false" />
<element signature="e#34612#35369#0#PHP" expanded="false" />
<element signature="e#35375#35856#0#PHP" expanded="false" />
<element signature="e#35861#36631#0#PHP" expanded="false" />
<element signature="e#36637#37000#0#PHP" expanded="false" />
<element signature="e#37005#37196#0#PHP" expanded="false" />
<element signature="e#37202#37560#0#PHP" expanded="false" />
<element signature="e#37565#37756#0#PHP" expanded="false" />
<element signature="e#37762#38905#0#PHP" expanded="false" />
<element signature="e#38910#41575#0#PHP" expanded="false" />
<element signature="e#41581#42079#0#PHP" expanded="false" />
<element signature="e#42084#43830#0#PHP" expanded="false" />
<element signature="e#43836#44249#0#PHP" expanded="false" />
<element signature="e#44254#44733#0#PHP" expanded="false" />
<element signature="e#44739#45273#0#PHP" expanded="false" />
<element signature="e#45278#46663#0#PHP" expanded="false" />
<element signature="e#46669#47323#0#PHP" expanded="false" />
<element signature="e#47328#49343#0#PHP" expanded="false" />
<element signature="e#49349#50109#0#PHP" expanded="false" />
<element signature="e#50114#52823#0#PHP" expanded="false" />
<element signature="e#52849#53680#0#PHP" expanded="false" />
<element signature="e#53686#54106#0#PHP" expanded="false" />
<element signature="e#54111#54594#0#PHP" expanded="false" />
<element signature="e#54600#55406#0#PHP" expanded="false" />
<element signature="e#55411#58569#0#PHP" expanded="false" />
<element signature="e#57204#58563#0#PHP" expanded="false" />
<element signature="e#58584#59919#0#PHP" expanded="false" />
<element signature="e#58700#59102#0#PHP" expanded="false" />
<element signature="e#59935#60969#0#PHP" expanded="false" />
<element signature="e#60975#61733#0#PHP" expanded="false" />
<element signature="e#61738#65481#0#PHP" expanded="false" />
<element signature="e#65487#65879#0#PHP" expanded="false" />
<element signature="e#65884#66836#0#PHP" expanded="false" />
<element signature="e#66860#67433#0#PHP" expanded="false" />
<element signature="e#67439#68038#0#PHP" expanded="false" />
<element signature="e#68043#68970#0#PHP" expanded="false" />
<element signature="e#68976#69690#0#PHP" expanded="false" />
<element signature="e#69696#70123#0#PHP" expanded="false" />
<element signature="e#70128#70597#0#PHP" expanded="false" />
<element signature="e#70604#71809#0#PHP" expanded="false" />
<element signature="e#71814#73517#0#PHP" expanded="false" />
<element signature="e#73523#74300#0#PHP" expanded="false" />
<element signature="e#74305#78243#0#PHP" expanded="false" />
<element signature="e#78249#78758#0#PHP" expanded="false" />
<element signature="e#78763#79435#0#PHP" expanded="false" />
<element signature="e#8426#8859#0#PHP" expanded="false" />
<element signature="e#8922#9331#0#PHP" expanded="false" />
<element signature="e#9395#9665#0#PHP" expanded="false" />
<element signature="e#10685#11365#0#PHP" expanded="false" />
<element signature="e#11370#12228#0#PHP" expanded="false" />
<element signature="e#12234#13023#0#PHP" expanded="false" />
<element signature="e#13028#14377#0#PHP" expanded="false" />
<element signature="e#14383#15085#0#PHP" expanded="false" />
<element signature="e#15090#16410#0#PHP" expanded="false" />
<element signature="e#16416#16992#0#PHP" expanded="false" />
<element signature="e#16997#17609#0#PHP" expanded="false" />
<element signature="e#17615#18331#0#PHP" expanded="false" />
<element signature="e#18336#22463#0#PHP" expanded="false" />
<element signature="e#22469#23399#0#PHP" expanded="false" />
<element signature="e#23404#28545#0#PHP" expanded="false" />
<element signature="e#28551#28928#0#PHP" expanded="false" />
<element signature="e#28933#29372#0#PHP" expanded="false" />
<element signature="e#29378#30199#0#PHP" expanded="false" />
<element signature="e#30204#33608#0#PHP" expanded="false" />
<element signature="e#30650#33602#0#PHP" expanded="false" />
<element signature="e#33614#34119#0#PHP" expanded="false" />
<element signature="e#34124#34375#0#PHP" expanded="false" />
<element signature="e#34381#34860#0#PHP" expanded="false" />
<element signature="e#34865#35622#0#PHP" expanded="false" />
<element signature="e#35628#36109#0#PHP" expanded="false" />
<element signature="e#36114#36884#0#PHP" expanded="false" />
<element signature="e#36890#37253#0#PHP" expanded="false" />
<element signature="e#37258#37449#0#PHP" expanded="false" />
<element signature="e#37455#37813#0#PHP" expanded="false" />
<element signature="e#37818#38009#0#PHP" expanded="false" />
<element signature="e#38015#39158#0#PHP" expanded="false" />
<element signature="e#39163#41828#0#PHP" expanded="false" />
<element signature="e#41834#42332#0#PHP" expanded="false" />
<element signature="e#42337#44083#0#PHP" expanded="false" />
<element signature="e#44089#44502#0#PHP" expanded="false" />
<element signature="e#44507#44986#0#PHP" expanded="false" />
<element signature="e#44992#45526#0#PHP" expanded="false" />
<element signature="e#45531#46916#0#PHP" expanded="false" />
<element signature="e#46922#47576#0#PHP" expanded="false" />
<element signature="e#47581#49596#0#PHP" expanded="false" />
<element signature="e#49602#50362#0#PHP" expanded="false" />
<element signature="e#50367#53076#0#PHP" expanded="false" />
<element signature="e#53102#53933#0#PHP" expanded="false" />
<element signature="e#53939#54359#0#PHP" expanded="false" />
<element signature="e#54364#54847#0#PHP" expanded="false" />
<element signature="e#54853#55659#0#PHP" expanded="false" />
<element signature="e#55664#58822#0#PHP" expanded="false" />
<element signature="e#57457#58816#0#PHP" expanded="false" />
<element signature="e#58837#60172#0#PHP" expanded="false" />
<element signature="e#58953#59355#0#PHP" expanded="false" />
<element signature="e#60188#61222#0#PHP" expanded="false" />
<element signature="e#61228#61986#0#PHP" expanded="false" />
<element signature="e#61991#65734#0#PHP" expanded="false" />
<element signature="e#65740#66132#0#PHP" expanded="false" />
<element signature="e#66137#67089#0#PHP" expanded="false" />
<element signature="e#67113#67686#0#PHP" expanded="false" />
<element signature="e#67692#68291#0#PHP" expanded="false" />
<element signature="e#68296#69223#0#PHP" expanded="false" />
<element signature="e#69229#69943#0#PHP" expanded="false" />
<element signature="e#69949#70376#0#PHP" expanded="false" />
<element signature="e#70381#70850#0#PHP" expanded="false" />
<element signature="e#70857#72062#0#PHP" expanded="false" />
<element signature="e#72067#73770#0#PHP" expanded="false" />
<element signature="e#73776#74553#0#PHP" expanded="false" />
<element signature="e#74558#78496#0#PHP" expanded="false" />
<element signature="e#78502#79011#0#PHP" expanded="false" />
<element signature="e#79016#79688#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -208,11 +209,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-46" />
<option name="y" value="81" />
<component name="ProjectFrameBounds">
<option name="x" value="515" />
<option name="y" value="67" />
<option name="width" value="1652" />
<option name="height" value="933" />
<option name="height" value="942" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -229,8 +230,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -260,6 +259,8 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -406,6 +407,7 @@
<workItem from="1584687351301" duration="330000" />
<workItem from="1584758035473" duration="1782000" />
<workItem from="1584775386700" duration="6222000" />
<workItem from="1584794340552" duration="3018000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -432,7 +434,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="631228000" />
<option name="totallyTimeSpent" value="634246000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -444,16 +446,17 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-46" y="81" width="1652" height="933" extended-state="1" />
<frame x="515" y="67" width="1652" height="942" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15515076" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15703517" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<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" />
<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" />
<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" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.46733668" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46708074" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<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" />
<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" />
<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" />
... ... @@ -802,7 +805,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2310">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -810,7 +812,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5721">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -818,7 +819,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -826,7 +826,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -834,201 +833,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="55" column="21" lean-forward="false" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
<folding>
<element signature="e#631#922#0#PHP" expanded="false" />
<marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." />
<marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." />
<marker date="1583590171926" expanded="false" signature="3739:3805" ph="..." />
<marker date="1583590171926" expanded="false" signature="3878:3925" ph="..." />
<marker date="1583590171926" expanded="true" signature="3926:3964" ph="..." />
<marker date="1583590171926" expanded="false" signature="3988:4015" ph="..." />
<marker date="1583590171926" expanded="true" signature="4016:4171" ph="..." />
<marker date="1583590171926" expanded="false" signature="4195:4211" ph="..." />
<marker date="1583590171926" expanded="true" signature="4212:5259" ph="..." />
<marker date="1583590171926" expanded="false" signature="4238:4282" ph="..." />
<marker date="1583590171926" expanded="true" signature="4283:4361" ph="..." />
<marker date="1583590171926" expanded="false" signature="4313:4325" ph="..." />
<marker date="1583590171926" expanded="false" signature="4385:4429" ph="..." />
<marker date="1583590171926" expanded="true" signature="4430:4508" ph="..." />
<marker date="1583590171926" expanded="false" signature="4461:4473" ph="..." />
<marker date="1583590171926" expanded="false" signature="4532:4576" ph="..." />
<marker date="1583590171926" expanded="true" signature="4577:4655" ph="..." />
<marker date="1583590171926" expanded="false" signature="4608:4620" ph="..." />
<marker date="1583590171926" expanded="false" signature="4679:4723" ph="..." />
<marker date="1583590171926" expanded="true" signature="4724:4805" ph="..." />
<marker date="1583590171926" expanded="false" signature="4755:4767" ph="..." />
<marker date="1583590171926" expanded="false" signature="4829:4873" ph="..." />
<marker date="1583590171926" expanded="true" signature="4874:4959" ph="..." />
<marker date="1583590171926" expanded="false" signature="4906:4918" ph="..." />
<marker date="1583590171926" expanded="false" signature="4983:5027" ph="..." />
<marker date="1583590171926" expanded="true" signature="5028:5110" ph="..." />
<marker date="1583590171926" expanded="false" signature="5062:5074" ph="..." />
<marker date="1583590171926" expanded="false" signature="5134:5178" ph="..." />
<marker date="1583590171926" expanded="true" signature="5179:5242" ph="..." />
<marker date="1583590171926" expanded="true" signature="5284:5748" ph="..." />
<marker date="1583590171926" expanded="false" signature="5312:5378" ph="..." />
<marker date="1583590171926" expanded="false" signature="5421:5466" ph="..." />
<marker date="1583590171926" expanded="true" signature="5467:5731" ph="..." />
<marker date="1583590171926" expanded="false" signature="5468:5474" ph=" " />
<marker date="1583590171926" expanded="false" signature="5474:5480" ph=" " />
<marker date="1583590171926" expanded="false" signature="5480:5486" ph=" " />
<marker date="1583590171926" expanded="false" signature="5486:5492" ph=" " />
<marker date="1583590171926" expanded="false" signature="5524:5533" ph="..." />
<marker date="1583590171926" expanded="false" signature="5576:5585" ph="..." />
<marker date="1583590171926" expanded="false" signature="5614:5623" ph="..." />
<marker date="1583590171926" expanded="false" signature="5648:5657" ph="..." />
<marker date="1583590171926" expanded="false" signature="5772:5790" ph="..." />
<marker date="1583590171926" expanded="true" signature="5791:6108" ph="..." />
<marker date="1583590171926" expanded="false" signature="5819:5885" ph="..." />
<marker date="1583590171926" expanded="false" signature="5924:5952" ph="..." />
<marker date="1583590171926" expanded="false" signature="5954:5960" ph=" " />
<marker date="1583590171926" expanded="false" signature="5960:5966" ph=" " />
<marker date="1583590171926" expanded="false" signature="5966:5972" ph=" " />
<marker date="1583590171926" expanded="false" signature="5972:5978" ph=" " />
<marker date="1583590171926" expanded="false" signature="6031:6040" ph="..." />
<marker date="1583590171926" expanded="false" signature="6132:6150" ph="..." />
<marker date="1583590171926" expanded="true" signature="6151:6557" ph="..." />
<marker date="1583590171926" expanded="false" signature="6179:6245" ph="..." />
<marker date="1583590171926" expanded="false" signature="6286:6331" ph="..." />
<marker date="1583590171926" expanded="true" signature="6332:6540" ph="..." />
<marker date="1583590171926" expanded="false" signature="6333:6339" ph=" " />
<marker date="1583590171926" expanded="false" signature="6339:6345" ph=" " />
<marker date="1583590171926" expanded="false" signature="6345:6351" ph=" " />
<marker date="1583590171926" expanded="false" signature="6351:6357" ph=" " />
<marker date="1583590171926" expanded="false" signature="6381:6387" ph=" " />
<marker date="1583590171926" expanded="false" signature="6390:6396" ph=" " />
<marker date="1583590171926" expanded="false" signature="6398:6404" ph=" " />
<marker date="1583590171926" expanded="false" signature="6455:6464" ph="..." />
<marker date="1583590171926" expanded="false" signature="6494:6503" ph="..." />
<marker date="1583590171926" expanded="false" signature="6581:6628" ph="..." />
<marker date="1583590171926" expanded="false" signature="6630:6636" ph=" " />
<marker date="1583590171926" expanded="false" signature="6636:6642" ph=" " />
<marker date="1583590171926" expanded="false" signature="6642:6648" ph=" " />
<marker date="1583590171926" expanded="false" signature="6648:6654" ph=" " />
<marker date="1583590171926" expanded="false" signature="6709:6718" ph="..." />
<marker date="1583590171926" expanded="false" signature="6837:6884" ph="..." />
<marker date="1583590171926" expanded="false" signature="6886:6892" ph=" " />
<marker date="1583590171926" expanded="false" signature="6892:6898" ph=" " />
<marker date="1583590171926" expanded="false" signature="6898:6904" ph=" " />
<marker date="1583590171926" expanded="false" signature="6904:6910" ph=" " />
<marker date="1583590171926" expanded="false" signature="6964:6973" ph="..." />
<marker date="1583590171926" expanded="false" signature="7047:7063" ph="..." />
<marker date="1583590171926" expanded="false" signature="7115:7162" ph="..." />
<marker date="1583590171926" expanded="false" signature="7164:7170" ph=" " />
<marker date="1583590171926" expanded="false" signature="7170:7176" ph=" " />
<marker date="1583590171926" expanded="false" signature="7176:7182" ph=" " />
<marker date="1583590171926" expanded="false" signature="7182:7188" ph=" " />
<marker date="1583590171926" expanded="false" signature="7215:7241" ph="..." />
<marker date="1583590171926" expanded="false" signature="7319:7337" ph="..." />
<marker date="1583590171926" expanded="true" signature="7338:7936" ph="..." />
<marker date="1583590171926" expanded="false" signature="7366:7432" ph="..." />
<marker date="1583590171926" expanded="false" signature="7471:7518" ph="..." />
<marker date="1583590171926" expanded="false" signature="7520:7526" ph=" " />
<marker date="1583590171926" expanded="false" signature="7526:7532" ph=" " />
<marker date="1583590171926" expanded="false" signature="7532:7538" ph=" " />
<marker date="1583590171926" expanded="false" signature="7538:7544" ph=" " />
<marker date="1583590171926" expanded="false" signature="7629:7676" ph="..." />
<marker date="1583590171926" expanded="false" signature="7678:7684" ph=" " />
<marker date="1583590171926" expanded="false" signature="7684:7690" ph=" " />
<marker date="1583590171926" expanded="false" signature="7690:7696" ph=" " />
<marker date="1583590171926" expanded="false" signature="7696:7702" ph=" " />
<marker date="1583590171926" expanded="false" signature="7803:7850" ph="..." />
<marker date="1583590171926" expanded="false" signature="7852:7858" ph=" " />
<marker date="1583590171926" expanded="false" signature="7858:7864" ph=" " />
<marker date="1583590171926" expanded="false" signature="7864:7870" ph=" " />
<marker date="1583590171926" expanded="false" signature="7870:7876" ph=" " />
<marker date="1583590171926" expanded="false" signature="7960:7978" ph="..." />
<marker date="1583590171926" expanded="true" signature="7979:9624" ph="..." />
<marker date="1583590171926" expanded="false" signature="8007:8073" ph="..." />
<marker date="1583590171926" expanded="false" signature="8112:8159" ph="..." />
<marker date="1583590171926" expanded="false" signature="8161:8167" ph=" " />
<marker date="1583590171926" expanded="false" signature="8167:8173" ph=" " />
<marker date="1583590171926" expanded="false" signature="8173:8179" ph=" " />
<marker date="1583590171926" expanded="false" signature="8179:8185" ph=" " />
<marker date="1583590171926" expanded="false" signature="8309:8356" ph="..." />
<marker date="1583590171926" expanded="false" signature="8358:8364" ph=" " />
<marker date="1583590171926" expanded="false" signature="8364:8370" ph=" " />
<marker date="1583590171926" expanded="false" signature="8370:8376" ph=" " />
<marker date="1583590171926" expanded="false" signature="8376:8382" ph=" " />
<marker date="1583590171926" expanded="false" signature="8534:8581" ph="..." />
<marker date="1583590171926" expanded="false" signature="8583:8589" ph=" " />
<marker date="1583590171926" expanded="false" signature="8589:8595" ph=" " />
<marker date="1583590171926" expanded="false" signature="8595:8601" ph=" " />
<marker date="1583590171926" expanded="false" signature="8601:8607" ph=" " />
<marker date="1583590171926" expanded="false" signature="8726:8773" ph="..." />
<marker date="1583590171926" expanded="false" signature="8775:8781" ph=" " />
<marker date="1583590171926" expanded="false" signature="8781:8787" ph=" " />
<marker date="1583590171926" expanded="false" signature="8787:8793" ph=" " />
<marker date="1583590171926" expanded="false" signature="8793:8799" ph=" " />
<marker date="1583590171926" expanded="false" signature="8883:8930" ph="..." />
<marker date="1583590171926" expanded="false" signature="8932:8938" ph=" " />
<marker date="1583590171926" expanded="false" signature="8938:8944" ph=" " />
<marker date="1583590171926" expanded="false" signature="8944:8950" ph=" " />
<marker date="1583590171926" expanded="false" signature="8950:8956" ph=" " />
<marker date="1583590171926" expanded="false" signature="9016:9063" ph="..." />
<marker date="1583590171926" expanded="false" signature="9065:9071" ph=" " />
<marker date="1583590171926" expanded="false" signature="9071:9077" ph=" " />
<marker date="1583590171926" expanded="false" signature="9077:9083" ph=" " />
<marker date="1583590171926" expanded="false" signature="9083:9089" ph=" " />
<marker date="1583590171926" expanded="false" signature="9273:9320" ph="..." />
<marker date="1583590171926" expanded="false" signature="9322:9328" ph=" " />
<marker date="1583590171926" expanded="false" signature="9328:9334" ph=" " />
<marker date="1583590171926" expanded="false" signature="9334:9340" ph=" " />
<marker date="1583590171926" expanded="false" signature="9340:9346" ph=" " />
<marker date="1583590171926" expanded="false" signature="9474:9521" ph="..." />
<marker date="1583590171926" expanded="false" signature="9523:9529" ph=" " />
<marker date="1583590171926" expanded="false" signature="9529:9535" ph=" " />
<marker date="1583590171926" expanded="false" signature="9535:9541" ph=" " />
<marker date="1583590171926" expanded="false" signature="9541:9547" ph=" " />
<marker date="1583590171926" expanded="false" signature="9648:9666" ph="..." />
<marker date="1583590171926" expanded="true" signature="9667:10167" ph="..." />
<marker date="1583590171926" expanded="false" signature="9695:9761" ph="..." />
<marker date="1583590171926" expanded="false" signature="9802:9849" ph="..." />
<marker date="1583590171926" expanded="false" signature="9851:9857" ph=" " />
<marker date="1583590171926" expanded="false" signature="9857:9863" ph=" " />
<marker date="1583590171926" expanded="false" signature="9863:9869" ph=" " />
<marker date="1583590171926" expanded="false" signature="9869:9875" ph=" " />
<marker date="1583590171926" expanded="false" signature="9987:10034" ph="..." />
<marker date="1583590171926" expanded="false" signature="10036:10042" ph=" " />
<marker date="1583590171926" expanded="false" signature="10042:10048" ph=" " />
<marker date="1583590171926" expanded="false" signature="10048:10054" ph=" " />
<marker date="1583590171926" expanded="false" signature="10054:10060" ph=" " />
<marker date="1583590171926" expanded="false" signature="10191:10209" ph="..." />
<marker date="1583590171926" expanded="true" signature="10210:11210" ph="..." />
<marker date="1583590171926" expanded="false" signature="10238:10304" ph="..." />
<marker date="1583590171926" expanded="false" signature="10343:10390" ph="..." />
<marker date="1583590171926" expanded="false" signature="10392:10398" ph=" " />
<marker date="1583590171926" expanded="false" signature="10398:10404" ph=" " />
<marker date="1583590171926" expanded="false" signature="10404:10410" ph=" " />
<marker date="1583590171926" expanded="false" signature="10410:10416" ph=" " />
<marker date="1583590171926" expanded="false" signature="10482:10529" ph="..." />
<marker date="1583590171926" expanded="false" signature="10531:10537" ph=" " />
<marker date="1583590171926" expanded="false" signature="10537:10543" ph=" " />
<marker date="1583590171926" expanded="false" signature="10543:10549" ph=" " />
<marker date="1583590171926" expanded="false" signature="10549:10555" ph=" " />
<marker date="1583590171926" expanded="false" signature="10612:10659" ph="..." />
<marker date="1583590171926" expanded="false" signature="10661:10667" ph=" " />
<marker date="1583590171926" expanded="false" signature="10667:10673" ph=" " />
<marker date="1583590171926" expanded="false" signature="10673:10679" ph=" " />
<marker date="1583590171926" expanded="false" signature="10679:10685" ph=" " />
<marker date="1583590171926" expanded="false" signature="10763:10810" ph="..." />
<marker date="1583590171926" expanded="false" signature="10812:10818" ph=" " />
<marker date="1583590171926" expanded="false" signature="10818:10824" ph=" " />
<marker date="1583590171926" expanded="false" signature="10824:10830" ph=" " />
<marker date="1583590171926" expanded="false" signature="10830:10836" ph=" " />
<marker date="1583590171926" expanded="false" signature="10929:10976" ph="..." />
<marker date="1583590171926" expanded="false" signature="10978:10984" ph=" " />
<marker date="1583590171926" expanded="false" signature="10984:10990" ph=" " />
<marker date="1583590171926" expanded="false" signature="10990:10996" ph=" " />
<marker date="1583590171926" expanded="false" signature="10996:11002" ph=" " />
<marker date="1583590171926" expanded="false" signature="11076:11123" ph="..." />
<marker date="1583590171926" expanded="false" signature="11125:11131" ph=" " />
<marker date="1583590171926" expanded="false" signature="11131:11137" ph=" " />
<marker date="1583590171926" expanded="false" signature="11137:11143" ph=" " />
<marker date="1583590171926" expanded="false" signature="11143:11149" ph=" " />
<marker date="1583590171926" expanded="false" signature="11234:11314" ph="..." />
<marker date="1583590171926" expanded="false" signature="11375:11455" ph="..." />
</folding>
</state>
</provider>
</entry>
... ... @@ -1036,7 +840,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -1044,7 +847,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="99" column="21" lean-forward="true" selection-start-line="99" selection-start-column="21" selection-end-line="99" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
... ... @@ -1052,7 +854,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1315">
<caret line="99" column="21" lean-forward="true" selection-start-line="99" selection-start-column="21" selection-end-line="99" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
... ... @@ -1068,7 +869,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="346">
<caret line="118" column="17" lean-forward="true" selection-start-line="118" selection-start-column="17" selection-end-line="118" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
... ... @@ -1076,16 +876,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="298">
<caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
<folding>
<element signature="e#2201#6736#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="155">
<caret line="568" column="29" lean-forward="false" selection-start-line="568" selection-start-column="20" selection-end-line="568" selection-end-column="29" />
<state relative-caret-position="156">
<caret line="321" column="35" lean-forward="true" selection-start-line="321" selection-start-column="35" selection-end-line="321" selection-end-column="35" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -1099,74 +896,73 @@
<element signature="e#5446#5789#0#PHP" expanded="false" />
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#6536#7634#0#PHP" expanded="false" />
<element signature="e#7639#10426#0#PHP" expanded="false" />
<element signature="e#8426#8733#0#PHP" expanded="false" />
<element signature="e#8796#9078#0#PHP" expanded="false" />
<element signature="e#9142#9412#0#PHP" expanded="false" />
<element signature="e#10432#11112#0#PHP" expanded="false" />
<element signature="e#11117#11975#0#PHP" expanded="false" />
<element signature="e#11981#12770#0#PHP" expanded="false" />
<element signature="e#12775#14124#0#PHP" expanded="false" />
<element signature="e#14130#14832#0#PHP" expanded="false" />
<element signature="e#14837#16157#0#PHP" expanded="false" />
<element signature="e#16163#16739#0#PHP" expanded="false" />
<element signature="e#16744#17356#0#PHP" expanded="false" />
<element signature="e#17362#18078#0#PHP" expanded="false" />
<element signature="e#22216#23146#0#PHP" expanded="false" />
<element signature="e#23151#28292#0#PHP" expanded="false" />
<element signature="e#28298#28675#0#PHP" expanded="false" />
<element signature="e#28680#29119#0#PHP" expanded="false" />
<element signature="e#29125#29946#0#PHP" expanded="false" />
<element signature="e#29951#33355#0#PHP" expanded="false" />
<element signature="e#30397#33349#0#PHP" expanded="false" />
<element signature="e#33361#33866#0#PHP" expanded="false" />
<element signature="e#33871#34122#0#PHP" expanded="false" />
<element signature="e#34128#34607#0#PHP" expanded="false" />
<element signature="e#34612#35369#0#PHP" expanded="false" />
<element signature="e#35375#35856#0#PHP" expanded="false" />
<element signature="e#35861#36631#0#PHP" expanded="false" />
<element signature="e#36637#37000#0#PHP" expanded="false" />
<element signature="e#37005#37196#0#PHP" expanded="false" />
<element signature="e#37202#37560#0#PHP" expanded="false" />
<element signature="e#37565#37756#0#PHP" expanded="false" />
<element signature="e#37762#38905#0#PHP" expanded="false" />
<element signature="e#38910#41575#0#PHP" expanded="false" />
<element signature="e#41581#42079#0#PHP" expanded="false" />
<element signature="e#42084#43830#0#PHP" expanded="false" />
<element signature="e#43836#44249#0#PHP" expanded="false" />
<element signature="e#44254#44733#0#PHP" expanded="false" />
<element signature="e#44739#45273#0#PHP" expanded="false" />
<element signature="e#45278#46663#0#PHP" expanded="false" />
<element signature="e#46669#47323#0#PHP" expanded="false" />
<element signature="e#47328#49343#0#PHP" expanded="false" />
<element signature="e#49349#50109#0#PHP" expanded="false" />
<element signature="e#50114#52823#0#PHP" expanded="false" />
<element signature="e#52849#53680#0#PHP" expanded="false" />
<element signature="e#53686#54106#0#PHP" expanded="false" />
<element signature="e#54111#54594#0#PHP" expanded="false" />
<element signature="e#54600#55406#0#PHP" expanded="false" />
<element signature="e#55411#58569#0#PHP" expanded="false" />
<element signature="e#57204#58563#0#PHP" expanded="false" />
<element signature="e#58584#59919#0#PHP" expanded="false" />
<element signature="e#58700#59102#0#PHP" expanded="false" />
<element signature="e#59935#60969#0#PHP" expanded="false" />
<element signature="e#60975#61733#0#PHP" expanded="false" />
<element signature="e#61738#65481#0#PHP" expanded="false" />
<element signature="e#65487#65879#0#PHP" expanded="false" />
<element signature="e#65884#66836#0#PHP" expanded="false" />
<element signature="e#66860#67433#0#PHP" expanded="false" />
<element signature="e#67439#68038#0#PHP" expanded="false" />
<element signature="e#68043#68970#0#PHP" expanded="false" />
<element signature="e#68976#69690#0#PHP" expanded="false" />
<element signature="e#69696#70123#0#PHP" expanded="false" />
<element signature="e#70128#70597#0#PHP" expanded="false" />
<element signature="e#70604#71809#0#PHP" expanded="false" />
<element signature="e#71814#73517#0#PHP" expanded="false" />
<element signature="e#73523#74300#0#PHP" expanded="false" />
<element signature="e#74305#78243#0#PHP" expanded="false" />
<element signature="e#78249#78758#0#PHP" expanded="false" />
<element signature="e#78763#79435#0#PHP" expanded="false" />
<element signature="e#8426#8859#0#PHP" expanded="false" />
<element signature="e#8922#9331#0#PHP" expanded="false" />
<element signature="e#9395#9665#0#PHP" expanded="false" />
<element signature="e#10685#11365#0#PHP" expanded="false" />
<element signature="e#11370#12228#0#PHP" expanded="false" />
<element signature="e#12234#13023#0#PHP" expanded="false" />
<element signature="e#13028#14377#0#PHP" expanded="false" />
<element signature="e#14383#15085#0#PHP" expanded="false" />
<element signature="e#15090#16410#0#PHP" expanded="false" />
<element signature="e#16416#16992#0#PHP" expanded="false" />
<element signature="e#16997#17609#0#PHP" expanded="false" />
<element signature="e#17615#18331#0#PHP" expanded="false" />
<element signature="e#18336#22463#0#PHP" expanded="false" />
<element signature="e#22469#23399#0#PHP" expanded="false" />
<element signature="e#23404#28545#0#PHP" expanded="false" />
<element signature="e#28551#28928#0#PHP" expanded="false" />
<element signature="e#28933#29372#0#PHP" expanded="false" />
<element signature="e#29378#30199#0#PHP" expanded="false" />
<element signature="e#30204#33608#0#PHP" expanded="false" />
<element signature="e#30650#33602#0#PHP" expanded="false" />
<element signature="e#33614#34119#0#PHP" expanded="false" />
<element signature="e#34124#34375#0#PHP" expanded="false" />
<element signature="e#34381#34860#0#PHP" expanded="false" />
<element signature="e#34865#35622#0#PHP" expanded="false" />
<element signature="e#35628#36109#0#PHP" expanded="false" />
<element signature="e#36114#36884#0#PHP" expanded="false" />
<element signature="e#36890#37253#0#PHP" expanded="false" />
<element signature="e#37258#37449#0#PHP" expanded="false" />
<element signature="e#37455#37813#0#PHP" expanded="false" />
<element signature="e#37818#38009#0#PHP" expanded="false" />
<element signature="e#38015#39158#0#PHP" expanded="false" />
<element signature="e#39163#41828#0#PHP" expanded="false" />
<element signature="e#41834#42332#0#PHP" expanded="false" />
<element signature="e#42337#44083#0#PHP" expanded="false" />
<element signature="e#44089#44502#0#PHP" expanded="false" />
<element signature="e#44507#44986#0#PHP" expanded="false" />
<element signature="e#44992#45526#0#PHP" expanded="false" />
<element signature="e#45531#46916#0#PHP" expanded="false" />
<element signature="e#46922#47576#0#PHP" expanded="false" />
<element signature="e#47581#49596#0#PHP" expanded="false" />
<element signature="e#49602#50362#0#PHP" expanded="false" />
<element signature="e#50367#53076#0#PHP" expanded="false" />
<element signature="e#53102#53933#0#PHP" expanded="false" />
<element signature="e#53939#54359#0#PHP" expanded="false" />
<element signature="e#54364#54847#0#PHP" expanded="false" />
<element signature="e#54853#55659#0#PHP" expanded="false" />
<element signature="e#55664#58822#0#PHP" expanded="false" />
<element signature="e#57457#58816#0#PHP" expanded="false" />
<element signature="e#58837#60172#0#PHP" expanded="false" />
<element signature="e#58953#59355#0#PHP" expanded="false" />
<element signature="e#60188#61222#0#PHP" expanded="false" />
<element signature="e#61228#61986#0#PHP" expanded="false" />
<element signature="e#61991#65734#0#PHP" expanded="false" />
<element signature="e#65740#66132#0#PHP" expanded="false" />
<element signature="e#66137#67089#0#PHP" expanded="false" />
<element signature="e#67113#67686#0#PHP" expanded="false" />
<element signature="e#67692#68291#0#PHP" expanded="false" />
<element signature="e#68296#69223#0#PHP" expanded="false" />
<element signature="e#69229#69943#0#PHP" expanded="false" />
<element signature="e#69949#70376#0#PHP" expanded="false" />
<element signature="e#70381#70850#0#PHP" expanded="false" />
<element signature="e#70857#72062#0#PHP" expanded="false" />
<element signature="e#72067#73770#0#PHP" expanded="false" />
<element signature="e#73776#74553#0#PHP" expanded="false" />
<element signature="e#74558#78496#0#PHP" expanded="false" />
<element signature="e#78502#79011#0#PHP" expanded="false" />
<element signature="e#79016#79688#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -290,7 +290,8 @@ class User extends Api
$address = $param['address'];
$where_address = function ($query_address) use ($address) {
foreach ($address as $v){
$query_address->where('address_ids','like','%,'.$v.',%');
$a = Db::name('words')->where('id',$v)->field('id,name')->find();
$query_address->where('address_ids','like','%,'.$v.',%')->whereor('keyword','like',"%$a[name]%");
}
};
}
... ... @@ -301,7 +302,8 @@ class User extends Api
$text = $param['text'];
$where_text = function ($query_text) use ($text) {
foreach ($text as $vt){
$query_text->where('text_ids','like','%,'.$vt.',%');
$a = Db::name('words')->where('id',$vt)->field('id,name')->find();
$query_text->where('text_ids','like','%,'.$vt.',%')->whereor('keyword','like',"%$a[name]%");
}
};
}
... ...
... ... @@ -7679,7 +7679,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-21 17:19:16 </div>
Generated on 2020-03-21 21:29:01 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...