郭盛 / areial · 提交

转到一个项目

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

修改搜索

内嵌 并排对比
正在显示 3 个修改的文件 包含 157 行增加 和 359 行删除
@@ -5,7 +5,9 @@ @@ -5,7 +5,9 @@
5 </component> 5 </component>
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 7 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> 9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
  10 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
9 </list> 11 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 <option name="TRACKING_ENABLED" value="true" /> 13 <option name="TRACKING_ENABLED" value="true" />
@@ -19,8 +21,8 @@ @@ -19,8 +21,8 @@
19 <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> 21 <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
20 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 22 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
21 <provider selected="true" editor-type-id="text-editor"> 23 <provider selected="true" editor-type-id="text-editor">
22 - <state relative-caret-position="155">  
23 - <caret line="568" column="29" lean-forward="false" selection-start-line="568" selection-start-column="20" selection-end-line="568" selection-end-column="29" /> 24 + <state relative-caret-position="156">
  25 + <caret line="321" column="35" lean-forward="true" selection-start-line="321" selection-start-column="35" selection-end-line="321" selection-end-column="35" />
24 <folding> 26 <folding>
25 <element signature="e#535#1273#0#PHP" expanded="false" /> 27 <element signature="e#535#1273#0#PHP" expanded="false" />
26 <element signature="e#1278#2941#0#PHP" expanded="false" /> 28 <element signature="e#1278#2941#0#PHP" expanded="false" />
@@ -34,74 +36,73 @@ @@ -34,74 +36,73 @@
34 <element signature="e#5446#5789#0#PHP" expanded="false" /> 36 <element signature="e#5446#5789#0#PHP" expanded="false" />
35 <element signature="e#5795#6208#0#PHP" expanded="false" /> 37 <element signature="e#5795#6208#0#PHP" expanded="false" />
36 <element signature="e#6213#6530#0#PHP" expanded="false" /> 38 <element signature="e#6213#6530#0#PHP" expanded="false" />
37 - <element signature="e#6536#7634#0#PHP" expanded="false" />  
38 - <element signature="e#7639#10426#0#PHP" expanded="false" />  
39 - <element signature="e#8426#8733#0#PHP" expanded="false" />  
40 - <element signature="e#8796#9078#0#PHP" expanded="false" />  
41 - <element signature="e#9142#9412#0#PHP" expanded="false" />  
42 - <element signature="e#10432#11112#0#PHP" expanded="false" />  
43 - <element signature="e#11117#11975#0#PHP" expanded="false" />  
44 - <element signature="e#11981#12770#0#PHP" expanded="false" />  
45 - <element signature="e#12775#14124#0#PHP" expanded="false" />  
46 - <element signature="e#14130#14832#0#PHP" expanded="false" />  
47 - <element signature="e#14837#16157#0#PHP" expanded="false" />  
48 - <element signature="e#16163#16739#0#PHP" expanded="false" />  
49 - <element signature="e#16744#17356#0#PHP" expanded="false" />  
50 - <element signature="e#17362#18078#0#PHP" expanded="false" />  
51 - <element signature="e#22216#23146#0#PHP" expanded="false" />  
52 - <element signature="e#23151#28292#0#PHP" expanded="false" />  
53 - <element signature="e#28298#28675#0#PHP" expanded="false" />  
54 - <element signature="e#28680#29119#0#PHP" expanded="false" />  
55 - <element signature="e#29125#29946#0#PHP" expanded="false" />  
56 - <element signature="e#29951#33355#0#PHP" expanded="false" />  
57 - <element signature="e#30397#33349#0#PHP" expanded="false" />  
58 - <element signature="e#33361#33866#0#PHP" expanded="false" />  
59 - <element signature="e#33871#34122#0#PHP" expanded="false" />  
60 - <element signature="e#34128#34607#0#PHP" expanded="false" />  
61 - <element signature="e#34612#35369#0#PHP" expanded="false" />  
62 - <element signature="e#35375#35856#0#PHP" expanded="false" />  
63 - <element signature="e#35861#36631#0#PHP" expanded="false" />  
64 - <element signature="e#36637#37000#0#PHP" expanded="false" />  
65 - <element signature="e#37005#37196#0#PHP" expanded="false" />  
66 - <element signature="e#37202#37560#0#PHP" expanded="false" />  
67 - <element signature="e#37565#37756#0#PHP" expanded="false" />  
68 - <element signature="e#37762#38905#0#PHP" expanded="false" />  
69 - <element signature="e#38910#41575#0#PHP" expanded="false" />  
70 - <element signature="e#41581#42079#0#PHP" expanded="false" />  
71 - <element signature="e#42084#43830#0#PHP" expanded="false" />  
72 - <element signature="e#43836#44249#0#PHP" expanded="false" />  
73 - <element signature="e#44254#44733#0#PHP" expanded="false" />  
74 - <element signature="e#44739#45273#0#PHP" expanded="false" />  
75 - <element signature="e#45278#46663#0#PHP" expanded="false" />  
76 - <element signature="e#46669#47323#0#PHP" expanded="false" />  
77 - <element signature="e#47328#49343#0#PHP" expanded="false" />  
78 - <element signature="e#49349#50109#0#PHP" expanded="false" />  
79 - <element signature="e#50114#52823#0#PHP" expanded="false" />  
80 - <element signature="e#52849#53680#0#PHP" expanded="false" />  
81 - <element signature="e#53686#54106#0#PHP" expanded="false" />  
82 - <element signature="e#54111#54594#0#PHP" expanded="false" />  
83 - <element signature="e#54600#55406#0#PHP" expanded="false" />  
84 - <element signature="e#55411#58569#0#PHP" expanded="false" />  
85 - <element signature="e#57204#58563#0#PHP" expanded="false" />  
86 - <element signature="e#58584#59919#0#PHP" expanded="false" />  
87 - <element signature="e#58700#59102#0#PHP" expanded="false" />  
88 - <element signature="e#59935#60969#0#PHP" expanded="false" />  
89 - <element signature="e#60975#61733#0#PHP" expanded="false" />  
90 - <element signature="e#61738#65481#0#PHP" expanded="false" />  
91 - <element signature="e#65487#65879#0#PHP" expanded="false" />  
92 - <element signature="e#65884#66836#0#PHP" expanded="false" />  
93 - <element signature="e#66860#67433#0#PHP" expanded="false" />  
94 - <element signature="e#67439#68038#0#PHP" expanded="false" />  
95 - <element signature="e#68043#68970#0#PHP" expanded="false" />  
96 - <element signature="e#68976#69690#0#PHP" expanded="false" />  
97 - <element signature="e#69696#70123#0#PHP" expanded="false" />  
98 - <element signature="e#70128#70597#0#PHP" expanded="false" />  
99 - <element signature="e#70604#71809#0#PHP" expanded="false" />  
100 - <element signature="e#71814#73517#0#PHP" expanded="false" />  
101 - <element signature="e#73523#74300#0#PHP" expanded="false" />  
102 - <element signature="e#74305#78243#0#PHP" expanded="false" />  
103 - <element signature="e#78249#78758#0#PHP" expanded="false" />  
104 - <element signature="e#78763#79435#0#PHP" expanded="false" /> 39 + <element signature="e#8426#8859#0#PHP" expanded="false" />
  40 + <element signature="e#8922#9331#0#PHP" expanded="false" />
  41 + <element signature="e#9395#9665#0#PHP" expanded="false" />
  42 + <element signature="e#10685#11365#0#PHP" expanded="false" />
  43 + <element signature="e#11370#12228#0#PHP" expanded="false" />
  44 + <element signature="e#12234#13023#0#PHP" expanded="false" />
  45 + <element signature="e#13028#14377#0#PHP" expanded="false" />
  46 + <element signature="e#14383#15085#0#PHP" expanded="false" />
  47 + <element signature="e#15090#16410#0#PHP" expanded="false" />
  48 + <element signature="e#16416#16992#0#PHP" expanded="false" />
  49 + <element signature="e#16997#17609#0#PHP" expanded="false" />
  50 + <element signature="e#17615#18331#0#PHP" expanded="false" />
  51 + <element signature="e#18336#22463#0#PHP" expanded="false" />
  52 + <element signature="e#22469#23399#0#PHP" expanded="false" />
  53 + <element signature="e#23404#28545#0#PHP" expanded="false" />
  54 + <element signature="e#28551#28928#0#PHP" expanded="false" />
  55 + <element signature="e#28933#29372#0#PHP" expanded="false" />
  56 + <element signature="e#29378#30199#0#PHP" expanded="false" />
  57 + <element signature="e#30204#33608#0#PHP" expanded="false" />
  58 + <element signature="e#30650#33602#0#PHP" expanded="false" />
  59 + <element signature="e#33614#34119#0#PHP" expanded="false" />
  60 + <element signature="e#34124#34375#0#PHP" expanded="false" />
  61 + <element signature="e#34381#34860#0#PHP" expanded="false" />
  62 + <element signature="e#34865#35622#0#PHP" expanded="false" />
  63 + <element signature="e#35628#36109#0#PHP" expanded="false" />
  64 + <element signature="e#36114#36884#0#PHP" expanded="false" />
  65 + <element signature="e#36890#37253#0#PHP" expanded="false" />
  66 + <element signature="e#37258#37449#0#PHP" expanded="false" />
  67 + <element signature="e#37455#37813#0#PHP" expanded="false" />
  68 + <element signature="e#37818#38009#0#PHP" expanded="false" />
  69 + <element signature="e#38015#39158#0#PHP" expanded="false" />
  70 + <element signature="e#39163#41828#0#PHP" expanded="false" />
  71 + <element signature="e#41834#42332#0#PHP" expanded="false" />
  72 + <element signature="e#42337#44083#0#PHP" expanded="false" />
  73 + <element signature="e#44089#44502#0#PHP" expanded="false" />
  74 + <element signature="e#44507#44986#0#PHP" expanded="false" />
  75 + <element signature="e#44992#45526#0#PHP" expanded="false" />
  76 + <element signature="e#45531#46916#0#PHP" expanded="false" />
  77 + <element signature="e#46922#47576#0#PHP" expanded="false" />
  78 + <element signature="e#47581#49596#0#PHP" expanded="false" />
  79 + <element signature="e#49602#50362#0#PHP" expanded="false" />
  80 + <element signature="e#50367#53076#0#PHP" expanded="false" />
  81 + <element signature="e#53102#53933#0#PHP" expanded="false" />
  82 + <element signature="e#53939#54359#0#PHP" expanded="false" />
  83 + <element signature="e#54364#54847#0#PHP" expanded="false" />
  84 + <element signature="e#54853#55659#0#PHP" expanded="false" />
  85 + <element signature="e#55664#58822#0#PHP" expanded="false" />
  86 + <element signature="e#57457#58816#0#PHP" expanded="false" />
  87 + <element signature="e#58837#60172#0#PHP" expanded="false" />
  88 + <element signature="e#58953#59355#0#PHP" expanded="false" />
  89 + <element signature="e#60188#61222#0#PHP" expanded="false" />
  90 + <element signature="e#61228#61986#0#PHP" expanded="false" />
  91 + <element signature="e#61991#65734#0#PHP" expanded="false" />
  92 + <element signature="e#65740#66132#0#PHP" expanded="false" />
  93 + <element signature="e#66137#67089#0#PHP" expanded="false" />
  94 + <element signature="e#67113#67686#0#PHP" expanded="false" />
  95 + <element signature="e#67692#68291#0#PHP" expanded="false" />
  96 + <element signature="e#68296#69223#0#PHP" expanded="false" />
  97 + <element signature="e#69229#69943#0#PHP" expanded="false" />
  98 + <element signature="e#69949#70376#0#PHP" expanded="false" />
  99 + <element signature="e#70381#70850#0#PHP" expanded="false" />
  100 + <element signature="e#70857#72062#0#PHP" expanded="false" />
  101 + <element signature="e#72067#73770#0#PHP" expanded="false" />
  102 + <element signature="e#73776#74553#0#PHP" expanded="false" />
  103 + <element signature="e#74558#78496#0#PHP" expanded="false" />
  104 + <element signature="e#78502#79011#0#PHP" expanded="false" />
  105 + <element signature="e#79016#79688#0#PHP" expanded="false" />
