郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 3b64f1e3e3e2df9da168613c19e16d4453e17b1f 1 个父辈 179eb947
1 个管道 的构建 通过 耗费 1 秒

上传一张图片

内嵌 并排对比
正在显示 2 个修改的文件 包含 36 行增加 和 26 行删除
... ... @@ -4,14 +4,7 @@
<bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="31" />
</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/admin/controller/Video.php" afterPath="$PROJECT_DIR$/application/admin/controller/Video.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<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>
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -24,8 +17,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="725">
<caret line="147" column="0" lean-forward="true" selection-start-line="147" selection-start-column="0" selection-end-line="147" selection-end-column="0" />
<state relative-caret-position="-50">
<caret line="1379" column="7" lean-forward="true" selection-start-line="1379" selection-start-column="7" selection-end-line="1379" selection-end-column="7" />
<folding>
<element signature="e#544#1282#0#PHP" expanded="false" />
<element signature="e#1287#2950#0#PHP" expanded="false" />
... ... @@ -81,7 +74,6 @@
<element signature="e#43416#44247#0#PHP" expanded="false" />
<element signature="e#44253#44673#0#PHP" expanded="false" />
<element signature="e#44678#45161#0#PHP" expanded="false" />
<element signature="e#45167#45973#0#PHP" expanded="false" />
<element signature="e#45978#49136#0#PHP" expanded="false" />
<element signature="e#49151#50486#0#PHP" expanded="false" />
<element signature="e#50502#51536#0#PHP" expanded="false" />
... ... @@ -207,8 +199,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-61" />
<option name="y" value="101" />
<option name="x" value="359" />
<option name="y" value="92" />
<option name="width" value="1513" />
<option name="height" value="961" />
</component>
... ... @@ -252,6 +244,24 @@
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="20191120" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -267,6 +277,12 @@
<property name="settings.editor.selected.configurable" value="preferences.keymap" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\htdocs\areial\public\uploads\20191120" />
<recent name="D:\htdocs\areial\public\uploads" />
<recent name="D:\htdocs\areial\public\cert" />
<recent name="D:\htdocs\areial\public\uploads\20191118" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\htdocs\areial\public\assets\js" />
<recent name="D:\htdocs\areial\public\assets\libs\bootstrap-table\dist\extensions" />
... ... @@ -274,11 +290,6 @@
<recent name="D:\htdocs\areial\extend" />
<recent name="D:\htdocs\areial\public\uploads\20191118" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\htdocs\areial\public\uploads" />
<recent name="D:\htdocs\areial\public\cert" />
<recent name="D:\htdocs\areial\public\uploads\20191118" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
... ... @@ -391,7 +402,7 @@
<workItem from="1583454639047" duration="19611000" />
<workItem from="1583481861278" duration="4890000" />
<workItem from="1583540220249" duration="10194000" />
<workItem from="1583551237397" duration="8465000" />
<workItem from="1583551237397" duration="8931000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -418,7 +429,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="529329000" />
<option name="totallyTimeSpent" value="529795000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -430,10 +441,9 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-61" y="101" width="1513" height="961" extended-state="1" />
<editor active="true" />
<frame x="359" y="92" width="1513" height="961" extended-state="1" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16999312" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16999312" 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.329602" 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" />
... ... @@ -644,6 +654,7 @@
<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>
... ... @@ -1036,8 +1047,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="725">
<caret line="147" column="0" lean-forward="true" selection-start-line="147" selection-start-column="0" selection-end-line="147" selection-end-column="0" />
<state relative-caret-position="-50">
<caret line="1379" column="7" lean-forward="true" selection-start-line="1379" selection-start-column="7" selection-end-line="1379" selection-end-column="7" />
<folding>
<element signature="e#544#1282#0#PHP" expanded="false" />
<element signature="e#1287#2950#0#PHP" expanded="false" />
... ... @@ -1093,7 +1104,6 @@
<element signature="e#43416#44247#0#PHP" expanded="false" />
<element signature="e#44253#44673#0#PHP" expanded="false" />
<element signature="e#44678#45161#0#PHP" expanded="false" />
<element signature="e#45167#45973#0#PHP" expanded="false" />
<element signature="e#45978#49136#0#PHP" expanded="false" />
<element signature="e#49151#50486#0#PHP" expanded="false" />
<element signature="e#50502#51536#0#PHP" expanded="false" />
... ...