正在显示
3 个修改的文件
包含
8 行增加
和
7 行删除
@@ -2,7 +2,9 @@ | @@ -2,7 +2,9 @@ | ||
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment=""> | 4 | <list default="true" id="73de7205-e736-4b59-941a-a54ab4506a41" name="Default" comment=""> |
5 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OtherController.php" afterPath="$PROJECT_DIR$/api/index/controller/OtherController.php" /> | 5 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/bg.png" /> |
6 | + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/static/font-awesome/fonts/PingFang Medium.ttf" /> | ||
7 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
6 | </list> | 8 | </list> |
7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 9 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
8 | <option name="TRACKING_ENABLED" value="true" /> | 10 | <option name="TRACKING_ENABLED" value="true" /> |
@@ -16,7 +18,7 @@ | @@ -16,7 +18,7 @@ | ||
16 | <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> | 18 | <file leaf-file-name="OtherController.php" pinned="false" current-in-tab="true"> |
17 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | 19 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> |
18 | <provider selected="true" editor-type-id="text-editor"> | 20 | <provider selected="true" editor-type-id="text-editor"> |
19 | - <state relative-caret-position="550"> | 21 | + <state relative-caret-position="400"> |
20 | <caret line="329" column="46" lean-forward="true" selection-start-line="329" selection-start-column="46" selection-end-line="329" selection-end-column="46" /> | 22 | <caret line="329" column="46" lean-forward="true" selection-start-line="329" selection-start-column="46" selection-end-line="329" selection-end-column="46" /> |
21 | <folding> | 23 | <folding> |
22 | <element signature="e#129#158#0#PHP" expanded="true" /> | 24 | <element signature="e#129#158#0#PHP" expanded="true" /> |
@@ -277,18 +279,17 @@ | @@ -277,18 +279,17 @@ | ||
277 | <workItem from="1569484124771" duration="560000" /> | 279 | <workItem from="1569484124771" duration="560000" /> |
278 | <workItem from="1569486627319" duration="2740000" /> | 280 | <workItem from="1569486627319" duration="2740000" /> |
279 | <workItem from="1569494185536" duration="1054000" /> | 281 | <workItem from="1569494185536" duration="1054000" /> |
280 | - <workItem from="1569544728303" duration="21293000" /> | 282 | + <workItem from="1569544728303" duration="21472000" /> |
281 | </task> | 283 | </task> |
282 | <servers /> | 284 | <servers /> |
283 | </component> | 285 | </component> |
284 | <component name="TimeTrackingManager"> | 286 | <component name="TimeTrackingManager"> |
285 | - <option name="totallyTimeSpent" value="395180000" /> | 287 | + <option name="totallyTimeSpent" value="395359000" /> |
286 | </component> | 288 | </component> |
287 | <component name="ToolWindowManager"> | 289 | <component name="ToolWindowManager"> |
288 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> | 290 | <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> |
289 | - <editor active="true" /> | ||
290 | <layout> | 291 | <layout> |
291 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17430703" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | 292 | + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17430703" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> |
292 | <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> | 293 | <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> |
293 | <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.34076828" sideWeight="0.50296295" order="7" side_tool="true" content_ui="tabs" /> | 294 | <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.34076828" sideWeight="0.50296295" order="7" side_tool="true" content_ui="tabs" /> |
294 | <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="3" side_tool="false" content_ui="tabs" /> | 295 | <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="3" side_tool="false" content_ui="tabs" /> |
@@ -720,7 +721,7 @@ | @@ -720,7 +721,7 @@ | ||
720 | </entry> | 721 | </entry> |
721 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> | 722 | <entry file="file://$PROJECT_DIR$/api/index/controller/OtherController.php"> |
722 | <provider selected="true" editor-type-id="text-editor"> | 723 | <provider selected="true" editor-type-id="text-editor"> |
723 | - <state relative-caret-position="550"> | 724 | + <state relative-caret-position="400"> |
724 | <caret line="329" column="46" lean-forward="true" selection-start-line="329" selection-start-column="46" selection-end-line="329" selection-end-column="46" /> | 725 | <caret line="329" column="46" lean-forward="true" selection-start-line="329" selection-start-column="46" selection-end-line="329" selection-end-column="46" /> |
725 | <folding> | 726 | <folding> |
726 | <element signature="e#129#158#0#PHP" expanded="true" /> | 727 | <element signature="e#129#158#0#PHP" expanded="true" /> |
public/bg.png
0 → 100644
![](/guosheng/resource/raw/d9c3ed54214e814bb0e4dc0c0efccc29573d2c2a/public/bg.png)
107.2 KB
不能预览此文件类型
-
请 注册 或 登录 后发表评论