105 </folding> 106 </folding>
106 </state> 107 </state>
107 </provider> 108 </provider>
@@ -208,11 +209,11 @@ @@ -208,11 +209,11 @@
208 <sorting>DEFINITION_ORDER</sorting> 209 <sorting>DEFINITION_ORDER</sorting>
209 </component> 210 </component>
210 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 211 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
211 - <component name="ProjectFrameBounds" extendedState="1">  
212 - <option name="x" value="-46" />  
213 - <option name="y" value="81" /> 212 + <component name="ProjectFrameBounds">
  213 + <option name="x" value="515" />
  214 + <option name="y" value="67" />
214 <option name="width" value="1652" /> 215 <option name="width" value="1652" />
215 - <option name="height" value="933" /> 216 + <option name="height" value="942" />
216 </component> 217 </component>
217 <component name="ProjectView"> 218 <component name="ProjectView">
218 <navigator currentView="ProjectPane" proportions="" version="1"> 219 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -229,8 +230,6 @@ @@ -229,8 +230,6 @@
229 <foldersAlwaysOnTop value="true" /> 230 <foldersAlwaysOnTop value="true" />
230 </navigator> 231 </navigator>
231 <panes> 232 <panes>
232 - <pane id="Scratches" />  
233 - <pane id="Scope" />  
234 <pane id="ProjectPane"> 233 <pane id="ProjectPane">
235 <subPane> 234 <subPane>
236 <expand> 235 <expand>
@@ -260,6 +259,8 @@ @@ -260,6 +259,8 @@
260 <select /> 259 <select />
261 </subPane> 260 </subPane>
262 </pane> 261 </pane>
  262 + <pane id="Scope" />
  263 + <pane id="Scratches" />
