正在显示
2 个修改的文件
包含
16 行增加
和
23 行删除
@@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> |
9 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> | 9 | + <change type="MOVED" beforePath="$PROJECT_DIR$/public/admin.php" afterPath="$PROJECT_DIR$/public/admininfo.php" /> |
10 | </list> | 10 | </list> |
11 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 11 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
12 | <option name="TRACKING_ENABLED" value="true" /> | 12 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -21,7 +21,7 @@ | @@ -21,7 +21,7 @@ | ||
21 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 21 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
22 | <provider selected="true" editor-type-id="text-editor"> | 22 | <provider selected="true" editor-type-id="text-editor"> |
23 | <state relative-caret-position="450"> | 23 | <state relative-caret-position="450"> |
24 | - <caret line="282" column="17" lean-forward="true" selection-start-line="282" selection-start-column="17" selection-end-line="282" selection-end-column="17" /> | 24 | + <caret line="282" column="17" lean-forward="false" selection-start-line="282" selection-start-column="17" selection-end-line="282" selection-end-column="17" /> |
25 | <folding> | 25 | <folding> |
26 | <element signature="e#535#1273#0#PHP" expanded="false" /> | 26 | <element signature="e#535#1273#0#PHP" expanded="false" /> |
27 | <element signature="e#1278#2941#0#PHP" expanded="false" /> | 27 | <element signature="e#1278#2941#0#PHP" expanded="false" /> |
@@ -210,9 +210,9 @@ | @@ -210,9 +210,9 @@ | ||
210 | <sorting>DEFINITION_ORDER</sorting> | 210 | <sorting>DEFINITION_ORDER</sorting> |
211 | </component> | 211 | </component> |
212 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> | 212 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
213 | - <component name="ProjectFrameBounds"> | ||
214 | - <option name="x" value="293" /> | ||
215 | - <option name="y" value="48" /> | 213 | + <component name="ProjectFrameBounds" extendedState="1"> |
214 | + <option name="x" value="54" /> | ||
215 | + <option name="y" value="99" /> | ||
216 | <option name="width" value="1652" /> | 216 | <option name="width" value="1652" /> |
217 | <option name="height" value="931" /> | 217 | <option name="height" value="931" /> |
218 | </component> | 218 | </component> |
@@ -248,15 +248,7 @@ | @@ -248,15 +248,7 @@ | ||
248 | <path> | 248 | <path> |
249 | <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | 249 | <item name="areial" type="b2602c69:ProjectViewProjectNode" /> |
250 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | 250 | <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> |
251 | - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
252 | - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
253 | - </path> | ||
254 | - <path> | ||
255 | - <item name="areial" type="b2602c69:ProjectViewProjectNode" /> | ||
256 | - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
257 | - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
258 | - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> | ||
259 | - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> | 251 | + <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> |
260 | </path> | 252 | </path> |
261 | </expand> | 253 | </expand> |
262 | <select /> | 254 | <select /> |
@@ -266,7 +258,7 @@ | @@ -266,7 +258,7 @@ | ||
266 | </component> | 258 | </component> |
267 | <component name="PropertiesComponent"> | 259 | <component name="PropertiesComponent"> |
268 | <property name="WebServerToolWindowFactoryState" value="false" /> | 260 | <property name="WebServerToolWindowFactoryState" value="false" /> |
269 | - <property name="last_opened_file_path" value="$PROJECT_DIR$/../fastadmin/questions" /> | 261 | + <property name="last_opened_file_path" value="$PROJECT_DIR$" /> |
270 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> | 262 | <property name="DefaultHtmlFileTemplate" value="HTML File" /> |
271 | <property name="settings.editor.selected.configurable" value="preferences.keymap" /> | 263 | <property name="settings.editor.selected.configurable" value="preferences.keymap" /> |
272 | </component> | 264 | </component> |
@@ -412,7 +404,8 @@ | @@ -412,7 +404,8 @@ | ||
412 | <workItem from="1584922896072" duration="645000" /> | 404 | <workItem from="1584922896072" duration="645000" /> |
413 | <workItem from="1585128834226" duration="698000" /> | 405 | <workItem from="1585128834226" duration="698000" /> |
414 | <workItem from="1585216476771" duration="4322000" /> | 406 | <workItem from="1585216476771" duration="4322000" /> |
415 | - <workItem from="1585220935766" duration="915000" /> | 407 | + <workItem from="1585220935766" duration="1086000" /> |
408 | + <workItem from="1585528700995" duration="51000" /> | ||
416 | </task> | 409 | </task> |
417 | <task id="LOCAL-00001" summary="调试"> | 410 | <task id="LOCAL-00001" summary="调试"> |
418 | <created>1574145133364</created> | 411 | <created>1574145133364</created> |
@@ -439,7 +432,7 @@ | @@ -439,7 +432,7 @@ | ||
439 | <servers /> | 432 | <servers /> |
440 | </component> | 433 | </component> |
441 | <component name="TimeTrackingManager"> | 434 | <component name="TimeTrackingManager"> |
442 | - <option name="totallyTimeSpent" value="642427000" /> | 435 | + <option name="totallyTimeSpent" value="642649000" /> |
443 | </component> | 436 | </component> |
444 | <component name="TodoView"> | 437 | <component name="TodoView"> |
445 | <todo-panel id="selected-file"> | 438 | <todo-panel id="selected-file"> |
@@ -451,18 +444,18 @@ | @@ -451,18 +444,18 @@ | ||
451 | </todo-panel> | 444 | </todo-panel> |
452 | </component> | 445 | </component> |
453 | <component name="ToolWindowManager"> | 446 | <component name="ToolWindowManager"> |
454 | - <frame x="293" y="48" width="1652" height="931" extended-state="0" /> | 447 | + <frame x="54" y="99" width="1652" height="931" extended-state="1" /> |
455 | <layout> | 448 | <layout> |
456 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16080402" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> | 449 | + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16268845" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> |
457 | <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" /> | 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" /> |
458 | <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" /> | 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" /> |
459 | <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" /> | 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" /> |
460 | - <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" /> | ||
461 | <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" /> | 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" /> |
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" /> | ||
462 | <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" /> | 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" /> |
463 | - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.46599495" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> | ||
464 | - <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" /> | 456 | + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46599495" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> |
465 | <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" /> | 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" /> |
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" /> | ||
466 | <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" /> | 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" /> |
467 | <window_info id="Message" 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="3" side_tool="false" content_ui="tabs" /> | 460 | <window_info id="Message" 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="3" side_tool="false" content_ui="tabs" /> |
468 | <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 461 | <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
@@ -886,7 +879,7 @@ | @@ -886,7 +879,7 @@ | ||
886 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> | 879 | <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> |
887 | <provider selected="true" editor-type-id="text-editor"> | 880 | <provider selected="true" editor-type-id="text-editor"> |
888 | <state relative-caret-position="450"> | 881 | <state relative-caret-position="450"> |
889 | - <caret line="282" column="17" lean-forward="true" selection-start-line="282" selection-start-column="17" selection-end-line="282" selection-end-column="17" /> | 882 | + <caret line="282" column="17" lean-forward="false" selection-start-line="282" selection-start-column="17" selection-end-line="282" selection-end-column="17" /> |
890 | <folding> | 883 | <folding> |
891 | <element signature="e#535#1273#0#PHP" expanded="false" /> | 884 | <element signature="e#535#1273#0#PHP" expanded="false" /> |
892 | <element signature="e#1278#2941#0#PHP" expanded="false" /> | 885 | <element signature="e#1278#2941#0#PHP" expanded="false" /> |
-
请 注册 或 登录 后发表评论