263 </panes> 264 </panes>
264 </component> 265 </component>
265 <component name="PropertiesComponent"> 266 <component name="PropertiesComponent">
@@ -406,6 +407,7 @@ @@ -406,6 +407,7 @@
406 <workItem from="1584687351301" duration="330000" /> 407 <workItem from="1584687351301" duration="330000" />
407 <workItem from="1584758035473" duration="1782000" /> 408 <workItem from="1584758035473" duration="1782000" />
408 <workItem from="1584775386700" duration="6222000" /> 409 <workItem from="1584775386700" duration="6222000" />
  410 + <workItem from="1584794340552" duration="3018000" />
409 </task> 411 </task>
410 <task id="LOCAL-00001" summary="调试"> 412 <task id="LOCAL-00001" summary="调试">
411 <created>1574145133364</created> 413 <created>1574145133364</created>
@@ -432,7 +434,7 @@ @@ -432,7 +434,7 @@
432 <servers /> 434 <servers />
433 </component> 435 </component>
434 <component name="TimeTrackingManager"> 436 <component name="TimeTrackingManager">
435 - <option name="totallyTimeSpent" value="631228000" /> 437 + <option name="totallyTimeSpent" value="634246000" />
436 </component> 438 </component>
437 <component name="TodoView"> 439 <component name="TodoView">
438 <todo-panel id="selected-file"> 440 <todo-panel id="selected-file">
@@ -444,16 +446,17 @@ @@ -444,16 +446,17 @@
444 </todo-panel> 446 </todo-panel>
445 </component> 447 </component>
446 <component name="ToolWindowManager"> 448 <component name="ToolWindowManager">
447 - <frame x="-46" y="81" width="1652" height="933" extended-state="1" /> 449 + <frame x="515" y="67" width="1652" height="942" extended-state="0" />
  450 + <editor active="true" />
448 <layout> 451 <layout>
449 - <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" /> 452 + <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" />
450 <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" /> 453 <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" />
451 <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" /> 454 <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" />
452 <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" /> 455 <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" />
453 <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" /> 456 <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" />
454 <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" /> 457 <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" />
455 <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" /> 458 <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" />
456 - <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" /> 459 + <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" />
457 <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" /> 460 <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" />
458 <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" /> 461 <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" />
459 <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" /> 462 <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 @@ @@ -802,7 +805,6 @@
802 <provider selected="true" editor-type-id="text-editor"> 805 <provider selected="true" editor-type-id="text-editor">
803 <state relative-caret-position="-2310"> 806 <state relative-caret-position="-2310">
804 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 807 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
805 - <folding />  
806 </state> 808 </state>
807 </provider> 809 </provider>
808 </entry> 810 </entry>
@@ -810,7 +812,6 @@ @@ -810,7 +812,6 @@
810 <provider selected="true" editor-type-id="text-editor"> 812 <provider selected="true" editor-type-id="text-editor">
811 <state relative-caret-position="-5721"> 813 <state relative-caret-position="-5721">
812 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 814 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
813 - <folding />  
814 </state> 815 </state>
815 </provider> 816 </provider>
816 </entry> 817 </entry>
@@ -818,7 +819,6 @@ @@ -818,7 +819,6 @@
818 <provider selected="true" editor-type-id="text-editor"> 819 <provider selected="true" editor-type-id="text-editor">
819 <state relative-caret-position="0"> 820 <state relative-caret-position="0">
820 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 821 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
821 - <folding />  
822 </state> 822 </state>
823 </provider> 823 </provider>
824 </entry> 824 </entry>
@@ -826,7 +826,6 @@ @@ -826,7 +826,6 @@
826 <provider selected="true" editor-type-id="text-editor"> 826 <provider selected="true" editor-type-id="text-editor">
827 <state relative-caret-position="0"> 827 <state relative-caret-position="0">
828 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 828 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
829 - <folding />  
830 </state> 829 </state>
831 </provider> 830 </provider>
832 </entry> 831 </entry>
@@ -834,201 +833,6 @@ @@ -834,201 +833,6 @@
834 <provider selected="true" editor-type-id="text-editor"> 833 <provider selected="true" editor-type-id="text-editor">
835 <state relative-caret-position="0"> 834 <state relative-caret-position="0">
836 <caret line="55" column="21" lean-forward="false" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" /> 835 <caret line="55" column="21" lean-forward="false" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
837 - <folding>  
838 - <element signature="e#631#922#0#PHP" expanded="false" />  
839 - <marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." />  
840 - <marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." />  
841 - <marker date="1583590171926" expanded="false" signature="3739:3805" ph="..." />  
842 - <marker date="1583590171926" expanded="false" signature="3878:3925" ph="..." />  
843 - <marker date="1583590171926" expanded="true" signature="3926:3964" ph="..." />  
844 - <marker date="1583590171926" expanded="false" signature="3988:4015" ph="..." />  
845 - <marker date="1583590171926" expanded="true" signature="4016:4171" ph="..." />  
846 - <marker date="1583590171926" expanded="false" signature="4195:4211" ph="..." />  
847 - <marker date="1583590171926" expanded="true" signature="4212:5259" ph="..." />  
848 - <marker date="1583590171926" expanded="false" signature="4238:4282" ph="..." />  
849 - <marker date="1583590171926" expanded="true" signature="4283:4361" ph="..." />  
850 - <marker date="1583590171926" expanded="false" signature="4313:4325" ph="..." />  
851 - <marker date="1583590171926" expanded="false" signature="4385:4429" ph="..." />  
852 - <marker date="1583590171926" expanded="true" signature="4430:4508" ph="..." />  
853 - <marker date="1583590171926" expanded="false" signature="4461:4473" ph="..." />  
854 - <marker date="1583590171926" expanded="false" signature="4532:4576" ph="..." />  
855 - <marker date="1583590171926" expanded="true" signature="4577:4655" ph="..." />  
856 - <marker date="1583590171926" expanded="false" signature="4608:4620" ph="..." />  
857 - <marker date="1583590171926" expanded="false" signature="4679:4723" ph="..." />  
858 - <marker date="1583590171926" expanded="true" signature="4724:4805" ph="..." />  
859 - <marker date="1583590171926" expanded="false" signature="4755:4767" ph="..." />  
860 - <marker date="1583590171926" expanded="false" signature="4829:4873" ph="..." />  
861 - <marker date="1583590171926" expanded="true" signature="4874:4959" ph="..." />  
862 - <marker date="1583590171926" expanded="false" signature="4906:4918" ph="..." />  
863 - <marker date="1583590171926" expanded="false" signature="4983:5027" ph="..." />  
864 - <marker date="1583590171926" expanded="true" signature="5028:5110" ph="..." />  
865 - <marker date="1583590171926" expanded="false" signature="5062:5074" ph="..." />  
866 - <marker date="1583590171926" expanded="false" signature="5134:5178" ph="..." />  
867 - <marker date="1583590171926" expanded="true" signature="5179:5242" ph="..." />  
868 - <marker date="1583590171926" expanded="true" signature="5284:5748" ph="..." />  
869 - <marker date="1583590171926" expanded="false" signature="5312:5378" ph="..." />  
870 - <marker date="1583590171926" expanded="false" signature="5421:5466" ph="..." />  
871 - <marker date="1583590171926" expanded="true" signature="5467:5731" ph="..." />  
872 - <marker date="1583590171926" expanded="false" signature="5468:5474" ph=" " />  
873 - <marker date="1583590171926" expanded="false" signature="5474:5480" ph=" " />  
874 - <marker date="1583590171926" expanded="false" signature="5480:5486" ph=" " />  
875 - <marker date="1583590171926" expanded="false" signature="5486:5492" ph=" " />  
876 - <marker date="1583590171926" expanded="false" signature="5524:5533" ph="..." />  
877 - <marker date="1583590171926" expanded="false" signature="5576:5585" ph="..." />  
878 - <marker date="1583590171926" expanded="false" signature="5614:5623" ph="..." />  
879 - <marker date="1583590171926" expanded="false" signature="5648:5657" ph="..." />  
880 - <marker date="1583590171926" expanded="false" signature="5772:5790" ph="..." />  
881 - <marker date="1583590171926" expanded="true" signature="5791:6108" ph="..." />  
882 - <marker date="1583590171926" expanded="false" signature="5819:5885" ph="..." />  
883 - <marker date="1583590171926" expanded="false" signature="5924:5952" ph="..." />  
884 - <marker date="1583590171926" expanded="false" signature="5954:5960" ph=" " />  
885 - <marker date="1583590171926" expanded="false" signature="5960:5966" ph=" " />  
886 - <marker date="1583590171926" expanded="false" signature="5966:5972" ph=" " />  
887 - <marker date="1583590171926" expanded="false" signature="5972:5978" ph=" " />  
888 - <marker date="1583590171926" expanded="false" signature="6031:6040" ph="..." />  
889 - <marker date="1583590171926" expanded="false" signature="6132:6150" ph="..." />  
890 - <marker date="1583590171926" expanded="true" signature="6151:6557" ph="..." />  
891 - <marker date="1583590171926" expanded="false" signature="6179:6245" ph="..." />  
892 - <marker date="1583590171926" expanded="false" signature="6286:6331" ph="..." />  
893 - <marker date="1583590171926" expanded="true" signature="6332:6540" ph="..." />  
894 - <marker date="1583590171926" expanded="false" signature="6333:6339" ph=" " />  
895 - <marker date="1583590171926" expanded="false" signature="6339:6345" ph=" " />  
896 - <marker date="1583590171926" expanded="false" signature="6345:6351" ph=" " />  
897 - <marker date="1583590171926" expanded="false" signature="6351:6357" ph=" " />  
898 - <marker date="1583590171926" expanded="false" signature="6381:6387" ph=" " />  
899 - <marker date="1583590171926" expanded="false" signature="6390:6396" ph=" " />  
900 - <marker date="1583590171926" expanded="false" signature="6398:6404" ph=" " />  
901 - <marker date="1583590171926" expanded="false" signature="6455:6464" ph="..." />  
902 - <marker date="1583590171926" expanded="false" signature="6494:6503" ph="..." />  
903 - <marker date="1583590171926" expanded="false" signature="6581:6628" ph="..." />  
904 - <marker date="1583590171926" expanded="false" signature="6630:6636" ph=" " />  
905 - <marker date="1583590171926" expanded="false" signature="6636:6642" ph=" " />  
906 - <marker date="1583590171926" expanded="false" signature="6642:6648" ph=" " />  
907 - <marker date="1583590171926" expanded="false" signature="6648:6654" ph=" " />  
908 - <marker date="1583590171926" expanded="false" signature="6709:6718" ph="..." />  
909 - <marker date="1583590171926" expanded="false" signature="6837:6884" ph="..." />  
910 - <marker date="1583590171926" expanded="false" signature="6886:6892" ph=" " />  
911 - <marker date="1583590171926" expanded="false" signature="6892:6898" ph=" " />  
912 - <marker date="1583590171926" expanded="false" signature="6898:6904" ph=" " />  
913 - <marker date="1583590171926" expanded="false" signature="6904:6910" ph=" " />  
914 - <marker date="1583590171926" expanded="false" signature="6964:6973" ph="..." />  
915 - <marker date="1583590171926" expanded="false" signature="7047:7063" ph="..." />  
916 - <marker date="1583590171926" expanded="false" signature="7115:7162" ph="..." />  
917 - <marker date="1583590171926" expanded="false" signature="7164:7170" ph=" " />  
918 - <marker date="1583590171926" expanded="false" signature="7170:7176" ph=" " />  
919 - <marker date="1583590171926" expanded="false" signature="7176:7182" ph=" " />  
920 - <marker date="1583590171926" expanded="false" signature="7182:7188" ph=" " />  
921 - <marker date="1583590171926" expanded="false" signature="7215:7241" ph="..." />  
922 - <marker date="1583590171926" expanded="false" signature="7319:7337" ph="..." />  
923 - <marker date="1583590171926" expanded="true" signature="7338:7936" ph="..." />  
924 - <marker date="1583590171926" expanded="false" signature="7366:7432" ph="..." />  
925 - <marker date="1583590171926" expanded="false" signature="7471:7518" ph="..." />  
926 - <marker date="1583590171926" expanded="false" signature="7520:7526" ph=" " />  
927 - <marker date="1583590171926" expanded="false" signature="7526:7532" ph=" " />  
928 - <marker date="1583590171926" expanded="false" signature="7532:7538" ph=" " />  
929 - <marker date="1583590171926" expanded="false" signature="7538:7544" ph=" " />  
930 - <marker date="1583590171926" expanded="false" signature="7629:7676" ph="..." />  
931 - <marker date="1583590171926" expanded="false" signature="7678:7684" ph=" " />  
932 - <marker date="1583590171926" expanded="false" signature="7684:7690" ph=" " />  
933 - <marker date="1583590171926" expanded="false" signature="7690:7696" ph=" " />  
934 - <marker date="1583590171926" expanded="false" signature="7696:7702" ph=" " />  
935 - <marker date="1583590171926" expanded="false" signature="7803:7850" ph="..." />  
936 - <marker date="1583590171926" expanded="false" signature="7852:7858" ph=" " />  
937 - <marker date="1583590171926" expanded="false" signature="7858:7864" ph=" " />  
938 - <marker date="1583590171926" expanded="false" signature="7864:7870" ph=" " />  
939 - <marker date="1583590171926" expanded="false" signature="7870:7876" ph=" " />  
940 - <marker date="1583590171926" expanded="false" signature="7960:7978" ph="..." />  
941 - <marker date="1583590171926" expanded="true" signature="7979:9624" ph="..." />  
942 - <marker date="1583590171926" expanded="false" signature="8007:8073" ph="..." />  
943 - <marker date="1583590171926" expanded="false" signature="8112:8159" ph="..." />  
944 - <marker date="1583590171926" expanded="false" signature="8161:8167" ph=" " />  
945 - <marker date="1583590171926" expanded="false" signature="8167:8173" ph=" " />  
946 - <marker date="1583590171926" expanded="false" signature="8173:8179" ph=" " />  
947 - <marker date="1583590171926" expanded="false" signature="8179:8185" ph=" " />  
948 - <marker date="1583590171926" expanded="false" signature="8309:8356" ph="..." />  
949 - <marker date="1583590171926" expanded="false" signature="8358:8364" ph=" " />  
950 - <marker date="1583590171926" expanded="false" signature="8364:8370" ph=" " />  
951 - <marker date="1583590171926" expanded="false" signature="8370:8376" ph=" " />  
952 - <marker date="1583590171926" expanded="false" signature="8376:8382" ph=" " />  
953 - <marker date="1583590171926" expanded="false" signature="8534:8581" ph="..." />  
954 - <marker date="1583590171926" expanded="false" signature="8583:8589" ph=" " />  
955 - <marker date="1583590171926" expanded="false" signature="8589:8595" ph=" " />  
956 - <marker date="1583590171926" expanded="false" signature="8595:8601" ph=" " />  
957 - <marker date="1583590171926" expanded="false" signature="8601:8607" ph=" " />  
958 - <marker date="1583590171926" expanded="false" signature="8726:8773" ph="..." />  
959 - <marker date="1583590171926" expanded="false" signature="8775:8781" ph=" " />  
960 - <marker date="1583590171926" expanded="false" signature="8781:8787" ph=" " />  
961 - <marker date="1583590171926" expanded="false" signature="8787:8793" ph=" " />  
962 - <marker date="1583590171926" expanded="false" signature="8793:8799" ph=" " />  
963 - <marker date="1583590171926" expanded="false" signature="8883:8930" ph="..." />  
964 - <marker date="1583590171926" expanded="false" signature="8932:8938" ph=" " />  
965 - <marker date="1583590171926" expanded="false" signature="8938:8944" ph=" " />  
966 - <marker date="1583590171926" expanded="false" signature="8944:8950" ph=" " />  
967 - <marker date="1583590171926" expanded="false" signature="8950:8956" ph=" " />  
968 - <marker date="1583590171926" expanded="false" signature="9016:9063" ph="..." />  
969 - <marker date="1583590171926" expanded="false" signature="9065:9071" ph=" " />  
970 - <marker date="1583590171926" expanded="false" signature="9071:9077" ph=" " />  
971 - <marker date="1583590171926" expanded="false" signature="9077:9083" ph=" " />  
972 - <marker date="1583590171926" expanded="false" signature="9083:9089" ph=" " />  
973 - <marker date="1583590171926" expanded="false" signature="9273:9320" ph="..." />  
974 - <marker date="1583590171926" expanded="false" signature="9322:9328" ph=" " />  
975 - <marker date="1583590171926" expanded="false" signature="9328:9334" ph=" " />  
976 - <marker date="1583590171926" expanded="false" signature="9334:9340" ph=" " />  
977 - <marker date="1583590171926" expanded="false" signature="9340:9346" ph=" " />  
978 - <marker date="1583590171926" expanded="false" signature="9474:9521" ph="..." />  
979 - <marker date="1583590171926" expanded="false" signature="9523:9529" ph=" " />  
980 - <marker date="1583590171926" expanded="false" signature="9529:9535" ph=" " />  
981 - <marker date="1583590171926" expanded="false" signature="9535:9541" ph=" " />  
982 - <marker date="1583590171926" expanded="false" signature="9541:9547" ph=" " />  
983 - <marker date="1583590171926" expanded="false" signature="9648:9666" ph="..." />  
984 - <marker date="1583590171926" expanded="true" signature="9667:10167" ph="..." />  
985 - <marker date="1583590171926" expanded="false" signature="9695:9761" ph="..." />  
986 - <marker date="1583590171926" expanded="false" signature="9802:9849" ph="..." />  
987 - <marker date="1583590171926" expanded="false" signature="9851:9857" ph=" " />  
988 - <marker date="1583590171926" expanded="false" signature="9857:9863" ph=" " />  
989 - <marker date="1583590171926" expanded="false" signature="9863:9869" ph=" " />  
990 - <marker date="1583590171926" expanded="false" signature="9869:9875" ph=" " />  
991 - <marker date="1583590171926" expanded="false" signature="9987:10034" ph="..." />  
992 - <marker date="1583590171926" expanded="false" signature="10036:10042" ph=" " />  
993 - <marker date="1583590171926" expanded="false" signature="10042:10048" ph=" " />  
994 - <marker date="1583590171926" expanded="false" signature="10048:10054" ph=" " />  
995 - <marker date="1583590171926" expanded="false" signature="10054:10060" ph=" " />  
996 - <marker date="1583590171926" expanded="false" signature="10191:10209" ph="..." />  
997 - <marker date="1583590171926" expanded="true" signature="10210:11210" ph="..." />  
998 - <marker date="1583590171926" expanded="false" signature="10238:10304" ph="..." />  
999 - <marker date="1583590171926" expanded="false" signature="10343:10390" ph="..." />  
1000 - <marker date="1583590171926" expanded="false" signature="10392:10398" ph=" " />  
1001 - <marker date="1583590171926" expanded="false" signature="10398:10404" ph=" " />  
1002 - <marker date="1583590171926" expanded="false" signature="10404:10410" ph=" " />  
1003 - <marker date="1583590171926" expanded="false" signature="10410:10416" ph=" " />  
1004 - <marker date="1583590171926" expanded="false" signature="10482:10529" ph="..." />  
1005 - <marker date="1583590171926" expanded="false" signature="10531:10537" ph=" " />  
1006 - <marker date="1583590171926" expanded="false" signature="10537:10543" ph=" " />  
1007 - <marker date="1583590171926" expanded="false" signature="10543:10549" ph=" " />  
1008 - <marker date="1583590171926" expanded="false" signature="10549:10555" ph=" " />  
1009 - <marker date="1583590171926" expanded="false" signature="10612:10659" ph="..." />  
1010 - <marker date="1583590171926" expanded="false" signature="10661:10667" ph=" " />  
1011 - <marker date="1583590171926" expanded="false" signature="10667:10673" ph=" " />  
1012 - <marker date="1583590171926" expanded="false" signature="10673:10679" ph=" " />  
1013 - <marker date="1583590171926" expanded="false" signature="10679:10685" ph=" " />  
1014 - <marker date="1583590171926" expanded="false" signature="10763:10810" ph="..." />  
1015 - <marker date="1583590171926" expanded="false" signature="10812:10818" ph=" " />  
1016 - <marker date="1583590171926" expanded="false" signature="10818:10824" ph=" " />  
1017 - <marker date="1583590171926" expanded="false" signature="10824:10830" ph=" " />  
1018 - <marker date="1583590171926" expanded="false" signature="10830:10836" ph=" " />  
1019 - <marker date="1583590171926" expanded="false" signature="10929:10976" ph="..." />  
1020 - <marker date="1583590171926" expanded="false" signature="10978:10984" ph=" " />  
1021 - <marker date="1583590171926" expanded="false" signature="10984:10990" ph=" " />  
1022 - <marker date="1583590171926" expanded="false" signature="10990:10996" ph=" " />  
1023 - <marker date="1583590171926" expanded="false" signature="10996:11002" ph=" " />  
1024 - <marker date="1583590171926" expanded="false" signature="11076:11123" ph="..." />  
1025 - <marker date="1583590171926" expanded="false" signature="11125:11131" ph=" " />  
1026 - <marker date="1583590171926" expanded="false" signature="11131:11137" ph=" " />  
1027 - <marker date="1583590171926" expanded="false" signature="11137:11143" ph=" " />  
1028 - <marker date="1583590171926" expanded="false" signature="11143:11149" ph=" " />  
1029 - <marker date="1583590171926" expanded="false" signature="11234:11314" ph="..." />  
1030 - <marker date="1583590171926" expanded="false" signature="11375:11455" ph="..." />  
1031 - </folding>  
1032 </state> 836 </state>
1033 </provider> 837 </provider>
1034 </entry> 838 </entry>
@@ -1036,7 +840,6 @@ @@ -1036,7 +840,6 @@
1036 <provider selected="true" editor-type-id="text-editor"> 840 <provider selected="true" editor-type-id="text-editor">
1037 <state relative-caret-position="0"> 841 <state relative-caret-position="0">
1038 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 842 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1039 - <folding />  
1040 </state> 843 </state>
1041 </provider> 844 </provider>
1042 </entry> 845 </entry>
@@ -1044,7 +847,6 @@ @@ -1044,7 +847,6 @@
1044 <provider selected="true" editor-type-id="text-editor"> 847 <provider selected="true" editor-type-id="text-editor">
1045 <state relative-caret-position="190"> 848 <state relative-caret-position="190">
1046 <caret line="99" column="21" lean-forward="true" selection-start-line="99" selection-start-column="21" selection-end-line="99" selection-end-column="21" /> 849 <caret line="99" column="21" lean-forward="true" selection-start-line="99" selection-start-column="21" selection-end-line="99" selection-end-column="21" />
1047 - <folding />  
1048 </state> 850 </state>
1049 </provider> 851 </provider>
1050 </entry> 852 </entry>
@@ -1052,7 +854,6 @@ @@ -1052,7 +854,6 @@
1052 <provider selected="true" editor-type-id="text-editor"> 854 <provider selected="true" editor-type-id="text-editor">
1053 <state relative-caret-position="1315"> 855 <state relative-caret-position="1315">
1054 <caret line="99" column="21" lean-forward="true" selection-start-line="99" selection-start-column="21" selection-end-line="99" selection-end-column="21" /> 856 <caret line="99" column="21" lean-forward="true" selection-start-line="99" selection-start-column="21" selection-end-line="99" selection-end-column="21" />
1055 - <folding />  
1056 </state> 857 </state>
1057 </provider> 858 </provider>
1058 </entry> 859 </entry>
@@ -1068,7 +869,6 @@ @@ -1068,7 +869,6 @@
1068 <provider selected="true" editor-type-id="text-editor"> 869 <provider selected="true" editor-type-id="text-editor">
1069 <state relative-caret-position="346"> 870 <state relative-caret-position="346">
1070 <caret line="118" column="17" lean-forward="true" selection-start-line="118" selection-start-column="17" selection-end-line="118" selection-end-column="17" /> 871 <caret line="118" column="17" lean-forward="true" selection-start-line="118" selection-start-column="17" selection-end-line="118" selection-end-column="17" />
1071 - <folding />  
1072 </state> 872 </state>
1073 </provider> 873 </provider>
1074 </entry> 874 </entry>
@@ -1076,16 +876,13 @@ @@ -1076,16 +876,13 @@
1076 <provider selected="true" editor-type-id="text-editor"> 876 <provider selected="true" editor-type-id="text-editor">
1077 <state relative-caret-position="298"> 877 <state relative-caret-position="298">
1078 <caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" /> 878 <caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
1079 - <folding>  
1080 - <element signature="e#2201#6736#0#PHP" expanded="false" />  
1081 - </folding>  
1082 </state> 879 </state>
1083 </provider> 880 </provider>
1084 </entry> 881 </entry>
1085 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 882 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
1086 <provider selected="true" editor-type-id="text-editor"> 883 <provider selected="true" editor-type-id="text-editor">
1087 - <state relative-caret-position="155">  
1088 - <caret line="568" column="29" lean-forward="false" selection-start-line="568" selection-start-column="20" selection-end-line="568" selection-end-column="29" /> 884 + <state relative-caret-position="156">
  885 + <caret line="321" column="35" lean-forward="true" selection-start-line="321" selection-start-column="35" selection-end-line="321" selection-end-column="35" />
1089 <folding> 886 <folding>
1090 <element signature="e#535#1273#0#PHP" expanded="false" /> 887 <element signature="e#535#1273#0#PHP" expanded="false" />
1091 <element signature="e#1278#2941#0#PHP" expanded="false" /> 888 <element signature="e#1278#2941#0#PHP" expanded="false" />
@@ -1099,74 +896,73 @@ @@ -1099,74 +896,73 @@
1099 <element signature="e#5446#5789#0#PHP" expanded="false" /> 896 <element signature="e#5446#5789#0#PHP" expanded="false" />
1100 <element signature="e#5795#6208#0#PHP" expanded="false" /> 897 <element signature="e#5795#6208#0#PHP" expanded="false" />
1101 <element signature="e#6213#6530#0#PHP" expanded="false" /> 898 <element signature="e#6213#6530#0#PHP" expanded="false" />
1102 - <element signature="e#6536#7634#0#PHP" expanded="false" />  
1103 - <element signature="e#7639#10426#0#PHP" expanded="false" />  
1104 - <element signature="e#8426#8733#0#PHP" expanded="false" />  
1105 - <element signature="e#8796#9078#0#PHP" expanded="false" />  
1106 - <element signature="e#9142#9412#0#PHP" expanded="false" />  
1107 - <element signature="e#10432#11112#0#PHP" expanded="false" />  
1108 - <element signature="e#11117#11975#0#PHP" expanded="false" />  
1109 - <element signature="e#11981#12770#0#PHP" expanded="false" />  
1110 - <element signature="e#12775#14124#0#PHP" expanded="false" />  
1111 - <element signature="e#14130#14832#0#PHP" expanded="false" />  
1112 - <element signature="e#14837#16157#0#PHP" expanded="false" />  
1113 - <element signature="e#16163#16739#0#PHP" expanded="false" />  
1114 - <element signature="e#16744#17356#0#PHP" expanded="false" />  
1115 - <element signature="e#17362#18078#0#PHP" expanded="false" />  
1116 - <element signature="e#22216#23146#0#PHP" expanded="false" />  
1117 - <element signature="e#23151#28292#0#PHP" expanded="false" />  
1118 - <element signature="e#28298#28675#0#PHP" expanded="false" />  
1119 - <element signature="e#28680#29119#0#PHP" expanded="false" />  
1120 - <element signature="e#29125#29946#0#PHP" expanded="false" />  
1121 - <element signature="e#29951#33355#0#PHP" expanded="false" />  
1122 - <element signature="e#30397#33349#0#PHP" expanded="false" />  
1123 - <element signature="e#33361#33866#0#PHP" expanded="false" />  
1124 - <element signature="e#33871#34122#0#PHP" expanded="false" />  
1125 - <element signature="e#34128#34607#0#PHP" expanded="false" />  
1126 - <element signature="e#34612#35369#0#PHP" expanded="false" />  
1127 - <element signature="e#35375#35856#0#PHP" expanded="false" />  
1128 - <element signature="e#35861#36631#0#PHP" expanded="false" />  
1129 - <element signature="e#36637#37000#0#PHP" expanded="false" />  
1130 - <element signature="e#37005#37196#0#PHP" expanded="false" />  
1131 - <element signature="e#37202#37560#0#PHP" expanded="false" />  
1132 - <element signature="e#37565#37756#0#PHP" expanded="false" />  
1133 - <element signature="e#37762#38905#0#PHP" expanded="false" />  
1134 - <element signature="e#38910#41575#0#PHP" expanded="false" />  
1135 - <element signature="e#41581#42079#0#PHP" expanded="false" />  
1136 - <element signature="e#42084#43830#0#PHP" expanded="false" />  
1137 - <element signature="e#43836#44249#0#PHP" expanded="false" />  
1138 - <element signature="e#44254#44733#0#PHP" expanded="false" />  
1139 - <element signature="e#44739#45273#0#PHP" expanded="false" />  
1140 - <element signature="e#45278#46663#0#PHP" expanded="false" />  
1141 - <element signature="e#46669#47323#0#PHP" expanded="false" />  
1142 - <element signature="e#47328#49343#0#PHP" expanded="false" />  
1143 - <element signature="e#49349#50109#0#PHP" expanded="false" />  
1144 - <element signature="e#50114#52823#0#PHP" expanded="false" />  
1145 - <element signature="e#52849#53680#0#PHP" expanded="false" />  
1146 - <element signature="e#53686#54106#0#PHP" expanded="false" />  
1147 - <element signature="e#54111#54594#0#PHP" expanded="false" />  
1148 - <element signature="e#54600#55406#0#PHP" expanded="false" />  
1149 - <element signature="e#55411#58569#0#PHP" expanded="false" />  
1150 - <element signature="e#57204#58563#0#PHP" expanded="false" />  
1151 - <element signature="e#58584#59919#0#PHP" expanded="false" />  
1152 - <element signature="e#58700#59102#0#PHP" expanded="false" />  
1153 - <element signature="e#59935#60969#0#PHP" expanded="false" />  
1154 - <element signature="e#60975#61733#0#PHP" expanded="false" />  
1155 - <element signature="e#61738#65481#0#PHP" expanded="false" />  
1156 - <element signature="e#65487#65879#0#PHP" expanded="false" />  
1157 - <element signature="e#65884#66836#0#PHP" expanded="false" />  
1158 - <element signature="e#66860#67433#0#PHP" expanded="false" />  
1159 - <element signature="e#67439#68038#0#PHP" expanded="false" />  
1160 - <element signature="e#68043#68970#0#PHP" expanded="false" />  
1161 - <element signature="e#68976#69690#0#PHP" expanded="false" />  
1162 - <element signature="e#69696#70123#0#PHP" expanded="false" />  
1163 - <element signature="e#70128#70597#0#PHP" expanded="false" />  
1164 - <element signature="e#70604#71809#0#PHP" expanded="false" />  
1165 - <element signature="e#71814#73517#0#PHP" expanded="false" />  
1166 - <element signature="e#73523#74300#0#PHP" expanded="false" />  
1167 - <element signature="e#74305#78243#0#PHP" expanded="false" />  
1168 - <element signature="e#78249#78758#0#PHP" expanded="false" />  
1169 - <element signature="e#78763#79435#0#PHP" expanded="false" /> 899 + <element signature="e#8426#8859#0#PHP" expanded="false" />
  900 + <element signature="e#8922#9331#0#PHP" expanded="false" />
  901 + <element signature="e#9395#9665#0#PHP" expanded="false" />
  902 + <element signature="e#10685#11365#0#PHP" expanded="false" />
  903 + <element signature="e#11370#12228#0#PHP" expanded="false" />
  904 + <element signature="e#12234#13023#0#PHP" expanded="false" />
  905 + <element signature="e#13028#14377#0#PHP" expanded="false" />
  906 + <element signature="e#14383#15085#0#PHP" expanded="false" />
  907 + <element signature="e#15090#16410#0#PHP" expanded="false" />
  908 + <element signature="e#16416#16992#0#PHP" expanded="false" />
  909 + <element signature="e#16997#17609#0#PHP" expanded="false" />
  910 + <element signature="e#17615#18331#0#PHP" expanded="false" />
  911 + <element signature="e#18336#22463#0#PHP" expanded="false" />
  912 + <element signature="e#22469#23399#0#PHP" expanded="false" />
  913 + <element signature="e#23404#28545#0#PHP" expanded="false" />
  914 + <element signature="e#28551#28928#0#PHP" expanded="false" />
  915 + <element signature="e#28933#29372#0#PHP" expanded="false" />
  916 + <element signature="e#29378#30199#0#PHP" expanded="false" />
  917 + <element signature="e#30204#33608#0#PHP" expanded="false" />
  918 + <element signature="e#30650#33602#0#PHP" expanded="false" />
  919 + <element signature="e#33614#34119#0#PHP" expanded="false" />
  920 + <element signature="e#34124#34375#0#PHP" expanded="false" />
  921 + <element signature="e#34381#34860#0#PHP" expanded="false" />
  922 + <element signature="e#34865#35622#0#PHP" expanded="false" />
  923 + <element signature="e#35628#36109#0#PHP" expanded="false" />
  924 + <element signature="e#36114#36884#0#PHP" expanded="false" />
  925 + <element signature="e#36890#37253#0#PHP" expanded="false" />
  926 + <element signature="e#37258#37449#0#PHP" expanded="false" />
  927 + <element signature="e#37455#37813#0#PHP" expanded="false" />
  928 + <element signature="e#37818#38009#0#PHP" expanded="false" />
  929 + <element signature="e#38015#39158#0#PHP" expanded="false" />
  930 + <element signature="e#39163#41828#0#PHP" expanded="false" />
  931 + <element signature="e#41834#42332#0#PHP" expanded="false" />
  932 + <element signature="e#42337#44083#0#PHP" expanded="false" />
  933 + <element signature="e#44089#44502#0#PHP" expanded="false" />
  934 + <element signature="e#44507#44986#0#PHP" expanded="false" />
  935 + <element signature="e#44992#45526#0#PHP" expanded="false" />
  936 + <element signature="e#45531#46916#0#PHP" expanded="false" />
  937 + <element signature="e#46922#47576#0#PHP" expanded="false" />
  938 + <element signature="e#47581#49596#0#PHP" expanded="false" />
  939 + <element signature="e#49602#50362#0#PHP" expanded="false" />
  940 + <element signature="e#50367#53076#0#PHP" expanded="false" />
  941 + <element signature="e#53102#53933#0#PHP" expanded="false" />
  942 + <element signature="e#53939#54359#0#PHP" expanded="false" />
  943 + <element signature="e#54364#54847#0#PHP" expanded="false" />
  944 + <element signature="e#54853#55659#0#PHP" expanded="false" />
  945 + <element signature="e#55664#58822#0#PHP" expanded="false" />
  946 + <element signature="e#57457#58816#0#PHP" expanded="false" />
  947 + <element signature="e#58837#60172#0#PHP" expanded="false" />
  948 + <element signature="e#58953#59355#0#PHP" expanded="false" />
  949 + <element signature="e#60188#61222#0#PHP" expanded="false" />
  950 + <element signature="e#61228#61986#0#PHP" expanded="false" />
  951 + <element signature="e#61991#65734#0#PHP" expanded="false" />
  952 + <element signature="e#65740#66132#0#PHP" expanded="false" />
  953 + <element signature="e#66137#67089#0#PHP" expanded="false" />
  954 + <element signature="e#67113#67686#0#PHP" expanded="false" />
  955 + <element signature="e#67692#68291#0#PHP" expanded="false" />
  956 + <element signature="e#68296#69223#0#PHP" expanded="false" />
  957 + <element signature="e#69229#69943#0#PHP" expanded="false" />
  958 + <element signature="e#69949#70376#0#PHP" expanded="false" />
  959 + <element signature="e#70381#70850#0#PHP" expanded="false" />
  960 + <element signature="e#70857#72062#0#PHP" expanded="false" />
  961 + <element signature="e#72067#73770#0#PHP" expanded="false" />
  962 + <element signature="e#73776#74553#0#PHP" expanded="false" />
  963 + <element signature="e#74558#78496#0#PHP" expanded="false" />
  964 + <element signature="e#78502#79011#0#PHP" expanded="false" />
  965 + <element signature="e#79016#79688#0#PHP" expanded="false" />
1170 </folding> 966 </folding>
1171 </state> 967 </state>
1172 </provider> 968 </provider>
@@ -290,7 +290,8 @@ class User extends Api @@ -290,7 +290,8 @@ class User extends Api
290 $address = $param['address']; 290 $address = $param['address'];
291 $where_address = function ($query_address) use ($address) { 291 $where_address = function ($query_address) use ($address) {
292 foreach ($address as $v){ 292 foreach ($address as $v){
293 - $query_address->where('address_ids','like','%,'.$v.',%'); 293 + $a = Db::name('words')->where('id',$v)->field('id,name')->find();
  294 + $query_address->where('address_ids','like','%,'.$v.',%')->whereor('keyword','like',"%$a[name]%");
294 } 295 }
295 }; 296 };
296 } 297 }
@@ -301,7 +302,8 @@ class User extends Api @@ -301,7 +302,8 @@ class User extends Api
301 $text = $param['text']; 302 $text = $param['text'];
302 $where_text = function ($query_text) use ($text) { 303 $where_text = function ($query_text) use ($text) {
303 foreach ($text as $vt){ 304 foreach ($text as $vt){
304 - $query_text->where('text_ids','like','%,'.$vt.',%'); 305 + $a = Db::name('words')->where('id',$vt)->field('id,name')->find();
  306 + $query_text->where('text_ids','like','%,'.$vt.',%')->whereor('keyword','like',"%$a[name]%");
305 } 307 }
306 }; 308 };
307 } 309 }
@@ -7679,7 +7679,7 @@ @@ -7679,7 +7679,7 @@
7679 7679
7680 <div class="row mt0 footer"> 7680 <div class="row mt0 footer">
7681 <div class="col-md-6" align="left"> 7681 <div class="col-md-6" align="left">
7682 - Generated on 2020-03-21 17:19:16 </div> 7682 + Generated on 2020-03-21 21:29:01 </div>
7683 <div class="col-md-6" align="right"> 7683 <div class="col-md-6" align="right">
7684 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 7684 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
7685 </div> 7685 </div>